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



commit f793e9e5a19dc0d5ce9706a426fcb00dd54b8137
Author: Branko KokanoviÄ? <branko kokanovic gmail com>
Date:   Sun Aug 29 21:16:41 2010 +0200

    Updated Serbian translation

 po/sr.po       |  753 ++++++++++++++++++++++++++------------------------------
 po/sr latin po |  753 ++++++++++++++++++++++++++------------------------------
 2 files changed, 704 insertions(+), 802 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index e6cfffd..770345e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,16 +5,16 @@
 #
 # Ð?иÑ?ко СпаÑ?иÑ? <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.
 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"
+"POT-Creation-Date: 2010-08-26 20:14+0000\n"
+"PO-Revision-Date: 2010-08-27 21:10+0200\n"
+"Last-Translator: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>\n"
 "Language-Team: Serbian <gnome prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,17 +22,21 @@ msgstr ""
 "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 +45,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 +54,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 +66,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 +89,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:329 ../src/hamster-time-tracker:172
 msgid "Time Tracker"
 msgstr "Ð?Ñ?аÑ?илаÑ? вÑ?емена"
 
@@ -127,11 +149,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 +161,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:367
 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 +207,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 +230,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 +246,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 +275,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:215
+#: ../src/hamster/reports.py:314 ../src/hamster-time-tracker:48
 msgid "Tags"
 msgstr "Ð?знаке"
 
-#: ../data/overview.ui.h:2
-msgid "Add"
-msgstr "Ð?одаÑ?"
+#: ../data/overview.ui.h:2 ../src/hamster/applet.py:209
+#: ../src/hamster/preferences.py:193 ../src/hamster/reports.py:312
+#: ../src/hamster-time-tracker:39
+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
 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 +445,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:302
+#: ../src/hamster/applet.py:325 ../src/hamster/applet.py:414
+#: ../src/hamster-time-tracker:168 ../src/hamster-time-tracker:232
+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,289 +479,256 @@ 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:375
 #, 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:378
 #, 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:399 ../src/hamster/db.py:286
+#: ../src/hamster/db.py:296 ../src/hamster/db.py:352 ../src/hamster/db.py:682
+#: ../src/hamster/db.py:865 ../src/hamster/edit_activity.py:54
+#: ../src/hamster/preferences.py:56 ../src/hamster/reports.py:61
+#: ../src/hamster/reports.py:99 ../src/hamster/reports.py:222
+#: ../src/hamster-time-tracker:218
 msgid "Unsorted"
 msgstr "Ð?епоÑ?еÑ?ано"
 
-#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+#: ../src/hamster/applet.py:405 ../src/hamster-time-tracker:163
+#: ../src/hamster-time-tracker:223
 msgid "Just started"
 msgstr "УпÑ?аво запоÑ?ела"
 
-#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
-#| msgid "Add activity"
+#: ../src/hamster/applet.py:640 ../src/hamster-time-tracker:369
 msgid "Changed activity"
 msgstr "Ð?змеÑ?ена акÑ?ивноÑ?Ñ?"
 
-#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#: ../src/hamster/applet.py:641 ../src/hamster-time-tracker:370
 #, c-format, python-format
 msgid "Switched to '%s'"
 msgstr "Ð?Ñ?ебаÑ?ена Ñ? â??%sâ??"
 
 #. defaults
-#: ../src/hamster/db.py:918
+#: ../src/hamster/db.py:957
 msgid "Work"
 msgstr "Ð?оÑ?ао"
 
-#: ../src/hamster/db.py:919
+#: ../src/hamster/db.py:958
 msgid "Reading news"
 msgstr "ЧиÑ?аÑ?е веÑ?Ñ?и"
 
-#: ../src/hamster/db.py:920
+#: ../src/hamster/db.py:959
 msgid "Checking stocks"
 msgstr "Ð?Ñ?овеÑ?а акÑ?иÑ?а"
 
-#: ../src/hamster/db.py:921
+#: ../src/hamster/db.py:960
 msgid "Super secret project X"
 msgstr "СÑ?пеÑ? Ñ?аÑ?ни пÑ?оÑ?екаÑ? X"
 
-#: ../src/hamster/db.py:922
+#: ../src/hamster/db.py:961
 msgid "World domination"
 msgstr "Ð?Ñ?ваÑ?аÑ?е Ñ?веÑ?а"
 
