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

[Miloš Popović <mpopovic src gnome org>]

commit c24330deb7e327d11456c7e42f8a3d2684e830c6
Author: MiloÅ¡ PopoviÄ? <mpopovic src gnome org>
Date:   Mon Mar 29 15:33:51 2010 +0200

    Updated Serbian translations

 po/sr.po       | 1005 +++++++++++++++++++++++++++++++++-----------------------
 po/sr latin po | 1005 +++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 1198 insertions(+), 812 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 353651e..e6cfffd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,123 +6,178 @@
 # Ð?иÑ?ко СпаÑ?иÑ? <mirkospasic gmail com>
 # Ð?оÑ?ан РакиÑ? <grakic devbase net>
 # Translated on 2009-09-14 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: 2009-09-13 01:38+0000\n"
-"PO-Revision-Date: 2009-09-14 22:00+0200\n"
-"Last-Translator: Ð?Ñ?анко Ð?окановиÑ? <branko kokanovic gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\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"
 "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"
 
-#: ../data/Hamster_Applet.server.in.in.h:1 ../hamster/about.py:40
-msgid "Project Hamster â?? track your time"
-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. "
+"Activities that span two days, will tip over to the side where the largest "
+"part of the activity is."
+msgstr ""
+"Ð?кÑ?ивноÑ?Ñ?и Ñ?е Ñ?маÑ?Ñ?аÑ?Ñ? Ñ?Ñ?Ñ?еÑ?аÑ?Ñ?им Ñ?колико Ñ?е Ñ?Ñ?енÑ?Ñ?но вÑ?еме Ñ? пÑ?оÑ?лоÑ?Ñ?и Ñ? "
+"одноÑ?Ñ? на дан поÑ?еÑ?ка. Уколико Ñ?е Ñ?Ñ?енÑ?Ñ?но вÑ?еме након дана поÑ?еÑ?ка, "
+"акÑ?ивноÑ?Ñ?и Ñ?е Ñ?маÑ?Ñ?аÑ?Ñ? данаÑ?Ñ?им. Уколико акÑ?ивноÑ?Ñ? обÑ?Ñ?ваÑ?а два дана, она Ñ?е "
+"пÑ?еÑ?и Ñ? онаÑ? дан када Ñ?е извÑ?Ñ?ен веÑ?и део Ñ?е акÑ?ивноÑ?Ñ?и."
 
-#. Title of reminder notification
-#: ../data/Hamster_Applet.server.in.in.h:2 ../hamster/about.py:37
-#: ../hamster/about.py:38 ../hamster/applet.py:63
-msgid "Time Tracker"
-msgstr "Ð?Ñ?аÑ?илаÑ? вÑ?емена"
+#: ../data/hamster-applet.schemas.in.h:2
+msgid ""
+"Also remind every notify_interval minutes if no activity has been started."
+msgstr ""
+"Уколико ни Ñ?една акÑ?ивноÑ?Ñ? ниÑ?е запоÑ?еÑ?а подÑ?еÑ?и ме након одÑ?еÑ?еног боÑ?а "
+"минÑ?Ñ?а, коÑ?е одÑ?еÑ?Ñ?Ñ?е кÑ?Ñ?Ñ? notify_interval."
 
-#: ../data/Hamster_Applet.xml.h:1
-msgid "_About"
-msgstr "_Ð? пÑ?огÑ?амÑ?"
+#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:5
+msgid "Also remind when no activity is set"
+msgstr "ТакоÑ?е ме и подÑ?еÑ?и када нема акÑ?ивноÑ?Ñ?и"
 
-#: ../data/Hamster_Applet.xml.h:2
-msgid "_Overview"
-msgstr "_Ð?Ñ?еглед"
+#: ../data/hamster-applet.schemas.in.h:4
+msgid "At what time does the day start (defaults to 5:30AM)"
+msgstr "Ð?ада поÑ?иÑ?е нови дан (подÑ?азÑ?мевано Ñ?е 5:30)"
 
-#: ../data/Hamster_Applet.xml.h:3
-msgid "_Preferences"
-msgstr "_Ð?оÑ?Ñ?авке"
+#: ../data/hamster-applet.schemas.in.h:5
+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."
+msgstr ""
+"Уколико Ñ?е Ñ?кÑ?Ñ?Ñ?ено пÑ?ебаÑ?иваÑ?е по именÑ?, оваÑ? Ñ?пиÑ?ак поÑ?Ñ?авÑ?а имена "
+"акÑ?ивноÑ?Ñ?и на коÑ?е Ñ?е Ñ?Ñ?еба пÑ?ебаÑ?иÑ?и (Ñ?адни пÑ?оÑ?Ñ?оÑ?и пÑ?едÑ?Ñ?авÑ?ени Ñ?иÑ?овим "
+"индекÑ?има)."
 
-#: ../data/preferences.ui.h:1
-msgid "<b>Activities</b>"
-msgstr "<b>Ð?кÑ?ивноÑ?Ñ?и</b>"
+#: ../data/hamster-applet.schemas.in.h:6
+msgid "Keyboard shortcut for showing the Time Tracker window."
+msgstr "Ð?Ñ?еÑ?иÑ?а на Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?и за пÑ?иказиваÑ?е пÑ?озоÑ?а Ð?Ñ?аÑ?иоÑ?а вÑ?емена"
 
-#: ../data/preferences.ui.h:2
-msgid "<b>Global Hotkey</b>"
-msgstr "<b>Ð?лобалне Ñ?Ñ?нкÑ?ионалне Ñ?ипке</b>"
+#: ../data/hamster-applet.schemas.in.h:7
+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."
+msgstr ""
+"СпиÑ?ак Ñ?кÑ?Ñ?Ñ?ениÑ? наÑ?ина пÑ?аÑ?еÑ?а. â??nameâ?? (назив) Ñ?е омогÑ?Ñ?иÑ?и пÑ?ебаÑ?иваÑ?е "
+"акÑ?ивноÑ?Ñ?и по именима из workspace_mapping. â??memoryâ?? (мемоÑ?иÑ?а) Ñ?е омогÑ?Ñ?иÑ?и "
+"пÑ?ебаÑ?иваÑ?е на поÑ?ледÑ?Ñ? акÑ?ивноÑ?Ñ?и пÑ?и повÑ?аÑ?кÑ? на пÑ?еÑ?Ñ?одни Ñ?адни пÑ?оÑ?Ñ?оÑ?."
 
-#: ../data/preferences.ui.h:3
-msgid "<b>Tracking</b>"
-msgstr "<b>Ð?Ñ?аÑ?еÑ?е</b>"
+#: ../data/hamster-applet.schemas.in.h:8
+msgid ""
+"Remind of current task every specified amount of minutes. Set to 0 or "
+"greater than 120 to disable reminder."
+msgstr ""
+"Ð?одÑ?еÑ?и на Ñ?Ñ?енÑ?Ñ?ни поÑ?ао након вÑ?еменÑ?ког инÑ?еÑ?вала заÑ?даÑ?ог Ñ? минÑ?Ñ?ама. "
+"СÑ?авиÑ?е на 0 или на виÑ?е од 120 минÑ?Ñ?а да онемогÑ?Ñ?иÑ?е подÑ?еÑ?ник."
 
-#: ../data/preferences.ui.h:4
-msgid "Activity list"
-msgstr "СпиÑ?ак акÑ?ивноÑ?Ñ?и"
+#: ../data/hamster-applet.schemas.in.h:9
+msgid "Remind of current task every x minutes"
+msgstr "Ð?одÑ?еÑ?и на Ñ?Ñ?енÑ?Ñ?ни поÑ?ао Ñ?вакиÑ? x минÑ?Ñ?а"
 
-#: ../data/preferences.ui.h:5
-msgid "Add activity"
-msgstr "Ð?одаÑ? акÑ?ивноÑ?Ñ?"
+#: ../data/hamster-applet.schemas.in.h:10
+msgid "Should workspace switch trigger activity switch"
+msgstr "Ð?а ли пÑ?екидаÑ? Ñ?адног пÑ?оÑ?Ñ?оÑ?а Ñ?Ñ?еба да Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?е и акÑ?ивноÑ?Ñ?"
 
-#: ../data/preferences.ui.h:6
-msgid "Add category"
-msgstr "Ð?одаÑ? каÑ?егоÑ?иÑ?Ñ?"
+#: ../data/hamster-applet.schemas.in.h:11
+msgid "Show window"
+msgstr "Ð?Ñ?икажи пÑ?озоÑ?"
 
-#: ../data/preferences.ui.h:7 ../data/hamster-applet.schemas.in.h:2
-msgid "Also remind when no activity is set"
-msgstr "ТакоÑ?е ме и подÑ?еÑ?и када нема акÑ?ивноÑ?Ñ?и"
+#: ../data/hamster-applet.schemas.in.h:12
+msgid "Stop tracking current activity on shutdown"
+msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е Ñ?екÑ?Ñ?е акÑ?ивноÑ?Ñ?и пÑ?и гаÑ?еÑ?Ñ?"
 
-#: ../data/preferences.ui.h:8
-msgid "Category list"
-msgstr "СпиÑ?ак каÑ?егоÑ?иÑ?а"
+#: ../data/hamster-applet.schemas.in.h:13
+msgid "Stop tracking current activity when computer becomes idle"
+msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е Ñ?екÑ?Ñ?е акÑ?ивноÑ?Ñ?и, када Ñ?аÑ?Ñ?наÑ? поÑ?Ñ?ане неÑ?поÑ?лен"
 
-#: ../data/preferences.ui.h:9
-msgid "Edit activity"
-msgstr "УÑ?еди акÑ?ивноÑ?Ñ?"
+#: ../data/hamster-applet.schemas.in.h:14
+msgid "Stop tracking on idle"
+msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е када нема акÑ?ивноÑ?Ñ?и"
 
-#: ../data/preferences.ui.h:10
-msgid "Edit category"
-msgstr "Ð?змени каÑ?егоÑ?иÑ?Ñ?"
+#: ../data/hamster-applet.schemas.in.h:15 ../data/preferences.ui.h:20
+msgid "Stop tracking on shutdown"
+msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е пÑ?и гаÑ?еÑ?Ñ?"
 
-#: ../data/preferences.ui.h:11
-msgid "Move activity down"
-msgstr "Ð?омеÑ?и акÑ?ивноÑ?Ñ? наниже"
+#: ../data/hamster-applet.schemas.in.h:16
+msgid "Switch activity on workspace change"
+msgstr "Ð?Ñ?омени акÑ?ивноÑ?Ñ? пÑ?и пÑ?омени Ñ?адног пÑ?оÑ?Ñ?оÑ?а"
 
-#: ../data/preferences.ui.h:12
-msgid "Move activity up"
-msgstr "Ð?омеÑ?и акÑ?ивноÑ?Ñ? навиÑ?е"
+#: ../data/Hamster_Applet.server.in.in.h:1 ../src/hamster/about.py:42
+msgid "Project Hamster â?? track your time"
+msgstr "Ð?Ñ?оÑ?екаÑ? Ð?Ñ?едни Ñ?Ñ?Ñ?ак â?? пÑ?аÑ?иÑ?е ваÑ?е вÑ?еме"
 
