[hamster-applet/gnome-2-30] Updated Serbian translation



commit 96293c78ad665ac0d1a4adf7a61e276d6f7c37bf
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Tue Sep 20 22:00:07 2011 +0200

    Updated Serbian translation

 po/sr.po       |  791 +++++++++++++++++++++++++++-----------------------------
 po/sr latin po |  791 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 758 insertions(+), 824 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index e6cfffd..dd3d870 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,34 +5,40 @@
 #
 # ÐÐÑÐÐ ÐÐÐÑÐÑ <mirkospasic gmail com>
 # ÐÐÑÐÐÂÐÐÐÐÑÂ<grakic devbase net>
-# Translated on 2009-09-14 by: ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ <branko kokanovic gmail com>
+# Translated on 2010-08-27 by: ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ <branko kokanovic gmail com>
 # ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>, 2010.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: hamster-applet\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hamster-applet&component=general\n"
-"POT-Creation-Date: 2010-03-29 12:20+0000\n"
-"PO-Revision-Date: 2010-03-29 15:31+0200\n"
-"Last-Translator: ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>\n"
-"Language-Team: Serbian <gnome prevod org>\n"
+"product=hamster-applet&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-07-14 19:46+0000\n"
+"PO-Revision-Date: 2011-07-13 19:08+0200\n"
+"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Serbian (sr)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../data/90-hamster-applet.xml.in.h:1
+msgid "Project Hamster (GNOME Time Tracker)"
+msgstr "ÐÑÐÐÐÐ ÑÑÑÐÐ (ÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐ)"
 
 #: ../data/hamster-applet.schemas.in.h:1
 msgid ""
 "Activities will be counted as to belong to yesterday if the current time is "
-"less than the specified day start and today, if it is over the time. "
+"less than the specified day start; and today, if it is over the time. "
 "Activities that span two days, will tip over to the side where the largest "
 "part of the activity is."
 msgstr ""
 "ÐÐÑÐÐÐÐÑÑÐ ÑÐ ÑÐÐÑÑÐÑÑ ÑÑÑÐÑÐÑÑÐÐ ÑÐÐÐÐÐÐ ÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐ Ñ ÐÑÐÑÐÐÑÑÐ Ñ "
-"ÐÐÐÐÑÑ ÐÐ ÐÐÐ ÐÐÑÐÑÐÐ. ÐÐÐÐÐÐÐ ÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐ, "
-"ÐÐÑÐÐÐÐÑÑÐ ÑÐ ÑÐÐÑÑÐÑÑ ÐÐÐÐÑÑÐÐ. ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐÐ, ÐÐÐ ÑÐ "
-"ÐÑÐÑÐ Ñ ÐÐÐÑ ÐÐÐ ÐÐÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐ ÑÐ ÐÐÑÐÐÐÐÑÑÐ."
+"ÐÐÐÐÑÑ ÐÐ ÐÐÐ ÐÐÑÐÑÐÐ; ÐÐÐÐÑÑÐÐ ÐÐÐ ÑÐ ÐÑÐÐÐ ÑÐÐ ÐÑÐÐÐÐÐ. ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑ "
+"ÐÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐÐ, ÐÐÐ ÑÐ ÐÑÐÑÐ Ñ ÐÐÐÑ ÐÐÐ ÐÐÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐ ÑÐ "
+"ÐÐÑÐÐÐÐÑÑÐ."
 
 #: ../data/hamster-applet.schemas.in.h:2
 msgid ""
@@ -41,7 +47,7 @@ msgstr ""
 "ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÐÑÑ ÐÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐ "
 "ÐÐÐÑÑÐ, ÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÑÑÑ notify_interval."
 
-#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:5
+#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:4
 msgid "Also remind when no activity is set"
 msgstr "ÐÐÐÐÑÐ ÐÐ Ð ÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ"
 
@@ -50,6 +56,10 @@ msgid "At what time does the day start (defaults to 5:30AM)"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐ (ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ 5:30)"
 
 #: ../data/hamster-applet.schemas.in.h:5
+msgid "Command for toggling visibility of the hamster application window."
+msgstr "ÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÑ ÐÐÐÑÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÑÑÐÐ."
+
+#: ../data/hamster-applet.schemas.in.h:6
 msgid ""
 "If switching by name is enabled, this list sets the activity names that "
 "should be switched to, workspaces represented by the index of item."
@@ -58,21 +68,22 @@ msgstr ""
 "ÐÐÑÐÐÐÐÑÑÐ ÐÐ ÐÐÑÐ ÑÐ ÑÑÐÐÐ ÐÑÐÐÐÑÐÑÐ (ÑÐÐÐÐ ÐÑÐÑÑÐÑÐ ÐÑÐÐÑÑÐÐÑÐÐÐ ÑÐÑÐÐÐÐ "
 "ÐÐÐÐÐÑÐÐÐ)."
 
-#: ../data/hamster-applet.schemas.in.h:6
-msgid "Keyboard shortcut for showing the Time Tracker window."
-msgstr "ÐÑÐÑÐÑÐ ÐÐ ÑÐÑÑÐÑÑÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÐÐ"
-
 #: ../data/hamster-applet.schemas.in.h:7
+msgid "Keyboard shortcut for showing / hiding the Time Tracker window."
+msgstr ""
+"ÐÑÐÑÐÑÐ ÐÐ ÑÐÑÑÐÑÑÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ / ÑÐÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+
+#: ../data/hamster-applet.schemas.in.h:8
 msgid ""
 "List of enabled tracking methods. \"name\" will enable switching activities "
 "by name defined in workspace_mapping. \"memory\" will enable switching to "
-"last activity when returning to a previous workspace."
+"the last activity when returning to a previous workspace."
 msgstr ""
 "ÐÐÐÑÐÐ ÑÐÑÑÑÐÐÐÑ ÐÐÑÐÐÐ ÐÑÐÑÐÑÐ. ânameâ (ÐÐÐÐÐ) ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐÐÐÑÐ "
 "ÐÐÑÐÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐ workspace_mapping. âmemoryâ (ÐÐÐÐÑÐÑÐ) ÑÐ ÐÐÐÐÑÑÐÑÐ "
 "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑÐ ÐÑÐ ÐÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÑ."
 
-#: ../data/hamster-applet.schemas.in.h:8
+#: ../data/hamster-applet.schemas.in.h:9
 msgid ""
 "Remind of current task every specified amount of minutes. Set to 0 or "
 "greater than 120 to disable reminder."
@@ -80,46 +91,59 @@ msgstr ""
 "ÐÐÐÑÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐÐ Ñ ÐÐÐÑÑÐÐÐ. "
 "ÐÑÐÐÐÑÐ ÐÐ 0 ÐÐÐ ÐÐ ÐÐÑÐ ÐÐ 120 ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÑÐÐÐ."
 
-#: ../data/hamster-applet.schemas.in.h:9
+#: ../data/hamster-applet.schemas.in.h:10
 msgid "Remind of current task every x minutes"
 msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÐÐÑ x ÐÐÐÑÑÐ"
 
-#: ../data/hamster-applet.schemas.in.h:10
+#: ../data/hamster-applet.schemas.in.h:11
 msgid "Should workspace switch trigger activity switch"
 msgstr "ÐÐ ÐÐ ÐÑÐÐÐÐÐÑ ÑÐÐÐÐÐ ÐÑÐÑÑÐÑÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÑÐ Ð ÐÐÑÐÐÐÐÑÑ"
 
-#: ../data/hamster-applet.schemas.in.h:11
-msgid "Show window"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÑ"
-
 #: ../data/hamster-applet.schemas.in.h:12
+msgid "Show / hide Time Tracker Window"
+msgstr "ÐÑÐÐÐÐÐ / ÑÐÐÑÐÑ ÐÑÐÐÐÑ ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+
+#: ../data/hamster-applet.schemas.in.h:13
 msgid "Stop tracking current activity on shutdown"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÐÐÐÐÑÑÐ ÐÑÐ ÐÐÑÐÑÑ"
 
-#: ../data/hamster-applet.schemas.in.h:13
+#: ../data/hamster-applet.schemas.in.h:14
 msgid "Stop tracking current activity when computer becomes idle"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÐÐÐÐÑÑÐ, ÐÐÐÐ ÑÐÑÑÐÐÑ ÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐÐÐ"
 
-#: ../data/hamster-applet.schemas.in.h:14
+#: ../data/hamster-applet.schemas.in.h:15
 msgid "Stop tracking on idle"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ"
 
-#: ../data/hamster-applet.schemas.in.h:15 ../data/preferences.ui.h:20
+#: ../data/hamster-applet.schemas.in.h:16 ../data/preferences.ui.h:16
 msgid "Stop tracking on shutdown"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐ ÐÐÑÐÑÑ"
 
-#: ../data/hamster-applet.schemas.in.h:16
+#: ../data/hamster-applet.schemas.in.h:17
 msgid "Switch activity on workspace change"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑ ÐÑÐ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
+#: ../data/hamster-applet.schemas.in.h:18
+msgid "Toggle hamster application window"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÑÑÐÐ"
+
+#: ../data/hamster-applet.schemas.in.h:19
+msgid "Toggle hamster application window action"
+msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÑÑÐÐ"
+
+#: ../data/hamster-applet.schemas.in.h:20
+msgid "Toggle visibility of the hamster application window."
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÑÑÐÐ"
+
 #: ../data/Hamster_Applet.server.in.in.h:1 ../src/hamster/about.py:42
 msgid "Project Hamster â track your time"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐ ÑÑÑÐÐ â ÐÑÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐÐ"
 
 #: ../data/Hamster_Applet.server.in.in.h:2
-#: ../data/hamster-standalone.desktop.in.in.h:2 ../data/hamster.ui.h:10
+#: ../data/hamster-applet.desktop.in.in.h:2
+#: ../data/hamster-time-tracker.desktop.in.in.h:2 ../data/hamster.ui.h:9
 #: ../src/hamster/about.py:39 ../src/hamster/about.py:40
-#: ../src/hamster/applet.py:344 ../src/hamster-standalone:199
+#: ../src/hamster/applet.py:332 ../src/hamster-time-tracker:253
 msgid "Time Tracker"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐÐ"
 
@@ -127,11 +151,11 @@ msgstr "ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐÐ"
 msgid "_About"
 msgstr "_Ð ÐÑÐÐÑÐÐÑ"
 
-#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:13
+#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:12
 msgid "_Help"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../data/Hamster_Applet.xml.h:3
+#: ../data/Hamster_Applet.xml.h:3 ../data/overview.ui.h:12
 msgid "_Overview"
 msgstr "_ÐÑÐÐÐÐÐ"
 
@@ -139,46 +163,39 @@ msgstr "_ÐÑÐÐÐÐÐ"
 msgid "_Preferences"
 msgstr "_ÐÐÑÑÐÐÐÐ"
 
-#: ../data/hamster-standalone.desktop.in.in.h:1
-#| msgid "Project Hamster Website"
-msgid "Project Hamster desktop time tracking"
-msgstr "ÐÑÐÐÐÐ ÑÑÑÐÐ ÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÐÐ ÐÐÐÑÑÐ"
-
-#: ../data/applet.ui.h:1
-msgid "Ad_d Earlier Activity"
-msgstr "ÐÐ_ÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ"
+#: ../data/hamster-applet.desktop.in.in.h:1
+#: ../data/hamster-time-tracker.desktop.in.in.h:1
+msgid "Project Hamster - track your time"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐ ÑÑÑÐÐ - ÐÑÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐÐ"
 
-#: ../data/applet.ui.h:2 ../src/hamster/applet.py:387
+#: ../data/applet.ui.h:1 ../src/hamster/applet.py:370
 msgid "No records today"
 msgstr "ÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../data/applet.ui.h:3 ../data/hamster.ui.h:4
-#| msgid "Switch"
+#: ../data/applet.ui.h:2 ../data/hamster.ui.h:4
 msgid "S_witch"
 msgstr "ÐÑÐ_ÐÐÑÐ"
 
-#: ../data/applet.ui.h:4
+#: ../data/applet.ui.h:3
 msgid "Show _Overview"
 msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÐÐÐÐ"
 
-#: ../data/applet.ui.h:5 ../data/hamster.ui.h:5
-#| msgid "_Stop Tracking"
+#: ../data/applet.ui.h:4 ../data/hamster.ui.h:5
 msgid "Start _Tracking"
 msgstr "Ð_ÐÐÐÑÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../data/applet.ui.h:6 ../data/hamster.ui.h:8