-#: ../src/hamster/db.py:924
+#: ../src/hamster/db.py:963
 msgid "Day-to-day"
 msgstr "Ð?з дана Ñ? дан"
 
-#: ../src/hamster/db.py:925
+#: ../src/hamster/db.py:964
 msgid "Lunch"
 msgstr "РÑ?Ñ?ак"
 
-#: ../src/hamster/db.py:926
+#: ../src/hamster/db.py:965
 msgid "Watering flowers"
 msgstr "Ð?аливаÑ?е Ñ?веÑ?а"
 
-#: ../src/hamster/db.py:927
+#: ../src/hamster/db.py:966
 msgid "Doing handstands"
 msgstr "Ð?Ñ?евоÑ?еÑ?е Ð?нома на Ñ?Ñ?пÑ?ки"
 
-#: ../src/hamster/edit_activity.py:67
+#: ../src/hamster/edit_activity.py:70
 msgid "Update activity"
 msgstr "Ð?жÑ?Ñ?иÑ?аÑ? акÑ?ивноÑ?Ñ?"
 
-#: ../src/hamster/overview_activities.py:88
+#: ../src/hamster/overview_activities.py:90
 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:103
+msgid "None"
+msgstr "Ð?иÑ?Ñ?а"
+
+#: ../src/hamster/preferences.py:118 ../src/hamster/preferences.py:189
 msgid "Name"
 msgstr "Ð?ме"
 
-#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
-#: ../src/hamster/reports.py:288
+#: ../src/hamster/preferences.py:138 ../src/hamster/reports.py:313
 msgid "Category"
 msgstr "Ð?аÑ?егоÑ?иÑ?а"
 
-#: ../src/hamster/preferences.py:673
+#: ../src/hamster/preferences.py:628
 msgid "New category"
 msgstr "Ð?ова каÑ?егоÑ?иÑ?а"
 
-#: ../src/hamster/preferences.py:686
+#: ../src/hamster/preferences.py:641
 msgid "New activity"
 msgstr "Ð?ова акÑ?ивноÑ?Ñ?"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:757
+#: ../src/hamster/preferences.py:692
 #, python-format
 msgid "%(interval_minutes)d minutes"
 msgstr "%(interval_minutes)d минÑ?Ñ?а"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:760
+#: ../src/hamster/preferences.py:695
 msgid "Never"
 msgstr "Ð?икад"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:115
+#: ../src/hamster/reports.py:120
 msgid "activity"
 msgstr "акÑ?ивноÑ?Ñ?"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:117
+#: ../src/hamster/reports.py:122
 msgid "start time"
 msgstr "вÑ?еме поÑ?еÑ?ка"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:119
+#: ../src/hamster/reports.py:124
 msgid "end time"
 msgstr "вÑ?еме завÑ?Ñ?еÑ?ка"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:121
+#: ../src/hamster/reports.py:126
 msgid "duration minutes"
 msgstr "Ñ?Ñ?аÑ?аÑ?е Ñ? минÑ?Ñ?има"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:123
+#: ../src/hamster/reports.py:128
 msgid "category"
 msgstr "каÑ?егоÑ?иÑ?а"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:125
+#: ../src/hamster/reports.py:130
 msgid "description"
 msgstr "опиÑ?"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:127
-#| msgid "Totals"
+#: ../src/hamster/reports.py:132
 msgid "tags"
 msgstr "ознаке"
 
-#: ../src/hamster/reports.py:167
+#: ../src/hamster/reports.py:173
 #, python-format
 msgid ""
-"Overview for %(start_B)s %(start_d)s, %(start_Y)s â?? %(end_B)s %(end_d)s, %"
-"(end_Y)s"
+"Activity log 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:175
 #, 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 log 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:177
 #, 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 log 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:179
 #, 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 log 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"
 