-#: ../data/preferences.ui.h:13
-msgid "Remind of current activity every:"
-msgstr "Ð?одÑ?еÑ?и ме на Ñ?Ñ?енÑ?Ñ?нÑ? акÑ?ивноÑ?Ñ? Ñ?вакиÑ?:"
+#: ../data/Hamster_Applet.server.in.in.h:2
+#: ../data/hamster-standalone.desktop.in.in.h:2 ../data/hamster.ui.h:10
+#: ../src/hamster/about.py:39 ../src/hamster/about.py:40
+#: ../src/hamster/applet.py:344 ../src/hamster-standalone:199
+msgid "Time Tracker"
+msgstr "Ð?Ñ?аÑ?илаÑ? вÑ?емена"
 
-#: ../data/preferences.ui.h:14
-msgid "Remove activity"
-msgstr "Уклони акÑ?ивноÑ?Ñ?"
+#: ../data/Hamster_Applet.xml.h:1
+msgid "_About"
+msgstr "_Ð? пÑ?огÑ?амÑ?"
 
-#: ../data/preferences.ui.h:15
-msgid "Remove category"
-msgstr "Уклони каÑ?егоÑ?иÑ?Ñ?"
+#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:13
+msgid "_Help"
+msgstr "_Ð?омоÑ?"
 
-#: ../data/preferences.ui.h:16 ../data/hamster-applet.schemas.in.h:10
-msgid "Stop tracking on shutdown"
-msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е пÑ?и гаÑ?еÑ?Ñ?"
+#: ../data/Hamster_Applet.xml.h:3
+msgid "_Overview"
+msgstr "_Ð?Ñ?еглед"
 
-#: ../data/preferences.ui.h:17
-msgid "Stop tracking when computer becomes idle"
-msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е када Ñ?аÑ?Ñ?наÑ? ленÑ?аÑ?и"
+#: ../data/Hamster_Applet.xml.h:4
+msgid "_Preferences"
+msgstr "_Ð?оÑ?Ñ?авке"
 
-#: ../data/preferences.ui.h:18
-msgid "Time Tracker Preferences"
-msgstr "Ð?оÑ?Ñ?авке пÑ?аÑ?еÑ?а вÑ?емена"
+#: ../data/hamster-standalone.desktop.in.in.h:1
+#| msgid "Project Hamster Website"
+msgid "Project Hamster desktop time tracking"
+msgstr "Ð?Ñ?едни Ñ?Ñ?Ñ?ак за пÑ?аÑ?еÑ?е вÑ?емена Ñ?а Ñ?адне повÑ?Ñ?и"
 
-#: ../data/preferences.ui.h:19
-msgid "_Activities"
-msgstr "_Ð?кÑ?ивноÑ?Ñ?и"
+#: ../data/applet.ui.h:1
+msgid "Ad_d Earlier Activity"
+msgstr "Ð?о_даÑ? Ñ?аниÑ?Ñ? акÑ?овноÑ?Ñ?"
 
-#: ../data/preferences.ui.h:20
-msgid "_Categories"
-msgstr "_Ð?аÑ?егоÑ?иÑ?е"
+#: ../data/applet.ui.h:2 ../src/hamster/applet.py:387
+msgid "No records today"
+msgstr "Ð?анаÑ? нема запиÑ?а"
+
+#: ../data/applet.ui.h:3 ../data/hamster.ui.h:4
+#| msgid "Switch"
+msgid "S_witch"
+msgstr "Ð?Ñ?е_баÑ?и"
+
+#: ../data/applet.ui.h:4
+msgid "Show _Overview"
+msgstr "Ð?Ñ?икажи _пÑ?еглед"
+
+#: ../data/applet.ui.h:5 ../data/hamster.ui.h:5
+#| msgid "_Stop Tracking"
+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:8
+msgid "_Today"
+msgstr "_Ð?анаÑ?"
 
 #: ../data/edit_activity.ui.h:1
 msgid "Activity:"
@@ -141,184 +196,230 @@ msgid "Preview:"
 msgstr "Ð?Ñ?еглед:"
 
 #: ../data/edit_activity.ui.h:5
+msgid "Tags:"
+msgstr "Ð?знаке:"
+
+#: ../data/edit_activity.ui.h:6
 msgid "Time:"
 msgstr "Ð?Ñ?еме:"
 
-#: ../data/edit_activity.ui.h:6
+#: ../data/edit_activity.ui.h:7
 msgid "in progress"
 msgstr "Ñ? Ñ?окÑ?"
 
-#: ../data/edit_activity.ui.h:7 ../data/stats.ui.h:19
+#: ../data/edit_activity.ui.h:8 ../data/overview.ui.h:8
 msgid "to"
 msgstr "до"
 
-#: ../data/hamster-applet.schemas.in.h:1
-msgid ""
-"Also remind every notify_interval minutes if no activity has been started."
-msgstr ""
-"Уколико ни Ñ?една акÑ?ивноÑ?Ñ? ниÑ?е запоÑ?еÑ?а подÑ?еÑ?и ме након одÑ?еÑ?еног боÑ?а минÑ?Ñ?а, "
-"коÑ?е одÑ?еÑ?Ñ?Ñ?е кÑ?Ñ?Ñ? notify_interval."
+#: ../data/hamster.ui.h:1
+#| msgid "Add Earlier Activity"
+msgid "Add earlier activity"
+msgstr "Ð?одаÑ? Ñ?аниÑ?Ñ? акÑ?ивноÑ?Ñ?"
 
-#: ../data/hamster-applet.schemas.in.h:3
-msgid "Keyboard shortcut for showing the Time Tracker window."
-msgstr "Ð?Ñ?еÑ?иÑ?а на Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?и за пÑ?иказиваÑ?е пÑ?озоÑ?а Ð?Ñ?аÑ?иоÑ?а вÑ?емена"
+#: ../data/hamster.ui.h:2
+msgid "Contents"
+msgstr "СадÑ?жаÑ?"
 
-#: ../data/hamster-applet.schemas.in.h:4
-msgid ""
-"Remind of current task every specified amount of minutes. Set to 0 or "
-"greater than 120 to disable reminder."
-msgstr ""
-"Ð?одÑ?еÑ?и на Ñ?Ñ?енÑ?Ñ?ни поÑ?ао након вÑ?еменÑ?ког инÑ?еÑ?вала заÑ?даÑ?ог Ñ? минÑ?Ñ?ама. "
-"СÑ?авиÑ?е на 0 или на виÑ?е од 120 минÑ?Ñ?а да онемогÑ?Ñ?иÑ?е подÑ?еÑ?ник."
+#: ../data/hamster.ui.h:3
+msgid "Overview"
+msgstr "Ð?Ñ?еглед"
 
-#: ../data/hamster-applet.schemas.in.h:5
-msgid "Remind of current task every x minutes"
-msgstr "Ð?одÑ?еÑ?и на Ñ?Ñ?енÑ?Ñ?ни поÑ?ао Ñ?вакиÑ? x минÑ?Ñ?а"
+#: ../data/hamster.ui.h:6
+#| msgid "New activity"
+msgid "Start new activity"
+msgstr "Ð?апоÑ?ни новÑ? акÑ?ивноÑ?Ñ?"
 
-#: ../data/hamster-applet.schemas.in.h:6
-msgid "Show window"
-msgstr "Ð?Ñ?икажи пÑ?озоÑ?"
+#: ../data/hamster.ui.h:7 ../data/stats.ui.h:2
+msgid "Statistics"
+msgstr "СÑ?аÑ?иÑ?Ñ?ике"
 
-#: ../data/hamster-applet.schemas.in.h:7
-msgid "Stop tracking current activity on shutdown"
-msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е Ñ?екÑ?Ñ?е акÑ?ивноÑ?Ñ?и пÑ?и гаÑ?еÑ?Ñ?"
+#: ../data/hamster.ui.h:11
+msgid "Today"
+msgstr "Ð?анаÑ?"
 
-#: ../data/hamster-applet.schemas.in.h:8
-msgid "Stop tracking current activity when computer becomes idle"
-msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е Ñ?екÑ?Ñ?е акÑ?ивноÑ?Ñ?и, када Ñ?аÑ?Ñ?наÑ? поÑ?Ñ?ане неÑ?поÑ?лен"
+#: ../data/hamster.ui.h:12
+#| msgid "Edit"
+msgid "_Edit"
+msgstr "_УÑ?еÑ?иваÑ?е"
 
-#: ../data/hamster-applet.schemas.in.h:9
-msgid "Stop tracking on idle"
-msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е када нема акÑ?ивноÑ?Ñ?и"
+#: ../data/hamster.ui.h:14
+#| msgid "_Stop Tracking"
+msgid "_Tracking"
+msgstr "Ð?Ñ?аÑ?_еÑ?е"
 
-#: ../data/applet.ui.h:1
-msgid ""
-"<span size=\"small\" >Type in an activity and hit Enter to start tracking!</"
-"span>"
-msgstr ""
-"<span size=\"small\" >УпиÑ?иÑ?е акÑ?ивноÑ?Ñ? и пÑ?иÑ?иÑ?ниÑ?е â??Enterâ?? да запоÑ?неÑ?е "
-"пÑ?аÑ?еÑ?е!</span>"
+#: ../data/overview_totals.ui.h:1 ../data/overview.ui.h:1
+#: ../data/preferences.ui.h:1
+#| msgid "_Activities"
+msgid "Activities"
+msgstr "Ð?кÑ?ивноÑ?Ñ?и"
 
-#: ../data/applet.ui.h:2
-msgid ""
-"<span size=\"small\" color=\"blue\" underline=\"single\">Tell me more</span>"
-msgstr ""
-"<span size=\"small\" color=\"blue\" underline=\"single\">РеÑ?и ми виÑ?е</span>"
+#: ../data/overview_totals.ui.h:2
+#| msgid "_Categories"
+msgid "Categories"
+msgstr "Ð?аÑ?егоÑ?иÑ?е"
 
-#: ../data/applet.ui.h:3
-msgid "Ad_d Earlier Activity"
-msgstr "Ð?о_даÑ? Ñ?аниÑ?Ñ? акÑ?овноÑ?Ñ?"
+#: ../data/overview_totals.ui.h:3
+msgid "No data for this interval"
+msgstr "Ð?ема подаÑ?ака за оваÑ? инÑ?еÑ?вал"
 
-#. This title appears only when debugging from console. Leave it as is.
-#: ../data/applet.ui.h:5
-msgid "Hamster"
-msgstr "Hamster"
+#: ../data/overview_totals.ui.h:4
+#| msgid "Statistics"
+msgid "Show Statistics"
+msgstr "Ð?Ñ?икажи Ñ?Ñ?аÑ?иÑ?Ñ?икÑ?"
 