-#| msgid "_Stop Tracking"
-msgid "Sto_p tracking"
-msgstr "_ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ"
-
-#: ../data/applet.ui.h:7 ../data/hamster.ui.h:9
-msgid "Tell me more"
-msgstr "ÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+#: ../data/applet.ui.h:5
+msgid "Sto_p Tracking"
+msgstr "ÐÐÑÑÑÐÐÐ _ÐÑÐÑÐÑÐ"
 
-#: ../data/applet.ui.h:8
-msgid "_Today"
+#: ../data/applet.ui.h:6
+msgid "To_day"
 msgstr "_ÐÐÐÐÑ"
 
+#: ../data/applet.ui.h:7
+msgid "_Add earlier activity"
+msgstr "ÐÐÐ_ÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ"
+
 #: ../data/edit_activity.ui.h:1
 msgid "Activity:"
 msgstr "ÐÐÑÐÐÐÐÑÑ:"
@@ -192,27 +209,22 @@ msgid "Description:"
 msgstr "ÐÐÐÑ:"
 
 #: ../data/edit_activity.ui.h:4
-msgid "Preview:"
-msgstr "ÐÑÐÐÐÐÐ:"
-
-#: ../data/edit_activity.ui.h:5
 msgid "Tags:"
 msgstr "ÐÐÐÐÐÐ:"
 
-#: ../data/edit_activity.ui.h:6
+#: ../data/edit_activity.ui.h:5
 msgid "Time:"
 msgstr "ÐÑÐÐÐ:"
 
-#: ../data/edit_activity.ui.h:7
+#: ../data/edit_activity.ui.h:6
 msgid "in progress"
 msgstr "Ñ ÑÐÐÑ"
 
-#: ../data/edit_activity.ui.h:8 ../data/overview.ui.h:8
+#: ../data/edit_activity.ui.h:7 ../data/range_pick.ui.h:6
 msgid "to"
 msgstr "ÐÐ"
 
 #: ../data/hamster.ui.h:1
-#| msgid "Add Earlier Activity"
 msgid "Add earlier activity"
 msgstr "ÐÐÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ"
 
@@ -220,12 +232,15 @@ msgstr "ÐÐÐÐÑ ÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ"
 msgid "Contents"
 msgstr "ÐÐÐÑÐÐÑ"
 
-#: ../data/hamster.ui.h:3
+#. now add buttons
+#: ../data/hamster.ui.h:3 ../src/docky_control/2.0/hamster_control.py:79
+#: ../src/docky_control/2.0/hamster_control.py:94
+#: ../src/docky_control/2.1/hamster_control.py:79
+#: ../src/docky_control/2.1/hamster_control.py:94
 msgid "Overview"
 msgstr "ÐÑÐÐÐÐÐ"
 
 #: ../data/hamster.ui.h:6
-#| msgid "New activity"
 msgid "Start new activity"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÐÐÐÑÑ"
 
@@ -233,28 +248,27 @@ msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÐÐÐÑÑ"
 msgid "Statistics"
 msgstr "ÐÑÐÑÐÑÑÐÐÐ"
 
-#: ../data/hamster.ui.h:11
+#: ../data/hamster.ui.h:8
+msgid "Sto_p tracking"
+msgstr "_ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ"
+
+#: ../data/hamster.ui.h:10
 msgid "Today"
 msgstr "ÐÐÐÐÑ"
 
-#: ../data/hamster.ui.h:12
-#| msgid "Edit"
+#: ../data/hamster.ui.h:11
 msgid "_Edit"
 msgstr "_ÐÑÐÑÐÐÐÑÐ"
 
-#: ../data/hamster.ui.h:14
-#| msgid "_Stop Tracking"
+#: ../data/hamster.ui.h:13
 msgid "_Tracking"
 msgstr "ÐÑÐÑ_ÐÑÐ"
 
 #: ../data/overview_totals.ui.h:1 ../data/overview.ui.h:1
-#: ../data/preferences.ui.h:1
-#| msgid "_Activities"
 msgid "Activities"
 msgstr "ÐÐÑÐÐÐÐÑÑÐ"
 
 #: ../data/overview_totals.ui.h:2
-#| msgid "_Categories"
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
@@ -263,143 +277,169 @@ msgid "No data for this interval"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
 #: ../data/overview_totals.ui.h:4
-#| msgid "Statistics"
 msgid "Show Statistics"
 msgstr "ÐÑÐÐÐÐÐ ÑÑÐÑÐÑÑÐÐÑ"
 
-#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:212
-#: ../src/hamster/reports.py:227 ../src/hamster-standalone:70
-#| msgid "Totals"
+#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:211
+#: ../src/hamster/reports.py:303 ../src/hamster-time-tracker:159
 msgid "Tags"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../data/overview.ui.h:2
-msgid "Add"
-msgstr "ÐÐÐÐÑ"
+#: ../data/overview.ui.h:2 ../src/hamster/applet.py:205
+#: ../src/hamster/preferences.py:195 ../src/hamster/reports.py:301
+#: ../src/hamster-time-tracker:153
+msgid "Activity"
+msgstr "ÐÐÑÐÐÐÐÑÑ"
 
 #: ../data/overview.ui.h:3
+msgid "Add new"
+msgstr "ÐÐÐÐÑ ÐÐÐÑ"
+
+#: ../data/overview.ui.h:4
+msgid "Day"
+msgstr "ÐÐÐ"
+
+#: ../data/overview.ui.h:5
 msgid "Edit"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../data/overview.ui.h:4
-msgid "Overview - Hamster"
+#: ../data/overview.ui.h:6
+msgid "Month"
+msgstr "ÐÐÑÐÑ"
+
+#: ../data/overview.ui.h:7
+msgid "Overview â Hamster"
 msgstr "ÐÑÐÐÐÐÐ â ÐÑÐÐÐÐ ÑÑÑÐÐ"
 
-#: ../data/overview.ui.h:5
+#: ../data/overview.ui.h:8
 msgid "Remove"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../data/overview.ui.h:6
-#| msgid "HTML Report"
-msgid "Save Report"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÑÑÐÑ"
+#: ../data/overview.ui.h:9
+msgid "Save report..."
+msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÑÑÐÑ..."
 
-#. summary table
-#: ../data/overview.ui.h:7 ../data/stats.ui.h:3 ../src/hamster/reports.py:285
+#: ../data/overview.ui.h:10 ../data/stats.ui.h:3 ../src/hamster/reports.py:292
 msgid "Totals"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../data/preferences.ui.h:2
+#: ../data/overview.ui.h:11
+msgid "Week"
+msgstr "ÐÐÐÐÐÑÐ"
+
+#: ../data/overview.ui.h:13
+msgid "_View"
+msgstr "Ð_ÑÐÐÐÐÐ"
+
+#: ../data/preferences.ui.h:1
 msgid "Activity list"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÐÑÑÐ"
 
-#: ../data/preferences.ui.h:3
+#: ../data/preferences.ui.h:2
 msgid "Add activity"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÐÑÑ"
 
-#: ../data/preferences.ui.h:4
+#: ../data/preferences.ui.h:3
 msgid "Add category"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÑÐÑÑ"
 
-#: ../data/preferences.ui.h:6
-#| msgid "_Categories"
+#: ../data/preferences.ui.h:5
 msgid "Categories and Tags"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐ"
 
-#: ../data/preferences.ui.h:7
+#: ../data/preferences.ui.h:6
 msgid "Category list"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../data/preferences.ui.h:8
+#: ../data/preferences.ui.h:7
 msgid "Edit activity"
 msgstr "ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÑ"
 
-#: ../data/preferences.ui.h:9
+#: ../data/preferences.ui.h:8
 msgid "Edit category"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ"
 
-#: ../data/preferences.ui.h:10
-msgid "General"
-msgstr "ÐÐÑÑÐ"
-
-#: ../data/preferences.ui.h:11
-#| msgid "<b>Global Hotkey</b>"
-msgid "Global Hotkey"
-msgstr "ÐÐÑÑÐ ÐÑÐÑÐÑÐ"
-
-#: ../data/preferences.ui.h:12
-msgid "Move activity down"
-msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐ"
-
-#: ../data/preferences.ui.h:13
-msgid "Move activity up"
-msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐ"
+#: ../data/preferences.ui.h:9
+msgid "Integration"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÐ"
 
-#: ../data/preferences.ui.h:14
+#: ../data/preferences.ui.h:10
 msgid "New day starts at"
 msgstr "ÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐ Ñ"
 
-#: ../data/preferences.ui.h:15
+#: ../data/preferences.ui.h:11
 msgid "Remind of current activity every:"
 msgstr "ÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÐÐÐÑÑ ÑÐÐÐÐÑ:"
 
-#: ../data/preferences.ui.h:16
+#: ../data/preferences.ui.h:12
 msgid "Remove activity"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑ"
 
-#: ../data/preferences.ui.h:17
+#: ../data/preferences.ui.h:13
 msgid "Remove category"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÑ"
 
-#: ../data/preferences.ui.h:18
+#: ../data/preferences.ui.h:14
 msgid "Resume the last activity when returning to a workspace"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÐÑÐÑÐÑ Ñ ÑÐÐÐÐ ÐÑÐÑÑÐÑ"
 
-#: ../data/preferences.ui.h:19
+#: ../data/preferences.ui.h:15
 msgid "Start new activity when switching workspaces:"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÐÐÐÑÑ ÐÑÐ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐ ÐÑÐÑÑÐÑÐ:"
 
-#: ../data/preferences.ui.h:21
+#: ../data/preferences.ui.h:17
 msgid "Stop tracking when computer becomes idle"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐ ÑÐÑÑÐÐÑ ÐÐÐÑÐÑÐ"
 
-#: ../data/preferences.ui.h:22
+#: ../data/preferences.ui.h:18
 msgid "Tags that should appear in autocomplete"
 msgstr "ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐ Ñ ÑÐÐÐÐÐÐÑÑÐÐÐÑÑ"
 
-#: ../data/preferences.ui.h:23
+#: ../data/preferences.ui.h:19
 msgid "Time Tracker Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../data/preferences.ui.h:24
-#| msgid "_Stop Tracking"
+#: ../data/preferences.ui.h:20
 msgid "Tracking"
 msgstr "ÐÑÐÑÐÑÐ"
 
-#: ../data/preferences.ui.h:25
+#: ../data/preferences.ui.h:21
+msgid "Use following todo list if available:"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÑÑÐÐÐ:"
+
+#: ../data/preferences.ui.h:22
 msgid "Workspaces"
 msgstr "ÐÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
-#: ../data/preferences.ui.h:26
+#: ../data/preferences.ui.h:23
 msgid "_Activities"
 msgstr "_ÐÐÑÐÐÐÐÑÑÐ"
 
-#: ../data/preferences.ui.h:27
+#: ../data/preferences.ui.h:24
 msgid "_Categories"
 msgstr "_ÐÐÑÐÐÐÑÐÑÐ"
 
+#: ../data/range_pick.ui.h:1
+msgid "Apply"
+msgstr "ÐÑÐÐÐÐÐ"
+
+#: ../data/range_pick.ui.h:2
+msgid "Day:"
+msgstr "ÐÐÐ:"
+
+#: ../data/range_pick.ui.h:3
+msgid "Month:"
+msgstr "ÐÐÑÐÑ:"
+
+#: ../data/range_pick.ui.h:4
+msgid "Range:"
+msgstr "ÐÑÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ:"
+
+#: ../data/range_pick.ui.h:5
+msgid "Week:"
+msgstr "ÐÐÐÐÐÑÐ:"
+
 #: ../data/stats.ui.h:1
-#| msgid "<b>Starts and ends</b>"
 msgid "Starts and ends"
 msgstr "ÐÐÑÐÑÐÐ Ð ÐÑÐÑ"
 
@@ -407,9 +447,23 @@ msgstr "ÐÐÑÐÑÐÐ Ð ÐÑÐÑ"
 msgid "Year:"
 msgstr "ÐÐÐÐÐÐ:"
 
+#: ../src/docky_control/2.0/hamster_control.py:71
+#: ../src/docky_control/2.1/hamster_control.py:75 ../src/hamster/applet.py:305
+#: ../src/hamster/applet.py:328 ../src/hamster/applet.py:417
+#: ../src/hamster-time-tracker:249 ../src/hamster-time-tracker:313
+msgid "No activity"
+msgstr "ÐÐÐ ÐÐÑÐÐÐÐÑÑÐ"
+
+#: ../src/docky_control/2.0/hamster_control.py:81
+#: ../src/docky_control/2.0/hamster_control.py:95
+#: ../src/docky_control/2.1/hamster_control.py:81
+#: ../src/docky_control/2.1/hamster_control.py:95
+msgid "Preferences"
+msgstr "ÐÐÑÑÐÐÐÐ"
+
 #: ../src/hamster/about.py:43