-#: ../src/hamster/reports.py:224
+#. 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:231 ../src/hamster/reports.py:293
+msgctxt "html report"
+msgid "%b %d, %Y"
+msgstr "%d.%b.%Y"
+
+#: ../src/hamster/reports.py:303
+msgid "Totals by Day"
+msgstr "УкÑ?пно по данима"
+
+#: ../src/hamster/reports.py:304
+msgid "Activity Log"
+msgstr "Ð?невник акÑ?ивноÑ?Ñ?и"
+
+#: ../src/hamster/reports.py:306
+msgid "totals by activity"
+msgstr "Ñ?кÑ?пно по акÑ?ивноÑ?Ñ?има"
+
+#: ../src/hamster/reports.py:307
+msgid "totals by category"
+msgstr "Ñ?кÑ?пно по каÑ?егоÑ?иÑ?ама"
+
+#: ../src/hamster/reports.py:309
+msgid "Show:"
+msgstr "Ð?Ñ?икажи:"
+
+#: ../src/hamster/reports.py:311
 msgid "Date"
 msgstr "Ð?аÑ?Ñ?м"
 
-#: ../src/hamster/reports.py:228
+#: ../src/hamster/reports.py:315
 msgid "Start"
 msgstr "Ð?оÑ?еÑ?ак"
 
-#: ../src/hamster/reports.py:229
+#: ../src/hamster/reports.py:316
 msgid "End"
 msgstr "Ð?Ñ?аÑ?"
 
-#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+#: ../src/hamster/reports.py:317
 msgid "Duration"
-msgstr "ТеаÑ?аÑ?е"
+msgstr "ТÑ?аÑ?аÑ?е"
 
-#: ../src/hamster/reports.py:231
+#: ../src/hamster/reports.py:318
 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:321
+msgid "Show template"
+msgstr "Ð?Ñ?икажи Ñ?аблон"
 
-#: ../src/hamster/reports.py:300
-msgid "Total Time"
-msgstr "УкÑ?пно вÑ?еме"
+#: ../src/hamster/reports.py:322
+#, 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:161
 #, c-format
 msgid "Working on <b>%s</b>"
 msgstr "Радим на <b>%s</b>"
 
-#: ../src/hamster/stats.py:86
+#: ../src/hamster-time-tracker:489
+msgid "Hamster time tracker. Usage:"
+msgstr "Ð?Ñ?едни Ñ?Ñ?Ñ?ак пÑ?аÑ?еÑ?е вÑ?емена. Ð?оÑ?иÑ?Ñ?еÑ?е:"
+
+#: ../src/hamster/stats.py:89
 msgctxt "years"
 msgid "All"
 msgstr "Све"
 
-#: ../src/hamster/stats.py:176
+#: ../src/hamster/stats.py:165
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -717,15 +736,14 @@ msgstr ""
 "Ð?оÑ? нема подаÑ?ака за изÑ?адÑ? Ñ?Ñ?аÑ?иÑ?Ñ?ике.\n"
 "Ð?едеÑ?Ñ? дана коÑ?иÑ?Ñ?еÑ?а би помогло!"
 
-#: ../src/hamster/stats.py:179
-#| msgid "Still collecting data â?? check back after a week has passed!"
+#: ../src/hamster/stats.py:168
 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:319
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -733,19 +751,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:324
 msgctxt "first record"
 msgid "%b %d"
 msgstr "%b. %d"
 
-#: ../src/hamster/stats.py:317
+#: ../src/hamster/stats.py:326
 #, 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:335 ../src/hamster/stats.py:339
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -754,7 +770,7 @@ msgstr[1] "%(num)s године"
 msgstr[2] "%(num)s година"
 
 #. FIXME: difficult string to properly pluralize
-#: ../src/hamster/stats.py:335
+#: ../src/hamster/stats.py:344
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -766,12 +782,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:362
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../src/hamster/stats.py:358
+#: ../src/hamster/stats.py:367
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
@@ -782,7 +798,7 @@ msgstr[2] ""
 "Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?и."
 
 #. total records (in selected scope)
-#: ../src/hamster/stats.py:366
+#: ../src/hamster/stats.py:375
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -790,176 +806,111 @@ msgstr[0] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?."
 msgstr[1] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?а."
 msgstr[2] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?а."
 
-#: ../src/hamster/stats.py:386
+#: ../src/hamster/stats.py:395
 msgid "Hamster would like to observe you some more!"
 msgstr "Ð?Ñ?едни Ñ?Ñ?Ñ?ак би волео да Ñ?е Ñ?оÑ? мало надгледа!"
 
-#: ../src/hamster/stats.py:388
+#: ../src/hamster/stats.py:397
 #, python-format
 msgid ""