-#: ../data/applet.ui.h:6 ../hamster/applet.py:554
-msgid "No records today"
-msgstr "Ð?анаÑ? нема запиÑ?а"
+#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:212
+#: ../src/hamster/reports.py:227 ../src/hamster-standalone:70
+#| msgid "Totals"
+msgid "Tags"
+msgstr "Ð?знаке"
 
-#: ../data/applet.ui.h:7
-msgid "Show _Overview"
-msgstr "Ð?Ñ?икажи _пÑ?еглед"
+#: ../data/overview.ui.h:2
+msgid "Add"
+msgstr "Ð?одаÑ?"
 
-#: ../data/applet.ui.h:8
-msgid "_Activity:"
-msgstr "_Ð?кÑ?ивноÑ?Ñ?:"
+#: ../data/overview.ui.h:3
+msgid "Edit"
+msgstr "Ð?змени"
 
-#: ../data/applet.ui.h:9
-msgid "_Stop Tracking"
-msgstr "_Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е"
+#: ../data/overview.ui.h:4
+msgid "Overview - Hamster"
+msgstr "Ð?Ñ?еглед â?? Ð?Ñ?едни Ñ?Ñ?Ñ?ак"
 
-#: ../data/applet.ui.h:10
-msgid "_Today"
-msgstr "_Ð?анаÑ?"
+#: ../data/overview.ui.h:5
+msgid "Remove"
+msgstr "Уклони"
 
-#: ../data/stats.ui.h:1
-msgid " _Day"
-msgstr "_Ð?ан"
+#: ../data/overview.ui.h:6
+#| msgid "HTML Report"
+msgid "Save Report"
+msgstr "СаÑ?Ñ?ваÑ? извеÑ?Ñ?аÑ?"
 
-#: ../data/stats.ui.h:2
-msgid " _Month"
-msgstr "_Ð?еÑ?еÑ?"
+#. summary table
+#: ../data/overview.ui.h:7 ../data/stats.ui.h:3 ../src/hamster/reports.py:285
+msgid "Totals"
+msgstr "УкÑ?пно"
 
-#: ../data/stats.ui.h:3
-msgid " _Week"
-msgstr "_СедмиÑ?а"
+#: ../data/preferences.ui.h:2
+msgid "Activity list"
+msgstr "СпиÑ?ак акÑ?ивноÑ?Ñ?и"
 
-#: ../data/stats.ui.h:4
-msgid "<b>Overview</b>"
-msgstr "<b>Ð?Ñ?еглед</b>"
+#: ../data/preferences.ui.h:3
+msgid "Add activity"
+msgstr "Ð?одаÑ? акÑ?ивноÑ?Ñ?"
 
-#: ../data/stats.ui.h:5
-msgid "<b>Starts and ends</b>"
-msgstr "<b>Ð?оÑ?еÑ?ак и кÑ?аÑ?</b>"
+#: ../data/preferences.ui.h:4
+msgid "Add category"
+msgstr "Ð?одаÑ? каÑ?егоÑ?иÑ?Ñ?"
 
-#: ../data/stats.ui.h:6
-msgid "<b>Totals</b>"
-msgstr "<b>УкÑ?пно</b>"
+#: ../data/preferences.ui.h:6
+#| msgid "_Categories"
+msgid "Categories and Tags"
+msgstr "Ð?аÑ?егоÑ?иÑ?е и ознаке"
 
-#: ../data/stats.ui.h:7 ../hamster/reports.py:231 ../hamster/reports.py:292
-msgid "Activity"
-msgstr "Ð?кÑ?ивноÑ?Ñ?"
+#: ../data/preferences.ui.h:7
+msgid "Category list"
+msgstr "СпиÑ?ак каÑ?егоÑ?иÑ?а"
 
-#: ../data/stats.ui.h:8
-msgid "Categories:"
-msgstr "Ð?аÑ?егоÑ?иÑ?е"
+#: ../data/preferences.ui.h:8
+msgid "Edit activity"
+msgstr "УÑ?еди акÑ?ивноÑ?Ñ?"
 
-#: ../data/stats.ui.h:9
-msgid "Date interval:"
-msgstr "Ð?нÑ?еÑ?вал даÑ?Ñ?ма:"
+#: ../data/preferences.ui.h:9
+msgid "Edit category"
+msgstr "Ð?змени каÑ?егоÑ?иÑ?Ñ?"
 
-#: ../data/stats.ui.h:10
-msgid "No data for this interval"
-msgstr "Ð?ема подаÑ?ака за оваÑ? инÑ?еÑ?вал"
+#: ../data/preferences.ui.h:10
+msgid "General"
+msgstr "Ð?пÑ?Ñ?е"
 
-#: ../data/stats.ui.h:11
-msgid "Overview"
-msgstr "Ð?Ñ?еглед"
+#: ../data/preferences.ui.h:11
+#| msgid "<b>Global Hotkey</b>"
+msgid "Global Hotkey"
+msgstr "Ð?пÑ?Ñ?е пÑ?еÑ?иÑ?е"
 
-#: ../data/stats.ui.h:12
-msgid "Overview - Hamster"
-msgstr "Ð?Ñ?еглед â?? Ð?Ñ?едни Ñ?Ñ?Ñ?ак"
+#: ../data/preferences.ui.h:12
+msgid "Move activity down"
+msgstr "Ð?омеÑ?и акÑ?ивноÑ?Ñ? наниже"
 
-#: ../data/stats.ui.h:13
-msgid "Save as HTML"
-msgstr "СаÑ?Ñ?ваÑ? као ХТÐ?Ð?"
+#: ../data/preferences.ui.h:13
+msgid "Move activity up"
+msgstr "Ð?омеÑ?и акÑ?ивноÑ?Ñ? навиÑ?е"
 
-#: ../data/stats.ui.h:14
-msgid "Save report â?? Time Tracker"
-msgstr "СаÑ?Ñ?ваÑ? извеÑ?Ñ?аÑ? - Ð?Ñ?аÑ?илаÑ? вÑ?емена"
+#: ../data/preferences.ui.h:14
+msgid "New day starts at"
+msgstr "Ð?ови дан поÑ?иÑ?е Ñ?"
 
-#: ../data/stats.ui.h:15
-msgid "Statistics"
-msgstr "СÑ?аÑ?иÑ?Ñ?ике"
+#: ../data/preferences.ui.h:15
+msgid "Remind of current activity every:"
+msgstr "Ð?одÑ?еÑ?и ме на Ñ?Ñ?енÑ?Ñ?нÑ? акÑ?ивноÑ?Ñ? Ñ?вакиÑ?:"
 
-#: ../data/stats.ui.h:16
-msgid "Today"
-msgstr "Ð?анаÑ?"
+#: ../data/preferences.ui.h:16
+msgid "Remove activity"
+msgstr "Уклони акÑ?ивноÑ?Ñ?"
 
-#: ../data/stats.ui.h:17 ../hamster/stats.py:948
-msgid "Week"
-msgstr "СедмиÑ?а"
+#: ../data/preferences.ui.h:17
+msgid "Remove category"
+msgstr "Уклони каÑ?егоÑ?иÑ?Ñ?"
+
+#: ../data/preferences.ui.h:18
+msgid "Resume the last activity when returning to a workspace"
+msgstr "Ð?аÑ?Ñ?ави поÑ?ледÑ?Ñ? акÑ?ивноÑ?Ñ? по повÑ?аÑ?кÑ? Ñ? Ñ?адни пÑ?оÑ?Ñ?оÑ?"
+
+#: ../data/preferences.ui.h:19
+msgid "Start new activity when switching workspaces:"
+msgstr "Ð?апоÑ?ни новÑ? акÑ?ивноÑ?Ñ? пÑ?и пÑ?омени Ñ?адног пÑ?оÑ?Ñ?оÑ?а:"
 
-#: ../data/stats.ui.h:18
+#: ../data/preferences.ui.h:21
+msgid "Stop tracking when computer becomes idle"
+msgstr "Ð?аÑ?Ñ?Ñ?ави пÑ?аÑ?еÑ?е када Ñ?аÑ?Ñ?наÑ? ленÑ?аÑ?и"
+
+#: ../data/preferences.ui.h:22
+msgid "Tags that should appear in autocomplete"
+msgstr "Ð?знаке за пÑ?иказ Ñ? Ñ?амодопÑ?Ñ?аваÑ?Ñ?"
+
+#: ../data/preferences.ui.h:23
+msgid "Time Tracker Preferences"
+msgstr "Ð?оÑ?Ñ?авке пÑ?аÑ?еÑ?а вÑ?емена"
+
+#: ../data/preferences.ui.h:24
+#| msgid "_Stop Tracking"
+msgid "Tracking"
+msgstr "Ð?Ñ?аÑ?еÑ?е"
+
+#: ../data/preferences.ui.h:25
+msgid "Workspaces"
+msgstr "Радни пÑ?оÑ?Ñ?оÑ?и"
+
+#: ../data/preferences.ui.h:26
+msgid "_Activities"
+msgstr "_Ð?кÑ?ивноÑ?Ñ?и"
+
+#: ../data/preferences.ui.h:27
+msgid "_Categories"
+msgstr "_Ð?аÑ?егоÑ?иÑ?е"
+
+#: ../data/stats.ui.h:1
+#| msgid "<b>Starts and ends</b>"
+msgid "Starts and ends"
+msgstr "Ð?оÑ?еÑ?ак и кÑ?аÑ?"
+
+#: ../data/stats.ui.h:4
 msgid "Year:"
 msgstr "Ð?одина:"
 
-#: ../hamster/about.py:41
+#: ../src/hamster/about.py:43
 msgid "Copyright © 2007â??2009 Toms BauÄ£is and others"
 msgstr "Ð?Ñ?Ñ?оÑ?Ñ?ка пÑ?ава © 2007-2009 Toms Baugis и оÑ?Ñ?али"
 
-#: ../hamster/about.py:43
+#: ../src/hamster/about.py:45
 msgid "Project Hamster Website"
 msgstr "Ð?еб меÑ?Ñ?о Ð?Ñ?едног Ñ?Ñ?Ñ?ка"
 
-#: ../hamster/about.py:44
+#: ../src/hamster/about.py:46
 msgid "About Time Tracker"
 msgstr "Ð? пÑ?аÑ?иоÑ?Ñ? вÑ?емена"
 
-#: ../hamster/about.py:54
+#: ../src/hamster/about.py:56
 msgid "translator-credits"
 msgstr ""
 "Ð?иÑ?ко СпаÑ?иÑ? <mirkospasic gmail com>\n"
@@ -326,192 +427,223 @@ msgstr ""
 "\n"
 "Ð?Ñ?евод.оÑ?г â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език."
 