-msgid "Copyright  2007â2009 Toms BauÄis and others"
-msgstr "ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ Â 2007-2009 Toms Baugis Ð ÐÑÑÐÐÐ"
+msgid "Copyright  2007â2010 Toms BauÄis and others"
+msgstr "ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ Â 2007-2010 Toms BauÄis Ð ÐÑÑÐÐÐ"
 
 #: ../src/hamster/about.py:45
 msgid "Project Hamster Website"
@@ -427,90 +481,78 @@ msgstr ""
 "\n"
 "ÐÑÐÐÐÐ.ÐÑÐ â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
 
-#: ../src/hamster/applet.py:206 ../src/hamster/preferences.py:196
-#: ../src/hamster/reports.py:225 ../src/hamster/reports.py:289
-#: ../src/hamster-standalone:64
-msgid "Activity"
-msgstr "ÐÐÑÐÐÐÐÑÑ"
-
-#: ../src/hamster/applet.py:317 ../src/hamster/applet.py:340
-#: ../src/hamster/applet.py:437 ../src/hamster-standalone:195
-#: ../src/hamster-standalone:264
-msgid "No activity"
-msgstr "ÐÐÐ ÐÐÑÐÐÐÐÑÑÐ"
-
-#: ../src/hamster/applet.py:395
+#: ../src/hamster/applet.py:378
 #, python-format
 msgid "%(category)s: %(duration)s"
 msgstr "%(category)s: %(duration)s"
 
 #. duration in main drop-down per category in hours
-#: ../src/hamster/applet.py:398
+#: ../src/hamster/applet.py:381
 #, python-format
 msgid "%sh"
 msgstr "%sÑ"
 
-#: ../src/hamster/applet.py:420 ../src/hamster/db.py:243
-#: ../src/hamster/db.py:253 ../src/hamster/db.py:307 ../src/hamster/db.py:662
-#: ../src/hamster/db.py:723 ../src/hamster/edit_activity.py:51
-#: ../src/hamster/preferences.py:61 ../src/hamster/reports.py:56
-#: ../src/hamster/reports.py:94 ../src/hamster/reports.py:243
-#: ../src/hamster-standalone:247 ../src/hamster/stuff.py:132
+#: ../src/hamster/applet.py:402 ../src/hamster/db.py:288
+#: ../src/hamster/db.py:298 ../src/hamster/db.py:354 ../src/hamster/db.py:668
+#: ../src/hamster/db.py:855 ../src/hamster/edit_activity.py:54
+#: ../src/hamster/preferences.py:58 ../src/hamster/reports.py:73
+#: ../src/hamster/reports.py:111 ../src/hamster/reports.py:240
+#: ../src/hamster-time-tracker:299
 msgid "Unsorted"
 msgstr "ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+#: ../src/hamster/applet.py:408 ../src/hamster-time-tracker:244
+#: ../src/hamster-time-tracker:304
 msgid "Just started"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
-#| msgid "Add activity"
+#: ../src/hamster/applet.py:644 ../src/hamster-time-tracker:453
 msgid "Changed activity"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÑÑ"
 
-#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#: ../src/hamster/applet.py:645 ../src/hamster-time-tracker:454
 #, c-format, python-format
 msgid "Switched to '%s'"
 msgstr "ÐÑÐÐÐÑÐÐÐ Ñ â%sâ"
 
 #. defaults
-#: ../src/hamster/db.py:918
+#: ../src/hamster/db.py:947
 msgid "Work"
 msgstr "ÐÐÑÐÐ"
 
-#: ../src/hamster/db.py:919
+#: ../src/hamster/db.py:948
 msgid "Reading news"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐ"
 
-#: ../src/hamster/db.py:920
+#: ../src/hamster/db.py:949
 msgid "Checking stocks"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐ"
 
-#: ../src/hamster/db.py:921
+#: ../src/hamster/db.py:950
 msgid "Super secret project X"
 msgstr "ÐÑÐÐÑ ÑÐÑÐÐ ÐÑÐÑÐÐÐÑ X"
 
-#: ../src/hamster/db.py:922
+#: ../src/hamster/db.py:951
 msgid "World domination"
 msgstr "ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ"
 
-#: ../src/hamster/db.py:924
+#: ../src/hamster/db.py:953
 msgid "Day-to-day"
 msgstr "ÐÐ ÐÐÐÐ Ñ ÐÐÐ"
 
-#: ../src/hamster/db.py:925
+#: ../src/hamster/db.py:954
 msgid "Lunch"
 msgstr "ÐÑÑÐÐ"
 
-#: ../src/hamster/db.py:926
+#: ../src/hamster/db.py:955
 msgid "Watering flowers"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÑÐ"
 
-#: ../src/hamster/db.py:927
+#: ../src/hamster/db.py:956
 msgid "Doing handstands"
 msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐ"
 
-#: ../src/hamster/edit_activity.py:67
+#: ../src/hamster/edit_activity.py:70
 msgid "Update activity"
 msgstr "ÐÐÑÑÐÑÐÑ ÐÐÑÐÐÐÐÑÑ"
 
@@ -519,197 +561,180 @@ msgctxt "overview list"
 msgid "%A, %b %d"
 msgstr "%A, %d.%b"
 
-#: ../src/hamster/overview.py:79
-msgid "Week"
-msgstr "ÐÐÐÐÐÑÐ"
-
-#: ../src/hamster/overview.py:80
-msgid "Month"
-msgstr "ÐÐÑÐÑ"
-
-#: ../src/hamster/overview.py:81
-msgid "Date Range"
-msgstr "ÐÑÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-
-#. date format for overview label when only single day is visible
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:158
-#| msgctxt "single day overview"
-#| msgid "%B %d, %Y"
-msgid "%B %d, %Y"
-msgstr "%d. %B, %Y."
-
-#. overview label if start and end years don't match
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:166
-#, python-format
-#| msgid ""
-#| "Overview for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %"
-#| "(end_Y)s"
-msgid "%(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr ""
-"%(start_B)s %(start_d)s, %(start_Y)s. â %(end_B)s %(end_d)s, %(end_Y)s."
-
-#. overview label if start and end month do not match
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:172
-#, python-format
-#| msgid ""
-#| "Overview for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgid "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s."
-
-#. overview label for interval in same month
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:178
-#, python-format
-#| msgid "Overview for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgid "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgstr "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s."
-
-#: ../src/hamster/overview_totals.py:148
+#: ../src/hamster/overview_totals.py:161
 #, python-format
 msgid "%s hours tracked total"
 msgstr "ÐÐÑÐÐÐ ÑÐ ÐÑÐÑÐÐÐ ÑÐ %s ÑÐÑÐ"
 
-#: ../src/hamster/preferences.py:117 ../src/hamster/preferences.py:192
+#. Translators: 'None' refers here to the Todo list choice in Hamster preferences (Tracking tab)
+#: ../src/hamster/preferences.py:105
+msgid "None"
+msgstr "ÐÐÑÑÐ"
+
+#: ../src/hamster/preferences.py:120 ../src/hamster/preferences.py:191
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
-#: ../src/hamster/reports.py:288
+#: ../src/hamster/preferences.py:140 ../src/hamster/reports.py:302
 msgid "Category"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../src/hamster/preferences.py:673
+#: ../src/hamster/preferences.py:637
 msgid "New category"
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../src/hamster/preferences.py:686
+#: ../src/hamster/preferences.py:650
 msgid "New activity"
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐÑÑ"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:757
+#: ../src/hamster/preferences.py:701
 #, python-format
-msgid "%(interval_minutes)d minutes"
-msgstr "%(interval_minutes)d ÐÐÐÑÑÐ"
+msgid "%(interval_minutes)d minute"
+msgid_plural "%(interval_minutes)d minutes"
+msgstr[0] "%(interval_minutes)d ÐÐÐÑÑ"
+msgstr[1] "%(interval_minutes)d ÐÐÐÑÑÐ"
+msgstr[2] "%(interval_minutes)d ÐÐÐÑÑÐ"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:760
+#: ../src/hamster/preferences.py:706
 msgid "Never"
 msgstr "ÐÐÐÐÐ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:115
+#: ../src/hamster/reports.py:132
 msgid "activity"
 msgstr "ÐÐÑÐÐÐÐÑÑ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:117
+#: ../src/hamster/reports.py:134
 msgid "start time"
 msgstr "ÐÑÐÐÐ ÐÐÑÐÑÐÐ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:119
+#: ../src/hamster/reports.py:136
 msgid "end time"
 msgstr "ÐÑÐÐÐ ÐÐÐÑÑÐÑÐÐ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:121
+#: ../src/hamster/reports.py:138
 msgid "duration minutes"
 msgstr "ÑÑÐÑÐÑÐ Ñ ÐÐÐÑÑÐÐÐ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:123
+#: ../src/hamster/reports.py:140
 msgid "category"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:125
+#: ../src/hamster/reports.py:142
 msgid "description"
 msgstr "ÐÐÐÑ"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:127
-#| msgid "Totals"
+#: ../src/hamster/reports.py:144 ../src/hamster/reports.py:296
 msgid "tags"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../src/hamster/reports.py:167
+#: ../src/hamster/reports.py:191
 #, python-format
 msgid ""
-"Overview for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %"
-"(end_Y)s"
+"Activity report for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)"
+"s, %(end_Y)s"
 msgstr ""
-"ÐÐÐÐÑÑÐÑ ÐÐ %(start_d)s. %(start_B)s %(start_Y)s â %(end_d)s. %(end_B)s %"
-"(end_Y)s"
+"ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ %(start_d)s.%(start_B)s.%(start_Y)s â %(end_d)s.%"
+"(end_B)s.%(end_Y)s"
 
-#: ../src/hamster/reports.py:169
+#: ../src/hamster/reports.py:193
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr "ÐÐÐÐÑÑÐÑ ÐÐ %(start_d)s. %(start_B)s â %(end_d)s. %(end_B)s %(end_Y)s"
+msgid ""
+"Activity report for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr ""
+"ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ %(start_d)s.%(start_B)s â %(end_d)s.%(end_B)s.%(end_Y)s"
 
-#: ../src/hamster/reports.py:171
+#: ../src/hamster/reports.py:195
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgstr "ÐÐÐÐÑÑÐÑ ÐÐ %(start_d)s â %(end_d)s. %(start_B)s %(end_Y)s"
+msgid "Activity report for %(start_B)s %(start_d)s, %(start_Y)s"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ %(start_d)s.%(start_B)s.%(start_Y)s"
 
-#: ../src/hamster/reports.py:174
+#: ../src/hamster/reports.py:197
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s, %(start_Y)s"
-msgstr "ÐÐÐÐÑÑÐÑ ÐÐ %(start_d)s. %(start_B)s %(start_Y)s"
+msgid "Activity report for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ %(start_d)s - %(end_d)s.%(start_B)s.%(end_Y)s"
+
+#. date column format for each row in HTML report
+#. Using python datetime formatting syntax. See:
+#. http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/reports.py:249 ../src/hamster/reports.py:281
+msgctxt "html report"
+msgid "%b %d, %Y"
+msgstr "%d.%b.%Y"
+
+#. grand_total = _("%s hours") % ("%.1f" % (total_duration.seconds / 60.0 / 60 + total_duration.days * 24)),
+#: ../src/hamster/reports.py:290
+msgid "Totals by Day"
+msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐ"
+
+#: ../src/hamster/reports.py:291
+msgid "Activity Log"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ"
+
+#: ../src/hamster/reports.py:294
+msgid "activities"
+msgstr "ÐÐÑÐÐÐÐÑÑÐ"
 
-#: ../src/hamster/reports.py:224
+#: ../src/hamster/reports.py:295
+msgid "categories"
+msgstr "ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../src/hamster/reports.py:298
+msgid "Distinguish:"
+msgstr "ÐÐÐÐÐÐÑÑ:"
+
+#: ../src/hamster/reports.py:300
 msgid "Date"
 msgstr "ÐÐÑÑÐ"
 
-#: ../src/hamster/reports.py:228
+#: ../src/hamster/reports.py:304
 msgid "Start"
 msgstr "ÐÐÑÐÑÐÐ"
 
-#: ../src/hamster/reports.py:229
+#: ../src/hamster/reports.py:305
 msgid "End"
 msgstr "ÐÑÐÑ"
 
-#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+#: ../src/hamster/reports.py:306
 msgid "Duration"
-msgstr "ÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÑÐÑÐ"
 