-"With %s percent of all facts starting before 9am you seem to be an early "
+"With %s percent of all facts starting before 9am, you seem to be an early "
 "bird."
 msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? поÑ?иÑ?але пÑ?е 9 пÑ?еподне, изгледа да Ñ?Ñ?е "
 "Ñ?аноÑ?анилаÑ?."
 
-#: ../src/hamster/stats.py:391
+#: ../src/hamster/stats.py:400
 #, python-format
 msgid ""
-"With %s percent of all facts starting after 11pm you seem to be a night owl."
+"With %s percent of all facts starting after 11pm, you seem to be a night owl."
 msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? поÑ?иÑ?але поÑ?ле 11 Ñ?веÑ?е, изгледа да Ñ?Ñ?е "
 "ноÑ?на пÑ?иÑ?а."
 
-#: ../src/hamster/stats.py:394
+#: ../src/hamster/stats.py:403
 #, python-format
 msgid ""
-"With %s percent of all tasks being shorter than 15 minutes you seem to be a "
+"With %s percent of all tasks being shorter than 15 minutes, you seem to be a "
 "busy bee."
 msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? биле кÑ?аÑ?е од 15 минÑ?Ñ?а, изгледа да Ñ?Ñ?е "
 "пÑ?елиÑ?а Ð?аÑ?а."
 
 #. duration in round hours
-#: ../src/hamster/stuff.py:56
+#: ../src/hamster/stuff.py:57
 #, python-format
 msgid "%dh"
 msgstr "%dÑ?"
 
 #. duration less than hour
-#: ../src/hamster/stuff.py:59
+#: ../src/hamster/stuff.py:60
 #, python-format
 msgid "%dmin"
 msgstr "%dмин"
 
 #. x hours, y minutes
-#: ../src/hamster/stuff.py:62
+#: ../src/hamster/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/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/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."
 
-#: ../src/hamster/widgets/reportchooserdialog.py:50
+#. 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/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/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: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 "Ð?Ñ?аÑ?еÑ?е вÑ?емена"
diff --git a/po/sr latin po b/po/sr latin po
index d6067b3..aabcf7d 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,16 +5,16 @@
 #
 # 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.
 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"
+"POT-Creation-Date: 2010-08-26 20:14+0000\n"
+"PO-Revision-Date: 2010-08-27 21:10+0200\n"
+"Last-Translator: Branko KokanoviÄ? <branko kokanovic gmail com>\n"
 "Language-Team: Serbian <gnome prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,17 +22,21 @@ msgstr ""
 "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 +45,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 +54,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 +66,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 +89,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:329 ../src/hamster-time-tracker:172
 msgid "Time Tracker"
 msgstr "Pratilac vremena"
 
@@ -127,11 +149,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 +161,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:367
 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 +207,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 +230,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 +246,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 +275,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:215
+#: ../src/hamster/reports.py:314 ../src/hamster-time-tracker:48
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../data/overview.ui.h:2
-msgid "Add"
-msgstr "Dodaj"
+#: ../data/overview.ui.h:2 ../src/hamster/applet.py:209
+#: ../src/hamster/preferences.py:193 ../src/hamster/reports.py:312
+#: ../src/hamster-time-tracker:39
+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
 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 +445,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:302
+#: ../src/hamster/applet.py:325 ../src/hamster/applet.py:414
+#: ../src/hamster-time-tracker:168 ../src/hamster-time-tracker:232
+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,289 +479,256 @@ 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:375
 #, 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:378
 #, 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:399 ../src/hamster/db.py:286
+#: ../src/hamster/db.py:296 ../src/hamster/db.py:352 ../src/hamster/db.py:682
+#: ../src/hamster/db.py:865 ../src/hamster/edit_activity.py:54
+#: ../src/hamster/preferences.py:56 ../src/hamster/reports.py:61
+#: ../src/hamster/reports.py:99 ../src/hamster/reports.py:222
+#: ../src/hamster-time-tracker:218
 msgid "Unsorted"
 msgstr "NeporeÄ?ano"
 
-#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+#: ../src/hamster/applet.py:405 ../src/hamster-time-tracker:163
+#: ../src/hamster-time-tracker:223
 msgid "Just started"
 msgstr "Upravo zapoÄ?ela"
 