-#. translators: this is edit activity action in the notifier bubble
-#: ../hamster/applet.py:73
-msgid "Edit"
-msgstr "Ð?змени"
-
-#. translators: this is switch activity action in the notifier bubble
-#: ../hamster/applet.py:75
-msgid "Switch"
-msgstr "Ð?Ñ?ебаÑ?и"
-
-#: ../hamster/applet.py:305 ../hamster/reports.py:235
-#: ../hamster/reports.py:293
-msgid "Duration"
-msgstr "ТеаÑ?аÑ?е"
+#: ../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 "Ð?кÑ?ивноÑ?Ñ?"
 
-#: ../hamster/applet.py:492 ../hamster/applet.py:513
+#: ../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 "Ð?ез акÑ?ивноÑ?Ñ?и"
 
-#. activity reminder
-#: ../hamster/applet.py:508
-#, python-format
-msgid "Working on <b>%s</b>"
-msgstr "Радим на <b>%s</b>"
-
-#: ../hamster/applet.py:562
+#: ../src/hamster/applet.py:395
 #, python-format
 msgid "%(category)s: %(duration)s"
 msgstr "%(category)s: %(duration)s"
 
 #. duration in main drop-down per category in hours
-#: ../hamster/applet.py:565
+#: ../src/hamster/applet.py:398
 #, python-format
 msgid "%sh"
 msgstr "%sÑ?"
 
-#. unsorted category
-#: ../hamster/applet.py:601 ../hamster/db.py:226 ../hamster/db.py:243
-#: ../hamster/db.py:248 ../hamster/db.py:465 ../hamster/db.py:538
-#: ../hamster/edit_activity.py:368 ../hamster/preferences.py:56
-#: ../hamster/reports.py:54 ../hamster/reports.py:91 ../hamster/reports.py:248
-#: ../hamster/stuff.py:94
+#: ../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
 msgid "Unsorted"
 msgstr "Ð?епоÑ?еÑ?ано"
 
-#: ../hamster/applet.py:833
-msgid "What should be typed in the activity box?"
-msgstr "ШÑ?а да Ñ?пиÑ?ем Ñ? кÑ?Ñ?иÑ?Ñ? акÑ?ивноÑ?Ñ?и?"
+#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+msgid "Just started"
+msgstr "УпÑ?аво запоÑ?ела"
 
-#: ../hamster/applet.py:836
-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"
-"        "
+#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
+#| msgid "Add activity"
+msgid "Changed activity"
+msgstr "Ð?змеÑ?ена акÑ?ивноÑ?Ñ?"
+
+#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#, c-format, python-format
+msgid "Switched to '%s'"
+msgstr "Ð?Ñ?ебаÑ?ена Ñ? â??%sâ??"
 
 #. defaults
-#: ../hamster/db.py:728
+#: ../src/hamster/db.py:918
 msgid "Work"
 msgstr "Ð?оÑ?ао"
 
-#: ../hamster/db.py:729
+#: ../src/hamster/db.py:919
 msgid "Reading news"
 msgstr "ЧиÑ?аÑ?е веÑ?Ñ?и"
 
-#: ../hamster/db.py:730
+#: ../src/hamster/db.py:920
 msgid "Checking stocks"
 msgstr "Ð?Ñ?овеÑ?а акÑ?иÑ?а"
 
-#: ../hamster/db.py:731
+#: ../src/hamster/db.py:921
 msgid "Super secret project X"
 msgstr "СÑ?пеÑ? Ñ?аÑ?ни пÑ?оÑ?екаÑ? X"
 
-#: ../hamster/db.py:732
+#: ../src/hamster/db.py:922
 msgid "World domination"
 msgstr "Ð?Ñ?ваÑ?аÑ?е Ñ?веÑ?а"
 
-#: ../hamster/db.py:734
+#: ../src/hamster/db.py:924
 msgid "Day-to-day"
 msgstr "Ð?з дана Ñ? дан"
 
-#: ../hamster/db.py:735
+#: ../src/hamster/db.py:925
 msgid "Lunch"
 msgstr "Ð Ñ?Ñ?ак"
 
-#: ../hamster/db.py:736
+#: ../src/hamster/db.py:926
 msgid "Watering flowers"
 msgstr "Ð?аливаÑ?е Ñ?веÑ?а"
 
-#: ../hamster/db.py:737
+#: ../src/hamster/db.py:927
 msgid "Doing handstands"
 msgstr "Ð?Ñ?евоÑ?еÑ?е Ð?нома на Ñ?Ñ?пÑ?ки"
 
-#: ../hamster/edit_activity.py:385
+#: ../src/hamster/edit_activity.py:67
 msgid "Update activity"
 msgstr "Ð?жÑ?Ñ?иÑ?аÑ? акÑ?ивноÑ?Ñ?"
 
-#: ../hamster/preferences.py:104
+#: ../src/hamster/overview_activities.py:88
+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
+#, python-format
+msgid "%s hours tracked total"
+msgstr "УкÑ?пно Ñ?е пÑ?аÑ?ено Ñ?е %s Ñ?аÑ?и"
+
+#: ../src/hamster/preferences.py:117 ../src/hamster/preferences.py:192
 msgid "Name"
 msgstr "Ð?ме"
 
-#: ../hamster/preferences.py:124 ../hamster/reports.py:232
-#: ../hamster/reports.py:291
+#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
+#: ../src/hamster/reports.py:288
 msgid "Category"
 msgstr "Ð?аÑ?егоÑ?иÑ?а"
 
-#: ../hamster/preferences.py:559
+#: ../src/hamster/preferences.py:673
 msgid "New category"
 msgstr "Ð?ова каÑ?егоÑ?иÑ?а"
 
-#: ../hamster/preferences.py:572
+#: ../src/hamster/preferences.py:686
 msgid "New activity"
 msgstr "Ð?ова акÑ?ивноÑ?Ñ?"
 
 #. notify interval slider value label
-#: ../hamster/preferences.py:632
+#: ../src/hamster/preferences.py:757
 #, python-format
 msgid "%(interval_minutes)d minutes"
 msgstr "%(interval_minutes)d минÑ?Ñ?а"
 
 #. notify interval slider value label
-#: ../hamster/preferences.py:635
+#: ../src/hamster/preferences.py:760
 msgid "Never"
 msgstr "Ð?икад"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:112
+#: ../src/hamster/reports.py:115
 msgid "activity"
 msgstr "акÑ?ивноÑ?Ñ?"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:114
+#: ../src/hamster/reports.py:117
 msgid "start time"
 msgstr "вÑ?еме поÑ?еÑ?ка"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:116
+#: ../src/hamster/reports.py:119
 msgid "end time"
 msgstr "вÑ?еме завÑ?Ñ?еÑ?ка"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:118
+#: ../src/hamster/reports.py:121
 msgid "duration minutes"
 msgstr "Ñ?Ñ?аÑ?аÑ?е Ñ? минÑ?Ñ?има"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:120
+#: ../src/hamster/reports.py:123
 msgid "category"
 msgstr "каÑ?егоÑ?иÑ?а"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:122
+#: ../src/hamster/reports.py:125
 msgid "description"
 msgstr "опиÑ?"
 
-#. 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
-#: ../hamster/reports.py:160 ../hamster/stats.py:933
+#. column title in the TSV export format
+#: ../src/hamster/reports.py:127
+#| msgid "Totals"
+msgid "tags"
+msgstr "ознаке"
+
+#: ../src/hamster/reports.py:167
 #, python-format
 msgid ""
 "Overview for %(start_B)s %(start_d)s, %(start_Y)s â?? %(end_B)s %(end_d)s, %"
@@ -520,90 +652,64 @@ msgstr ""
 "Ð?звеÑ?Ñ?аÑ? за %(start_d)s. %(start_B)s %(start_Y)s â?? %(end_d)s. %(end_B)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
-#: ../hamster/reports.py:162 ../hamster/stats.py:939
+#: ../src/hamster/reports.py:169
 #, 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"
 
-#. 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
-#: ../hamster/reports.py:164 ../hamster/stats.py:945
+#: ../src/hamster/reports.py:171
 #, 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"
 
-#: ../hamster/reports.py:167
+#: ../src/hamster/reports.py:174
 #, python-format
 msgid "Overview for %(start_B)s %(start_d)s, %(start_Y)s"
 msgstr "Ð?звеÑ?Ñ?аÑ? за %(start_d)s. %(start_B)s %(start_Y)s"
 
-#: ../hamster/reports.py:230
+#: ../src/hamster/reports.py:224
 msgid "Date"
 msgstr "Ð?аÑ?Ñ?м"
 
-#: ../hamster/reports.py:233
+#: ../src/hamster/reports.py:228
 msgid "Start"
 msgstr "Ð?оÑ?еÑ?ак"
 
-#: ../hamster/reports.py:234
+#: ../src/hamster/reports.py:229
 msgid "End"
 msgstr "Ð?Ñ?аÑ?"
 
-#: ../hamster/reports.py:236
+#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+msgid "Duration"
+msgstr "ТеаÑ?аÑ?е"
+
+#: ../src/hamster/reports.py:231
 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
-#: ../hamster/reports.py:268
+#: ../src/hamster/reports.py:264
 msgctxt "html report"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#. summary table
-#: ../hamster/reports.py:288
-msgid "Totals"
-msgstr "УкÑ?пно"
-
-#: ../hamster/reports.py:303
+#: ../src/hamster/reports.py:300
 msgid "Total Time"
 msgstr "УкÑ?пно вÑ?еме"
 
-#: ../hamster/stats.py:64 ../hamster/stats.py:1241
-msgid "HTML Report"
-msgstr "ХТÐ?Ð? извеÑ?Ñ?аÑ?"
-
-#: ../hamster/stats.py:72 ../hamster/stats.py:1249
-msgid "Tab-Separated Values (TSV)"
-msgstr "Ð?Ñ?едноÑ?Ñ?и одвоÑ?ене Ñ?абÑ?лаÑ?оÑ?ом (TSV)"
-
-#: ../hamster/stats.py:80 ../hamster/stats.py:1257
-msgid "XML"
-msgstr "XML"
-
-#: ../hamster/stats.py:87 ../hamster/stats.py:1264
-msgid "iCal"
-msgstr "iCal"
-
-#. add unsorted category
-#: ../hamster/stats.py:120
-msgctxt "categories"
-msgid "All"
-msgstr "Све"
+#: ../src/hamster-standalone:190
+#, c-format
+msgid "Working on <b>%s</b>"
+msgstr "Радим на <b>%s</b>"
 
-#: ../hamster/stats.py:435
+#: ../src/hamster/stats.py:86
 msgctxt "years"
 msgid "All"
 msgstr "Све"
 
-#: ../hamster/stats.py:524
+#: ../src/hamster/stats.py:176
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -611,14 +717,15 @@ msgstr ""
 "Ð?оÑ? нема подаÑ?ака за изÑ?адÑ? Ñ?Ñ?аÑ?иÑ?Ñ?ике.\n"
 "Ð?едеÑ?Ñ? дана коÑ?иÑ?Ñ?еÑ?а би помогло!"
 