-#: ../src/hamster/reports.py:231
+#: ../src/hamster/reports.py:307
 msgid "Description"
 msgstr "ÐÐÐÑ"
 
-#. date column format for each row in HTML report
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/reports.py:264
-msgctxt "html report"
-msgid "%b %d, %Y"
-msgstr "%d.%b.%Y"
+#: ../src/hamster/reports.py:310
+msgid "Show template"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../src/hamster/reports.py:300
-msgid "Total Time"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐ"
+#: ../src/hamster/reports.py:311
+#, python-format
+msgid "You can override it by storing your version in %(home_folder)s"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑÐÑÐÐ ÐÐÑÑ ÐÐÑÐÐÑÑ Ñ %(home_folder)s"
 
-#: ../src/hamster-standalone:190
+#: ../src/hamster-time-tracker:242
 #, c-format
 msgid "Working on <b>%s</b>"
 msgstr "ÐÐÐÐÐ ÐÐ <b>%s</b>"
 
-#: ../src/hamster/stats.py:86
+#: ../src/hamster-time-tracker:595
+msgid "Hamster time tracker. Usage:"
+msgstr "ÐÑÐÐÐÐ ÑÑÑÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ. ÐÐÑÐÑÑÐÑÐ:"
+
+#: ../src/hamster/stats.py:90
 msgctxt "years"
 msgid "All"
 msgstr "ÐÐÐ"
 
-#: ../src/hamster/stats.py:176
+#: ../src/hamster/stats.py:166
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -717,15 +742,14 @@ msgstr ""
 "ÐÐÑ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑ ÑÑÐÑÐÑÑÐÐÐ.\n"
 "ÐÐÐÐÑÑ ÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐ!"
 
-#: ../src/hamster/stats.py:179
-#| msgid "Still collecting data â check back after a week has passed!"
+#: ../src/hamster/stats.py:169
 msgid "Collecting data â check back after a week has passed!"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ â ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐ!"
 
 #. date format for the first record if the year has not been selected
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:310
+#: ../src/hamster/stats.py:320
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -733,19 +757,17 @@ msgstr "%d.%b.%Y"
 #. date of first record when year has been selected
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:315
-#| msgctxt "overview graph"
-#| msgid "%b %d"
+#: ../src/hamster/stats.py:325
 msgctxt "first record"
 msgid "%b %d"
 msgstr "%b. %d"
 
-#: ../src/hamster/stats.py:317
+#: ../src/hamster/stats.py:327
 #, python-format
 msgid "First activity was recorded on %s."
 msgstr "ÐÑÐÐ ÐÐÑÐÐÐÐÑÑ ÑÐ ÐÐÐÐÐÐÐÐÐÐ %s."
 
-#: ../src/hamster/stats.py:326 ../src/hamster/stats.py:330
+#: ../src/hamster/stats.py:336 ../src/hamster/stats.py:340
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -754,7 +776,7 @@ msgstr[1] "%(num)s ÐÐÐÐÐÐ"
 msgstr[2] "%(num)s ÐÐÐÐÐÐ"
 
 #. FIXME: difficult string to properly pluralize
-#: ../src/hamster/stats.py:335
+#: ../src/hamster/stats.py:345
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -766,12 +788,12 @@ msgstr ""
 #. How the date of the longest activity should be displayed in statistics
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:353
+#: ../src/hamster/stats.py:363
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../src/hamster/stats.py:358
+#: ../src/hamster/stats.py:368
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
@@ -782,7 +804,7 @@ msgstr[2] ""
 "ÐÐÑÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐ ÑÐ ÐÐÐ %(date)s Ð ÑÑÐÑÐÐ ÑÐ %(hours)s ÑÐÑÐ."
 
 #. total records (in selected scope)
-#: ../src/hamster/stats.py:366
+#: ../src/hamster/stats.py:376
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -790,176 +812,121 @@ msgstr[0] "ÐÐÑÑÐÑÐ %s ÐÐÐÐÑ."
 msgstr[1] "ÐÐÑÑÐÑÐ %s ÐÐÐÐÑÐ."
 msgstr[2] "ÐÐÑÑÐÑÐ %s ÐÐÐÐÑÐ."
 
-#: ../src/hamster/stats.py:386
+#: ../src/hamster/stats.py:396
 msgid "Hamster would like to observe you some more!"
 msgstr "ÐÑÐÐÐÐ ÑÑÑÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÑÐ ÑÐÑ ÐÐÐÐ ÐÐÐÐÐÐÐÐ!"
 
-#: ../src/hamster/stats.py:388
+#: ../src/hamster/stats.py:398
 #, python-format
 msgid ""
-"With %s percent of all facts starting before 9am you seem to be an early "
-"bird."
+"With %s percent of all activities starting before 9am, you seem to be an "
+"early bird."
 msgstr ""
-"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐ 9 ÐÑÐÐÐÐÐÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÑÐ "
+"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐ 9 ÐÑÐÐÐÐÐÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÑÐ "
 "ÑÐÐÐÑÐÐÐÐÐÑ."
 
-#: ../src/hamster/stats.py:391
+#: ../src/hamster/stats.py:401
 #, python-format
 msgid ""
-"With %s percent of all facts starting after 11pm you seem to be a night owl."
+"With %s percent of all activities starting after 11pm, you seem to be a "
+"night owl."
 msgstr ""
-"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐ 11 ÑÐÐÑÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÑÐ "
+"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÐ 11 ÑÐÐÑÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÑÐ "
 "ÐÐÑÐÐ ÐÑÐÑÐ."
 
-#: ../src/hamster/stats.py:394
+#: ../src/hamster/stats.py:404
 #, python-format
 msgid ""
-"With %s percent of all tasks being shorter than 15 minutes you seem to be a "
-"busy bee."
+"With %s percent of all activities being shorter than 15 minutes, you seem to "
+"be a busy bee."
 msgstr ""
-"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑ ÐÐÐÐ ÐÑÐÑÐ ÐÐ 15 ÐÐÐÑÑÐ, ÐÐÐÐÐÐÐ ÐÐ ÑÑÐ "
-"ÐÑÐÐÐÑÐ ÐÐÑÐ."
+"ÐÐ %s ÐÑÐÑÐÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÐ ÐÐÑÐ ÑÑ ÑÑÐÑÐÐÐ ÐÐÑÐ ÐÐ 15 ÐÐÐÑÑÐ, ÐÐÐÐÐÐÐ ÐÐ "
+"ÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐ."
 
 #. duration in round hours
-#: ../src/hamster/stuff.py:56
+#: ../src/hamster/lib/stuff.py:57
 #, python-format
 msgid "%dh"
 msgstr "%dÑ"
 
 #. duration less than hour
-#: ../src/hamster/stuff.py:59
+#: ../src/hamster/lib/stuff.py:60
 #, python-format
 msgid "%dmin"
 msgstr "%dÐÐÐ"
 
 #. x hours, y minutes
-#: ../src/hamster/stuff.py:62
+#: ../src/hamster/lib/stuff.py:63
 #, python-format
 msgid "%dh %dmin"
 msgstr "%dÑ %dÐÐÐ"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:38
-#| msgid "Save report â Time Tracker"
-msgid "Save report - Time Tracker"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐÐ â ÑÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
+#. label of date range if looking on single day
+#. date format for overview label when only single day is visible
+#. Using python datetime formatting syntax. See:
+#. http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:80
+msgid "%B %d, %Y"
+msgstr "%d. %B, %Y."
+
+#. label of date range if start and end years don't match
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:86
+#, python-format
+msgid "%(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr ""
+"%(start_B)s %(start_d)s, %(start_Y)s. â %(end_B)s %(end_d)s, %(end_Y)s."
+
+#. label of date range if start and end month do not match
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:92
+#, python-format
+msgid "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s."
+
+#. label of date range for interval in same month
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:98
+#, python-format
+msgid "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
+msgstr "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s."
 
-#: ../src/hamster/widgets/reportchooserdialog.py:50
+#: ../src/hamster/widgets/reportchooserdialog.py:39
+msgid "Save Report â Time Tracker"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐ â ÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐÐ"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:57
 msgid "HTML Report"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐÑ"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:58
+#: ../src/hamster/widgets/reportchooserdialog.py:65
 msgid "Tab-Separated Values (TSV)"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐÑÐÐ (TSV)"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:66
+#: ../src/hamster/widgets/reportchooserdialog.py:73
 msgid "XML"
 msgstr "XML"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:73
+#: ../src/hamster/widgets/reportchooserdialog.py:80
 msgid "iCal"
 msgstr "iCal"
 
-#~ msgid "<b>Activities</b>"
-#~ msgstr "<b>ÐÐÑÐÐÐÐÑÑÐ</b>"
-
-#~ msgid "<b>Tracking</b>"
-#~ msgstr "<b>ÐÑÐÑÐÑÐ</b>"
-
-#~ msgid ""
-#~ "<span size=\"small\" >Type in an activity and hit Enter to start tracking!"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span size=\"small\" >ÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑ Ð ÐÑÐÑÐÑÐÐÑÐ âEnterâ ÐÐ ÐÐÐÐÑÐÐÑÐ "
-#~ "ÐÑÐÑÐÑÐ!</span>"
-
-#~ msgid ""
-#~ "<span size=\"small\" color=\"blue\" underline=\"single\">Tell me more</"
-#~ "span>"
-#~ msgstr ""
-#~ "<span size=\"small\" color=\"blue\" underline=\"single\">ÐÐÑÐ ÐÐ ÐÐÑÐ</"
-#~ "span>"
-
-#~ msgid "Hamster"
-#~ msgstr "Hamster"
-
-#~ msgid "_Activity:"
-#~ msgstr "_ÐÐÑÐÐÐÐÑÑ:"
-
-#~ msgid " _Day"
-#~ msgstr "_ÐÐÐ"
-
-#~ msgid " _Month"
-#~ msgstr "_ÐÐÑÐÑ"
-
-#~ msgid " _Week"
-#~ msgstr "_ÐÐÐÐÐÑÐ"
-
-#~ msgid "<b>Overview</b>"
-#~ msgstr "<b>ÐÑÐÐÐÐÐ</b>"
-
-#~ msgid "<b>Totals</b>"
-#~ msgstr "<b>ÐÐÑÐÐÐ</b>"
-
-#~ msgid "Categories:"
-#~ msgstr "ÐÐÑÐÐÐÑÐÑÐ"
-
-#~ msgid "Date interval:"
-#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ:"
-
-#~ msgid "Save as HTML"
-#~ msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐ"
-
-#~ msgid "What should be typed in the activity box?"
-#~ msgstr "ÐÑÐ ÐÐ ÑÐÐÑÐÐ Ñ ÐÑÑÐÑÑ ÐÐÑÐÐÐÐÑÑÐ?"
-
-#~ msgid ""
-#~ "There is a simple syntax that enables you to add details to your "
-#~ "activities:\n"
-#~ "        \n"
-#~ "\"@\" symbol marks a category. Example: \"watering flowers home\" will "
-#~ "start tracking the activity \"watering flowers\" in the category \"home"
-#~ "\".\n"
-#~ "\n"
-#~ "Commas (\",\") mark beginning of a description. Example: \"watering "
-#~ "flowers, begonias and forgetmenots\" will start tracking the activity "
-#~ "\"watering flowers\" and add the description \"begonias and forgetmenots"
-#~ "\" to it.\n"
-#~ "\n"
-#~ "Both can be combined: \"watering flowers home, begonias and forgetmenots"
-#~ "\" will work just fine!\n"
-#~ "\n"
-#~ "Now, start tracking!\n"
-#~ "        "
-#~ msgstr ""
-#~ "ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑÐÐÐ ÑÐ "
-#~ "ÑÐÐÐÐÑÑÐÐÐÐ:\n"
-#~ "        \n"
-#~ "â â ÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÑ. ÐÑÐÐÐÑ: âÐÐÐÐÐÐÑÐ ÑÐÐÑÐ ÐÑÑÐâ ÐÐÐÐÑÐÑÐ "
-#~ "ÐÑÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑÐ âÐÐÐÐÐÐÑÐ ÑÐÐÑÐâ Ñ ÐÐÑÐÐÐÑÐÑÐ âÐÑÑÐâ.\n"
-#~ "\n"
-#~ "ÐÐÑÐÐÐ (â,â) ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÑÐÐ ÐÐÐÑÐ. ÐÑÐÐÐÑ: âÐÐÐÐÐÐÑÐ ÑÐÐÑÐ, ÐÐÑÑÐÐÑÐ "
-#~ "Ð ÐÑÑÐÐÑÐÐâ ÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐ ÐÐÑÐÐÐÐÑÑÐ âÐÐÐÐÐÐÑÐ ÑÐÐÑÐâ Ð ÐÐÐÐÑÐ ÐÐÐÑ "
-#~ "âÐÐÑÑÐÐÑÐ Ð ÐÑÑÐÐÑÐÐâ ÐÐ ÑÑ ÐÐÑÐÐÐÐÑÑ.\n"
-#~ "\n"
-#~ "ÐÐÐ ÐÐÐ ÑÐ ÐÐÐÑ ÐÐÐÐÐÐÐÐÐÑÐ: âÐÐÐÐÐÐÑÐ ÑÐÐÑÐ ÐÑÑÐ, ÐÐÑÑÐÐÑÐ Ð ÐÑÑÐÐÑÐÐâ "
-#~ "ÑÐÐÐÑÐ ÐÑÑÐ ÐÐÑÐÐ!\n"
-#~ "\n"
-#~ "Ð ÑÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÑÐÑÐÑÐÐ ÐÑÐÐÐÐÐ!\n"
-#~ "        "
-
-#~ msgctxt "categories"
-#~ msgid "All"
-#~ msgstr "ÐÐÐ"
-
-#~ msgctxt "first record"
-#~ msgid "%(b)s %(d)s"
-#~ msgstr "%(b)s %(d)s"
-
-#~ msgid "Total"
-#~ msgstr "ÐÐÑÐÐÐ"
-
-#~ msgid "Overview for %(date)s"
-#~ msgstr "ÐÑÐÐÐÐÐ ÐÐ %(date)s"
-
-#~ msgid "Day"
-#~ msgstr "ÐÐÐ"
+#. title in the report file name
+#: ../src/hamster/widgets/reportchooserdialog.py:97
+msgid "Time track"
+msgstr "ÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ"
+
+#~ msgid "totals by activity"
+#~ msgstr "ÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐÑÑÐÐÐ"
+
+#~ msgid "totals by category"
+#~ msgstr "ÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐÐ"
+
+#~ msgid "Show:"
+#~ msgstr "ÐÑÐÐÐÐÐ:"
diff --git a/po/sr latin po b/po/sr latin po
index d6067b3..acca0a0 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,34 +5,40 @@
 #
 # Mirko SpasiÄ <mirkospasic gmail com>
 # GoranÂRakiÄÂ<grakic devbase net>