-#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
-#| msgid "Add activity"
+#: ../src/hamster/applet.py:640 ../src/hamster-time-tracker:369
 msgid "Changed activity"
 msgstr "Izmenjena aktivnost"
 
-#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#: ../src/hamster/applet.py:641 ../src/hamster-time-tracker:370
 #, c-format, python-format
 msgid "Switched to '%s'"
 msgstr "PrebaÄ?ena u â??%sâ??"
 
 #. defaults
-#: ../src/hamster/db.py:918
+#: ../src/hamster/db.py:957
 msgid "Work"
 msgstr "Posao"
 
-#: ../src/hamster/db.py:919
+#: ../src/hamster/db.py:958
 msgid "Reading news"
 msgstr "Ä?itanje vesti"
 
-#: ../src/hamster/db.py:920
+#: ../src/hamster/db.py:959
 msgid "Checking stocks"
 msgstr "Provera akcija"
 
-#: ../src/hamster/db.py:921
+#: ../src/hamster/db.py:960
 msgid "Super secret project X"
 msgstr "Super tajni projekat X"
 
-#: ../src/hamster/db.py:922
+#: ../src/hamster/db.py:961
 msgid "World domination"
 msgstr "Osvajanje sveta"
 
-#: ../src/hamster/db.py:924
+#: ../src/hamster/db.py:963
 msgid "Day-to-day"
 msgstr "Iz dana u dan"
 
-#: ../src/hamster/db.py:925
+#: ../src/hamster/db.py:964
 msgid "Lunch"
 msgstr "RuÄ?ak"
 
-#: ../src/hamster/db.py:926
+#: ../src/hamster/db.py:965
 msgid "Watering flowers"
 msgstr "Zalivanje cveÄ?a"
 
-#: ../src/hamster/db.py:927
+#: ../src/hamster/db.py:966
 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"
 
-#: ../src/hamster/overview_activities.py:88
+#: ../src/hamster/overview_activities.py:90
 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:103
+msgid "None"
+msgstr "Ništa"
+
+#: ../src/hamster/preferences.py:118 ../src/hamster/preferences.py:189
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
-#: ../src/hamster/reports.py:288
+#: ../src/hamster/preferences.py:138 ../src/hamster/reports.py:313
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/hamster/preferences.py:673
+#: ../src/hamster/preferences.py:628
 msgid "New category"
 msgstr "Nova kategorija"
 
-#: ../src/hamster/preferences.py:686
+#: ../src/hamster/preferences.py:641
 msgid "New activity"
 msgstr "Nova aktivnost"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:757
+#: ../src/hamster/preferences.py:692
 #, python-format
 msgid "%(interval_minutes)d minutes"
 msgstr "%(interval_minutes)d minuta"
 
 #. notify interval slider value label
-#: ../src/hamster/preferences.py:760
+#: ../src/hamster/preferences.py:695
 msgid "Never"
 msgstr "Nikad"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:115
+#: ../src/hamster/reports.py:120
 msgid "activity"
 msgstr "aktivnost"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:117
+#: ../src/hamster/reports.py:122
 msgid "start time"
 msgstr "vreme poÄ?etka"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:119
+#: ../src/hamster/reports.py:124
 msgid "end time"
 msgstr "vreme završetka"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:121
+#: ../src/hamster/reports.py:126
 msgid "duration minutes"
 msgstr "trajanje u minutima"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:123
+#: ../src/hamster/reports.py:128
 msgid "category"
 msgstr "kategorija"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:125
+#: ../src/hamster/reports.py:130
 msgid "description"
 msgstr "opis"
 
 #. column title in the TSV export format
-#: ../src/hamster/reports.py:127
-#| msgid "Totals"
+#: ../src/hamster/reports.py:132
 msgid "tags"
 msgstr "oznake"
 
-#: ../src/hamster/reports.py:167
+#: ../src/hamster/reports.py:173
 #, python-format
 msgid ""
-"Overview for %(start_B)s %(start_d)s, %(start_Y)s â?? %(end_B)s %(end_d)s, %"
-"(end_Y)s"
+"Activity log 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:175
 #, 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 log 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:177
 #, 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 log 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:179
 #, 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 log 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"
 