-#: ../hamster/stats.py:527
-msgid "Still collecting data â?? check back after a week has passed!"
-msgstr "Ð?оÑ? Ñ?век Ñ?кÑ?пÑ?ам подаÑ?ке â?? пÑ?овеÑ?иÑ?е поново након недеÑ?Ñ? дана!"
+#: ../src/hamster/stats.py:179
+#| msgid "Still collecting data â?? check back after a week has passed!"
+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
-#: ../hamster/stats.py:657
+#: ../src/hamster/stats.py:310
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -626,18 +733,19 @@ 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
-#: ../hamster/stats.py:662
-#, python-format
+#: ../src/hamster/stats.py:315
+#| msgctxt "overview graph"
+#| msgid "%b %d"
 msgctxt "first record"
-msgid "%(b)s %(d)s"
-msgstr "%(b)s %(d)s"
+msgid "%b %d"
+msgstr "%b. %d"
 
-#: ../hamster/stats.py:664
+#: ../src/hamster/stats.py:317
 #, python-format
 msgid "First activity was recorded on %s."
 msgstr "Ð?Ñ?ва акÑ?ивноÑ?Ñ? Ñ?е забележена %s."
 
-#: ../hamster/stats.py:673 ../hamster/stats.py:677
+#: ../src/hamster/stats.py:326 ../src/hamster/stats.py:330
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -646,7 +754,7 @@ msgstr[1] "%(num)s године"
 msgstr[2] "%(num)s година"
 
 #. FIXME: difficult string to properly pluralize
-#: ../hamster/stats.py:682
+#: ../src/hamster/stats.py:335
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -658,25 +766,23 @@ 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
-#: ../hamster/stats.py:700
+#: ../src/hamster/stats.py:353
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../hamster/stats.py:705
+#: ../src/hamster/stats.py:358
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
 "Longest continuous work happened on %(date)s and was %(hours)s hours."
-msgstr[0] ""
-"Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?."
-msgstr[1] ""
-"Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?а"
+msgstr[0] "Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?."
+msgstr[1] "Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?а"
 msgstr[2] ""
 "Ð?аÑ?дÑ?жи непÑ?екидни поÑ?ао Ñ?е био %(date)s и Ñ?Ñ?аÑ?ао Ñ?е %(hours)s Ñ?аÑ?и."
 
 #. total records (in selected scope)
-#: ../hamster/stats.py:713
+#: ../src/hamster/stats.py:366
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -684,11 +790,11 @@ msgstr[0] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?."
 msgstr[1] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?а."
 msgstr[2] "Ð?оÑ?Ñ?оÑ?и %s запиÑ?а."
 
-#: ../hamster/stats.py:733
+#: ../src/hamster/stats.py:386
 msgid "Hamster would like to observe you some more!"
 msgstr "Ð?Ñ?едни Ñ?Ñ?Ñ?ак би волео да Ñ?е Ñ?оÑ? мало надгледа!"
 
-#: ../hamster/stats.py:735
+#: ../src/hamster/stats.py:388
 #, python-format
 msgid ""
 "With %s percent of all facts starting before 9am you seem to be an early "
@@ -697,7 +803,7 @@ msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? поÑ?иÑ?але пÑ?е 9 пÑ?еподне, изгледа да Ñ?Ñ?е "
 "Ñ?аноÑ?анилаÑ?."
 
-#: ../hamster/stats.py:738
+#: ../src/hamster/stats.py:391
 #, python-format
 msgid ""
 "With %s percent of all facts starting after 11pm you seem to be a night owl."
@@ -705,7 +811,7 @@ msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? поÑ?иÑ?але поÑ?ле 11 Ñ?веÑ?е, изгледа да Ñ?Ñ?е "
 "ноÑ?на пÑ?иÑ?а."
 
-#: ../hamster/stats.py:741
+#: ../src/hamster/stats.py:394
 #, python-format
 msgid ""
 "With %s percent of all tasks being shorter than 15 minutes you seem to be a "
@@ -714,59 +820,146 @@ msgstr ""
 "Са %s пÑ?оÑ?енаÑ?а Ñ?виÑ? Ñ?Ñ?ваÑ?и коÑ?е Ñ?Ñ? биле кÑ?аÑ?е од 15 минÑ?Ñ?а, изгледа да Ñ?Ñ?е "
 "пÑ?елиÑ?а Ð?аÑ?а."
 
-#. Date format for the label in overview window fact listing
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../hamster/stats.py:828
-msgctxt "overview list"
-msgid "%A, %b %d"
-msgstr "%A, %d.%b"
-
-#: ../hamster/stats.py:869
-msgid "Total"
-msgstr "УкÑ?пно"
-
-#. date format used in the overview graph when month view is selected
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../hamster/stats.py:891
-msgctxt "overview graph"
-msgid "%b %d"
-msgstr "%d.%b"
-
-#: ../hamster/stats.py:920
-msgctxt "single day overview"
-msgid "%B %d, %Y"
-msgstr "%d. %B, %Y"
-
-#. Overview label if looking on single day
-#: ../hamster/stats.py:922
-#, python-format
-msgid "Overview for %(date)s"
-msgstr "Ð?Ñ?еглед за %(date)s"
-
-#: ../hamster/stats.py:950
-msgid "Month"
-msgstr "Ð?еÑ?еÑ?"
-
-#: ../hamster/stats.py:952
-msgid "Day"
-msgstr "Ð?ан"
-
 #. duration in round hours
-#: ../hamster/stuff.py:151
+#: ../src/hamster/stuff.py:56
 #, python-format
 msgid "%dh"
 msgstr "%dÑ?"
 
 #. duration less than hour
-#: ../hamster/stuff.py:154
+#: ../src/hamster/stuff.py:59
 #, python-format
 msgid "%dmin"
 msgstr "%dмин"
 
 #. x hours, y minutes
-#: ../hamster/stuff.py:157
+#: ../src/hamster/stuff.py:62
 #, 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 "Ð?Ñ?аÑ?илаÑ? вÑ?емена â?? Ñ?Ñ?ваÑ?е извеÑ?Ñ?аÑ?а"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:50
+msgid "HTML Report"
+msgstr "ХТÐ?Ð? извеÑ?Ñ?аÑ?"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:58
+msgid "Tab-Separated Values (TSV)"
+msgstr "Ð?Ñ?едноÑ?Ñ?и одвоÑ?ене Ñ?абÑ?лаÑ?оÑ?ом (TSV)"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:66
+msgid "XML"
+msgstr "XML"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:73
+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 "Ð?ан"
diff --git a/po/sr latin po b/po/sr latin po
index 30d440f..d6067b3 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -6,123 +6,178 @@
 # Mirko SpasiÄ? <mirkospasic gmail com>
 # Goran RakiÄ? <grakic devbase net>
 # Translated on 2009-09-14 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: 2009-09-13 01:38+0000\n"
-"PO-Revision-Date: 2009-09-14 22:00+0200\n"
-"Last-Translator: Branko KokanoviÄ? <branko kokanovic gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\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"
 "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"
 
-#: ../data/Hamster_Applet.server.in.in.h:1 ../hamster/about.py:40
-msgid "Project Hamster â?? track your time"
-msgstr "Projekat Vredni HrÄ?ak â?? pratite vaÅ¡e vreme"
+#: ../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. "
+"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."
 
-#. Title of reminder notification
-#: ../data/Hamster_Applet.server.in.in.h:2 ../hamster/about.py:37
-#: ../hamster/about.py:38 ../hamster/applet.py:63
-msgid "Time Tracker"
-msgstr "Pratilac vremena"
+#: ../data/hamster-applet.schemas.in.h:2
+msgid ""
+"Also remind every notify_interval minutes if no activity has been started."
+msgstr ""
+"Ukoliko ni jedna aktivnost nije zapoÄ?eta podseti me nakon odreÄ?enog boja "
+"minuta, koje odreÄ?uje kljuÄ? notify_interval."
 
-#: ../data/Hamster_Applet.xml.h:1
-msgid "_About"
-msgstr "_O programu"
+#: ../data/hamster-applet.schemas.in.h:3 ../data/preferences.ui.h:5
+msgid "Also remind when no activity is set"
+msgstr "TakoÄ?e me i podseti kada nema aktivnosti"
 
-#: ../data/Hamster_Applet.xml.h:2
-msgid "_Overview"
-msgstr "_Pregled"
+#: ../data/hamster-applet.schemas.in.h:4
+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.xml.h:3
-msgid "_Preferences"
-msgstr "_Postavke"
+#: ../data/hamster-applet.schemas.in.h:5
+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."
+msgstr ""
+"Ukoliko je ukljuÄ?eno prebacivanje po imenu, ovaj spisak postavlja imena "
+"aktivnosti na koje se treba prebaciti (radni prostori predstavljeni njihovim "
+"indeksima)."
 
-#: ../data/preferences.ui.h:1
-msgid "<b>Activities</b>"
-msgstr "<b>Aktivnosti</b>"
+#: ../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/preferences.ui.h:2
-msgid "<b>Global Hotkey</b>"
-msgstr "<b>Globalne funkcionalne tipke</b>"
+#: ../data/hamster-applet.schemas.in.h:7
+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."
+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/preferences.ui.h:3
-msgid "<b>Tracking</b>"
-msgstr "<b>PraÄ?enje</b>"
+#: ../data/hamster-applet.schemas.in.h:8
+msgid ""
+"Remind of current task every specified amount of minutes. Set to 0 or "
+"greater than 120 to disable reminder."
+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/preferences.ui.h:4
-msgid "Activity list"
-msgstr "Spisak aktivnosti"
+#: ../data/hamster-applet.schemas.in.h:9
+msgid "Remind of current task every x minutes"
+msgstr "Podseti na trenutni posao svakih x minuta"
 
-#: ../data/preferences.ui.h:5
-msgid "Add activity"
-msgstr "Dodaj aktivnost"
+#: ../data/hamster-applet.schemas.in.h:10
+msgid "Should workspace switch trigger activity switch"
+msgstr "Da li prekidaÄ? radnog prostora treba da ukljuÄ?uje i aktivnost"
 
-#: ../data/preferences.ui.h:6
-msgid "Add category"
-msgstr "Dodaj kategoriju"
+#: ../data/hamster-applet.schemas.in.h:11
+msgid "Show window"
+msgstr "Prikaži prozor"
 
-#: ../data/preferences.ui.h:7 ../data/hamster-applet.schemas.in.h:2
-msgid "Also remind when no activity is set"
-msgstr "TakoÄ?e me i podseti kada nema aktivnosti"
+#: ../data/hamster-applet.schemas.in.h:12
+msgid "Stop tracking current activity on shutdown"
+msgstr "Zaustavi praÄ?enje tekuÄ?e aktivnosti pri gaÅ¡enju"
 
-#: ../data/preferences.ui.h:8
-msgid "Category list"
-msgstr "Spisak kategorija"
+#: ../data/hamster-applet.schemas.in.h:13
+msgid "Stop tracking current activity when computer becomes idle"
+msgstr "Zaustavi praÄ?enje tekuÄ?e aktivnosti, kada raÄ?unar postane neuposlen"
 