-# Translated on 2009-09-14 by: Branko KokanoviÄ <branko kokanovic gmail com>
+# Translated on 2010-08-27 by: Branko KokanoviÄ <branko kokanovic gmail com>
 # MiloÅ PopoviÄ <gpopac gmail com>, 2010.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: hamster-applet\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hamster-applet&component=general\n"
-"POT-Creation-Date: 2010-03-29 12:20+0000\n"
-"PO-Revision-Date: 2010-03-29 15:31+0200\n"
-"Last-Translator: MiloÅ PopoviÄ <gpopac gmail com>\n"
-"Language-Team: Serbian <gnome prevod org>\n"
+"product=hamster-applet&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-07-14 19:46+0000\n"
+"PO-Revision-Date: 2011-07-13 19:08+0200\n"
+"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Serbian (sr)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../data/90-hamster-applet.xml.in.h:1
+msgid "Project Hamster (GNOME Time Tracker)"
+msgstr "Vredni hrÄak (PraÄenje vremena za Gnom)"
 
 #: ../data/hamster-applet.schemas.in.h:1
 msgid ""
 "Activities will be counted as to belong to yesterday if the current time is "
-"less than the specified day start and today, if it is over the time. "
+"less than the specified day start; and today, if it is over the time. "
 "Activities that span two days, will tip over to the side where the largest "
 "part of the activity is."
 msgstr ""
 "Aktivnosti se smatraju juÄeraÅnjim ukoliko je trenutno vreme u proÅlosti u "
-"odnosu na dan poÄetka. Ukoliko je trenutno vreme nakon dana poÄetka, "
-"aktivnosti se smatraju danaÅnjim. Ukoliko aktivnost obuhvata dva dana, ona Äe "
-"preÄi u onaj dan kada je izvrÅen veÄi deo te aktivnosti."
+"odnosu na dan poÄetka; danaÅnjim ako je preko tog vremena. Ukoliko aktivnost "
+"obuhvata dva dana, ona Äe preÄi u onaj dan kada je izvrÅen veÄi deo te "
+"aktivnosti."
 
 #: ../data/hamster-applet.schemas.in.h:2
 msgid ""
@@ -41,7 +47,7 @@ msgstr ""
 "Ukoliko ni jedna aktivnost nije zapoÄeta podseti me nakon odreÄenog boja "
 "minuta, koje odreÄuje kljuÄ notify_interval."
 
-#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:5
+#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:4
 msgid "Also remind when no activity is set"
 msgstr "TakoÄe me i podseti kada nema aktivnosti"
 
@@ -50,6 +56,10 @@ msgid "At what time does the day start (defaults to 5:30AM)"
 msgstr "Kada poÄinje novi dan (podrazumevano je 5:30)"
 
 #: ../data/hamster-applet.schemas.in.h:5
+msgid "Command for toggling visibility of the hamster application window."
+msgstr "Naredba za promenu vidljivosti glavnog prozora Vrednog hrÄka."
+
+#: ../data/hamster-applet.schemas.in.h:6
 msgid ""
 "If switching by name is enabled, this list sets the activity names that "
 "should be switched to, workspaces represented by the index of item."
@@ -58,21 +68,22 @@ msgstr ""
 "aktivnosti na koje se treba prebaciti (radni prostori predstavljeni njihovim "
 "indeksima)."
 
-#: ../data/hamster-applet.schemas.in.h:6
-msgid "Keyboard shortcut for showing the Time Tracker window."
-msgstr "PreÄica na tastaturi za prikazivanje prozora Pratioca vremena"
-
 #: ../data/hamster-applet.schemas.in.h:7
+msgid "Keyboard shortcut for showing / hiding the Time Tracker window."
+msgstr ""
+"PreÄica na tastaturi za prikazivanje / sakrivanje prozora Pratioca vremena"
+
+#: ../data/hamster-applet.schemas.in.h:8
 msgid ""
 "List of enabled tracking methods. \"name\" will enable switching activities "
 "by name defined in workspace_mapping. \"memory\" will enable switching to "
-"last activity when returning to a previous workspace."
+"the last activity when returning to a previous workspace."
 msgstr ""
 "Spisak ukljuÄenih naÄina praÄenja. ânameâ (naziv) Äe omoguÄiti prebacivanje "
 "aktivnosti po imenima iz workspace_mapping. âmemoryâ (memorija) Äe omoguÄiti "
 "prebacivanje na poslednju aktivnosti pri povratku na prethodni radni prostor."
 
-#: ../data/hamster-applet.schemas.in.h:8
+#: ../data/hamster-applet.schemas.in.h:9
 msgid ""
 "Remind of current task every specified amount of minutes. Set to 0 or "
 "greater than 120 to disable reminder."
@@ -80,46 +91,59 @@ msgstr ""
 "Podseti na trenutni posao nakon vremenskog intervala zatdatog u minutama. "
 "Stavite na 0 ili na viÅe od 120 minuta da onemoguÄite podsetnik."
 
-#: ../data/hamster-applet.schemas.in.h:9
+#: ../data/hamster-applet.schemas.in.h:10
 msgid "Remind of current task every x minutes"
 msgstr "Podseti na trenutni posao svakih x minuta"
 
-#: ../data/hamster-applet.schemas.in.h:10
+#: ../data/hamster-applet.schemas.in.h:11
 msgid "Should workspace switch trigger activity switch"
 msgstr "Da li prekidaÄ radnog prostora treba da ukljuÄuje i aktivnost"
 
-#: ../data/hamster-applet.schemas.in.h:11
-msgid "Show window"
-msgstr "PrikaÅi prozor"
-
 #: ../data/hamster-applet.schemas.in.h:12
+msgid "Show / hide Time Tracker Window"
+msgstr "PrikaÅi / sakrij prozor Pratioca vremena"
+
+#: ../data/hamster-applet.schemas.in.h:13
 msgid "Stop tracking current activity on shutdown"
 msgstr "Zaustavi praÄenje tekuÄe aktivnosti pri gaÅenju"
 
-#: ../data/hamster-applet.schemas.in.h:13
+#: ../data/hamster-applet.schemas.in.h:14
 msgid "Stop tracking current activity when computer becomes idle"
 msgstr "Zaustavi praÄenje tekuÄe aktivnosti, kada raÄunar postane neuposlen"
 
-#: ../data/hamster-applet.schemas.in.h:14
+#: ../data/hamster-applet.schemas.in.h:15
 msgid "Stop tracking on idle"
 msgstr "Zaustavi praÄenje kada nema aktivnosti"
 
-#: ../data/hamster-applet.schemas.in.h:15 ../data/preferences.ui.h:20
+#: ../data/hamster-applet.schemas.in.h:16 ../data/preferences.ui.h:16
 msgid "Stop tracking on shutdown"
 msgstr "Zaustavi praÄenje pri gaÅenju"
 
-#: ../data/hamster-applet.schemas.in.h:16
+#: ../data/hamster-applet.schemas.in.h:17
 msgid "Switch activity on workspace change"
 msgstr "Promeni aktivnost pri promeni radnog prostora"
 
+#: ../data/hamster-applet.schemas.in.h:18
+msgid "Toggle hamster application window"
+msgstr "Promena vidljivosti glavnog prozora Vrednog hrÄka"
+
+#: ../data/hamster-applet.schemas.in.h:19
+msgid "Toggle hamster application window action"
+msgstr "Akcija promene vidljivosti glavnog prozora Vrednog hrÄka"
+
+#: ../data/hamster-applet.schemas.in.h:20
+msgid "Toggle visibility of the hamster application window."
+msgstr "Promeni vidljivost glavnog prozora Vrednog hrÄka"
+
 #: ../data/Hamster_Applet.server.in.in.h:1 ../src/hamster/about.py:42
 msgid "Project Hamster â track your time"
 msgstr "Projekat Vredni hrÄak â pratite vaÅe vreme"
 
 #: ../data/Hamster_Applet.server.in.in.h:2
-#: ../data/hamster-standalone.desktop.in.in.h:2 ../data/hamster.ui.h:10
+#: ../data/hamster-applet.desktop.in.in.h:2
+#: ../data/hamster-time-tracker.desktop.in.in.h:2 ../data/hamster.ui.h:9
 #: ../src/hamster/about.py:39 ../src/hamster/about.py:40
-#: ../src/hamster/applet.py:344 ../src/hamster-standalone:199
+#: ../src/hamster/applet.py:332 ../src/hamster-time-tracker:253
 msgid "Time Tracker"
 msgstr "Pratilac vremena"
 
@@ -127,11 +151,11 @@ msgstr "Pratilac vremena"
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:13
+#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:12
 msgid "_Help"
 msgstr "_PomoÄ"
 
-#: ../data/Hamster_Applet.xml.h:3
+#: ../data/Hamster_Applet.xml.h:3 ../data/overview.ui.h:12
 msgid "_Overview"
 msgstr "_Pregled"
 
@@ -139,46 +163,39 @@ msgstr "_Pregled"
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../data/hamster-standalone.desktop.in.in.h:1
-#| msgid "Project Hamster Website"
-msgid "Project Hamster desktop time tracking"
-msgstr "Vredni hrÄak za praÄenje vremena sa radne povrÅi"
-
-#: ../data/applet.ui.h:1
-msgid "Ad_d Earlier Activity"
-msgstr "Do_daj raniju aktovnost"
+#: ../data/hamster-applet.desktop.in.in.h:1
+#: ../data/hamster-time-tracker.desktop.in.in.h:1
+msgid "Project Hamster - track your time"
+msgstr "Projekat Vredni hrÄak - pratite vaÅe vreme"
 
-#: ../data/applet.ui.h:2 ../src/hamster/applet.py:387
+#: ../data/applet.ui.h:1 ../src/hamster/applet.py:370
 msgid "No records today"
 msgstr "Danas nema zapisa"
 
-#: ../data/applet.ui.h:3 ../data/hamster.ui.h:4
-#| msgid "Switch"
+#: ../data/applet.ui.h:2 ../data/hamster.ui.h:4
 msgid "S_witch"
 msgstr "Pre_baci"
 
-#: ../data/applet.ui.h:4
+#: ../data/applet.ui.h:3
 msgid "Show _Overview"
 msgstr "PrikaÅi _pregled"
 