-#: ../src/hamster/reports.py:224
+#. 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:231 ../src/hamster/reports.py:293
+msgctxt "html report"
+msgid "%b %d, %Y"
+msgstr "%d.%b.%Y"
+
+#: ../src/hamster/reports.py:303
+msgid "Totals by Day"
+msgstr "Ukupno po danima"
+
+#: ../src/hamster/reports.py:304
+msgid "Activity Log"
+msgstr "Dnevnik aktivnosti"
+
+#: ../src/hamster/reports.py:306
+msgid "totals by activity"
+msgstr "ukupno po aktivnostima"
+
+#: ../src/hamster/reports.py:307
+msgid "totals by category"
+msgstr "ukupno po kategorijama"
+
+#: ../src/hamster/reports.py:309
+msgid "Show:"
+msgstr "Prikaži:"
+
+#: ../src/hamster/reports.py:311
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/hamster/reports.py:228
+#: ../src/hamster/reports.py:315
 msgid "Start"
 msgstr "PoÄ?etak"
 
-#: ../src/hamster/reports.py:229
+#: ../src/hamster/reports.py:316
 msgid "End"
 msgstr "Kraj"
 
-#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+#: ../src/hamster/reports.py:317
 msgid "Duration"
-msgstr "Teajanje"
+msgstr "Trajanje"
 
-#: ../src/hamster/reports.py:231
+#: ../src/hamster/reports.py:318
 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:321
+msgid "Show template"
+msgstr "Prikaži šablon"
 
-#: ../src/hamster/reports.py:300
-msgid "Total Time"
-msgstr "Ukupno vreme"
+#: ../src/hamster/reports.py:322
+#, 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:161
 #, c-format
 msgid "Working on <b>%s</b>"
 msgstr "Radim na <b>%s</b>"
 
-#: ../src/hamster/stats.py:86
+#: ../src/hamster-time-tracker:489
+msgid "Hamster time tracker. Usage:"
+msgstr "Vredni hrÄ?ak praÄ?enje vremena. KoriÅ¡Ä?enje:"
+
+#: ../src/hamster/stats.py:89
 msgctxt "years"
 msgid "All"
 msgstr "Sve"
 
-#: ../src/hamster/stats.py:176
+#: ../src/hamster/stats.py:165
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -717,15 +736,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:168
 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:319
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -733,19 +751,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:324
 msgctxt "first record"
 msgid "%b %d"
 msgstr "%b. %d"
 
-#: ../src/hamster/stats.py:317
+#: ../src/hamster/stats.py:326
 #, 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:335 ../src/hamster/stats.py:339
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -754,7 +770,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:344
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -766,12 +782,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:362
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../src/hamster/stats.py:358
+#: ../src/hamster/stats.py:367
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
@@ -782,7 +798,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:375
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -790,176 +806,111 @@ msgstr[0] "Postoji %s zapis."
 msgstr[1] "Postoji %s zapisa."
 msgstr[2] "Postoji %s zapisa."
 
-#: ../src/hamster/stats.py:386
+#: ../src/hamster/stats.py:395
 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:397
 #, python-format
 msgid ""
-"With %s percent of all facts starting before 9am you seem to be an early "
+"With %s percent of all facts 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 "
 "ranoranilac."
 
-#: ../src/hamster/stats.py:391
+#: ../src/hamster/stats.py:400
 #, python-format
 msgid ""
-"With %s percent of all facts starting after 11pm you seem to be a night owl."
+"With %s percent of all facts 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 "
 "noÄ?na ptica."
 
-#: ../src/hamster/stats.py:394
+#: ../src/hamster/stats.py:403
 #, python-format
 msgid ""
-"With %s percent of all tasks being shorter than 15 minutes you seem to be a "
+"With %s percent of all tasks 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."
 
 #. duration in round hours
-#: ../src/hamster/stuff.py:56
+#: ../src/hamster/stuff.py:57
 #, python-format
 msgid "%dh"
 msgstr "%ds"
 
 #. duration less than hour
-#: ../src/hamster/stuff.py:59
+#: ../src/hamster/stuff.py:60
 #, python-format
 msgid "%dmin"
 msgstr "%dmin"
 
 #. x hours, y minutes
-#: ../src/hamster/stuff.py:62
+#: ../src/hamster/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/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/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."
 
-#: ../src/hamster/widgets/reportchooserdialog.py:50
+#. 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/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/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: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"



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