-#: ../data/preferences.ui.h:9
-msgid "Edit activity"
-msgstr "Uredi aktivnost"
+#: ../data/hamster-applet.schemas.in.h:14
+msgid "Stop tracking on idle"
+msgstr "Zaustavi praÄ?enje kada nema aktivnosti"
 
-#: ../data/preferences.ui.h:10
-msgid "Edit category"
-msgstr "Izmeni kategoriju"
+#: ../data/hamster-applet.schemas.in.h:15 ../data/preferences.ui.h:20
+msgid "Stop tracking on shutdown"
+msgstr "Zaustavi praÄ?enje pri gaÅ¡enju"
 
-#: ../data/preferences.ui.h:11
-msgid "Move activity down"
-msgstr "Pomeri aktivnost naniže"
+#: ../data/hamster-applet.schemas.in.h:16
+msgid "Switch activity on workspace change"
+msgstr "Promeni aktivnost pri promeni radnog prostora"
 
-#: ../data/preferences.ui.h:12
-msgid "Move activity up"
-msgstr "Pomeri aktivnost naviše"
+#: ../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/preferences.ui.h:13
-msgid "Remind of current activity every:"
-msgstr "Podseti me na trenutnu aktivnost svakih:"
+#: ../data/Hamster_Applet.server.in.in.h:2
+#: ../data/hamster-standalone.desktop.in.in.h:2 ../data/hamster.ui.h:10
+#: ../src/hamster/about.py:39 ../src/hamster/about.py:40
+#: ../src/hamster/applet.py:344 ../src/hamster-standalone:199
+msgid "Time Tracker"
+msgstr "Pratilac vremena"
 
-#: ../data/preferences.ui.h:14
-msgid "Remove activity"
-msgstr "Ukloni aktivnost"
+#: ../data/Hamster_Applet.xml.h:1
+msgid "_About"
+msgstr "_O programu"
 
-#: ../data/preferences.ui.h:15
-msgid "Remove category"
-msgstr "Ukloni kategoriju"
+#: ../data/Hamster_Applet.xml.h:2 ../data/hamster.ui.h:13
+msgid "_Help"
+msgstr "_PomoÄ?"
 
-#: ../data/preferences.ui.h:16 ../data/hamster-applet.schemas.in.h:10
-msgid "Stop tracking on shutdown"
-msgstr "Zaustavi praÄ?enje pri gaÅ¡enju"
+#: ../data/Hamster_Applet.xml.h:3
+msgid "_Overview"
+msgstr "_Pregled"
 
-#: ../data/preferences.ui.h:17
-msgid "Stop tracking when computer becomes idle"
-msgstr "Zaustavi praÄ?enje kada raÄ?unar lenÄ?ari"
+#: ../data/Hamster_Applet.xml.h:4
+msgid "_Preferences"
+msgstr "_Postavke"
 
-#: ../data/preferences.ui.h:18
-msgid "Time Tracker Preferences"
-msgstr "Postavke praÄ?enja vremena"
+#: ../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/preferences.ui.h:19
-msgid "_Activities"
-msgstr "_Aktivnosti"
+#: ../data/applet.ui.h:1
+msgid "Ad_d Earlier Activity"
+msgstr "Do_daj raniju aktovnost"
 
-#: ../data/preferences.ui.h:20
-msgid "_Categories"
-msgstr "_Kategorije"
+#: ../data/applet.ui.h:2 ../src/hamster/applet.py:387
+msgid "No records today"
+msgstr "Danas nema zapisa"
+
+#: ../data/applet.ui.h:3 ../data/hamster.ui.h:4
+#| msgid "Switch"
+msgid "S_witch"
+msgstr "Pre_baci"
+
+#: ../data/applet.ui.h:4
+msgid "Show _Overview"
+msgstr "Prikaži _pregled"
+
+#: ../data/applet.ui.h:5 ../data/hamster.ui.h:5
+#| msgid "_Stop Tracking"
+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:8
+msgid "_Today"
+msgstr "_Danas"
 
 #: ../data/edit_activity.ui.h:1
 msgid "Activity:"
@@ -141,184 +196,230 @@ msgid "Preview:"
 msgstr "Pregled:"
 
 #: ../data/edit_activity.ui.h:5
+msgid "Tags:"
+msgstr "Oznake:"
+
+#: ../data/edit_activity.ui.h:6
 msgid "Time:"
 msgstr "Vreme:"
 
-#: ../data/edit_activity.ui.h:6
+#: ../data/edit_activity.ui.h:7
 msgid "in progress"
 msgstr "u toku"
 
-#: ../data/edit_activity.ui.h:7 ../data/stats.ui.h:19
+#: ../data/edit_activity.ui.h:8 ../data/overview.ui.h:8
 msgid "to"
 msgstr "do"
 
-#: ../data/hamster-applet.schemas.in.h:1
-msgid ""
-"Also remind every notify_interval minutes if no activity has been started."
-msgstr ""
-"Ukoliko ni jedna aktivnost nije zapoÄ?eta podseti me nakon odreÄ?enog boja minuta, "
-"koje odreÄ?uje kljuÄ? notify_interval."
+#: ../data/hamster.ui.h:1
+#| msgid "Add Earlier Activity"
+msgid "Add earlier activity"
+msgstr "Dodaj raniju aktivnost"
 
-#: ../data/hamster-applet.schemas.in.h:3
-msgid "Keyboard shortcut for showing the Time Tracker window."
-msgstr "PreÄ?ica na tastaturi za prikazivanje prozora Pratioca vremena"
+#: ../data/hamster.ui.h:2
+msgid "Contents"
+msgstr "Sadržaj"
 
-#: ../data/hamster-applet.schemas.in.h:4
-msgid ""
-"Remind of current task every specified amount of minutes. Set to 0 or "
-"greater than 120 to disable reminder."
-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.ui.h:3
+msgid "Overview"
+msgstr "Pregled"
 
-#: ../data/hamster-applet.schemas.in.h:5
-msgid "Remind of current task every x minutes"
-msgstr "Podseti na trenutni posao svakih x minuta"
+#: ../data/hamster.ui.h:6
+#| msgid "New activity"
+msgid "Start new activity"
+msgstr "ZapoÄ?ni novu aktivnost"
 
-#: ../data/hamster-applet.schemas.in.h:6
-msgid "Show window"
-msgstr "Prikaži prozor"
+#: ../data/hamster.ui.h:7 ../data/stats.ui.h:2
+msgid "Statistics"
+msgstr "Statistike"
 
-#: ../data/hamster-applet.schemas.in.h:7
-msgid "Stop tracking current activity on shutdown"
-msgstr "Zaustavi praÄ?enje tekuÄ?e aktivnosti pri gaÅ¡enju"
+#: ../data/hamster.ui.h:11
+msgid "Today"
+msgstr "Danas"
 
-#: ../data/hamster-applet.schemas.in.h:8
-msgid "Stop tracking current activity when computer becomes idle"
-msgstr "Zaustavi praÄ?enje tekuÄ?e aktivnosti, kada raÄ?unar postane neuposlen"
+#: ../data/hamster.ui.h:12
+#| msgid "Edit"
+msgid "_Edit"
+msgstr "_UreÄ?ivanje"
 
-#: ../data/hamster-applet.schemas.in.h:9
-msgid "Stop tracking on idle"
-msgstr "Zaustavi praÄ?enje kada nema aktivnosti"
+#: ../data/hamster.ui.h:14
+#| msgid "_Stop Tracking"
+msgid "_Tracking"
+msgstr "PraÄ?_enje"
 
-#: ../data/applet.ui.h:1
-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>"
+#: ../data/overview_totals.ui.h:1 ../data/overview.ui.h:1
+#: ../data/preferences.ui.h:1
+#| msgid "_Activities"
+msgid "Activities"
+msgstr "Aktivnosti"
 
-#: ../data/applet.ui.h:2
-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>"
+#: ../data/overview_totals.ui.h:2
+#| msgid "_Categories"
+msgid "Categories"
+msgstr "Kategorije"
 
-#: ../data/applet.ui.h:3
-msgid "Ad_d Earlier Activity"
-msgstr "Do_daj raniju aktovnost"
+#: ../data/overview_totals.ui.h:3
+msgid "No data for this interval"
+msgstr "Nema podataka za ovaj interval"
 
-#. This title appears only when debugging from console. Leave it as is.
-#: ../data/applet.ui.h:5
-msgid "Hamster"
-msgstr "Hamster"
+#: ../data/overview_totals.ui.h:4
+#| msgid "Statistics"
+msgid "Show Statistics"
+msgstr "Prikaži statistiku"
 
-#: ../data/applet.ui.h:6 ../hamster/applet.py:554
-msgid "No records today"
-msgstr "Danas nema zapisa"
+#: ../data/overview_totals.ui.h:5 ../src/hamster/applet.py:212
+#: ../src/hamster/reports.py:227 ../src/hamster-standalone:70
+#| msgid "Totals"
+msgid "Tags"
+msgstr "Oznake"
 
-#: ../data/applet.ui.h:7
-msgid "Show _Overview"
-msgstr "Prikaži _pregled"
+#: ../data/overview.ui.h:2
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../data/applet.ui.h:8
-msgid "_Activity:"
-msgstr "_Aktivnost:"
+#: ../data/overview.ui.h:3
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../data/applet.ui.h:9
-msgid "_Stop Tracking"
-msgstr "_Zaustavi praÄ?enje"
+#: ../data/overview.ui.h:4
+msgid "Overview - Hamster"
+msgstr "Pregled â?? Vredni hrÄ?ak"
 
-#: ../data/applet.ui.h:10
-msgid "_Today"
-msgstr "_Danas"
+#: ../data/overview.ui.h:5
+msgid "Remove"
+msgstr "Ukloni"
 
-#: ../data/stats.ui.h:1
-msgid " _Day"
-msgstr "_Dan"
+#: ../data/overview.ui.h:6
+#| msgid "HTML Report"
+msgid "Save Report"
+msgstr "SaÄ?uvaj izveÅ¡taj"
 
-#: ../data/stats.ui.h:2
-msgid " _Month"
-msgstr "_Mesec"
+#. summary table
+#: ../data/overview.ui.h:7 ../data/stats.ui.h:3 ../src/hamster/reports.py:285
+msgid "Totals"
+msgstr "Ukupno"
 
-#: ../data/stats.ui.h:3
-msgid " _Week"
-msgstr "_Sedmica"
+#: ../data/preferences.ui.h:2
+msgid "Activity list"
+msgstr "Spisak aktivnosti"
 
-#: ../data/stats.ui.h:4
-msgid "<b>Overview</b>"
-msgstr "<b>Pregled</b>"
+#: ../data/preferences.ui.h:3
+msgid "Add activity"
+msgstr "Dodaj aktivnost"
 