-#: ../data/applet.ui.h:5 ../data/hamster.ui.h:5
-#| msgid "_Stop Tracking"
+#: ../data/applet.ui.h:4 ../data/hamster.ui.h:5
 msgid "Start _Tracking"
 msgstr "Z_apoÄni praÄenje"
 
-#: ../data/applet.ui.h:6 ../data/hamster.ui.h:8
-#| msgid "_Stop Tracking"
-msgid "Sto_p tracking"
-msgstr "_Zaustavi praÄenje"
-
-#: ../data/applet.ui.h:7 ../data/hamster.ui.h:9
-msgid "Tell me more"
-msgstr "IspiÅi viÅe podataka"
+#: ../data/applet.ui.h:5
+msgid "Sto_p Tracking"
+msgstr "Zaustavi _praÄenje"
 
-#: ../data/applet.ui.h:8
-msgid "_Today"
+#: ../data/applet.ui.h:6
+msgid "To_day"
 msgstr "_Danas"
 
+#: ../data/applet.ui.h:7
+msgid "_Add earlier activity"
+msgstr "Dod_aj raniju aktivnost"
+
 #: ../data/edit_activity.ui.h:1
 msgid "Activity:"
 msgstr "Aktivnost:"
@@ -192,27 +209,22 @@ msgid "Description:"
 msgstr "Opis:"
 
 #: ../data/edit_activity.ui.h:4
-msgid "Preview:"
-msgstr "Pregled:"
-
-#: ../data/edit_activity.ui.h:5
 msgid "Tags:"
 msgstr "Oznake:"
 
-#: ../data/edit_activity.ui.h:6
+#: ../data/edit_activity.ui.h:5
 msgid "Time:"
 msgstr "Vreme:"
 
-#: ../data/edit_activity.ui.h:7
+#: ../data/edit_activity.ui.h:6
 msgid "in progress"
 msgstr "u toku"
 
-#: ../data/edit_activity.ui.h:8 ../data/overview.ui.h:8
+#: ../data/edit_activity.ui.h:7 ../data/range_pick.ui.h:6
 msgid "to"
 msgstr "do"
 
 #: ../data/hamster.ui.h:1
-#| msgid "Add Earlier Activity"
 msgid "Add earlier activity"
 msgstr "Dodaj raniju aktivnost"
 
@@ -220,12 +232,15 @@ msgstr "Dodaj raniju aktivnost"
 msgid "Contents"
 msgstr "SadrÅaj"
 
-#: ../data/hamster.ui.h:3
+#. now add buttons
+#: ../data/hamster.ui.h:3 ../src/docky_control/2.0/hamster_control.py:79
+#: ../src/docky_control/2.0/hamster_control.py:94
+#: ../src/docky_control/2.1/hamster_control.py:79
+#: ../src/docky_control/2.1/hamster_control.py:94
 msgid "Overview"
 msgstr "Pregled"
 
 #: ../data/hamster.ui.h:6
-#| msgid "New activity"
 msgid "Start new activity"
 msgstr "ZapoÄni novu aktivnost"
 
@@ -233,28 +248,27 @@ msgstr "ZapoÄni novu aktivnost"
 msgid "Statistics"
 msgstr "Statistike"
 
-#: ../data/hamster.ui.h:11
+#: ../data/hamster.ui.h:8
+msgid "Sto_p tracking"
+msgstr "_Zaustavi praÄenje"
+
+#: ../data/hamster.ui.h:10
 msgid "Today"
 msgstr "Danas"
 
-#: ../data/hamster.ui.h:12
-#| msgid "Edit"
+#: ../data/hamster.ui.h:11
 msgid "_Edit"
 msgstr "_UreÄivanje"
 
-#: ../data/hamster.ui.h:14
-#| msgid "_Stop Tracking"
+#: ../data/hamster.ui.h:13
 msgid "_Tracking"
 msgstr "PraÄ_enje"
 
 #: ../data/overview_totals.ui.h:1 ../data/overview.ui.h:1
-#: ../data/preferences.ui.h:1
-#| msgid "_Activities"
 msgid "Activities"
 msgstr "Aktivnosti"
 
 #: ../data/overview_totals.ui.h:2
-#| msgid "_Categories"
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -263,143 +277,169 @@ msgid "No data for this interval"
 msgstr "Nema podataka za ovaj interval"
 
 #: ../data/overview_totals.ui.h:4
-#| msgid "Statistics"
 msgid "Show Statistics"
 msgstr "PrikaÅi statistiku"
 
-#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:212
-#: ../src/hamster/reports.py:227 ../src/hamster-standalone:70
-#| msgid "Totals"
+#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:211
+#: ../src/hamster/reports.py:303 ../src/hamster-time-tracker:159
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../data/overview.ui.h:2
-msgid "Add"
-msgstr "Dodaj"
+#: ../data/overview.ui.h:2 ../src/hamster/applet.py:205
+#: ../src/hamster/preferences.py:195 ../src/hamster/reports.py:301
+#: ../src/hamster-time-tracker:153
+msgid "Activity"
+msgstr "Aktivnost"
 
 #: ../data/overview.ui.h:3
+msgid "Add new"
+msgstr "Dodaj novu"
+
+#: ../data/overview.ui.h:4
+msgid "Day"
+msgstr "Dan"
+
+#: ../data/overview.ui.h:5
 msgid "Edit"
 msgstr "Izmeni"
 
-#: ../data/overview.ui.h:4
-msgid "Overview - Hamster"
+#: ../data/overview.ui.h:6
+msgid "Month"
+msgstr "Mesec"
+
+#: ../data/overview.ui.h:7
+msgid "Overview â Hamster"
 msgstr "Pregled â Vredni hrÄak"
 
-#: ../data/overview.ui.h:5
+#: ../data/overview.ui.h:8
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../data/overview.ui.h:6
-#| msgid "HTML Report"
-msgid "Save Report"
-msgstr "SaÄuvaj izveÅtaj"
+#: ../data/overview.ui.h:9
+msgid "Save report..."
+msgstr "SaÄuvaj izveÅtaj..."
 
-#. summary table
-#: ../data/overview.ui.h:7 ../data/stats.ui.h:3 ../src/hamster/reports.py:285
+#: ../data/overview.ui.h:10 ../data/stats.ui.h:3 ../src/hamster/reports.py:292
 msgid "Totals"
 msgstr "Ukupno"
 
-#: ../data/preferences.ui.h:2
+#: ../data/overview.ui.h:11
+msgid "Week"
+msgstr "Sedmica"
+
+#: ../data/overview.ui.h:13
+msgid "_View"
+msgstr "P_regled"
+
+#: ../data/preferences.ui.h:1
 msgid "Activity list"
 msgstr "Spisak aktivnosti"
 
-#: ../data/preferences.ui.h:3
+#: ../data/preferences.ui.h:2
 msgid "Add activity"
 msgstr "Dodaj aktivnost"
 
-#: ../data/preferences.ui.h:4
+#: ../data/preferences.ui.h:3
 msgid "Add category"
 msgstr "Dodaj kategoriju"
 
-#: ../data/preferences.ui.h:6
-#| msgid "_Categories"
+#: ../data/preferences.ui.h:5
 msgid "Categories and Tags"
 msgstr "Kategorije i oznake"
 
-#: ../data/preferences.ui.h:7
+#: ../data/preferences.ui.h:6
 msgid "Category list"
 msgstr "Spisak kategorija"
 
-#: ../data/preferences.ui.h:8
+#: ../data/preferences.ui.h:7
 msgid "Edit activity"
 msgstr "Uredi aktivnost"
 
-#: ../data/preferences.ui.h:9
+#: ../data/preferences.ui.h:8
 msgid "Edit category"
 msgstr "Izmeni kategoriju"
 
-#: ../data/preferences.ui.h:10
-msgid "General"
-msgstr "OpÅte"
-
-#: ../data/preferences.ui.h:11
-#| msgid "<b>Global Hotkey</b>"
-msgid "Global Hotkey"
-msgstr "OpÅte preÄice"
-
-#: ../data/preferences.ui.h:12
-msgid "Move activity down"
-msgstr "Pomeri aktivnost naniÅe"
-
-#: ../data/preferences.ui.h:13
-msgid "Move activity up"
-msgstr "Pomeri aktivnost naviÅe"
+#: ../data/preferences.ui.h:9
+msgid "Integration"
+msgstr "Integracija"
 
-#: ../data/preferences.ui.h:14
+#: ../data/preferences.ui.h:10
 msgid "New day starts at"
 msgstr "Novi dan poÄinje u"
 
-#: ../data/preferences.ui.h:15
+#: ../data/preferences.ui.h:11
 msgid "Remind of current activity every:"
 msgstr "Podseti me na trenutnu aktivnost svakih:"
 
-#: ../data/preferences.ui.h:16
+#: ../data/preferences.ui.h:12
 msgid "Remove activity"
 msgstr "Ukloni aktivnost"
 
-#: ../data/preferences.ui.h:17
+#: ../data/preferences.ui.h:13
 msgid "Remove category"
 msgstr "Ukloni kategoriju"
 
-#: ../data/preferences.ui.h:18
+#: ../data/preferences.ui.h:14
 msgid "Resume the last activity when returning to a workspace"
 msgstr "Nastavi poslednju aktivnost po povratku u radni prostor"
 
-#: ../data/preferences.ui.h:19
+#: ../data/preferences.ui.h:15
 msgid "Start new activity when switching workspaces:"
 msgstr "ZapoÄni novu aktivnost pri promeni radnog prostora:"
 
-#: ../data/preferences.ui.h:21
+#: ../data/preferences.ui.h:17
 msgid "Stop tracking when computer becomes idle"
 msgstr "Zaustavi praÄenje kada raÄunar lenÄari"
 
-#: ../data/preferences.ui.h:22
+#: ../data/preferences.ui.h:18
 msgid "Tags that should appear in autocomplete"
 msgstr "Oznake za prikaz u samodopunjavanju"
 
-#: ../data/preferences.ui.h:23
+#: ../data/preferences.ui.h:19
 msgid "Time Tracker Preferences"
 msgstr "Postavke praÄenja vremena"
 
-#: ../data/preferences.ui.h:24
-#| msgid "_Stop Tracking"
+#: ../data/preferences.ui.h:20
 msgid "Tracking"
 msgstr "PraÄenje"
 
-#: ../data/preferences.ui.h:25
+#: ../data/preferences.ui.h:21
+msgid "Use following todo list if available:"
+msgstr "Koristi sledeÄi spisak zadataka ako je dostupan:"
+
+#: ../data/preferences.ui.h:22
 msgid "Workspaces"
 msgstr "Radni prostori"
 
-#: ../data/preferences.ui.h:26
+#: ../data/preferences.ui.h:23
 msgid "_Activities"
 msgstr "_Aktivnosti"
 
-#: ../data/preferences.ui.h:27
+#: ../data/preferences.ui.h:24
 msgid "_Categories"
 msgstr "_Kategorije"
 
+#: ../data/range_pick.ui.h:1
+msgid "Apply"
+msgstr "Primeni"
+
+#: ../data/range_pick.ui.h:2
+msgid "Day:"
+msgstr "Dan:"
+
+#: ../data/range_pick.ui.h:3
+msgid "Month:"
+msgstr "Mesec:"
+
+#: ../data/range_pick.ui.h:4
+msgid "Range:"
+msgstr "Vremenski interval:"
+
+#: ../data/range_pick.ui.h:5
+msgid "Week:"
+msgstr "Sedmica:"
+
 #: ../data/stats.ui.h:1
-#| msgid "<b>Starts and ends</b>"
 msgid "Starts and ends"
 msgstr "PoÄetak i kraj"
 
@@ -407,9 +447,23 @@ msgstr "PoÄetak i kraj"
 msgid "Year:"
 msgstr "Godina:"
 
+#: ../src/docky_control/2.0/hamster_control.py:71
+#: ../src/docky_control/2.1/hamster_control.py:75 ../src/hamster/applet.py:305
+#: ../src/hamster/applet.py:328 ../src/hamster/applet.py:417
+#: ../src/hamster-time-tracker:249 ../src/hamster-time-tracker:313
+msgid "No activity"
+msgstr "Bez aktivnosti"
+
+#: ../src/docky_control/2.0/hamster_control.py:81
+#: ../src/docky_control/2.0/hamster_control.py:95
+#: ../src/docky_control/2.1/hamster_control.py:81
+#: ../src/docky_control/2.1/hamster_control.py:95
+msgid "Preferences"
+msgstr "Postavke"
+
 #: ../src/hamster/about.py:43