-#: ../data/stats.ui.h:5
-msgid "<b>Starts and ends</b>"
-msgstr "<b>PoÄ?etak i kraj</b>"
+#: ../data/preferences.ui.h:4
+msgid "Add category"
+msgstr "Dodaj kategoriju"
 
-#: ../data/stats.ui.h:6
-msgid "<b>Totals</b>"
-msgstr "<b>Ukupno</b>"
+#: ../data/preferences.ui.h:6
+#| msgid "_Categories"
+msgid "Categories and Tags"
+msgstr "Kategorije i oznake"
 
-#: ../data/stats.ui.h:7 ../hamster/reports.py:231 ../hamster/reports.py:292
-msgid "Activity"
-msgstr "Aktivnost"
+#: ../data/preferences.ui.h:7
+msgid "Category list"
+msgstr "Spisak kategorija"
 
-#: ../data/stats.ui.h:8
-msgid "Categories:"
-msgstr "Kategorije"
+#: ../data/preferences.ui.h:8
+msgid "Edit activity"
+msgstr "Uredi aktivnost"
 
-#: ../data/stats.ui.h:9
-msgid "Date interval:"
-msgstr "Interval datuma:"
+#: ../data/preferences.ui.h:9
+msgid "Edit category"
+msgstr "Izmeni kategoriju"
 
-#: ../data/stats.ui.h:10
-msgid "No data for this interval"
-msgstr "Nema podataka za ovaj interval"
+#: ../data/preferences.ui.h:10
+msgid "General"
+msgstr "Opšte"
 
-#: ../data/stats.ui.h:11
-msgid "Overview"
-msgstr "Pregled"
+#: ../data/preferences.ui.h:11
+#| msgid "<b>Global Hotkey</b>"
+msgid "Global Hotkey"
+msgstr "OpÅ¡te preÄ?ice"
 
-#: ../data/stats.ui.h:12
-msgid "Overview - Hamster"
-msgstr "Pregled â?? Vredni hrÄ?ak"
+#: ../data/preferences.ui.h:12
+msgid "Move activity down"
+msgstr "Pomeri aktivnost naniže"
 
-#: ../data/stats.ui.h:13
-msgid "Save as HTML"
-msgstr "SaÄ?uvaj kao HTML"
+#: ../data/preferences.ui.h:13
+msgid "Move activity up"
+msgstr "Pomeri aktivnost naviše"
 
-#: ../data/stats.ui.h:14
-msgid "Save report â?? Time Tracker"
-msgstr "SaÄ?uvaj izveÅ¡taj - Pratilac vremena"
+#: ../data/preferences.ui.h:14
+msgid "New day starts at"
+msgstr "Novi dan poÄ?inje u"
 
-#: ../data/stats.ui.h:15
-msgid "Statistics"
-msgstr "Statistike"
+#: ../data/preferences.ui.h:15
+msgid "Remind of current activity every:"
+msgstr "Podseti me na trenutnu aktivnost svakih:"
 
-#: ../data/stats.ui.h:16
-msgid "Today"
-msgstr "Danas"
+#: ../data/preferences.ui.h:16
+msgid "Remove activity"
+msgstr "Ukloni aktivnost"
 
-#: ../data/stats.ui.h:17 ../hamster/stats.py:948
-msgid "Week"
-msgstr "Sedmica"
+#: ../data/preferences.ui.h:17
+msgid "Remove category"
+msgstr "Ukloni kategoriju"
+
+#: ../data/preferences.ui.h:18
+msgid "Resume the last activity when returning to a workspace"
+msgstr "Nastavi poslednju aktivnost po povratku u radni prostor"
+
+#: ../data/preferences.ui.h:19
+msgid "Start new activity when switching workspaces:"
+msgstr "ZapoÄ?ni novu aktivnost pri promeni radnog prostora:"
 
-#: ../data/stats.ui.h:18
+#: ../data/preferences.ui.h:21
+msgid "Stop tracking when computer becomes idle"
+msgstr "Zaustavi praÄ?enje kada raÄ?unar lenÄ?ari"
+
+#: ../data/preferences.ui.h:22
+msgid "Tags that should appear in autocomplete"
+msgstr "Oznake za prikaz u samodopunjavanju"
+
+#: ../data/preferences.ui.h:23
+msgid "Time Tracker Preferences"
+msgstr "Postavke praÄ?enja vremena"
+
+#: ../data/preferences.ui.h:24
+#| msgid "_Stop Tracking"
+msgid "Tracking"
+msgstr "PraÄ?enje"
+
+#: ../data/preferences.ui.h:25
+msgid "Workspaces"
+msgstr "Radni prostori"
+
+#: ../data/preferences.ui.h:26
+msgid "_Activities"
+msgstr "_Aktivnosti"
+
+#: ../data/preferences.ui.h:27
+msgid "_Categories"
+msgstr "_Kategorije"
+
+#: ../data/stats.ui.h:1
+#| msgid "<b>Starts and ends</b>"
+msgid "Starts and ends"
+msgstr "PoÄ?etak i kraj"
+
+#: ../data/stats.ui.h:4
 msgid "Year:"
 msgstr "Godina:"
 
-#: ../hamster/about.py:41
+#: ../src/hamster/about.py:43
 msgid "Copyright © 2007â??2009 Toms BauÄ£is and others"
 msgstr "Autorska prava © 2007-2009 Toms Baugis i ostali"
 
-#: ../hamster/about.py:43
+#: ../src/hamster/about.py:45
 msgid "Project Hamster Website"
 msgstr "Veb mesto Vrednog hrÄ?ka"
 
-#: ../hamster/about.py:44
+#: ../src/hamster/about.py:46
 msgid "About Time Tracker"
 msgstr "O pratiocu vremena"
 
-#: ../hamster/about.py:54
+#: ../src/hamster/about.py:56
 msgid "translator-credits"
 msgstr ""
 "Mirko SpasiÄ? <mirkospasic gmail com>\n"
@@ -326,192 +427,223 @@ msgstr ""
 "\n"
 "Prevod.org â?? prevod na srpski jezik."
 
-#. translators: this is edit activity action in the notifier bubble
-#: ../hamster/applet.py:73
-msgid "Edit"
-msgstr "Izmeni"
-
-#. translators: this is switch activity action in the notifier bubble
-#: ../hamster/applet.py:75
-msgid "Switch"
-msgstr "Prebaci"
-
-#: ../hamster/applet.py:305 ../hamster/reports.py:235
-#: ../hamster/reports.py:293
-msgid "Duration"
-msgstr "Teajanje"
+#: ../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"
 
-#: ../hamster/applet.py:492 ../hamster/applet.py:513
+#: ../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"
 
-#. activity reminder
-#: ../hamster/applet.py:508
-#, python-format
-msgid "Working on <b>%s</b>"
-msgstr "Radim na <b>%s</b>"
-
-#: ../hamster/applet.py:562
+#: ../src/hamster/applet.py:395
 #, python-format
 msgid "%(category)s: %(duration)s"
 msgstr "%(category)s: %(duration)s"
 
 #. duration in main drop-down per category in hours
-#: ../hamster/applet.py:565
+#: ../src/hamster/applet.py:398
 #, python-format
 msgid "%sh"
 msgstr "%ss"
 
-#. unsorted category
-#: ../hamster/applet.py:601 ../hamster/db.py:226 ../hamster/db.py:243
-#: ../hamster/db.py:248 ../hamster/db.py:465 ../hamster/db.py:538
-#: ../hamster/edit_activity.py:368 ../hamster/preferences.py:56
-#: ../hamster/reports.py:54 ../hamster/reports.py:91 ../hamster/reports.py:248
-#: ../hamster/stuff.py:94
+#: ../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
 msgid "Unsorted"
 msgstr "NeporeÄ?ano"
 
-#: ../hamster/applet.py:833
-msgid "What should be typed in the activity box?"
-msgstr "Å ta da upiÅ¡em u kuÄ?icu aktivnosti?"
+#: ../src/hamster/applet.py:428 ../src/hamster-standalone:255
+msgid "Just started"
+msgstr "Upravo zapoÄ?ela"
 
-#: ../hamster/applet.py:836
-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"
-"        "
+#: ../src/hamster/applet.py:671 ../src/hamster-standalone:441
+#| msgid "Add activity"
+msgid "Changed activity"
+msgstr "Izmenjena aktivnost"
+
+#: ../src/hamster/applet.py:672 ../src/hamster-standalone:442
+#, c-format, python-format
+msgid "Switched to '%s'"
+msgstr "PrebaÄ?ena u â??%sâ??"
 
 #. defaults
-#: ../hamster/db.py:728
+#: ../src/hamster/db.py:918
 msgid "Work"
 msgstr "Posao"
 
-#: ../hamster/db.py:729
+#: ../src/hamster/db.py:919
 msgid "Reading news"
 msgstr "Ä?itanje vesti"
 
-#: ../hamster/db.py:730
+#: ../src/hamster/db.py:920
 msgid "Checking stocks"
 msgstr "Provera akcija"
 
-#: ../hamster/db.py:731
+#: ../src/hamster/db.py:921
 msgid "Super secret project X"
 msgstr "Super tajni projekat X"
 
-#: ../hamster/db.py:732
+#: ../src/hamster/db.py:922
 msgid "World domination"
 msgstr "Osvajanje sveta"
 
-#: ../hamster/db.py:734
+#: ../src/hamster/db.py:924
 msgid "Day-to-day"
 msgstr "Iz dana u dan"
 
-#: ../hamster/db.py:735
+#: ../src/hamster/db.py:925
 msgid "Lunch"
 msgstr "RuÄ?ak"
 
-#: ../hamster/db.py:736
+#: ../src/hamster/db.py:926
 msgid "Watering flowers"
 msgstr "Zalivanje cveÄ?a"
 
-#: ../hamster/db.py:737
+#: ../src/hamster/db.py:927
 msgid "Doing handstands"
 msgstr "PrevoÄ?enje Gnoma na srpski"
 
-#: ../hamster/edit_activity.py:385
+#: ../src/hamster/edit_activity.py:67
 msgid "Update activity"
 msgstr "Ažuriraj aktivnost"
 
-#: ../hamster/preferences.py:104
+#: ../src/hamster/overview_activities.py:88
+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
+#, 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
 msgid "Name"
 msgstr "Ime"
 
-#: ../hamster/preferences.py:124 ../hamster/reports.py:232
-#: ../hamster/reports.py:291
+#: ../src/hamster/preferences.py:137 ../src/hamster/reports.py:226
+#: ../src/hamster/reports.py:288
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../hamster/preferences.py:559
+#: ../src/hamster/preferences.py:673
 msgid "New category"
 msgstr "Nova kategorija"
 
-#: ../hamster/preferences.py:572
+#: ../src/hamster/preferences.py:686
 msgid "New activity"
 msgstr "Nova aktivnost"
 
 #. notify interval slider value label
-#: ../hamster/preferences.py:632
+#: ../src/hamster/preferences.py:757
 #, python-format
 msgid "%(interval_minutes)d minutes"
 msgstr "%(interval_minutes)d minuta"
 
 #. notify interval slider value label
-#: ../hamster/preferences.py:635
+#: ../src/hamster/preferences.py:760
 msgid "Never"
 msgstr "Nikad"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:112
+#: ../src/hamster/reports.py:115
 msgid "activity"
 msgstr "aktivnost"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:114
+#: ../src/hamster/reports.py:117
 msgid "start time"
 msgstr "vreme poÄ?etka"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:116
+#: ../src/hamster/reports.py:119
 msgid "end time"
 msgstr "vreme završetka"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:118
+#: ../src/hamster/reports.py:121
 msgid "duration minutes"
 msgstr "trajanje u minutima"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:120
+#: ../src/hamster/reports.py:123
 msgid "category"
 msgstr "kategorija"
 
 #. column title in the TSV export format
-#: ../hamster/reports.py:122
+#: ../src/hamster/reports.py:125
 msgid "description"
 msgstr "opis"
 
-#. 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
-#: ../hamster/reports.py:160 ../hamster/stats.py:933
+#. column title in the TSV export format
+#: ../src/hamster/reports.py:127
+#| msgid "Totals"
+msgid "tags"
+msgstr "oznake"
+
+#: ../src/hamster/reports.py:167
 #, python-format
 msgid ""
 "Overview for %(start_B)s %(start_d)s, %(start_Y)s â?? %(end_B)s %(end_d)s, %"
@@ -520,90 +652,64 @@ msgstr ""
 "IzveÅ¡taj za %(start_d)s. %(start_B)s %(start_Y)s â?? %(end_d)s. %(end_B)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
-#: ../hamster/reports.py:162 ../hamster/stats.py:939
+#: ../src/hamster/reports.py:169
 #, 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"
 
-#. 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
-#: ../hamster/reports.py:164 ../hamster/stats.py:945
+#: ../src/hamster/reports.py:171
 #, 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"
 
-#: ../hamster/reports.py:167
+#: ../src/hamster/reports.py:174
 #, 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"
 
-#: ../hamster/reports.py:230
+#: ../src/hamster/reports.py:224
 msgid "Date"
 msgstr "Datum"
 
-#: ../hamster/reports.py:233
+#: ../src/hamster/reports.py:228
 msgid "Start"
 msgstr "PoÄ?etak"
 
-#: ../hamster/reports.py:234
+#: ../src/hamster/reports.py:229
 msgid "End"
 msgstr "Kraj"
 
-#: ../hamster/reports.py:236
+#: ../src/hamster/reports.py:230 ../src/hamster/reports.py:290
+msgid "Duration"
+msgstr "Teajanje"
+
+#: ../src/hamster/reports.py:231
 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
-#: ../hamster/reports.py:268
+#: ../src/hamster/reports.py:264
 msgctxt "html report"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#. summary table
-#: ../hamster/reports.py:288
-msgid "Totals"
-msgstr "Ukupno"
-
-#: ../hamster/reports.py:303
+#: ../src/hamster/reports.py:300
 msgid "Total Time"
 msgstr "Ukupno vreme"
 
-#: ../hamster/stats.py:64 ../hamster/stats.py:1241
-msgid "HTML Report"
-msgstr "HTML izveštaj"
-
-#: ../hamster/stats.py:72 ../hamster/stats.py:1249
-msgid "Tab-Separated Values (TSV)"
-msgstr "Vrednosti odvojene tabulatorom (TSV)"
-
-#: ../hamster/stats.py:80 ../hamster/stats.py:1257
-msgid "XML"
-msgstr "XML"
-
-#: ../hamster/stats.py:87 ../hamster/stats.py:1264
-msgid "iCal"
-msgstr "iCal"
-
-#. add unsorted category
-#: ../hamster/stats.py:120
-msgctxt "categories"
-msgid "All"
-msgstr "Sve"
+#: ../src/hamster-standalone:190
+#, c-format
+msgid "Working on <b>%s</b>"
+msgstr "Radim na <b>%s</b>"
 
-#: ../hamster/stats.py:435
+#: ../src/hamster/stats.py:86
 msgctxt "years"
 msgid "All"
 msgstr "Sve"
 
-#: ../hamster/stats.py:524
+#: ../src/hamster/stats.py:176
 msgid ""
 "There is no data to generate statistics yet.\n"
 "A week of usage would be nice!"
@@ -611,14 +717,15 @@ msgstr ""
 "Još nema podataka za izradu statistike.\n"
 "Nedelju dana koriÅ¡Ä?enja bi pomoglo!"
 
-#: ../hamster/stats.py:527
-msgid "Still collecting data â?? check back after a week has passed!"
-msgstr "JoÅ¡ uvek skupljam podatke â?? proverite ponovo nakon nedelju dana!"
+#: ../src/hamster/stats.py:179
+#| msgid "Still collecting data â?? check back after a week has passed!"
+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
-#: ../hamster/stats.py:657
+#: ../src/hamster/stats.py:310
 msgctxt "first record"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
@@ -626,18 +733,19 @@ 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
-#: ../hamster/stats.py:662
-#, python-format
+#: ../src/hamster/stats.py:315
+#| msgctxt "overview graph"
+#| msgid "%b %d"
 msgctxt "first record"
-msgid "%(b)s %(d)s"
-msgstr "%(b)s %(d)s"
+msgid "%b %d"
+msgstr "%b. %d"
 
-#: ../hamster/stats.py:664
+#: ../src/hamster/stats.py:317
 #, python-format
 msgid "First activity was recorded on %s."
 msgstr "Prva aktivnost je zabeležena %s."
 
-#: ../hamster/stats.py:673 ../hamster/stats.py:677
+#: ../src/hamster/stats.py:326 ../src/hamster/stats.py:330
 #, python-format
 msgid "%(num)s year"
 msgid_plural "%(num)s years"
@@ -646,7 +754,7 @@ msgstr[1] "%(num)s godine"
 msgstr[2] "%(num)s godina"
 
 #. FIXME: difficult string to properly pluralize
-#: ../hamster/stats.py:682
+#: ../src/hamster/stats.py:335
 #, python-format
 msgid ""
 "Time tracked so far is %(human_days)s human days (%(human_years)s) or %"
@@ -658,25 +766,23 @@ 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
-#: ../hamster/stats.py:700
+#: ../src/hamster/stats.py:353
 msgctxt "date of the longest activity"
 msgid "%b %d, %Y"
 msgstr "%d.%b.%Y"
 
-#: ../hamster/stats.py:705
+#: ../src/hamster/stats.py:358
 #, python-format
 msgid "Longest continuous work happened on %(date)s and was %(hours)s hour."
 msgid_plural ""
 "Longest continuous work happened on %(date)s and was %(hours)s hours."
-msgstr[0] ""
-"Najduži neprekidni posao je bio %(date)s i trajao je %(hours)s sat."
-msgstr[1] ""
-"Najduži neprekidni posao je bio %(date)s i trajao je %(hours)s sata"
+msgstr[0] "Najduži neprekidni posao je bio %(date)s i trajao je %(hours)s sat."
+msgstr[1] "Najduži neprekidni posao je bio %(date)s i trajao je %(hours)s sata"
 msgstr[2] ""
 "Najduži neprekidni posao je bio %(date)s i trajao je %(hours)s sati."
 
 #. total records (in selected scope)
-#: ../hamster/stats.py:713
+#: ../src/hamster/stats.py:366
 #, python-format
 msgid "There is %s record."
 msgid_plural "There are %s records."
@@ -684,11 +790,11 @@ msgstr[0] "Postoji %s zapis."
 msgstr[1] "Postoji %s zapisa."
 msgstr[2] "Postoji %s zapisa."
 
-#: ../hamster/stats.py:733
+#: ../src/hamster/stats.py:386
 msgid "Hamster would like to observe you some more!"
 msgstr "Vredni hrÄ?ak bi voleo da te joÅ¡ malo nadgleda!"
 
-#: ../hamster/stats.py:735
+#: ../src/hamster/stats.py:388
 #, python-format
 msgid ""
 "With %s percent of all facts starting before 9am you seem to be an early "
@@ -697,7 +803,7 @@ msgstr ""
 "Sa %s procenata svih stvari koje su poÄ?injale pre 9 prepodne, izgleda da ste "
 "ranoranilac."
 
-#: ../hamster/stats.py:738
+#: ../src/hamster/stats.py:391
 #, python-format
 msgid ""
 "With %s percent of all facts starting after 11pm you seem to be a night owl."
@@ -705,7 +811,7 @@ msgstr ""
 "Sa %s procenata svih stvari koje su poÄ?injale posle 11 uveÄ?e, izgleda da ste "
 "noÄ?na ptica."
 
-#: ../hamster/stats.py:741
+#: ../src/hamster/stats.py:394
 #, python-format
 msgid ""
 "With %s percent of all tasks being shorter than 15 minutes you seem to be a "
@@ -714,59 +820,146 @@ msgstr ""
 "Sa %s procenata svih stvari koje su bile kraÄ?e od 15 minuta, izgleda da ste "
 "pÄ?elica Maja."
 
-#. Date format for the label in overview window fact listing
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../hamster/stats.py:828
-msgctxt "overview list"
-msgid "%A, %b %d"
-msgstr "%A, %d.%b"
-
-#: ../hamster/stats.py:869
-msgid "Total"
-msgstr "Ukupno"
-
-#. date format used in the overview graph when month view is selected
-#. Using python datetime formatting syntax. See:
-#. http://docs.python.org/library/time.html#time.strftime
-#: ../hamster/stats.py:891
-msgctxt "overview graph"
-msgid "%b %d"
-msgstr "%d.%b"
-
-#: ../hamster/stats.py:920
-msgctxt "single day overview"
-msgid "%B %d, %Y"
-msgstr "%d. %B, %Y"
-
-#. Overview label if looking on single day
-#: ../hamster/stats.py:922
-#, python-format
-msgid "Overview for %(date)s"
-msgstr "Pregled za %(date)s"
-
-#: ../hamster/stats.py:950
-msgid "Month"
-msgstr "Mesec"
-
-#: ../hamster/stats.py:952
-msgid "Day"
-msgstr "Dan"
-
 #. duration in round hours
-#: ../hamster/stuff.py:151
+#: ../src/hamster/stuff.py:56
 #, python-format
 msgid "%dh"
 msgstr "%ds"
 
 #. duration less than hour
-#: ../hamster/stuff.py:154
+#: ../src/hamster/stuff.py:59
 #, python-format
 msgid "%dmin"
 msgstr "%dmin"
 
 #. x hours, y minutes
-#: ../hamster/stuff.py:157
+#: ../src/hamster/stuff.py:62
 #, 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"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:50
+msgid "HTML Report"
+msgstr "HTML izveštaj"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:58
+msgid "Tab-Separated Values (TSV)"
+msgstr "Vrednosti odvojene tabulatorom (TSV)"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:66
+msgid "XML"
+msgstr "XML"
+
+#: ../src/hamster/widgets/reportchooserdialog.py:73
+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"