-msgid "Copyright  2007â2009 Toms BauÄis and others"
-msgstr "Autorska prava  2007-2009 Toms Baugis i ostali"
+msgid "Copyright  2007â2010 Toms BauÄis and others"
+msgstr "Autorska prava  2007-2010 Toms BauÄis i ostali"
 
 #: ../src/hamster/about.py:45
 msgid "Project Hamster Website"
@@ -427,90 +481,78 @@ msgstr ""
 "\n"
 "Prevod.org â prevod na srpski jezik."
 
-#: ../src/hamster/applet.py:206 ../src/hamster/preferences.py:196
-#: ../src/hamster/reports.py:225 ../src/hamster/reports.py:289
-#: ../src/hamster-standalone:64
-msgid "Activity"
-msgstr "Aktivnost"
-
-#: ../src/hamster/applet.py:317 ../src/hamster/applet.py:340
-#: ../src/hamster/applet.py:437 ../src/hamster-standalone:195
-#: ../src/hamster-standalone:264
-msgid "No activity"
-msgstr "Bez aktivnosti"
-
-#: ../src/hamster/applet.py:395
+#: ../src/hamster/applet.py:378
 #, python-format
 msgid "%(category)s: %(duration)s"
 msgstr "%(category)s: %(duration)s"
 
 #. duration in main drop-down per category in hours
-#: ../src/hamster/applet.py:398
+#: ../src/hamster/applet.py:381
 #, python-format
 msgid "%sh"
 msgstr "%ss"
 
-#: ../src/hamster/applet.py:420 ../src/hamster/db.py:243
-#: ../src/hamster/db.py:253 ../src/hamster/db.py:307 ../src/hamster/db.py:662
-#: ../src/hamster/db.py:723 ../src/hamster/edit_activity.py:51
-#: ../src/hamster/preferences.py:61 ../src/hamster/reports.py:56
-#: ../src/hamster/reports.py:94 ../src/hamster/reports.py:243
-#: ../src/hamster-standalone:247 ../src/hamster/stuff.py:132
+#: ../src/hamster/applet.py:402 ../src/hamster/db.py:288
+#: ../src/hamster/db.py:298 ../src/hamster/db.py:354 ../src/hamster/db.py:668
+#: ../src/hamster/db.py:855 ../src/hamster/edit_activity.py:54
+#: ../src/hamster/preferences.py:58 ../src/hamster/reports.py:73
+#: ../src/hamster/reports.py:111 ../src/hamster/reports.py:240
+#: ../src/hamster-time-tracker:299
 msgid "Unsorted"
 msgstr "NeporeÄano"
 
-#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+#: ../src/hamster/applet.py:408 ../src/hamster-time-tracker:244
+#: ../src/hamster-time-tracker:304
 msgid "Just started"
 msgstr "Upravo zapoÄela"
 
-#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
-#| msgid "Add activity"
+#: ../src/hamster/applet.py:644 ../src/hamster-time-tracker:453
 msgid "Changed activity"
 msgstr "Izmenjena aktivnost"
 
-#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#: ../src/hamster/applet.py:645 ../src/hamster-time-tracker:454
 #, c-format, python-format
 msgid "Switched to '%s'"
 msgstr "PrebaÄena u â%sâ"
 
 #. defaults
-#: ../src/hamster/db.py:918
+#: ../src/hamster/db.py:947
 msgid "Work"
 msgstr "Posao"
 
-#: ../src/hamster/db.py:919
+#: ../src/hamster/db.py:948
 msgid "Reading news"
 msgstr "Äitanje vesti"
 
-#: ../src/hamster/db.py:920
+#: ../src/hamster/db.py:949
 msgid "Checking stocks"
 msgstr "Provera akcija"
 
-#: ../src/hamster/db.py:921
+#: ../src/hamster/db.py:950
 msgid "Super secret project X"
 msgstr "Super tajni projekat X"
 
-#: ../src/hamster/db.py:922
+#: ../src/hamster/db.py:951
 msgid "World domination"
 msgstr "Osvajanje sveta"
 
-#: ../src/hamster/db.py:924
+#: ../src/hamster/db.py:953
 msgid "Day-to-day"
 msgstr "Iz dana u dan"
 
-#: ../src/hamster/db.py:925
+#: ../src/hamster/db.py:954
 msgid "Lunch"
 msgstr "RuÄak"
 
-#: ../src/hamster/db.py:926
+#: ../src/hamster/db.py:955
 msgid "Watering flowers"
 msgstr "Zalivanje cveÄa"
 
-#: ../src/hamster/db.py:927
+#: ../src/hamster/db.py:956
 msgid "Doing handstands"
 msgstr "PrevoÄenje Gnoma na srpski"
 
-#: ../src/hamster/edit_activity.py:67
+#: ../src/hamster/edit_activity.py:70
 msgid "Update activity"
 msgstr "AÅuriraj aktivnost"
 
@@ -519,197 +561,180 @@ msgctxt "overview list"
 msgid "%A, %b %d"
 msgstr "%A, %d.%b"
 
-#: ../src/hamster/overview.py:79
-msgid "Week"
-msgstr "Sedmica"
-
-#: ../src/hamster/overview.py:80
-msgid "Month"
-msgstr "Mesec"
-
-#: ../src/hamster/overview.py:81
-msgid "Date Range"
-msgstr "Vremenski interval"
-
-#. date format for overview label when only single day is visible
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:158
-#| msgctxt "single day overview"
-#| msgid "%B %d, %Y"
-msgid "%B %d, %Y"
-msgstr "%d. %B, %Y."
-
-#. overview label if start and end years don't match
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:166
-#, python-format
-#| msgid ""
-#| "Overview for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %"
-#| "(end_Y)s"
-msgid "%(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr ""
-"%(start_B)s %(start_d)s, %(start_Y)s. â %(end_B)s %(end_d)s, %(end_Y)s."
-
-#. overview label if start and end month do not match
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:172
-#, python-format
-#| msgid ""
-#| "Overview for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgid "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s."
-
-#. overview label for interval in same month
-#. letter after prefixes (start_, end_) is the one of
-#. standard python date formatting ones- you can use all of them
-#. see http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/overview.py:178
-#, python-format
-#| msgid "Overview for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgid "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgstr "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s."
-
-#: ../src/hamster/overview_totals.py:148
+#: ../src/hamster/overview_totals.py:161
 #, python-format
 msgid "%s hours tracked total"
 msgstr "Ukupno je praÄeno je %s sati"
 
-#: ../src/hamster/preferences.py:117 ../src/hamster/preferences.py:192
+#. Translators: 'None' refers here to the Todo list choice in Hamster preferences (Tracking tab)
+#: ../src/hamster/preferences.py:105
+msgid "None"
+msgstr "NiÅta"
+
+#: ../src/hamster/preferences.py:120 ../src/hamster/preferences.py:191
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
-#: ../src/hamster/reports.py:288
+#: ../src/hamster/preferences.py:140 ../src/hamster/reports.py:302
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/hamster/preferences.py:673
+#: ../src/hamster/preferences.py:637
 msgid "New category"
 msgstr "Nova kategorija"
 
-#: ../src/hamster/preferences.py:686
+#: ../src/hamster/preferences.py:650
 msgid "New activity"
 msgstr "Nova aktivnost"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:757
+#: ../src/hamster/preferences.py:701
 #, python-format
-msgid "%(interval_minutes)d minutes"
-msgstr "%(interval_minutes)d minuta"
+msgid "%(interval_minutes)d minute"
+msgid_plural "%(interval_minutes)d minutes"
+msgstr[0] "%(interval_minutes)d minut"
+msgstr[1] "%(interval_minutes)d minuta"
+msgstr[2] "%(interval_minutes)d minuta"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:760
+#: ../src/hamster/preferences.py:706
 msgid "Never"
 msgstr "Nikad"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:115
+#: ../src/hamster/reports.py:132
 msgid "activity"
 msgstr "aktivnost"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:117
+#: ../src/hamster/reports.py:134
 msgid "start time"
 msgstr "vreme poÄetka"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:119
+#: ../src/hamster/reports.py:136
 msgid "end time"
 msgstr "vreme zavrÅetka"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:121
+#: ../src/hamster/reports.py:138
 msgid "duration minutes"
 msgstr "trajanje u minutima"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:123
+#: ../src/hamster/reports.py:140
 msgid "category"
 msgstr "kategorija"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:125
+#: ../src/hamster/reports.py:142
 msgid "description"
 msgstr "opis"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:127
-#| msgid "Totals"
+#: ../src/hamster/reports.py:144 ../src/hamster/reports.py:296
 msgid "tags"
 msgstr "oznake"
 
-#: ../src/hamster/reports.py:167
+#: ../src/hamster/reports.py:191
 #, python-format
 msgid ""
-"Overview for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %"
-"(end_Y)s"
+"Activity report for %(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)"
+"s, %(end_Y)s"
 msgstr ""
-"IzveÅtaj za %(start_d)s. %(start_B)s %(start_Y)s â %(end_d)s. %(end_B)s %"
-"(end_Y)s"
+"Dnevnik aktivnosti za %(start_d)s.%(start_B)s.%(start_Y)s â %(end_d)s.%"
+"(end_B)s.%(end_Y)s"
 
-#: ../src/hamster/reports.py:169
+#: ../src/hamster/reports.py:193
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
-msgstr "IzveÅtaj za %(start_d)s. %(start_B)s â %(end_d)s. %(end_B)s %(end_Y)s"
+msgid ""
+"Activity report for %(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr ""
+"Dnevnik aktivnosti za %(start_d)s.%(start_B)s â %(end_d)s.%(end_B)s.%(end_Y)s"
 
-#: ../src/hamster/reports.py:171
+#: ../src/hamster/reports.py:195
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
-msgstr "IzveÅtaj za %(start_d)s â %(end_d)s. %(start_B)s %(end_Y)s"
+msgid "Activity report for %(start_B)s %(start_d)s, %(start_Y)s"
+msgstr "Dnevnik aktivnosti za %(start_d)s.%(start_B)s.%(start_Y)s"
 
-#: ../src/hamster/reports.py:174
+#: ../src/hamster/reports.py:197
 #, python-format
-msgid "Overview for %(start_B)s %(start_d)s, %(start_Y)s"
-msgstr "IzveÅtaj za %(start_d)s. %(start_B)s %(start_Y)s"
+msgid "Activity report for %(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
+msgstr "Dnevnik aktivnosti za %(start_d)s - %(end_d)s.%(start_B)s.%(end_Y)s"
+
+#. date column format for each row in HTML report
+#. Using python datetime formatting syntax. See:
+#. http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/reports.py:249 ../src/hamster/reports.py:281
+msgctxt "html report"
+msgid "%b %d, %Y"
+msgstr "%d.%b.%Y"
+
+#. grand_total = _("%s hours") % ("%.1f" % (total_duration.seconds / 60.0 / 60 + total_duration.days * 24)),
+#: ../src/hamster/reports.py:290
+msgid "Totals by Day"
+msgstr "Ukupno po danima"
+
+#: ../src/hamster/reports.py:291
+msgid "Activity Log"
+msgstr "Dnevnik aktivnosti"
+
+#: ../src/hamster/reports.py:294
+msgid "activities"
+msgstr "aktivnosti"
 
-#: ../src/hamster/reports.py:224
+#: ../src/hamster/reports.py:295
+msgid "categories"
+msgstr "kategorije"
+
+#: ../src/hamster/reports.py:298
+msgid "Distinguish:"
+msgstr "Razlikuj:"
+
+#: ../src/hamster/reports.py:300
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/hamster/reports.py:228
+#: ../src/hamster/reports.py:304
 msgid "Start"
 msgstr "PoÄetak"
 
-#: ../src/hamster/reports.py:229
+#: ../src/hamster/reports.py:305
 msgid "End"
 msgstr "Kraj"
 
-#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+#: ../src/hamster/reports.py:306
 msgid "Duration"
-msgstr "Teajanje"
+msgstr "Trajanje"
 
-#: ../src/hamster/reports.py:231
+#: ../src/hamster/reports.py:307
 msgid "Description"
 msgstr "Opis"
 
-#. date column format for each row in HTML report
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/reports.py:264
-msgctxt "html report"
-msgid "%b %d, %Y"
-msgstr "%d.%b.%Y"
+#: ../src/hamster/reports.py:310
+msgid "Show template"
+msgstr "PrikaÅi Åablon"
 
-#: ../src/hamster/reports.py:300
-msgid "Total Time"
-msgstr "Ukupno vreme"
+#: ../src/hamster/reports.py:311
+#, python-format
+msgid "You can override it by storing your version in %(home_folder)s"
+msgstr "MoÅete ga premostiti smeÅtanjem vaÅu verziju u %(home_folder)s"
 
-#: ../src/hamster-standalone:190
+#: ../src/hamster-time-tracker:242
 #, c-format
 msgid "Working on <b>%s</b>"
 msgstr "Radim na <b>%s</b>"
 
-#: ../src/hamster/stats.py:86
+#: ../src/hamster-time-tracker:595
+msgid "Hamster time tracker. Usage:"
+msgstr "Vredni hrÄak praÄenje vremena. KoriÅÄenje:"
+
+#: ../src/hamster/stats.py:90
 msgctxt "years"
 msgid "All"
 msgstr "Sve"
 
-#: ../src/hamster/stats.py:176
+#: ../src/hamster/stats.py:166
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -717,15 +742,14 @@ msgstr ""
 "JoÅ nema podataka za izradu statistike.\n"
 "Nedelju dana koriÅÄenja bi pomoglo!"
 
-#: ../src/hamster/stats.py:179
-#| msgid "Still collecting data â check back after a week has passed!"
+#: ../src/hamster/stats.py:169
 msgid "Collecting data â check back after a week has passed!"
 msgstr "Sakupljam podatke â proverite ponovo nakon nedelju dana!"
 
 #. date format for the first record if the year has not been selected
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:310
+#: ../src/hamster/stats.py:320
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -733,19 +757,17 @@ msgstr "%d.%b.%Y"
 #. date of first record when year has been selected
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:315
-#| msgctxt "overview graph"
-#| msgid "%b %d"
+#: ../src/hamster/stats.py:325
 msgctxt "first record"
 msgid "%b %d"
 msgstr "%b. %d"
 
-#: ../src/hamster/stats.py:317
+#: ../src/hamster/stats.py:327
 #, python-format
 msgid "First activity was recorded on %s."
 msgstr "Prva aktivnost je zabeleÅena %s."
 
-#: ../src/hamster/stats.py:326 ../src/hamster/stats.py:330
+#: ../src/hamster/stats.py:336 ../src/hamster/stats.py:340
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -754,7 +776,7 @@ msgstr[1] "%(num)s godine"
 msgstr[2] "%(num)s godina"
 
 #. FIXME: difficult string to properly pluralize
-#: ../src/hamster/stats.py:335
+#: ../src/hamster/stats.py:345
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -766,12 +788,12 @@ msgstr ""
 #. How the date of the longest activity should be displayed in statistics
 #. Using python datetime formatting syntax. See:
 #. http://docs.python.org/library/time.html#time.strftime
-#: ../src/hamster/stats.py:353
+#: ../src/hamster/stats.py:363
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../src/hamster/stats.py:358
+#: ../src/hamster/stats.py:368
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
@@ -782,7 +804,7 @@ msgstr[2] ""
 "NajduÅi neprekidni posao je bio %(date)s i trajao je %(hours)s sati."
 
 #. total records (in selected scope)
-#: ../src/hamster/stats.py:366
+#: ../src/hamster/stats.py:376
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -790,176 +812,121 @@ msgstr[0] "Postoji %s zapis."
 msgstr[1] "Postoji %s zapisa."
 msgstr[2] "Postoji %s zapisa."
 
-#: ../src/hamster/stats.py:386
+#: ../src/hamster/stats.py:396
 msgid "Hamster would like to observe you some more!"
 msgstr "Vredni hrÄak bi voleo da te joÅ malo nadgleda!"
 
-#: ../src/hamster/stats.py:388
+#: ../src/hamster/stats.py:398
 #, python-format
 msgid ""
-"With %s percent of all facts starting before 9am you seem to be an early "
-"bird."
+"With %s percent of all activities starting before 9am, you seem to be an "
+"early bird."
 msgstr ""
-"Sa %s procenata svih stvari koje su poÄinjale pre 9 prepodne, izgleda da ste "
+"Sa %s procenata svih stvari koje ste zapoÄeli pre 9 prepodne, izgleda da ste "
 "ranoranilac."
 
-#: ../src/hamster/stats.py:391
+#: ../src/hamster/stats.py:401
 #, python-format
 msgid ""
-"With %s percent of all facts starting after 11pm you seem to be a night owl."
+"With %s percent of all activities starting after 11pm, you seem to be a "
+"night owl."
 msgstr ""
-"Sa %s procenata svih stvari koje su poÄinjale posle 11 uveÄe, izgleda da ste "
+"Sa %s procenata svih stvari koje ste zapoÄeli posle 11 uveÄe, izgleda da ste "
 "noÄna ptica."
 
-#: ../src/hamster/stats.py:394
+#: ../src/hamster/stats.py:404
 #, python-format
 msgid ""
-"With %s percent of all tasks being shorter than 15 minutes you seem to be a "
-"busy bee."
+"With %s percent of all activities being shorter than 15 minutes, you seem to "
+"be a busy bee."
 msgstr ""
-"Sa %s procenata svih stvari koje su bile kraÄe od 15 minuta, izgleda da ste "
-"pÄelica Maja."
+"Sa %s procenata svih stvari koje su trajale manje od 15 minuta, izgleda da "
+"ste pÄelica Maja."
 
 #. duration in round hours
-#: ../src/hamster/stuff.py:56
+#: ../src/hamster/lib/stuff.py:57
 #, python-format
 msgid "%dh"
 msgstr "%ds"
 
 #. duration less than hour
-#: ../src/hamster/stuff.py:59
+#: ../src/hamster/lib/stuff.py:60
 #, python-format
 msgid "%dmin"
 msgstr "%dmin"
 
 #. x hours, y minutes
-#: ../src/hamster/stuff.py:62
+#: ../src/hamster/lib/stuff.py:63
 #, python-format
 msgid "%dh %dmin"
 msgstr "%ds %dmin"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:38
-#| msgid "Save report â Time Tracker"
-msgid "Save report - Time Tracker"
-msgstr "Pratilac vremena â Äuvanje izveÅtaja"
+#. label of date range if looking on single day
+#. date format for overview label when only single day is visible
+#. Using python datetime formatting syntax. See:
+#. http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:80
+msgid "%B %d, %Y"
+msgstr "%d. %B, %Y."
+
+#. label of date range if start and end years don't match
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:86
+#, python-format
+msgid "%(start_B)s %(start_d)s, %(start_Y)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr ""
+"%(start_B)s %(start_d)s, %(start_Y)s. â %(end_B)s %(end_d)s, %(end_Y)s."
+
+#. label of date range if start and end month do not match
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:92
+#, python-format
+msgid "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s"
+msgstr "%(start_B)s %(start_d)s â %(end_B)s %(end_d)s, %(end_Y)s."
+
+#. label of date range for interval in same month
+#. letter after prefixes (start_, end_) is the one of
+#. standard python date formatting ones- you can use all of them
+#. see http://docs.python.org/library/time.html#time.strftime
+#: ../src/hamster/lib/stuff.py:98
+#, python-format
+msgid "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s"
+msgstr "%(start_B)s %(start_d)s â %(end_d)s, %(end_Y)s."
 
-#: ../src/hamster/widgets/reportchooserdialog.py:50
+#: ../src/hamster/widgets/reportchooserdialog.py:39
+msgid "Save Report â Time Tracker"
+msgstr "Äuvanje izveÅtaja â Pratilac vremena"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:57
 msgid "HTML Report"
 msgstr "HTML izveÅtaj"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:58
+#: ../src/hamster/widgets/reportchooserdialog.py:65
 msgid "Tab-Separated Values (TSV)"
 msgstr "Vrednosti odvojene tabulatorom (TSV)"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:66
+#: ../src/hamster/widgets/reportchooserdialog.py:73
 msgid "XML"
 msgstr "XML"
 
-#: ../src/hamster/widgets/reportchooserdialog.py:73
+#: ../src/hamster/widgets/reportchooserdialog.py:80
 msgid "iCal"
 msgstr "iCal"
 
-#~ msgid "<b>Activities</b>"
-#~ msgstr "<b>Aktivnosti</b>"
-
-#~ msgid "<b>Tracking</b>"
-#~ msgstr "<b>PraÄenje</b>"
-
-#~ msgid ""
-#~ "<span size=\"small\" >Type in an activity and hit Enter to start tracking!"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span size=\"small\" >UpiÅite aktivnost i pritisnite âEnterâ da zapoÄnete "
-#~ "praÄenje!</span>"
-
-#~ msgid ""
-#~ "<span size=\"small\" color=\"blue\" underline=\"single\">Tell me more</"
-#~ "span>"
-#~ msgstr ""
-#~ "<span size=\"small\" color=\"blue\" underline=\"single\">Reci mi viÅe</"
-#~ "span>"
-
-#~ msgid "Hamster"
-#~ msgstr "Hamster"
-
-#~ msgid "_Activity:"
-#~ msgstr "_Aktivnost:"
-
-#~ msgid " _Day"
-#~ msgstr "_Dan"
-
-#~ msgid " _Month"
-#~ msgstr "_Mesec"
-
-#~ msgid " _Week"
-#~ msgstr "_Sedmica"
-
-#~ msgid "<b>Overview</b>"
-#~ msgstr "<b>Pregled</b>"
-
-#~ msgid "<b>Totals</b>"
-#~ msgstr "<b>Ukupno</b>"
-
-#~ msgid "Categories:"
-#~ msgstr "Kategorije"
-
-#~ msgid "Date interval:"
-#~ msgstr "Interval datuma:"
-
-#~ msgid "Save as HTML"
-#~ msgstr "SaÄuvaj kao HTML"
-
-#~ msgid "What should be typed in the activity box?"
-#~ msgstr "Åta da upiÅem u kuÄicu aktivnosti?"
-
-#~ msgid ""
-#~ "There is a simple syntax that enables you to add details to your "
-#~ "activities:\n"
-#~ "        \n"
-#~ "\"@\" symbol marks a category. Example: \"watering flowers home\" will "
-#~ "start tracking the activity \"watering flowers\" in the category \"home"
-#~ "\".\n"
-#~ "\n"
-#~ "Commas (\",\") mark beginning of a description. Example: \"watering "
-#~ "flowers, begonias and forgetmenots\" will start tracking the activity "
-#~ "\"watering flowers\" and add the description \"begonias and forgetmenots"
-#~ "\" to it.\n"
-#~ "\n"
-#~ "Both can be combined: \"watering flowers home, begonias and forgetmenots"
-#~ "\" will work just fine!\n"
-#~ "\n"
-#~ "Now, start tracking!\n"
-#~ "        "
-#~ msgstr ""
-#~ "Sintaksa koja vam omoguÄava da dodajete detalje aktivnostima je "
-#~ "jednostavna:\n"
-#~ "        \n"
-#~ "â â simbol oznaÄava kategoriju. Primer: âzalivanje cveÄa kuÄaâ zapoÄinje "
-#~ "praÄenje aktivnosti âzalivanje cveÄaâ u kategoriji âkuÄaâ.\n"
-#~ "\n"
-#~ "Zarezi (â,â) oznaÄavaju poÄetak opisa. Primer: âzalivanje cveÄa, petunije "
-#~ "i muÅkatleâ zapoÄinje praÄenje aktivnosti âzalivanje cveÄaâ i dodaje opis "
-#~ "âpetunije i muÅkatleâ na tu aktivnost.\n"
-#~ "\n"
-#~ "Ova dva se mogu kombinovati: âzalivanje cveÄa kuÄa, petunije i muÅkatleâ "
-#~ "takoÄe vrÅi posao!\n"
-#~ "\n"
-#~ "A sada moÅete da poÄnete sa praÄenjem vremena!\n"
-#~ "        "
-
-#~ msgctxt "categories"
-#~ msgid "All"
-#~ msgstr "Sve"
-
-#~ msgctxt "first record"
-#~ msgid "%(b)s %(d)s"
-#~ msgstr "%(b)s %(d)s"
-
-#~ msgid "Total"
-#~ msgstr "Ukupno"
-
-#~ msgid "Overview for %(date)s"
-#~ msgstr "Pregled za %(date)s"
-
-#~ msgid "Day"
-#~ msgstr "Dan"
+#. title in the report file name
+#: ../src/hamster/widgets/reportchooserdialog.py:97
+msgid "Time track"
+msgstr "PraÄenje vremena"
+
+#~ msgid "totals by activity"
+#~ msgstr "ukupno po aktivnostima"
+
+#~ msgid "totals by category"
+#~ msgstr "ukupno po kategorijama"
+
+#~ msgid "Show:"
+#~ msgstr "PrikaÅi:"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]