[gnome-applets/gnome-3-22] Updated Serbian translation



commit 0159a29ce190723bbafdb3ccdeddac638c025158
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Thu Oct 27 19:33:51 2016 +0200

    Updated Serbian translation

 po/sr.po       | 1591 ++++++++++++++++++++++++++++----------------------------
 po/sr latin po | 1593 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 1589 insertions(+), 1595 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 9fbda85..4fea805 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,16 +10,16 @@ msgstr ""
 "Project-Id-Version: gnome-applets\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "applets&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-21 18:49+0000\n"
-"PO-Revision-Date: 2016-03-21 21:13+0200\n"
+"POT-Creation-Date: 2016-10-08 17:41+0000\n"
+"PO-Revision-Date: 2016-10-27 19:32+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <gnom prevod org>\n"
+"Language-Team: српски <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../accessx-status/accessx-status-applet-menu.xml.h:1
@@ -28,16 +28,16 @@ msgstr "Поставке приступачности _тастатуре"
 
 #: ../accessx-status/accessx-status-applet-menu.xml.h:2
 #: ../battstat/battstat-applet-menu.xml.h:2
-#: ../charpick/charpick-applet-menu.xml.h:2 ../charpick/properties.c:522
+#: ../charpick/charpick-applet-menu.xml.h:2 ../charpick/src/properties.c:522
 #: ../cpufreq/cpufreq-applet-menu.xml.h:2
 #: ../drivemount/drivemount-applet-menu.xml.h:1
-#: ../geyes/geyes-applet-menu.xml.h:2 ../geyes/themes.c:295
+#: ../geyes/geyes-applet-menu.xml.h:2 ../geyes/src/themes.c:295
 #: ../gweather/gweather-applet-menu.xml.h:4
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:2
 #: ../multiload/multiload-applet-menu.xml.h:3
 #: ../netspeed/data/netspeed-menu.xml.h:3 ../netspeed/src/preferences.c:324
-#: ../stickynotes/stickynotes-applet-menu.xml.h:6
-#: ../trashapplet/trashapplet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:6
+#: ../trash/src/trash-menu.xml.h:3
 msgid "_Help"
 msgstr "_Помоћ"
 
@@ -50,33 +50,30 @@ msgstr "_Помоћ"
 #: ../geyes/geyes-applet-menu.xml.h:3 ../gweather/gweather-applet-menu.xml.h:5
 #: ../inhibit/inhibit-applet-menu.xml.h:1
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:3
-#: ../modemlights/modem-applet-menu.xml.h:4
+#: ../modem-lights/modem-applet-menu.xml.h:4
 #: ../multiload/multiload-applet-menu.xml.h:4
 #: ../netspeed/data/netspeed-menu.xml.h:4
-#: ../stickynotes/stickynotes-applet-menu.xml.h:7
-#: ../tracker-search-bar/tracker-search-bar-menu.xml.h:1
-#: ../trashapplet/trashapplet-menu.xml.h:4 ../windowpicker/src/wp-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:7
+#: ../tracker-search-bar/src/tracker-search-bar-menu.xml.h:1
+#: ../trash/src/trash-menu.xml.h:4 ../windowpicker/src/wp-menu.xml.h:2
 msgid "_About"
 msgstr "_О програму"
 
-#: ../accessx-status/applet.c:138
+#: ../accessx-status/src/applet.c:138
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr ""
 "Приказује стање функција Приступачности Икса као што су задржани измењивачи"
 
-#. about.set_artists([])
-#. about.set_documenters([])
-#. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
-#: ../accessx-status/applet.c:143 ../battstat/battstat_applet.c:1203
-#: ../charpick/charpick.c:604 ../command/command.c:120
-#: ../cpufreq/src/cpufreq-applet.c:609 ../drivemount/drivemount.c:108
-#: ../geyes/geyes.c:178 ../gweather/gweather-about.c:60
-#: ../invest-applet/invest/about.py:29 ../mini-commander/src/about.c:53
-#: ../modemlights/modem-applet.c:1000 ../multiload/main.c:62
-#: ../netspeed/src/netspeed.c:637
-#: ../stickynotes/stickynotes_applet_callbacks.c:391
-#: ../timerapplet/timerapplet.c:286 ../trashapplet/src/trashapplet.c:420
+#: ../accessx-status/src/applet.c:143 ../battstat/src/battstat_applet.c:1203
+#: ../charpick/src/charpick.c:579 ../command/src/command.c:120
+#: ../cpufreq/src/cpufreq-applet.c:606 ../drivemount/src/drivemount.c:98
+#: ../geyes/src/geyes.c:176 ../gweather/src/gweather-about.c:60
+#: ../invest-applet/invest/invest-applet.c:273 ../mini-commander/src/about.c:53
+#: ../modem-lights/src/modem-applet.c:996 ../multiload/src/main.c:62
+#: ../netspeed/src/netspeed.c:634
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:395
+#: ../timer/src/timer-applet.c:286 ../trash/src/trash-applet.c:419
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <danilo prevod org>\n"
@@ -86,53 +83,53 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../accessx-status/applet.c:170
+#: ../accessx-status/src/applet.c:170
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "Дошло је до грешке при покретању прегледача помоћи: %s"
 
-#: ../accessx-status/applet.c:204
+#: ../accessx-status/src/applet.c:204
 msgid "Open the universal access preferences dialog"
 msgstr "Отвара прозорче поставки универзалног приступа"
 
-#: ../accessx-status/applet.c:222
+#: ../accessx-status/src/applet.c:222
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "Дошло је до грешке приказивања прозорчета поставки тастатуре: %s"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:465 ../accessx-status/applet.c:505
+#: ../accessx-status/src/applet.c:465 ../accessx-status/src/applet.c:505
 msgid "a"
 msgstr "а"
 
-#: ../accessx-status/applet.c:978 ../accessx-status/applet.c:1051
-#: ../accessx-status/applet.c:1119 ../accessx-status/applet.c:1298
+#: ../accessx-status/src/applet.c:978 ../accessx-status/src/applet.c:1117
+#: ../accessx-status/src/applet.c:1296
 msgid "AccessX Status"
 msgstr "Стање приступачности Икса"
 
-#: ../accessx-status/applet.c:979 ../accessx-status/applet.c:1120
+#: ../accessx-status/src/applet.c:979 ../accessx-status/src/applet.c:1118
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "Приказује стање тастатуре када се користе функције приступачности."
 
-#: ../accessx-status/applet.c:1014
+#: ../accessx-status/src/applet.c:1014
 msgid "XKB Extension is not enabled"
 msgstr "ХКБ проширење није укључено"
 
-#: ../accessx-status/applet.c:1019
+#: ../accessx-status/src/applet.c:1019
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../accessx-status/applet.c:1027
+#: ../accessx-status/src/applet.c:1027
 #, c-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../accessx-status/applet.c:1295
+#: ../accessx-status/src/applet.c:1293
 #: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "Стање приступачности тастатуре"
 
-#: ../accessx-status/applet.c:1300
+#: ../accessx-status/src/applet.c:1298
 msgid "Displays current state of keyboard accessibility features"
 msgstr "Приказује текуће стање функција приступачности тастатуре"
 
@@ -148,30 +145,30 @@ msgstr "Производња програмчета стања приступа
 msgid "Shows the status of keyboard accessibility features"
 msgstr "Приказује стање функција приступачности тастатуре"
 
-#: ../battstat/battstat_applet.c:62
+#: ../battstat/src/battstat_applet.c:62
 msgid "System is running on AC power"
 msgstr "Систем се напаја из електричне мреже"
 
-#: ../battstat/battstat_applet.c:63
+#: ../battstat/src/battstat_applet.c:63
 msgid "System is running on battery power"
 msgstr "Систем се напаја из батерије"
 
-#: ../battstat/battstat_applet.c:329
+#: ../battstat/src/battstat_applet.c:329
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "Батерија је напуњена (%d%%)"
 
-#: ../battstat/battstat_applet.c:331
+#: ../battstat/src/battstat_applet.c:331
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "Није познато преостало време (%d%%)"
 
-#: ../battstat/battstat_applet.c:333
+#: ../battstat/src/battstat_applet.c:333
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "Није познато преостало време пуњења (%d%%)"
 
-#: ../battstat/battstat_applet.c:338
+#: ../battstat/src/battstat_applet.c:338
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
@@ -180,7 +177,7 @@ msgstr[1] "Преостају %d минута (%d%%)"
 msgstr[2] "Преостаје %d минута (%d%%)"
 msgstr[3] "Преостао је један минут (%d%%)"
 
-#: ../battstat/battstat_applet.c:343
+#: ../battstat/src/battstat_applet.c:343
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
@@ -189,7 +186,7 @@ msgstr[1] "%d минута до пуне батерије (%d%%)"
 msgstr[2] "%d минута до пуне батерије (%d%%)"
 msgstr[3] "Још минут до пуне батерије (%d%%)"
 
-#: ../battstat/battstat_applet.c:349
+#: ../battstat/src/battstat_applet.c:349
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
@@ -198,7 +195,7 @@ msgstr[1] "Преостају %d сата (%d%%)"
 msgstr[2] "Преостаје %d сати (%d%%)"
 msgstr[3] "Преостао је један сат (%d%%)"
 
-#: ../battstat/battstat_applet.c:354
+#: ../battstat/src/battstat_applet.c:354
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -209,12 +206,12 @@ msgstr[3] "Један сат до пуне батерије (%d%%)"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:361
+#: ../battstat/src/battstat_applet.c:361
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "Преостаје %d %s и %d %s (%d%%)"
 
-#: ../battstat/battstat_applet.c:362 ../battstat/battstat_applet.c:369
+#: ../battstat/src/battstat_applet.c:362 ../battstat/src/battstat_applet.c:369
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -222,7 +219,7 @@ msgstr[1] "сата"
 msgstr[2] "сати"
 msgstr[3] "сат"
 
-#: ../battstat/battstat_applet.c:363 ../battstat/battstat_applet.c:370
+#: ../battstat/src/battstat_applet.c:363 ../battstat/src/battstat_applet.c:370
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -232,30 +229,30 @@ msgstr[3] "минут"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:368
+#: ../battstat/src/battstat_applet.c:368
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "%d %s %d %s до пуне батерије (%d%%)"
 
-#: ../battstat/battstat_applet.c:382
+#: ../battstat/src/battstat_applet.c:382
 msgid "Battery Monitor"
 msgstr "Праћење стања батерије"
 
-#: ../battstat/battstat_applet.c:392 ../battstat/battstat_applet.c:451
+#: ../battstat/src/battstat_applet.c:392 ../battstat/src/battstat_applet.c:451
 msgid "Your battery is now fully recharged"
 msgstr "Батерија је сада у потпуности напуњена"
 
-#: ../battstat/battstat_applet.c:428 ../battstat/battstat_applet.c:583
+#: ../battstat/src/battstat_applet.c:428 ../battstat/src/battstat_applet.c:583
 msgid "Battery Notice"
 msgstr "Обавештење о батерији"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:528
+#: ../battstat/src/battstat_applet.c:528
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "Преостало вам је укупно %d%% од капацитета батерије."
 
-#: ../battstat/battstat_applet.c:534
+#: ../battstat/src/battstat_applet.c:534
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -273,7 +270,7 @@ msgstr[3] ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:546
+#: ../battstat/src/battstat_applet.c:546
 msgid ""
 "To avoid losing your work:\n"
 " • plug your laptop into external power, or\n"
@@ -286,7 +283,7 @@ msgstr ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:554
+#: ../battstat/src/battstat_applet.c:554
 msgid ""
 "To avoid losing your work:\n"
 " • suspend your laptop to save power,\n"
@@ -298,56 +295,73 @@ msgstr ""
 " • прикључите га на електричну мрежу, или\n"
 " • сачувајте отворене документе и искључите рачунар."
 
-#: ../battstat/battstat_applet.c:562
+#: ../battstat/src/battstat_applet.c:562
 msgid "Your battery is running low"
 msgstr "Батерија је скоро празна"
 
-#: ../battstat/battstat_applet.c:657
+#: ../battstat/src/battstat_applet.c:657
 msgid "No battery present"
 msgstr "Батерија није присутна"
 
-#: ../battstat/battstat_applet.c:660
+#: ../battstat/src/battstat_applet.c:660
 msgid "Battery status unknown"
 msgstr "Није познато стање батерије"
 
-#: ../battstat/battstat_applet.c:840
+#: ../battstat/src/battstat_applet.c:840
 msgid "N/A"
 msgstr "Недоступно"
 
-#: ../battstat/battstat_applet.c:1143 ../drivemount/drivemount.c:136
-#: ../geyes/geyes.c:334 ../geyes/themes.c:231 ../gweather/gweather-applet.c:72
-#: ../gweather/gweather-pref.c:677 ../mini-commander/src/preferences.c:259
-#: ../stickynotes/stickynotes_applet_callbacks.c:358
-#: ../stickynotes/stickynotes_applet_callbacks.c:542
-#: ../trashapplet/src/trashapplet.c:386
+#: ../battstat/src/battstat_applet.c:1143 ../drivemount/src/drivemount.c:126
+#: ../geyes/src/geyes.c:332 ../geyes/src/themes.c:231
+#: ../gweather/src/gweather-applet.c:72 ../gweather/src/gweather-pref.c:677
+#: ../mini-commander/src/preferences.c:259
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:362
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:546
+#: ../trash/src/trash-applet.c:385
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Дошло је до грешке при приказивању помоћи: %s"
 
-#: ../battstat/battstat_applet.c:1189
+#: ../battstat/src/battstat_applet.c:1189
 msgid "This utility shows the status of your laptop battery."
 msgstr "Ова алатка приказује стање батерије вашег преносног рачунара."
 
 #. true
-#: ../battstat/battstat_applet.c:1191
+#: ../battstat/src/battstat_applet.c:1191
 msgid "upower backend enabled."
 msgstr "Укључен је позадинац „upower“."
 
 #. false
-#: ../battstat/battstat_applet.c:1192
+#: ../battstat/src/battstat_applet.c:1192
 msgid "Legacy (non-HAL) backend enabled."
 msgstr "Укључен је обичан позадинац (не-ХАЛ)."
 
-#: ../battstat/battstat_applet.c:1563 ../battstat/battstat_applet.c:1616
+#: ../battstat/src/battstat_applet.c:1614
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "Праћење стања батерије"
 
-#: ../battstat/battstat_applet.c:1617
+#: ../battstat/src/battstat_applet.c:1615
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "Пратите преостало напајање преносног рачунара"
 
+#. TRANSLATOR: this is a selectable item in a drop-down menu to end
+#. * this sentence:
+#. *   "Warn when battery charge drops to: [XX] percent".
+#.
+#: ../battstat/src/properties.c:276
+msgid "Percent"
+msgstr "Постотак"
+
+#. TRANSLATOR: this is a selectable item in a drop-down menu to end
+#. * this sentence:
+#. *   "Warn when battery charge drops to: [XX] minutes remaining"
+#.
+#: ../battstat/src/properties.c:282
+msgid "Minutes Remaining"
+msgstr "Преостало минута"
+
 #: ../battstat/battstat-applet-menu.xml.h:1
 #: ../charpick/charpick-applet-menu.xml.h:1
 #: ../cpufreq/cpufreq-applet-menu.xml.h:1 ../geyes/geyes-applet-menu.xml.h:1
@@ -355,7 +369,7 @@ msgstr "Пратите преостало напајање преносног р
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:1
 #: ../multiload/multiload-applet-menu.xml.h:2
 #: ../netspeed/data/netspeed-menu.xml.h:2
-#: ../stickynotes/stickynotes-applet-menu.xml.h:5
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:5
 #: ../windowpicker/src/wp-menu.xml.h:1
 msgid "_Preferences"
 msgstr "_Поставке"
@@ -497,22 +511,6 @@ msgstr "Приказује време/постотак напуњености"
 msgid "0 for no label, 1 for percentage and 2 for time remaining."
 msgstr "0 за искључивање ознаке, 1 за проценат и 2 за преостало време."
 
-#. TRANSLATOR: this is a selectable item in a drop-down menu to end
-#. * this sentence:
-#. *   "Warn when battery charge drops to: [XX] percent".
-#.
-#: ../battstat/properties.c:276
-msgid "Percent"
-msgstr "Постотак"
-
-#. TRANSLATOR: this is a selectable item in a drop-down menu to end
-#. * this sentence:
-#. *   "Warn when battery charge drops to: [XX] minutes remaining"
-#.
-#: ../battstat/properties.c:282
-msgid "Minutes Remaining"
-msgstr "Преостало минута"
-
 #: ../battstat/sounds/battstat_applet.soundlist.in.h:1
 msgid "Battery Status Utility"
 msgstr "Алатка за стање батерије"
@@ -525,33 +523,34 @@ msgstr "Батерија је слаба"
 msgid "Battery fully re-charged"
 msgstr "Батерија је у потпуности напуњена"
 
-#: ../brightness/brightness-applet.c:95
+#: ../brightness/src/brightness-applet.c:92
 #: ../brightness/org.gnome.BrightnessApplet.panel-applet.in.in.h:1
 msgid "Brightness Applet"
 msgstr "Програмче осветљености"
 
-#: ../brightness/brightness-applet.c:96
+#: ../brightness/src/brightness-applet.c:93
 msgid "Adjusts laptop panel brightness."
 msgstr "Дотерајте осветљеност панела преносног рачунара."
 
-#: ../brightness/brightness-applet.c:213
+#: ../brightness/src/brightness-applet.c:210
 msgid "Cannot connect to gnome-settings-daemon"
 msgstr "Не могу да се повежем са услужником подешавања гнома"
 
-#: ../brightness/brightness-applet.c:215
+#: ../brightness/src/brightness-applet.c:212
 msgid "Cannot get laptop panel brightness"
 msgstr "Не могу да добавим осветљеност панела преносног рачунара"
 
-#: ../brightness/brightness-applet.c:217
+#: ../brightness/src/brightness-applet.c:214
 #, c-format
 msgid "LCD brightness : %d%%"
 msgstr "Осветљеност ЛЦД-а : %d%%"
 
-#: ../brightness/brightness-applet.c:649 ../inhibit/inhibit-applet.c:297
+#: ../brightness/src/brightness-applet.c:646
+#: ../inhibit/src/inhibit-applet.c:294
 msgid "Licensed under the GNU General Public License Version 2"
 msgstr "Издато под Гнуовом Општом јавном лиценцом издања 2"
 
-#: ../brightness/brightness-applet.c:650
+#: ../brightness/src/brightness-applet.c:647
 msgid ""
 "Brightness Applet is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -563,7 +562,7 @@ msgstr ""
 "је објавила Задужбина слободног софтвера; издања 2 лиценце\n"
 "или (по вашем избору) било којег новијег издања."
 
-#: ../brightness/brightness-applet.c:654
+#: ../brightness/src/brightness-applet.c:651
 msgid ""
 "Brightness Applet is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -575,7 +574,8 @@ msgstr ""
 "ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
 "Погледајте Гнуову Општу јавну лиценцу за више детаља."
 
-#: ../brightness/brightness-applet.c:658 ../inhibit/inhibit-applet.c:306
+#: ../brightness/src/brightness-applet.c:655
+#: ../inhibit/src/inhibit-applet.c:303
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
@@ -587,7 +587,7 @@ msgstr ""
 "софтвера на адресу: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301, USA“."
 
-#: ../brightness/brightness-applet.c:672
+#: ../brightness/src/brightness-applet.c:669
 msgid "Copyright © 2006 Benjamin Canou"
 msgstr "Ауторска права © 2006 Бенџамин Кану"
 
@@ -595,7 +595,7 @@ msgstr "Ауторска права © 2006 Бенџамин Кану"
 msgid "Adjusts Laptop panel brightness"
 msgstr "Дотерајте осветљеност панела преносног рачунара"
 
-#: ../charpick/charpick.c:426
+#: ../charpick/src/charpick.c:403
 msgid "Available palettes"
 msgstr "Доступне палете"
 
@@ -603,21 +603,21 @@ msgstr "Доступне палете"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:473
+#: ../charpick/src/charpick.c:450
 #, c-format
 msgid "Insert \"%s\""
 msgstr "Уметни „%s“"
 
-#: ../charpick/charpick.c:476
+#: ../charpick/src/charpick.c:453
 msgid "Insert special character"
 msgstr "Уметни нарочити знак"
 
-#: ../charpick/charpick.c:480
+#: ../charpick/src/charpick.c:457
 #, c-format
 msgid "insert special character %s"
 msgstr "умеће нарочити знак %s"
 
-#: ../charpick/charpick.c:599
+#: ../charpick/src/charpick.c:574
 msgid ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
@@ -625,161 +625,155 @@ msgstr ""
 "Програмче Гномовог панела за избор чудних знакова који се не налазе на мојој "
 "тастатури. Објављено под Гнуовом Општом јавном лиценцом (GNU GPL)."
 
-#: ../charpick/charpick.c:716 ../charpick/charpick.c:731
+#: ../charpick/src/charpick.c:691 ../charpick/src/properties.c:426
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
-#: ../charpick/properties.c:426
 msgid "Character Palette"
 msgstr "Палета знакова"
 
-#: ../charpick/charpick.c:716
+#: ../charpick/src/charpick.c:691
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "Унесите знакове"
 
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
-msgid "Charpicker Applet Factory"
-msgstr "Фабрика програмчета за избор знакова"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:1
-msgid "Characters shown on applet startup"
-msgstr "Знакови који се приказују по покретању програмчета"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:2
-msgid ""
-"The string that the user had selected when the applet was last used. This "
-"string will be displayed when the user starts the applet."
-msgstr ""
-"Ниска коју је изабрао корисник при последњој употреби програмчета. Ова ниска "
-"ће бити приказана када корисник покрене програмче."
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:3
-#: ../charpick/properties.c:353
-msgid "List of available palettes"
-msgstr "Списак доступних палета"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:4
-msgid "List of strings containing the available palettes."
-msgstr "Списак ниски које садрже доступне палете."
-
-#: ../charpick/properties.c:73 ../modemlights/modem-applet.c:911
-#: ../trashapplet/src/trashapplet.c:497 ../trashapplet/src/trash-empty.c:339
+#: ../charpick/src/properties.c:73
+#: ../invest-applet/invest/invest-preferences.c:324
+#: ../modem-lights/src/modem-applet.c:907 ../trash/src/trash-applet.c:496
+#: ../trash/src/trash-empty.c:341
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../charpick/properties.c:74
+#: ../charpick/src/properties.c:74
+#: ../invest-applet/invest/invest-preferences.c:325
 msgid "_OK"
 msgstr "У _реду"
 
-#: ../charpick/properties.c:93
+#: ../charpick/src/properties.c:93
 msgid "_Palette:"
 msgstr "_Палета:"
 
-#: ../charpick/properties.c:101
+#: ../charpick/src/properties.c:101
 msgid "Palette entry"
 msgstr "Унос у палети"
 
-#: ../charpick/properties.c:102
+#: ../charpick/src/properties.c:102
 msgid "Modify a palette by adding or removing characters"
 msgstr "Измените палету додавањем или уклањањем знакова"
 
-#: ../charpick/properties.c:214
+#: ../charpick/src/properties.c:214
 msgid "Add Palette"
 msgstr "Додај палету"
 
-#: ../charpick/properties.c:251
+#: ../charpick/src/properties.c:251
 msgid "Edit Palette"
 msgstr "Уреди палету"
 
-#: ../charpick/properties.c:352
+#: ../charpick/src/properties.c:352
 msgid "Palettes list"
 msgstr "Списак палета"
 
-#: ../charpick/properties.c:431
+#: ../charpick/src/properties.c:353
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:3
+msgid "List of available palettes"
+msgstr "Списак доступних палета"
+
+#: ../charpick/src/properties.c:431
 msgid "_Palettes:"
 msgstr "_Палете:"
 
-#: ../charpick/properties.c:443
+#: ../charpick/src/properties.c:443
 msgid "_Add"
 msgstr "_Додај"
 
-#: ../charpick/properties.c:447
+#: ../charpick/src/properties.c:447
 msgid "Add button"
 msgstr "Дугме додавања"
 
-#: ../charpick/properties.c:448
+#: ../charpick/src/properties.c:448
 msgid "Click to add a new palette"
 msgstr "Кликните да додате нову палету"
 
-#: ../charpick/properties.c:450
+#: ../charpick/src/properties.c:450
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../charpick/properties.c:455
+#: ../charpick/src/properties.c:455
 msgid "Edit button"
 msgstr "Дугме уређивања"
 
-#: ../charpick/properties.c:456
+#: ../charpick/src/properties.c:456
 msgid "Click to edit the selected palette"
 msgstr "Кликните да уредите изабрану палету"
 
-#: ../charpick/properties.c:458 ../trashapplet/src/trashapplet.c:499
+#: ../charpick/src/properties.c:458 ../trash/src/trash-applet.c:498
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../charpick/properties.c:463
+#: ../charpick/src/properties.c:463
 msgid "Delete button"
 msgstr "Дугме брисања"
 
-#: ../charpick/properties.c:464
+#: ../charpick/src/properties.c:464
 msgid "Click to delete the selected palette"
 msgstr "Кликните да обришете изабрану палету"
 
-#: ../charpick/properties.c:518
+#: ../charpick/src/properties.c:518
 msgid "Character Palette Preferences"
 msgstr "Поставке палете знакова"
 
-#: ../charpick/properties.c:521 ../command/command.c:143 ../geyes/themes.c:294
-#: ../netspeed/src/preferences.c:325 ../timerapplet/timerapplet.c:324
+#: ../charpick/src/properties.c:521 ../command/src/command.c:143
+#: ../geyes/src/themes.c:294 ../netspeed/src/preferences.c:325
+#: ../timer/src/timer-applet.c:324
 #: ../windowpicker/src/wp-preferences-dialog.ui.h:2
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../command/command.c:119
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
+msgid "Charpicker Applet Factory"
+msgstr "Фабрика програмчета за избор знакова"
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:1
+msgid "Characters shown on applet startup"
+msgstr "Знакови који се приказују по покретању програмчета"
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:2
+msgid ""
+"The string that the user had selected when the applet was last used. This "
+"string will be displayed when the user starts the applet."
+msgstr ""
+"Ниска коју је изабрао корисник при последњој употреби програмчета. Ова ниска "
+"ће бити приказана када корисник покрене програмче."
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:4
+msgid "List of strings containing the available palettes."
+msgstr "Списак ниски које садрже доступне палете."
+
+#: ../command/src/command.c:119
 #: ../command/org.gnome.applets.CommandApplet.panel-applet.in.in.h:3
 msgid "Shows the output of a command"
 msgstr "Приказује испис наредбе"
 
-#: ../command/command.c:140
-#| msgid "Command Line Preferences"
+#: ../command/src/command.c:140
 msgid "Command Applet Preferences"
 msgstr "Поставке терминалчића"
 
-#: ../command/command.c:153
-#| msgid "Co_mmand:"
+#: ../command/src/command.c:153
 msgid "Command:"
 msgstr "Наредба:"
 
-#: ../command/command.c:165
+#: ../command/src/command.c:161
 msgid "Interval (seconds):"
 msgstr "Период (у секундама):"
 
-#: ../command/command.c:177
+#: ../command/src/command.c:169
 msgid "Maximum width (chars):"
 msgstr "Највећа ширина (знакова):"
 
-#: ../command/command.c:189
+#: ../command/src/command.c:177
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:7
-#| msgid "Show notification"
 msgid "Show icon"
 msgstr "Приказује иконицу"
 
-#: ../command/command.c:340
-#| msgid "Command line"
-msgid "Command Applet"
-msgstr "Терминалчић"
-
 #: ../command/org.gnome.applets.CommandApplet.panel-applet.in.in.h:1
-#| msgid "MiniCommander Applet Factory"
 msgid "Command Factory"
 msgstr "Производња терминалчића"
 
@@ -789,7 +783,6 @@ msgid "Command"
 msgstr "Наредба"
 
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:1
-#| msgid "Command Line Preferences"
 msgid "Command to execute"
 msgstr "Наредба за извршавање"
 
@@ -806,7 +799,6 @@ msgid "Interval to execute the command (in seconds)"
 msgstr "Период за извршавање наредбе (у секундама)"
 
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:5
-#| msgid "Width of the applet"
 msgid "Width of output"
 msgstr "Ширина исписа"
 
@@ -851,7 +843,7 @@ msgid "Show CPU frequency as _percentage"
 msgstr "Прикажи фреквенцију процесора у _процентима"
 
 #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:943 ../cpufreq/src/cpufreq-applet.c:999
+#: ../cpufreq/src/cpufreq-applet.c:992
 msgid "CPU Frequency Scaling Monitor"
 msgstr "Праћење промене фреквенције процесора"
 
@@ -897,19 +889,19 @@ msgstr ""
 "Вредност „frequency“ означава приказ учестаности процесора, „frequency-unit“ "
 "за приказ учестаности и јединица, а „percentage“ постотак уместо учестаности."
 
-#: ../cpufreq/src/cpufreq-applet.c:576 ../cpufreq/src/cpufreq-prefs.c:360
+#: ../cpufreq/src/cpufreq-applet.c:573 ../cpufreq/src/cpufreq-prefs.c:358
 msgid "Could not open help document"
 msgstr "Не могу да отворим документ помоћи"
 
-#: ../cpufreq/src/cpufreq-applet.c:604
+#: ../cpufreq/src/cpufreq-applet.c:601
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "Ова алатка приказује текуће стање фреквенције процесора."
 
-#: ../cpufreq/src/cpufreq-applet.c:1000
+#: ../cpufreq/src/cpufreq-applet.c:993
 msgid "This utility shows the current CPU Frequency"
 msgstr "Ова алатка приказује текућу фреквенцију процесора"
 
-#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:120
+#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:118
 msgid "Frequency Scaling Unsupported"
 msgstr "Није подржана промена фреквенције"
 
@@ -929,15 +921,15 @@ msgstr ""
 "Нећете моћи да измените фреквенцију рачунара.  Рачунар можда није добро "
 "подешен или не подржава измену фреквенције процесора."
 
-#: ../cpufreq/src/cpufreq-prefs.c:495
+#: ../cpufreq/src/cpufreq-prefs.c:493
 msgid "Graphic"
 msgstr "График"
 
-#: ../cpufreq/src/cpufreq-prefs.c:500
+#: ../cpufreq/src/cpufreq-prefs.c:498
 msgid "Text"
 msgstr "Текст"
 
-#: ../cpufreq/src/cpufreq-prefs.c:505
+#: ../cpufreq/src/cpufreq-prefs.c:503
 msgid "Graphic and Text"
 msgstr "График и текст"
 
@@ -949,55 +941,55 @@ msgstr "Промене фреквенције процесора"
 msgid "Privileges are required to change the CPU Frequency scaling."
 msgstr "Потребна су овлашћења за промену фреквенције процесора."
 
-#: ../drivemount/drive-button.c:324 ../drivemount/drive-button.c:337
+#: ../drivemount/src/drive-button.c:324 ../drivemount/src/drive-button.c:337
 msgid "(mounted)"
 msgstr "(прикључен)"
 
-#: ../drivemount/drive-button.c:326
+#: ../drivemount/src/drive-button.c:326
 msgid "(not mounted)"
 msgstr "(није прикључен)"
 
-#: ../drivemount/drive-button.c:546
+#: ../drivemount/src/drive-button.c:546
 msgid "Cannot start Nautilus File Manager"
 msgstr "Не могу да покренем Наутилус управника датотека"
 
-#: ../drivemount/drive-button.c:553
+#: ../drivemount/src/drive-button.c:553
 msgid "Could not find Nautilus"
 msgstr "Не могу да пронађем Наутилус"
 
-#: ../drivemount/drive-button.c:863
+#: ../drivemount/src/drive-button.c:863
 msgid "_Play DVD"
 msgstr "_Пусти ДВД"
 
-#: ../drivemount/drive-button.c:867
+#: ../drivemount/src/drive-button.c:867
 msgid "_Play CD"
 msgstr "_Пусти ЦД"
 
-#: ../drivemount/drive-button.c:870
+#: ../drivemount/src/drive-button.c:870
 #, c-format
 msgid "_Open %s"
 msgstr "_Отвори %s"
 
-#: ../drivemount/drive-button.c:878
+#: ../drivemount/src/drive-button.c:878
 #, c-format
 msgid "Un_mount %s"
 msgstr "Ис_кључи %s"
 
-#: ../drivemount/drive-button.c:884
+#: ../drivemount/src/drive-button.c:884
 #, c-format
 msgid "_Mount %s"
 msgstr "_Прикључи %s"
 
-#: ../drivemount/drive-button.c:892
+#: ../drivemount/src/drive-button.c:892
 #, c-format
 msgid "_Eject %s"
 msgstr "_Избаци %s"
 
-#: ../drivemount/drivemount.c:105
+#: ../drivemount/src/drivemount.c:95
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "Програмче за прикључивање и искључивање блок уређаја."
 
-#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:200
+#: ../drivemount/src/drivemount.c:184
 #: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "Прикључење диска"
@@ -1014,73 +1006,68 @@ msgstr "Производња програмчета за прикључивањ
 msgid "Mount local disks and devices"
 msgstr "Прикључите локалне дискове и уређаје"
 
-#: ../geyes/geyes.c:173
+#: ../geyes/src/geyes.c:171
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "Шашаве очи за Гномов панел која прате курсор миша."
 
-#: ../geyes/geyes.c:373 ../geyes/geyes.c:406 ../geyes/geyes.c:408
+#: ../geyes/src/geyes.c:401 ../geyes/src/geyes.c:403
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "Очи"
 
-#: ../geyes/geyes.c:409
+#: ../geyes/src/geyes.c:404
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "Погледом очи верно прате кретњу миша"
 
-#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
-msgid "Geyes Applet Factory"
-msgstr "Фабрика програмчета ГОчи"
-
-#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
-msgid "A set of eyeballs for your panel"
-msgstr "Пар очију за ваш панел"
-
-#: ../geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in.h:1
-msgid "Directory in which the theme is located"
-msgstr "Директоријум у ком се налази тема"
-
-#: ../geyes/themes.c:139
+#: ../geyes/src/themes.c:139
 msgid "Can not launch the eyes applet."
 msgstr "Не могу да покренем програмче с очима."
 
-#: ../geyes/themes.c:140
+#: ../geyes/src/themes.c:140
 msgid "There was a fatal error while trying to load the theme."
 msgstr "Дошло је до кобне грешке при покушају учитавања теме."
 
-#: ../geyes/themes.c:292
+#: ../geyes/src/themes.c:292
 msgid "Geyes Preferences"
 msgstr "Поставке ГОчију"
 
-#: ../geyes/themes.c:325
+#: ../geyes/src/themes.c:325
 msgid "Themes"
 msgstr "Теме"
 
-#: ../geyes/themes.c:346
+#: ../geyes/src/themes.c:346
 msgid "_Select a theme:"
 msgstr "_Изаберите тему:"
 
-#: ../gweather/gweather-about.c:55
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
+msgid "Geyes Applet Factory"
+msgstr "Фабрика програмчета ГОчи"
+
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
+msgid "A set of eyeballs for your panel"
+msgstr "Пар очију за ваш панел"
+
+#: ../geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in.h:1
+msgid "Directory in which the theme is located"
+msgstr "Директоријум у ком се налази тема"
+
+#: ../gweather/src/gweather-about.c:55
 msgid "© 1999-2005 by S. Papadimitriou and others"
 msgstr "© 1999–2005 — С. Пападимитроу и други"
 
-#: ../gweather/gweather-about.c:56
+#: ../gweather/src/gweather-about.c:56
 msgid "A panel application for monitoring local weather conditions."
 msgstr "Програмче панела за праћење локалних временских прилика."
 
-#: ../gweather/gweather-applet.c:336
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
-msgid "Weather Report"
-msgstr "Извештај о времену"
-
-#: ../gweather/gweather-applet.c:354 ../gweather/gweather-applet.c:358
+#: ../gweather/src/gweather-applet.c:351 ../gweather/src/gweather-applet.c:355
 msgid "GNOME Weather"
 msgstr "Гном време"
 
-#: ../gweather/gweather-applet.c:463
+#: ../gweather/src/gweather-applet.c:460
 msgid "Weather Forecast"
 msgstr "Временска прогноза"
 
-#: ../gweather/gweather-applet.c:475
+#: ../gweather/src/gweather-applet.c:472
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1091,147 +1078,144 @@ msgstr ""
 "Небо: %s\n"
 "Температура: %s"
 
-#: ../gweather/gweather-applet.c:529
+#: ../gweather/src/gweather-applet.c:526
 msgid "Updating..."
 msgstr "Освежава..."
 
-#: ../gweather/gweather-applet-menu.xml.h:1
-msgid "_Details"
-msgstr "_Детаљи"
+#: ../gweather/src/gweather-dialog.c:158
+msgid "Details"
+msgstr "Детаљи"
 
-#: ../gweather/gweather-applet-menu.xml.h:2 ../gweather/gweather-dialog.c:160
+#: ../gweather/src/gweather-dialog.c:160
+#: ../gweather/gweather-applet-menu.xml.h:2
 msgid "_Update"
 msgstr "_Освежи"
 
-#: ../gweather/gweather-dialog.c:158
-msgid "Details"
-msgstr "Детаљи"
-
-#: ../gweather/gweather-dialog.c:199
+#: ../gweather/src/gweather-dialog.c:199
 msgid "City:"
 msgstr "Место:"
 
-#: ../gweather/gweather-dialog.c:207
+#: ../gweather/src/gweather-dialog.c:207
 msgid "Last update:"
 msgstr "Последња допуна:"
 
-#: ../gweather/gweather-dialog.c:215
+#: ../gweather/src/gweather-dialog.c:215
 msgid "Conditions:"
 msgstr "Услови:"
 
-#: ../gweather/gweather-dialog.c:223
+#: ../gweather/src/gweather-dialog.c:223
 msgid "Sky:"
 msgstr "Небо:"
 
-#: ../gweather/gweather-dialog.c:231
+#: ../gweather/src/gweather-dialog.c:231
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: ../gweather/gweather-dialog.c:239
+#: ../gweather/src/gweather-dialog.c:239
 msgid "Feels like:"
 msgstr "Осећа се као:"
 
-#: ../gweather/gweather-dialog.c:247
+#: ../gweather/src/gweather-dialog.c:247
 msgid "Dew point:"
 msgstr "Тачка росе:"
 
-#: ../gweather/gweather-dialog.c:255
+#: ../gweather/src/gweather-dialog.c:255
 msgid "Relative humidity:"
 msgstr "Релативна влажност:"
 
-#: ../gweather/gweather-dialog.c:263
+#: ../gweather/src/gweather-dialog.c:263
 msgid "Wind:"
 msgstr "Ветар:"
 
-#: ../gweather/gweather-dialog.c:271
+#: ../gweather/src/gweather-dialog.c:271
 msgid "Pressure:"
 msgstr "Притисак:"
 
-#: ../gweather/gweather-dialog.c:279
+#: ../gweather/src/gweather-dialog.c:279
 msgid "Visibility:"
 msgstr "Видљивост:"
 
-#: ../gweather/gweather-dialog.c:287
+#: ../gweather/src/gweather-dialog.c:287
 msgid "Sunrise:"
 msgstr "Зора:"
 
-#: ../gweather/gweather-dialog.c:295
+#: ../gweather/src/gweather-dialog.c:295
 msgid "Sunset:"
 msgstr "Залазак:"
 
-#: ../gweather/gweather-dialog.c:429
+#: ../gweather/src/gweather-dialog.c:429
 msgid "Current Conditions"
 msgstr "Текуће прилике"
 
-#: ../gweather/gweather-dialog.c:444
+#: ../gweather/src/gweather-dialog.c:444
 msgid "Forecast Report"
 msgstr "Временска прогноза"
 
-#: ../gweather/gweather-dialog.c:444
+#: ../gweather/src/gweather-dialog.c:444
 msgid "See the ForeCast Details"
 msgstr "Погледајте детаљну прогнозу"
 
-#: ../gweather/gweather-dialog.c:454
+#: ../gweather/src/gweather-dialog.c:454
 msgid "Forecast"
 msgstr "Прогноза"
 
-#: ../gweather/gweather-dialog.c:460
+#: ../gweather/src/gweather-dialog.c:460
 msgid "Radar Map"
 msgstr "Радарска мапа"
 
 #. XXX: weather.com? is this an advert?
-#: ../gweather/gweather-dialog.c:492
+#: ../gweather/src/gweather-dialog.c:492
 msgid "_Visit Weather.com"
 msgstr "_Посети „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:493
+#: ../gweather/src/gweather-dialog.c:493
 msgid "Visit Weather.com"
 msgstr "Посетите „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:493
+#: ../gweather/src/gweather-dialog.c:493
 msgid "Click to Enter Weather.com"
 msgstr "Кликните да посетите „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:571
+#: ../gweather/src/gweather-dialog.c:571
 msgid "Forecast not currently available for this location."
 msgstr "Прогноза није тренутно доступна за ово место."
 
 #. Accessible Name and Description for the components in Preference Dialog
-#: ../gweather/gweather-pref.c:135
+#: ../gweather/src/gweather-pref.c:135
 msgid "Location view"
 msgstr "Преглед према месту"
 
-#: ../gweather/gweather-pref.c:135
+#: ../gweather/src/gweather-pref.c:135
 msgid "Select Location from the list"
 msgstr "Изаберите место из списка"
 
-#: ../gweather/gweather-pref.c:136
+#: ../gweather/src/gweather-pref.c:136
 msgid "Update spin button"
 msgstr "Освежи вртеће дугме"
 
-#: ../gweather/gweather-pref.c:136
+#: ../gweather/src/gweather-pref.c:136
 msgid "Spinbutton for updating"
 msgstr "Вртеће дугме за освежавање"
 
-#: ../gweather/gweather-pref.c:137
+#: ../gweather/src/gweather-pref.c:137
 msgid "Address Entry"
 msgstr "Унос адресе"
 
-#: ../gweather/gweather-pref.c:137
+#: ../gweather/src/gweather-pref.c:137
 msgid "Enter the URL"
 msgstr "Унесите адресу"
 
-#: ../gweather/gweather-pref.c:372
+#: ../gweather/src/gweather-pref.c:372
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr ""
 "Није успело учитавање ИксМЛ базе са местима.  Пријавите ово као грешку."
 
-#: ../gweather/gweather-pref.c:736
+#: ../gweather/src/gweather-pref.c:736
 msgid "Weather Preferences"
 msgstr "Поставке времена"
 
-#: ../gweather/gweather-pref.c:767 ../gweather/gweather-pref.c:932
+#: ../gweather/src/gweather-pref.c:767 ../gweather/src/gweather-pref.c:932
 msgid "_Automatically update every:"
 msgstr "_Самостално освежи сваких:"
 
@@ -1239,160 +1223,165 @@ msgstr "_Самостално освежи сваких:"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:778
+#: ../gweather/src/gweather-pref.c:778
 msgid "_Temperature unit:"
 msgstr "_Јединица температуре:"
 
 #. Default means device with default route set
-#: ../gweather/gweather-pref.c:787 ../gweather/gweather-pref.c:804
-#: ../gweather/gweather-pref.c:827 ../gweather/gweather-pref.c:852
+#: ../gweather/src/gweather-pref.c:787 ../gweather/src/gweather-pref.c:804
+#: ../gweather/src/gweather-pref.c:827 ../gweather/src/gweather-pref.c:852
 #: ../netspeed/src/preferences.c:162
 msgid "Default"
 msgstr "Основна"
 
-#: ../gweather/gweather-pref.c:788
+#: ../gweather/src/gweather-pref.c:788
 msgid "Kelvin"
 msgstr "Келвини"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:790
+#: ../gweather/src/gweather-pref.c:790
 msgid "Celsius"
 msgstr "Целзијуси"
 
-#: ../gweather/gweather-pref.c:791
+#: ../gweather/src/gweather-pref.c:791
 msgid "Fahrenheit"
 msgstr "Фаренхајти"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:795
+#: ../gweather/src/gweather-pref.c:795
 msgid "_Wind speed unit:"
 msgstr "Јединица _брзине ветра:"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:806
+#: ../gweather/src/gweather-pref.c:806
 msgid "m/s"
 msgstr "м/с"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:808
+#: ../gweather/src/gweather-pref.c:808
 msgid "km/h"
 msgstr "км/ч"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:810
+#: ../gweather/src/gweather-pref.c:810
 msgid "mph"
 msgstr "миља/ч"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:812
+#: ../gweather/src/gweather-pref.c:812
 msgid "knots"
 msgstr "чворова"
 
-#: ../gweather/gweather-pref.c:814
+#: ../gweather/src/gweather-pref.c:814
 msgid "Beaufort scale"
 msgstr "Бофорова скала"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:818
+#: ../gweather/src/gweather-pref.c:818
 msgid "_Pressure unit:"
 msgstr "Јединица _притиска:"
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:829
+#: ../gweather/src/gweather-pref.c:829
 msgid "kPa"
 msgstr "kPa"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:831
+#: ../gweather/src/gweather-pref.c:831
 msgid "hPa"
 msgstr "hPa"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:833
+#: ../gweather/src/gweather-pref.c:833
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:835
+#: ../gweather/src/gweather-pref.c:835
 msgid "mmHg"
 msgstr "mmHg"
 
 # Kod nas treba mmHg
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:837
+#: ../gweather/src/gweather-pref.c:837
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:839
+#: ../gweather/src/gweather-pref.c:839
 msgid "atm"
 msgstr "атмосфера"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:843
+#: ../gweather/src/gweather-pref.c:843
 msgid "_Visibility unit:"
 msgstr "Јединица _видљивости:"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:854
+#: ../gweather/src/gweather-pref.c:854
 msgid "meters"
 msgstr "метара"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:856
+#: ../gweather/src/gweather-pref.c:856
 msgid "km"
 msgstr "km"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:858
+#: ../gweather/src/gweather-pref.c:858
 msgid "miles"
 msgstr "миља"
 
-#: ../gweather/gweather-pref.c:889
+#: ../gweather/src/gweather-pref.c:889
 msgid "Enable _radar map"
 msgstr "Укључи _радарску мапу"
 
-#: ../gweather/gweather-pref.c:901
+#: ../gweather/src/gweather-pref.c:901
 msgid "Use _custom address for radar map"
 msgstr "Користи произвољну _адресу за радарску мапу"
 
-#: ../gweather/gweather-pref.c:916
+#: ../gweather/src/gweather-pref.c:916
 msgid "A_ddress:"
 msgstr "А_дреса:"
 
-#: ../gweather/gweather-pref.c:928
+#: ../gweather/src/gweather-pref.c:928
 msgid "Update"
 msgstr "Освежи"
 
 # bug:plural-forms
-#: ../gweather/gweather-pref.c:952
+#: ../gweather/src/gweather-pref.c:952
 msgid "minutes"
 msgstr "минута"
 
-#: ../gweather/gweather-pref.c:964
+#: ../gweather/src/gweather-pref.c:964
 msgid "Display"
 msgstr "Приказ"
 
-#: ../gweather/gweather-pref.c:979 ../mini-commander/src/mini-commander.ui.h:12
+#: ../gweather/src/gweather-pref.c:979
+#: ../mini-commander/src/mini-commander.ui.h:12
 msgid "General"
 msgstr "Опште"
 
-#: ../gweather/gweather-pref.c:992
+#: ../gweather/src/gweather-pref.c:992
 msgid "_Select a location:"
 msgstr "Изаберите _место:"
 
-#: ../gweather/gweather-pref.c:1017
+#: ../gweather/src/gweather-pref.c:1017
 msgid "_Find:"
 msgstr "_Нађи:"
 
-#: ../gweather/gweather-pref.c:1024
+#: ../gweather/src/gweather-pref.c:1024
 msgid "Find _Next"
 msgstr "Нађи _следеће"
 
-#: ../gweather/gweather-pref.c:1042
+#: ../gweather/src/gweather-pref.c:1042
 msgid "Location"
 msgstr "Место"
 
+#: ../gweather/gweather-applet-menu.xml.h:1
+msgid "_Details"
+msgstr "_Детаљи"
+
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
 msgid "Gweather Applet Factory"
 msgstr "Фабрика програмчета Гпрогнозе"
@@ -1401,6 +1390,10 @@ msgstr "Фабрика програмчета Гпрогнозе"
 msgid "Factory for creating the weather applet."
 msgstr "Фабрика за прављење програмчета за време."
 
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
+msgid "Weather Report"
+msgstr "Извештај о времену"
+
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
 msgid "Monitor the current weather conditions, and forecasts"
 msgstr "Праћење тренутних временских прилика и временске прогнозе"
@@ -1449,32 +1442,32 @@ msgid "If true, additional details about weather will be downloaded and shown."
 msgstr ""
 "Ако је изабрано, додатне појединости о времену ће бити скинуте и приказане."
 
-#: ../inhibit/inhibit-applet.c:85
+#: ../inhibit/src/inhibit-applet.c:82
 #: ../inhibit/org.gnome.InhibitApplet.panel-applet.in.in.h:1
 msgid "Inhibit Applet"
 msgstr "Програмче спречавања"
 
-#: ../inhibit/inhibit-applet.c:86
+#: ../inhibit/src/inhibit-applet.c:83
 msgid "Allows user to inhibit automatic power saving."
 msgstr "Омогућава корисницима да спрече самостално чување енергије."
 
-#: ../inhibit/inhibit-applet.c:233
+#: ../inhibit/src/inhibit-applet.c:230
 msgid "Cannot connect to gnome-session"
 msgstr "Не могу да се повежем са гномовом сесијом"
 
-#: ../inhibit/inhibit-applet.c:236
+#: ../inhibit/src/inhibit-applet.c:233
 msgid "Automatic sleep inhibited"
 msgstr "Самостално спавање је спречено"
 
-#: ../inhibit/inhibit-applet.c:238
+#: ../inhibit/src/inhibit-applet.c:235
 msgid "Automatic sleep enabled"
 msgstr "Самостално спавање је укључено"
 
-#: ../inhibit/inhibit-applet.c:266
+#: ../inhibit/src/inhibit-applet.c:263
 msgid "Manual inhibit"
 msgstr "Ручно спречи"
 
-#: ../inhibit/inhibit-applet.c:298
+#: ../inhibit/src/inhibit-applet.c:295
 msgid ""
 "Inhibit Applet is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -1486,7 +1479,7 @@ msgstr ""
 "је објавила Задужбина слободног софтвера; издања 2 лиценце\n"
 "или (по вашем избору) било којег новијег издања."
 
-#: ../inhibit/inhibit-applet.c:302
+#: ../inhibit/src/inhibit-applet.c:299
 msgid ""
 "Inhibit Applet is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1498,7 +1491,7 @@ msgstr ""
 "ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
 "Погледајте Гнуову Општу јавну лиценцу за више детаља."
 
-#: ../inhibit/inhibit-applet.c:320
+#: ../inhibit/src/inhibit-applet.c:317
 msgid "Copyright © 2006-2007 Richard Hughes"
 msgstr "Ауторска права © 2006-2007 Ричард Хјуџис"
 
@@ -1507,7 +1500,7 @@ msgid "Allows user to inhibit automatic power saving"
 msgstr "Омогућава корисницима да спрече самостално чување енергије"
 
 #: ../invest-applet/data/financialchart.ui.h:1
-#: ../invest-applet/invest/chart.py:108
+#: ../invest-applet/invest/invest-chart.c:358
 msgid "Financial Chart"
 msgstr "Финансијски графикон"
 
@@ -1719,15 +1712,32 @@ msgid "Factory for creating the invest applet."
 msgstr "Фабрика за прављење програмчета улагања."
 
 #: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3
-#: ../invest-applet/invest/about.py:17
+#: ../invest-applet/invest/invest-applet.c:271
 msgid "Invest"
 msgstr "Улагања"
 
 #: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4
-#: ../invest-applet/invest/about.py:20
+#: ../invest-applet/invest/invest-applet.c:268
 msgid "Track your invested money."
 msgstr "Пратите ваш уложен новац."
 
+# Да није ово нешто као курсна листа???
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:1
+#: ../invest-applet/data/prefs-dialog.ui.h:12
+msgid "Currency"
+msgstr "Промет"
+
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:2
+#: ../invest-applet/data/prefs-dialog.ui.h:9
+msgid "Hide charts in quotes list"
+msgstr "Сакриј графике на списку акција"
+
+#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to 
also show the quotes of the stocks an index is based on.
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:3
+#: ../invest-applet/data/prefs-dialog.ui.h:7
+msgid "Show stocks of index values"
+msgstr "Прикажи берзе вредности индекса"
+
 #: ../invest-applet/data/prefs-dialog.ui.h:1
 msgid "Invest Preferences"
 msgstr "Поставке за улагања"
@@ -1746,11 +1756,6 @@ msgctxt " "
 msgid "Add Group"
 msgstr "Додај групу"
 
-#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to 
also show the quotes of the stocks an index is based on.
-#: ../invest-applet/data/prefs-dialog.ui.h:7
-msgid "Show stocks of index values"
-msgstr "Прикажи берзе вредности индекса"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:8
 msgid ""
 "An index value, for instance the <i>NASDAQ Composite</i> (^IXIC), is based "
@@ -1761,10 +1766,6 @@ msgstr ""
 "броју берзи. Ова опција омогућава такође приказивање акција <i><b>берзе</b></"
 "i> на којима се заснива индекс."
 
-#: ../invest-applet/data/prefs-dialog.ui.h:9
-msgid "Hide charts in quotes list"
-msgstr "Сакриј графике на списку акција"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:10
 msgid ""
 "A small chart image is shown next to each quote. The retrieval of each chart "
@@ -1783,27 +1784,21 @@ msgstr ""
 "<i><small><b>Извор:</b> <a href=\"http://finance.yahoo.com/\";>Јаху! "
 "Финансије</a> (са најмање 15 минута кашњења)</small></i>"
 
-# Да није ово нешто као курсна листа???
-#: ../invest-applet/data/prefs-dialog.ui.h:12
-msgid "Currency"
-msgstr "Промет"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:13
 msgid ""
 "Type the target currency to which all stock quotes will be converted to."
 msgstr ""
 "Упишите циљну новчану јединицу у којој ће бити претворене све акције берзе."
 
-#. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:70
+#: ../invest-applet/invest/invest-applet.c:368
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>Још увек нисте унели податке о берзи</b>"
 
-#: ../invest-applet/invest/applet.py:75
+#: ../invest-applet/invest/invest-applet.c:384
 msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>Тренутно нису доступна стања на берзи</b>"
 
-#: ../invest-applet/invest/applet.py:76
+#: ../invest-applet/invest/invest-applet.c:385
 msgid ""
 "The server could not be contacted. The computer is either offline or the "
 "servers are down. Try again later."
@@ -1811,114 +1806,124 @@ msgstr ""
 "Не могу да се повежем на овај сервер. Или рачунар ради ван мреже или су "
 "сервери угашени. Пробајте поново касније."
 
-#: ../invest-applet/invest/chart.py:157
-#, python-format
+#: ../invest-applet/invest/invest-chart.c:129
+msgid "Chart downloaded"
+msgstr "Графикон је преузет"
+
+#: ../invest-applet/invest/invest-chart.c:139
+msgid "Chart could not be downloaded"
+msgstr "Не могу да преузмен графикон"
+
+#: ../invest-applet/invest/invest-chart.c:242
+#, c-format
 msgid "Financial Chart - %s"
 msgstr "Финансијски графикон — %s"
 
-#: ../invest-applet/invest/chart.py:224
+#: ../invest-applet/invest/invest-chart.c:281
 msgid "Opening Chart"
 msgstr "Отвара графикон"
 
-#: ../invest-applet/invest/chart.py:239
-msgid "Chart downloaded"
-msgstr "Графикон је преузет"
+#: ../invest-applet/invest/invest-preferences.c:229
+msgid "Stock Group"
+msgstr "Група берзе"
 
-#: ../invest-applet/invest/chart.py:241
-msgid "Chart could not be downloaded"
-msgstr "Не могу да преузмен графикон"
+#. Translators: Asks the user to confirm deletion of a group of stocks
+#: ../invest-applet/invest/invest-preferences.c:322
+msgid "Delete entire stock group?"
+msgstr "Да обришем целу групу берзе?"
+
+#. Translators: stocks can be grouped together into a "stock group".
+#. * The user wants to delete a group, but the group still contains
+#. * stocks. By deleting the group, also all stocks will be removed
+#. * from configuration.
+#.
+#: ../invest-applet/invest/invest-preferences.c:339
+msgid ""
+"This removes all stocks contained in this stock group!\n"
+"Do you really want to remove this stock group?"
+msgstr ""
+"Ово ће уклонити све берзе које се налазе у овој групи!\n"
+"Да ли заиста желите да уклоните ову групу берзи?"
+
+# Да није ово нешто као курсна листа?
+#: ../invest-applet/invest/invest-preferences.c:554
+msgid "Currency Rate"
+msgstr "Прометна стопа"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:749
 msgid "Symbol"
 msgstr "Симбол"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:750
 msgid "Label"
 msgstr "Назив"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:751
 msgid "Amount"
 msgstr "Износ"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:752
 msgid "Price"
 msgstr "Цена"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:753
 msgid "Commission"
 msgstr "Провизија"
 
-# Да није ово нешто као курсна листа?
-#: ../invest-applet/invest/preferences.py:44
-msgid "Currency Rate"
-msgstr "Прометна стопа"
-
-#: ../invest-applet/invest/preferences.py:246
-msgid "Stock Group"
-msgstr "Група берзе"
-
-#. translators: Asks the user to confirm deletion of a group of stocks
-#: ../invest-applet/invest/preferences.py:271
-msgid "Delete entire stock group?"
-msgstr "Да обришем целу групу берзе?"
+#. Translators: This is share-market jargon. It is the average
+#. * percentage change of all stock prices. The %s gets replaced
+#. * with the string value of the change (localized), including
+#. * the percent sign.
+#.
+#: ../invest-applet/invest/invest-quotes.c:179
+#, c-format
+#| msgid "Average change: %s"
+msgid "Average change: %+.2f%%"
+msgstr "Средња промена: %+.2f%%"
+
+#. Translators: This is share-market jargon. It refers to the total
+#. * difference between the current price and purchase price for all
+#. * the shares put together for a particular currency. i.e. How much
+#. * money would be earned if they were sold right now. The first string
+#. * is the change value, the second the currency, and the third value
+#. * is the percentage of the change, formatted using user's locale.
+#.
+#: ../invest-applet/invest/invest-quotes.c:202
+#, c-format
+#| msgid "Positions balance: %s %s (%s)"
+msgid "Positions balance: %'+.2f %s (%'+.2f%%)"
+msgstr "Баланс положаја: %'+.2f %s (%'+.2f%%)"
 
-#. translators: stocks can be grouped together into a "stock group".
-#. The user wants to delete a group, but the group still contains stocks.
-#. By deleting the group, also all stocks will be removed from configuration
-#: ../invest-applet/invest/preferences.py:279
-msgid ""
-"This removes all stocks contained in this stock group!\n"
-"Do you really want to remove this stock group?"
-msgstr ""
-"Ово ће уклонити све берзе које се налазе у овој групи!\n"
-"Да ли заиста желите да уклоните ову групу берзи?"
+#: ../invest-applet/invest/invest-quotes.c:209
+#, c-format
+msgid "Updated at %s"
+msgstr "Ажурирано %s"
 
-#: ../invest-applet/invest/quotes.py:286
+#: ../invest-applet/invest/invest-quotes.c:1131
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "Не могу да се повежем на Јахуове финансије"
 
-#. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s 
gets replaced with the string value of the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:329
-#, python-format
-msgid "Average change: %s"
-msgstr "Средња промена: %s"
-
-#. Translators: This is share-market jargon. It refers to the total difference between the current price and 
purchase price for all the shares put together for a particular currency. i.e. How much money would be earned 
if they were sold right now. The first string is the change value, the second the currency, and the third 
value is the percentage of the change, formatted using user's locale.
-#: ../invest-applet/invest/quotes.py:338
-#, python-format
-msgid "Positions balance: %s %s (%s)"
-msgstr "Баланс позиције: %s %s (%s)"
-
-#: ../invest-applet/invest/quotes.py:340
-#, python-format
-msgid "Updated at %s"
-msgstr "Ажурирано %s"
-
-#. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB
-#. Translators: these words all refer to a stock. Last is short
-#. for "last price". Gain is referring to the gain since the
-#. stock was purchased.
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:255
 msgid "Ticker"
 msgstr "Тикер"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:306
 msgid "Last"
 msgstr "Задња"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:356
 msgid "Change %"
 msgstr "Промена %"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:376
 msgid "Chart"
 msgstr "Графикон"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:434
 msgid "Gain"
 msgstr "Добит"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:493
 msgid "Gain %"
 msgstr "Добит %"
 
@@ -1969,17 +1974,11 @@ msgstr "Притисните ово дугме да видите списак п
 msgid "Command line has been disabled by your system administrator"
 msgstr "Линију за унос наредбе је искључио администратор вашег система"
 
-# Команда!
-#: ../mini-commander/src/mini-commander_applet.c:363
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
-msgid "Command Line"
-msgstr "Наредба"
-
-#: ../mini-commander/src/mini-commander_applet.c:411
+#: ../mini-commander/src/mini-commander_applet.c:407
 msgid "Mini-Commander applet"
 msgstr "Програмче Мали-наредник"
 
-#: ../mini-commander/src/mini-commander_applet.c:412
+#: ../mini-commander/src/mini-commander_applet.c:408
 msgid "This applet adds a command line to the panel"
 msgstr "Ово програмче додаје поље за издавање наредби на панел"
 
@@ -2000,15 +1999,17 @@ msgid "Size"
 msgstr "Величина"
 
 #: ../mini-commander/src/mini-commander.ui.h:5
-#: ../stickynotes/stickynotes-preferences.ui.h:3
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:3
 msgid "_Width:"
 msgstr "_Ширина:"
 
-#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:476
+#: ../mini-commander/src/mini-commander.ui.h:6
+#: ../multiload/src/properties.c:476
 msgid "pixels"
 msgstr "пиксела"
 
-#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:521
+#: ../mini-commander/src/mini-commander.ui.h:7
+#: ../multiload/src/properties.c:521
 msgid "Colors"
 msgstr "Боје"
 
@@ -2060,6 +2061,11 @@ msgstr "_Наредба:"
 msgid "MiniCommander Applet Factory"
 msgstr "Производња терминалчића"
 
+# Команда!
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
+msgid "Command Line"
+msgstr "Наредба"
+
 #: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
 msgid "Mini-Commander"
 msgstr "Терминалчић"
@@ -2156,25 +2162,20 @@ msgstr "Не можете двоструко навести исте обрас
 msgid "Pattern"
 msgstr "Образац"
 
-#: ../modemlights/modem-applet.c:161
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
-msgid "Modem Monitor"
-msgstr "Праћење модема"
-
-#: ../modemlights/modem-applet.c:671
+#: ../modem-lights/src/modem-applet.c:667
 msgid "Connection active, but could not get connection time"
 msgstr "Веза је успостављена, али не могу да сазнам њено трајање"
 
-#: ../modemlights/modem-applet.c:687
+#: ../modem-lights/src/modem-applet.c:683
 #, c-format
 msgid "Time connected: %.1d:%.2d"
 msgstr "Трајање везе: %.1d:%.2d"
 
-#: ../modemlights/modem-applet.c:691
+#: ../modem-lights/src/modem-applet.c:687
 msgid "Not connected"
 msgstr "Неповезан"
 
-#: ../modemlights/modem-applet.c:713
+#: ../modem-lights/src/modem-applet.c:709
 msgid ""
 "To connect to your Internet service provider, you need administrator "
 "privileges"
@@ -2182,7 +2183,7 @@ msgstr ""
 "Да се повежете на вашег добављача Интернет услуга, требају вам "
 "администраторска овлашћења"
 
-#: ../modemlights/modem-applet.c:714
+#: ../modem-lights/src/modem-applet.c:710
 msgid ""
 "To disconnect from your Internet service provider, you need administrator "
 "privileges"
@@ -2190,11 +2191,11 @@ msgstr ""
 "Да прекинете везу са вашим добављачем Интернет услуга, требају вам "
 "администраторска овлашћења"
 
-#: ../modemlights/modem-applet.c:789
+#: ../modem-lights/src/modem-applet.c:785
 msgid "The entered password is invalid"
 msgstr "Унета лозинка је неисправна"
 
-#: ../modemlights/modem-applet.c:791
+#: ../modem-lights/src/modem-applet.c:787
 msgid ""
 "Check that you have typed it correctly and that you haven't activated the "
 "\"caps lock\" key"
@@ -2202,27 +2203,27 @@ msgstr ""
 "Проверите да ли сте је исправно унели и да нисте притиснули „Caps Lock“ "
 "тастер"
 
-#: ../modemlights/modem-applet.c:902
+#: ../modem-lights/src/modem-applet.c:898
 msgid "Do you want to connect?"
 msgstr "Желите да успоставите везу?"
 
-#: ../modemlights/modem-applet.c:903
+#: ../modem-lights/src/modem-applet.c:899
 msgid "Do you want to disconnect?"
 msgstr "Желите да прекинете везу?"
 
-#: ../modemlights/modem-applet.c:912
+#: ../modem-lights/src/modem-applet.c:908
 msgid "C_onnect"
 msgstr "П_овежи се"
 
-#: ../modemlights/modem-applet.c:912
+#: ../modem-lights/src/modem-applet.c:908
 msgid "_Disconnect"
 msgstr "_Прекини везу"
 
-#: ../modemlights/modem-applet.c:971
+#: ../modem-lights/src/modem-applet.c:967
 msgid "Could not launch network configuration tool"
 msgstr "Не могу да покренем алат за подешавање мреже"
 
-#: ../modemlights/modem-applet.c:973
+#: ../modem-lights/src/modem-applet.c:969
 msgid ""
 "Check that it's installed in the correct path and that it has the correct "
 "permissions"
@@ -2230,44 +2231,48 @@ msgstr ""
 "Проверите да ли је инсталиран на исправном месту и да има одговарајућа "
 "овлашћења"
 
-#: ../modemlights/modem-applet.c:997
+#: ../modem-lights/src/modem-applet.c:993
 msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "Програмче за повезивање и праћење модемске мрежне везе."
 
-#: ../modemlights/modem-applet-menu.xml.h:1
+#: ../modem-lights/modem-applet-menu.xml.h:1
 msgid "_Activate"
 msgstr "_Успостави"
 
-#: ../modemlights/modem-applet-menu.xml.h:2
+#: ../modem-lights/modem-applet-menu.xml.h:2
 msgid "_Deactivate"
 msgstr "Пре_кини"
 
-#: ../modemlights/modem-applet-menu.xml.h:3
-#: ../stickynotes/stickynotes-note-menu.xml.h:4
+#: ../modem-lights/modem-applet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:4
 msgid "_Properties"
 msgstr "Осо_бине"
 
-#: ../modemlights/modemlights.ui.h:1
+#: ../modem-lights/modemlights.ui.h:1
 msgid "Enter password"
 msgstr "Унесите лозинку"
 
-#: ../modemlights/modemlights.ui.h:2
+#: ../modem-lights/modemlights.ui.h:2
 msgid "Root password required"
 msgstr "Потребна је администраторска лозинка"
 
-#: ../modemlights/modemlights.ui.h:3
+#: ../modem-lights/modemlights.ui.h:3
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../modemlights/modemlights.ui.h:4
+#: ../modem-lights/modemlights.ui.h:4
 msgid "Connecting with Internet Service Provider"
 msgstr "Повезујем се са продавцем Интернет услуга"
 
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
+#: ../modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
+msgid "Modem Monitor"
+msgstr "Праћење модема"
+
+#: ../modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
 msgid "Activate and monitor a dial-up network connection"
 msgstr "Покрени и прати модемску мрежну везу"
 
-#: ../multiload/main.c:57
+#: ../multiload/src/main.c:57
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
@@ -2275,43 +2280,43 @@ msgstr ""
 "Праћење оптерећења система омогућава приказ графика за процесор, меморију, и "
 "меморију на диску, а уз то и мрежни саобраћај."
 
-#: ../multiload/main.c:131
+#: ../multiload/src/main.c:131
 msgid "Start system-monitor"
 msgstr "Покреће праћење система"
 
-#: ../multiload/main.c:152
+#: ../multiload/src/main.c:152
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "Дошло је до грешке при извршавању „%s“: %s"
 
-#: ../multiload/main.c:275 ../multiload/properties.c:546
+#: ../multiload/src/main.c:275 ../multiload/src/properties.c:546
 msgid "Processor"
 msgstr "Процесор"
 
-#: ../multiload/main.c:277 ../multiload/properties.c:554
+#: ../multiload/src/main.c:277 ../multiload/src/properties.c:554
 msgid "Memory"
 msgstr "Меморија"
 
-#: ../multiload/main.c:279 ../multiload/properties.c:562
+#: ../multiload/src/main.c:279 ../multiload/src/properties.c:562
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../multiload/main.c:281 ../multiload/properties.c:569
+#: ../multiload/src/main.c:281 ../multiload/src/properties.c:569
 msgid "Swap Space"
 msgstr "Заменска меморија"
 
-#: ../multiload/main.c:283 ../multiload/main.c:362
+#: ../multiload/src/main.c:283 ../multiload/src/main.c:362
 msgid "Load Average"
 msgstr "Просечно оптерећење"
 
-#: ../multiload/main.c:285
+#: ../multiload/src/main.c:285
 msgid "Disk"
 msgstr "Диск"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:301
+#: ../multiload/src/main.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -2322,13 +2327,13 @@ msgstr ""
 "%u%% употребљавају програми\n"
 "%u%% је у употреби као остава"
 
-#: ../multiload/main.c:309
+#: ../multiload/src/main.c:309
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "Просечно оптерећење система је %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:317
+#: ../multiload/src/main.c:317
 #, c-format
 msgid ""
 "%s:\n"
@@ -2339,7 +2344,7 @@ msgstr ""
 "Прима %s\n"
 "Шаље %s"
 
-#: ../multiload/main.c:333
+#: ../multiload/src/main.c:333
 #, c-format
 msgid ""
 "%s:\n"
@@ -2360,40 +2365,172 @@ msgstr[3] ""
 "%s:\n"
 "%u%% у употреби"
 
-#: ../multiload/main.c:358
+#: ../multiload/src/main.c:358
 msgid "CPU Load"
 msgstr "Оптерећење процесора"
 
-#: ../multiload/main.c:359
+#: ../multiload/src/main.c:359
 msgid "Memory Load"
 msgstr "Оптерећење меморије"
 
 # bug: Ili je ovo "net" kao "ukupno"?
-#: ../multiload/main.c:360
+#: ../multiload/src/main.c:360
 msgid "Net Load"
 msgstr "Оптерећење мреже"
 
-#: ../multiload/main.c:361
+#: ../multiload/src/main.c:361
 msgid "Swap Load"
 msgstr "Оптерећење меморије на диску"
 
-#: ../multiload/main.c:363
+#: ../multiload/src/main.c:363
 msgid "Disk Load"
 msgstr "Оптерећење диска"
 
-#: ../multiload/main.c:473
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
-msgid "System Monitor"
-msgstr "Праћење система"
+#: ../multiload/src/netspeed.c:40
+#, c-format
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../multiload/src/properties.c:308
+msgid "Monitored Resources"
+msgstr "Праћени ресурси"
+
+#: ../multiload/src/properties.c:333
+msgid "_Processor"
+msgstr "_Процесор"
+
+#: ../multiload/src/properties.c:346
+msgid "_Memory"
+msgstr "_Меморија"
+
+#: ../multiload/src/properties.c:359
+msgid "_Network"
+msgstr "М_режа"
+
+#: ../multiload/src/properties.c:372
+msgid "S_wap Space"
+msgstr "_Замена за меморију (swap)"
+
+#: ../multiload/src/properties.c:385
+msgid "_Load"
+msgstr "_Оптерећење"
+
+#: ../multiload/src/properties.c:398
+msgid "_Harddisk"
+msgstr "_Тврди диск"
+
+#: ../multiload/src/properties.c:413
+msgid "Options"
+msgstr "Опције"
+
+#: ../multiload/src/properties.c:443
+msgid "System m_onitor width: "
+msgstr "_Ширина програмчета: "
+
+#: ../multiload/src/properties.c:445
+msgid "System m_onitor height: "
+msgstr "_Висина програмчета: "
+
+#: ../multiload/src/properties.c:484
+msgid "Sys_tem monitor update interval: "
+msgstr "_Време између два освежавања приказа: "
+
+#: ../multiload/src/properties.c:510
+msgid "milliseconds"
+msgstr "милисекунди"
+
+#: ../multiload/src/properties.c:548 ../multiload/src/properties.c:556
+msgid "_User"
+msgstr "_Корисник"
+
+#: ../multiload/src/properties.c:549
+msgid "S_ystem"
+msgstr "_Систем"
+
+#: ../multiload/src/properties.c:550
+msgid "N_ice"
+msgstr "_Мање приоритетно"
+
+#: ../multiload/src/properties.c:551
+msgid "I_OWait"
+msgstr "У_Ичекање"
+
+#: ../multiload/src/properties.c:552
+msgid "I_dle"
+msgstr "_Неупослен"
+
+#: ../multiload/src/properties.c:557
+msgid "Sh_ared"
+msgstr "_Дељена"
+
+#: ../multiload/src/properties.c:558
+msgid "_Buffers"
+msgstr "_Бафери"
+
+#: ../multiload/src/properties.c:559
+msgid "Cach_ed"
+msgstr "Кеш_ирана"
+
+#: ../multiload/src/properties.c:560
+msgid "F_ree"
+msgstr "_Слободна"
+
+#: ../multiload/src/properties.c:564
+msgid "_In"
+msgstr "_Примљено"
+
+#: ../multiload/src/properties.c:565
+msgid "_Out"
+msgstr "П_ослато"
+
+#: ../multiload/src/properties.c:566
+msgid "_Local"
+msgstr "_Локално"
+
+#: ../multiload/src/properties.c:567 ../multiload/src/properties.c:577
+#: ../multiload/src/properties.c:583
+msgid "_Background"
+msgstr "_Позадина"
+
+#: ../multiload/src/properties.c:571
+msgid "_Used"
+msgstr "Ис_коришћено"
+
+#: ../multiload/src/properties.c:572
+msgid "_Free"
+msgstr "_Слободно"
+
+#: ../multiload/src/properties.c:574
+msgid "Load"
+msgstr "Оптерећење"
+
+#: ../multiload/src/properties.c:576
+msgid "_Average"
+msgstr "Про_сечно"
+
+#: ../multiload/src/properties.c:579
+msgid "Harddisk"
+msgstr "Тврди диск"
+
+#: ../multiload/src/properties.c:581
+msgid "_Read"
+msgstr "_Читање"
+
+#: ../multiload/src/properties.c:582
+msgid "_Write"
+msgstr "_Упис"
+
+#: ../multiload/src/properties.c:609
+msgid "System Monitor Preferences"
+msgstr "Поставке праћења система"
 
 #: ../multiload/multiload-applet-menu.xml.h:1
 msgid "_Open System Monitor"
 msgstr "_Покрени Праћење система"
 
-#: ../multiload/netspeed.c:40
-#, c-format
-msgid "%s/s"
-msgstr "%s/s"
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
+msgid "System Monitor"
+msgstr "Праћење система"
 
 #: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
 msgid "A system load indicator"
@@ -2531,139 +2668,6 @@ msgid "The desktop description file to execute as the system monitor"
 msgstr ""
 "Покретачка датотека коју треба покренути као програм за праћење система"
 
-#: ../multiload/properties.c:308
-msgid "Monitored Resources"
-msgstr "Праћени ресурси"
-
-#: ../multiload/properties.c:333
-msgid "_Processor"
-msgstr "_Процесор"
-
-#: ../multiload/properties.c:346
-msgid "_Memory"
-msgstr "_Меморија"
-
-#: ../multiload/properties.c:359
-msgid "_Network"
-msgstr "М_режа"
-
-#: ../multiload/properties.c:372
-msgid "S_wap Space"
-msgstr "_Замена за меморију (swap)"
-
-#: ../multiload/properties.c:385
-msgid "_Load"
-msgstr "_Оптерећење"
-
-#: ../multiload/properties.c:398
-msgid "_Harddisk"
-msgstr "_Тврди диск"
-
-#: ../multiload/properties.c:413
-msgid "Options"
-msgstr "Опције"
-
-#: ../multiload/properties.c:443
-msgid "System m_onitor width: "
-msgstr "_Ширина програмчета: "
-
-#: ../multiload/properties.c:445
-msgid "System m_onitor height: "
-msgstr "_Висина програмчета: "
-
-#: ../multiload/properties.c:484
-msgid "Sys_tem monitor update interval: "
-msgstr "_Време између два освежавања приказа: "
-
-#: ../multiload/properties.c:510
-msgid "milliseconds"
-msgstr "милисекунди"
-
-#: ../multiload/properties.c:548 ../multiload/properties.c:556
-msgid "_User"
-msgstr "_Корисник"
-
-#: ../multiload/properties.c:549
-msgid "S_ystem"
-msgstr "_Систем"
-
-#: ../multiload/properties.c:550
-msgid "N_ice"
-msgstr "_Мање приоритетно"
-
-#: ../multiload/properties.c:551
-msgid "I_OWait"
-msgstr "У_Ичекање"
-
-#: ../multiload/properties.c:552
-msgid "I_dle"
-msgstr "_Неупослен"
-
-#: ../multiload/properties.c:557
-msgid "Sh_ared"
-msgstr "_Дељена"
-
-#: ../multiload/properties.c:558
-msgid "_Buffers"
-msgstr "_Бафери"
-
-#: ../multiload/properties.c:559
-msgid "Cach_ed"
-msgstr "Кеш_ирана"
-
-#: ../multiload/properties.c:560
-msgid "F_ree"
-msgstr "_Слободна"
-
-#: ../multiload/properties.c:564
-msgid "_In"
-msgstr "_Примљено"
-
-#: ../multiload/properties.c:565
-msgid "_Out"
-msgstr "П_ослато"
-
-#: ../multiload/properties.c:566
-msgid "_Local"
-msgstr "_Локално"
-
-#: ../multiload/properties.c:567 ../multiload/properties.c:577
-#: ../multiload/properties.c:583
-msgid "_Background"
-msgstr "_Позадина"
-
-#: ../multiload/properties.c:571
-msgid "_Used"
-msgstr "Ис_коришћено"
-
-#: ../multiload/properties.c:572
-msgid "_Free"
-msgstr "_Слободно"
-
-#: ../multiload/properties.c:574
-msgid "Load"
-msgstr "Оптерећење"
-
-#: ../multiload/properties.c:576
-msgid "_Average"
-msgstr "Про_сечно"
-
-#: ../multiload/properties.c:579
-msgid "Harddisk"
-msgstr "Тврди диск"
-
-#: ../multiload/properties.c:581
-msgid "_Read"
-msgstr "_Читање"
-
-#: ../multiload/properties.c:582
-msgid "_Write"
-msgstr "_Упис"
-
-#: ../multiload/properties.c:609
-msgid "System Monitor Preferences"
-msgstr "Поставке праћења система"
-
 #: ../netspeed/data/netspeed-menu.xml.h:1
 msgid "Device _Details"
 msgstr "Подаци _уређаја"
@@ -2736,55 +2740,55 @@ msgstr "Програмче брзине мреже"
 msgid "Network Monitor"
 msgstr "Надзорник мреже"
 
-#: ../netspeed/src/netspeed.c:368
+#: ../netspeed/src/netspeed.c:365
 msgid "b/s"
 msgstr "b/s"
 
-#: ../netspeed/src/netspeed.c:368
+#: ../netspeed/src/netspeed.c:365
 msgid "B/s"
 msgstr "B/s"
 
-#: ../netspeed/src/netspeed.c:370
+#: ../netspeed/src/netspeed.c:367
 msgid "bits"
 msgstr "бита"
 
-#: ../netspeed/src/netspeed.c:370
+#: ../netspeed/src/netspeed.c:367
 msgid "bytes"
 msgstr "бајта"
 
-#: ../netspeed/src/netspeed.c:377
+#: ../netspeed/src/netspeed.c:374
 msgid "kb/s"
 msgstr "kb/s"
 
-#: ../netspeed/src/netspeed.c:377
+#: ../netspeed/src/netspeed.c:374
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: ../netspeed/src/netspeed.c:379
+#: ../netspeed/src/netspeed.c:376
 msgid "kb"
 msgstr "kb"
 
-#: ../netspeed/src/netspeed.c:379
+#: ../netspeed/src/netspeed.c:376
 msgid "KiB"
 msgstr "KiB"
 
-#: ../netspeed/src/netspeed.c:388
+#: ../netspeed/src/netspeed.c:385
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../netspeed/src/netspeed.c:388
+#: ../netspeed/src/netspeed.c:385
 msgid "MiB/s"
 msgstr "MiB/s"
 
-#: ../netspeed/src/netspeed.c:390
+#: ../netspeed/src/netspeed.c:387
 msgid "Mb"
 msgstr "Mb"
 
-#: ../netspeed/src/netspeed.c:390
+#: ../netspeed/src/netspeed.c:387
 msgid "MiB"
 msgstr "MiB"
 
-#: ../netspeed/src/netspeed.c:634
+#: ../netspeed/src/netspeed.c:631
 msgid ""
 "A little applet that displays some information on the traffic on the "
 "specified network device"
@@ -2792,70 +2796,70 @@ msgstr ""
 "Мали програмчић који приказује неке податке о саобраћају на назначеном "
 "мрежном уређају"
 
-#: ../netspeed/src/netspeed.c:639
+#: ../netspeed/src/netspeed.c:636
 msgid "Netspeed Website"
 msgstr "Веб страница Брзине мреже"
 
-#: ../netspeed/src/netspeed.c:902
+#: ../netspeed/src/netspeed.c:899
 #, c-format
 msgid "Device Details for %s"
 msgstr "Подаци уређаја за %s"
 
-#: ../netspeed/src/netspeed.c:927
+#: ../netspeed/src/netspeed.c:924
 msgid "_In graph color"
 msgstr "Боја графика _улаза"
 
-#: ../netspeed/src/netspeed.c:928
+#: ../netspeed/src/netspeed.c:925
 msgid "_Out graph color"
 msgstr "Боја графика _излаза"
 
-#: ../netspeed/src/netspeed.c:944
+#: ../netspeed/src/netspeed.c:941
 msgid "Internet Address:"
 msgstr "Интернет адреса:"
 
-#: ../netspeed/src/netspeed.c:945
+#: ../netspeed/src/netspeed.c:942
 msgid "Netmask:"
 msgstr "Мрежна маска:"
 
-#: ../netspeed/src/netspeed.c:946
+#: ../netspeed/src/netspeed.c:943
 msgid "Hardware Address:"
 msgstr "Хардверска адреса:"
 
-#: ../netspeed/src/netspeed.c:947
+#: ../netspeed/src/netspeed.c:944
 msgid "P-t-P Address:"
 msgstr "Т-д-Т адреса:"
 
-#: ../netspeed/src/netspeed.c:948
+#: ../netspeed/src/netspeed.c:945
 msgid "Bytes in:"
 msgstr "Примљених бајтова:"
 
-#: ../netspeed/src/netspeed.c:949
+#: ../netspeed/src/netspeed.c:946
 msgid "Bytes out:"
 msgstr "Послатих бајтова:"
 
-#: ../netspeed/src/netspeed.c:951 ../netspeed/src/netspeed.c:952
-#: ../netspeed/src/netspeed.c:953 ../netspeed/src/netspeed.c:954
+#: ../netspeed/src/netspeed.c:948 ../netspeed/src/netspeed.c:949
+#: ../netspeed/src/netspeed.c:950 ../netspeed/src/netspeed.c:951
 msgid "none"
 msgstr "ништа"
 
-#: ../netspeed/src/netspeed.c:993
+#: ../netspeed/src/netspeed.c:990
 msgid "IPv6 Address:"
 msgstr "ИПв6 адреса:"
 
-#: ../netspeed/src/netspeed.c:1025
+#: ../netspeed/src/netspeed.c:1022
 msgid "Signal Strength:"
 msgstr "Јачина сигнала:"
 
-#: ../netspeed/src/netspeed.c:1026
+#: ../netspeed/src/netspeed.c:1023
 msgid "ESSID:"
 msgstr "ЕССИД:"
 
-#: ../netspeed/src/netspeed.c:1076
+#: ../netspeed/src/netspeed.c:1073
 #, c-format
 msgid "%s is down"
 msgstr "%s је угашен"
 
-#: ../netspeed/src/netspeed.c:1081
+#: ../netspeed/src/netspeed.c:1078
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -2864,11 +2868,11 @@ msgstr ""
 "%s: %s\n"
 "пријем: %s слање: %s"
 
-#: ../netspeed/src/netspeed.c:1083 ../netspeed/src/netspeed.c:1092
+#: ../netspeed/src/netspeed.c:1080 ../netspeed/src/netspeed.c:1089
 msgid "has no ip"
 msgstr "нема ип"
 
-#: ../netspeed/src/netspeed.c:1090
+#: ../netspeed/src/netspeed.c:1087
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -2877,7 +2881,7 @@ msgstr ""
 "%s: %s\n"
 "укупно: %s"
 
-#: ../netspeed/src/netspeed.c:1099
+#: ../netspeed/src/netspeed.c:1096
 #, c-format
 msgid ""
 "\n"
@@ -2888,21 +2892,21 @@ msgstr ""
 "ЕССИД: %s\n"
 "Јачина: %d %%"
 
-#: ../netspeed/src/netspeed.c:1100
+#: ../netspeed/src/netspeed.c:1097
 msgid "unknown"
 msgstr "непознато"
 
-#: ../netspeed/src/netspeed.c:1165
+#: ../netspeed/src/netspeed.c:1162
 #, c-format
 msgid "Do you want to disconnect %s now?"
 msgstr "Да ли желите да прекинете везу „%s“ сада?"
 
-#: ../netspeed/src/netspeed.c:1167
+#: ../netspeed/src/netspeed.c:1164
 #, c-format
 msgid "Do you want to connect %s now?"
 msgstr "Да ли желите да повежете везу „%s“ сада?"
 
-#: ../netspeed/src/netspeed.c:1190
+#: ../netspeed/src/netspeed.c:1187
 #, c-format
 msgid ""
 "<b>Running command %s failed</b>\n"
@@ -2911,10 +2915,6 @@ msgstr ""
 "<b>Није успело извршавање наредбе „%s“</b>\n"
 "%s"
 
-#: ../netspeed/src/netspeed.c:1457
-msgid "Netspeed"
-msgstr "Брзина мреже"
-
 #: ../netspeed/src/netspeed.c:1549
 #, c-format
 msgid ""
@@ -2948,37 +2948,36 @@ msgstr "Промени _иконицу у складу са изабраним 
 msgid "Netspeed Preferences"
 msgstr "Поставке Брзине мреже"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
 msgid "Sticky Notes Applet Factory"
 msgstr "Производња програмчета за белешке"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:146
-#: ../stickynotes/stickynotes_applet.c:380
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
+#: ../sticky-notes/src/stickynotes_applet.c:385
 msgid "Sticky Notes"
 msgstr "Белешке"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "Направите, гледајте и управљајте белешкама на радној површини"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:1
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:1
 msgid "Default width for new notes"
 msgstr "Уобичајена ширина за нове белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:2
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:2
 msgid "Default width for new sticky notes in pixels."
 msgstr "Уобичајена ширина у тачкама за нове белешке."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:3
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:3
 msgid "Default height for new notes"
 msgstr "Уобичајена висина за нове белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:4
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:4
 msgid "Default color for new notes"
 msgstr "Уобичајена боја за нове белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:5
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:5
 msgid ""
 "Default color for new sticky notes. This can be standard name, hexadecimal "
 "value, RGB color or RGBA color."
@@ -2986,11 +2985,11 @@ msgstr ""
 "Основна боја за нове лепљиве белешке. Ово може бити уобичајени назив, "
 "хексадецимална вредност, РГБ боја или РГБА боја."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:6
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:6
 msgid "Default color for font"
 msgstr "Основна боја словног лика"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:7
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:7
 msgid ""
 "Default font color for new sticky notes. This can be standard name, "
 "hexadecimal value, RGB color or RGBA color."
@@ -2998,11 +2997,11 @@ msgstr ""
 "Основна боја слова за нове лепљиве белешке. Ово може бити уобичајени назив, "
 "хексадецимална вредност, РГБ боја или РГБА боја."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:8
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:8
 msgid "Default font for new notes"
 msgstr "Основна слова за нове белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:9
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:9
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
@@ -3010,29 +3009,29 @@ msgstr ""
 "Основна слова за нове лепљиве белешке. Ово треба да буде назив слова за "
 "Панго, нпр. „Sans Italic 10“."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:10
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:10
 msgid "Sticky notes' workspace stickyness"
 msgstr "Лепљивост белешки за радну површину"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:11
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:11
 msgid ""
 "Specifies whether the sticky notes are visible on ALL workspaces on the "
 "desktop, or not."
 msgstr "Одређује да ли се белешке виде на СВИМ радним површинама, или не."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:12
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:12
 msgid "Sticky notes' locked state"
 msgstr "Закључано стање белешки"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:13
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:13
 msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "Одређује да ли су белешке закључане (не могу се изменити) или не."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:14
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:14
 msgid "Date format of note's title"
 msgstr "Образац за датум у насловима белешки"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:15
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:15
 msgid ""
 "By default, sticky notes are given the current date as the title when they "
 "are created. This format is used; anything that can be parsed by strftime() "
@@ -3041,11 +3040,11 @@ msgstr ""
 "Уобичајено, када се направе белешке, користи се текући датум за наслов. Овај "
 "образац се користи; све што прихвата „strftime()“ је дозвољено."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:16
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:16
 msgid "Whether to use the default system color"
 msgstr "Да ли се користи подразумевана боја система"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:17
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:17
 msgid ""
 "If this option is disabled, a custom color can be used as the default color "
 "for all sticky notes."
@@ -3053,11 +3052,11 @@ msgstr ""
 "Уколико је ова опција искључена, може се користити боја по избору као "
 "уобичајена боја за све белешке."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:18
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:18
 msgid "Whether to use the default system font"
 msgstr "Да ли се користи подразумевани системски словни лик"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:19
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:19
 msgid ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
@@ -3065,11 +3064,11 @@ msgstr ""
 "Уколико је ова опција искључена, може се користити словни лик по избору као "
 "уобичајени словни лик за све белешке."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:20
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:20
 msgid "Whether to force the default color and font on all notes"
 msgstr "Да ли да наметнем подразумевану боју и словни лик за све белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:21
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:21
 msgid ""
 "If this option is enabled, the custom colors and fonts that have been "
 "assigned to individual notes will be ignored."
@@ -3077,11 +3076,11 @@ msgstr ""
 "Уколико је ова опција укључена, неће се користити подешавања боја и словних "
 "ликова за појединачне белешке."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:22
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:22
 msgid "Whether to hide all notes when the desktop is selected"
 msgstr "Да ли да сакријем све белешке при избору радне површи"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:23
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:23
 msgid ""
 "If this option is enabled, selecting the desktop in any way will "
 "automatically hide all the open notes."
@@ -3089,15 +3088,23 @@ msgstr ""
 "Уколико је ова опција укључена, избор радне површине на било кој начин ће "
 "сакрити све отворене белешке."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:24
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:24
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "Да ли се тражи одобрење при брисању белешке"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:25
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:25
 msgid "Empty notes are always deleted without confirmation."
 msgstr "Празне белешке се увек бришу без потврде."
 
-#: ../stickynotes/stickynotes_applet.c:539
+#: ../sticky-notes/src/stickynotes.c:594
+msgid "This note is locked."
+msgstr "Ова белешка је закључана."
+
+#: ../sticky-notes/src/stickynotes.c:598
+msgid "This note is unlocked."
+msgstr "Ова белешка је откључана."
+
+#: ../sticky-notes/src/stickynotes_applet.c:544
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
@@ -3106,392 +3113,372 @@ msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 msgstr[3] "Једна белешка"
 
-#: ../stickynotes/stickynotes_applet.c:540
+#: ../sticky-notes/src/stickynotes_applet.c:545
 msgid "Show sticky notes"
 msgstr "Прикажи белешке"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:387
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:391
 msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "Белешке за радно окружење Гном"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:1
-#: ../stickynotes/stickynotes-note-menu.xml.h:1
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:1
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:1
 msgid "_New Note"
 msgstr "_Нова белешка"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:2
 msgid "Hi_de Notes"
 msgstr "Сак_риј белешке"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:3
 msgid "_Lock Notes"
 msgstr "_Закључај белешке"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:4
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:4
 msgid "_Delete Notes"
 msgstr "_Уклони белешке"
 
-#: ../stickynotes/stickynotes.c:591
-msgid "This note is locked."
-msgstr "Ова белешка је закључана."
-
-#: ../stickynotes/stickynotes.c:595
-msgid "This note is unlocked."
-msgstr "Ова белешка је откључана."
-
-#: ../stickynotes/stickynotes-delete-all.ui.h:1
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:1
 msgid "_Delete All"
 msgstr "Обриши _све"
 
-#: ../stickynotes/stickynotes-delete-all.ui.h:2
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:2
 msgid "Delete all sticky notes?"
 msgstr "Да обришем све лепљиве белешке?"
 
-#: ../stickynotes/stickynotes-delete-all.ui.h:3
-#: ../stickynotes/stickynotes-delete.ui.h:2
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:3
+#: ../sticky-notes/src/sticky-notes-delete.ui.h:2
 msgid "This cannot be undone."
 msgstr "Ово не можете поништити."
 
-#: ../stickynotes/stickynotes-delete.ui.h:1
+#: ../sticky-notes/src/sticky-notes-delete.ui.h:1
 msgid "Delete this sticky note?"
 msgstr "Да обришем лепљиву белешку?"
 
-#: ../stickynotes/stickynotes-note-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:2
 msgid "_Delete Note..."
 msgstr "_Обриши белешку..."
 
-#: ../stickynotes/stickynotes-note-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:3
 msgid "_Lock Note"
 msgstr "_Закључај белешку"
 
-#: ../stickynotes/stickynotes-note.ui.h:1
+#: ../sticky-notes/src/sticky-notes-note.ui.h:1
 msgid "Sticky Note"
 msgstr "Белешке"
 
-#: ../stickynotes/stickynotes-note.ui.h:2
+#: ../sticky-notes/src/sticky-notes-note.ui.h:2
 msgid "Lock/Unlock note"
 msgstr "Закључај/откључај белешку"
 
-#: ../stickynotes/stickynotes-note.ui.h:3
+#: ../sticky-notes/src/sticky-notes-note.ui.h:3
 msgid "Close note"
 msgstr "Затвори белешку"
 
-#: ../stickynotes/stickynotes-note.ui.h:4
+#: ../sticky-notes/src/sticky-notes-note.ui.h:4
 msgid "Resize note"
 msgstr "Промени величину белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:1
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:1
 msgid "Sticky Notes Preferences"
 msgstr "Поставке за белешку"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:2
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:2
 msgid "Default Note Properties"
 msgstr "Подешавање подразумеване белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:4
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:4
 msgid "H_eight:"
 msgstr "_Висина:"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:5
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:5
 msgid "Specify the default width (in pixels) of new notes"
 msgstr "Изаберите подразумевану ширину белешке (у пикселима)"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:6
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:6
 msgid "1"
 msgstr "1"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:7
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:7
 msgid "Specify the default height (in pixels) of new notes"
 msgstr "Изаберите подразумевану висину белешке (у пикселима)"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:8
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:8
 msgid "0"
 msgstr "0"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:9
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:9
 msgid "Use co_lor from the system theme"
 msgstr "Користи боју из _системске теме"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:10
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:10
 msgid "Font Co_lor:"
 msgstr "Бо_ја словног лика:"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:11
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:11
 msgid "Note C_olor:"
 msgstr "_Боја белешке:"
 
 # тоолтип??? ~Милош
-#: ../stickynotes/stickynotes-preferences.ui.h:12
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:12
 msgid "Choose a base color to use for all sticky notes"
 msgstr "Поставља подразумевану боју за све белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:13
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:13
 msgid "Pick a default sticky note color"
 msgstr "Изаберите подразумевану боју за белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:14
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:14
 msgid "Use fo_nt from the system theme"
 msgstr "Користи словни лик из _системске теме"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:15
-#: ../stickynotes/stickynotes-properties.ui.h:11
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:15
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:11
 msgid "_Font:"
 msgstr "_Словни лик:"
 
 # тоолтип??? ~Милош
-#: ../stickynotes/stickynotes-preferences.ui.h:16
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:16
 msgid "Choose a font to use for all sticky notes"
 msgstr "Поставља подразумевани словни лик за све белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:17
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:17
 msgid "Pick a default sticky note font"
 msgstr "Изаберите подразумевани словни лик за белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:18
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:18
 msgid "Behavior"
 msgstr "Понашање"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:19
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:19
 msgid "_Put notes on all workspaces"
 msgstr "Постави на све _радне површине"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:20
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:20
 msgid "Choose if notes are visible on all workspaces"
 msgstr "Да ли да прикажем белешке на свим радним просторима"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:21
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:21
 msgid "Force _default color and font on notes"
 msgstr "Да ли да _наметнем подразумевану боју и словни лик за све белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:22
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:22
 msgid "Choose if the default style is forced on all notes"
 msgstr "Да ли да наметнем подразумевани стил за све белешке"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:23
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:23
 msgid "Hide notes when the des_ktop is clicked on"
 msgstr "_Сакриј белешке када кликнем на радну површ"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:24
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:24
 msgid "Choose whether to hide all notes when selecting on the desktop"
 msgstr "Да ли да сакријем све белешке када кликнете на радну површину"
 
-#: ../stickynotes/stickynotes-properties.ui.h:1
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:1
 msgid "Sticky Note Properties"
 msgstr "Особине белешке"
 
-#: ../stickynotes/stickynotes-properties.ui.h:2
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:2
 msgid "Properties"
 msgstr "Особине"
 
-#: ../stickynotes/stickynotes-properties.ui.h:3
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:3
 msgid "_Title:"
 msgstr "_Наслов:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:4
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:4
 msgid "Specify a title for the note"
 msgstr "Упишите наслов за белешку"
 
-#: ../stickynotes/stickynotes-properties.ui.h:5
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:5
 msgid "Use default co_lor"
 msgstr "_Користи подразумевану боју"
 
-#: ../stickynotes/stickynotes-properties.ui.h:6
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:6
 msgid "Font C_olor:"
 msgstr "Боја _словног лика:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:7
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:7
 msgid "Note _Color:"
 msgstr "Боја _белешке:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:8
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:8
 msgid "Use default fo_nt"
 msgstr "_Користи подразумевани словни лик"
 
-#: ../stickynotes/stickynotes-properties.ui.h:9
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:9
 msgid "Choose a color for the note"
 msgstr "Уобичајена боја белешке"
 
-#: ../stickynotes/stickynotes-properties.ui.h:10
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:10
 msgid "Pick a color for the sticky note"
 msgstr "Изаберите боју за белешке"
 
-#: ../stickynotes/stickynotes-properties.ui.h:12
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:12
 msgid "Choose a font for the note"
 msgstr "Уобичајени словни лик белешке"
 
-#: ../stickynotes/stickynotes-properties.ui.h:13
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:13
 msgid "Pick a font for the sticky note"
 msgstr "Изаберите словни лик за белешку"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:1
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:1
 msgid "Timer Factory"
 msgstr "Производња времена"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:2
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:2
 msgid "Timer"
 msgstr "Одбројавач"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:3
-#: ../timerapplet/timerapplet.c:285
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:3
+#: ../timer/src/timer-applet.c:285
 msgid "Start a timer and receive a notification when it is finished"
 msgstr "Покрените одбројавач и примите обавештење када буде завршио"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:1
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:1
 msgid "'Timer'"
 msgstr "'Одбројавач'"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:2
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:2
 msgid "Name of timer"
 msgstr "Назив одбројавача"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:3
-#| msgid "Refresh time in milliseconds"
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:3
 msgid "Duration of timer in seconds"
 msgstr "Време одбројавача у секундама"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:4
-#| msgid "Show notifications for critical weather conditions"
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:4
 msgid "Show notification popup when timer finish"
 msgstr "Приказује облачић обавештења када се заврши одбројавање"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:5
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:5
 msgid "Show dialog window when timer finish"
 msgstr "Приказује прозорчић када се заврши одбројавање"
 
-#: ../timerapplet/timerapplet.c:158
+#: ../timer/src/timer-applet.c:158
 msgid "Finished"
 msgstr "Завршено"
 
-#: ../timerapplet/timerapplet.c:165 ../timerapplet/timerapplet.c:177
+#: ../timer/src/timer-applet.c:165 ../timer/src/timer-applet.c:177
 msgid "Timer finished!"
 msgstr "Одбројавање је завршено!"
 
-#: ../timerapplet/timerapplet.c:321
-#| msgid "Geyes Preferences"
+#: ../timer/src/timer-applet.c:321
 msgid "Timer Applet Preferences"
 msgstr "Поставке одбројавача"
 
-#: ../timerapplet/timerapplet.c:334
+#: ../timer/src/timer-applet.c:334
 msgid "Name:"
 msgstr "Назив:"
 
-#: ../timerapplet/timerapplet.c:347
+#: ../timer/src/timer-applet.c:343
 msgid "Hours:"
 msgstr "Часови:"
 
 # bug:plural-forms
-#: ../timerapplet/timerapplet.c:362
-#| msgid "minutes"
+#: ../timer/src/timer-applet.c:354
 msgid "Minutes:"
 msgstr "Минути:"
 
-#: ../timerapplet/timerapplet.c:377
-#| msgid "milliseconds"
+#: ../timer/src/timer-applet.c:365
 msgid "Seconds:"
 msgstr "Секунде:"
 
-#: ../timerapplet/timerapplet.c:392
-#| msgid "Show notification"
+#: ../timer/src/timer-applet.c:376
 msgid "Show notification popup"
 msgstr "Прикажи облачић обавештења"
 
-#: ../timerapplet/timerapplet.c:398
-#| msgid "Show handle"
+#: ../timer/src/timer-applet.c:380
 msgid "Show dialog"
 msgstr "Прикажи прозорче"
 
-#: ../timerapplet/timerapplet.c:422
-#| msgid "Trash Applet"
-msgid "Timer Applet"
-msgstr "Програмче одбројавања"
-
-#: ../tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in.h:1
+#: ../tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in.h:1
 msgid "Tracker Search Bar"
 msgstr "Трагачева трака претраге"
 
-#: ../tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in.h:2
+#: ../tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in.h:2
 msgid "Find your data quickly using Tracker"
 msgstr "Нађите ваше податке користећи Трагача"
 
-#: ../tracker-search-bar/tracker-results-window.c:718
-#: ../tracker-search-bar/tracker-results-window.c:734
+#: ../tracker-search-bar/src/tracker-results-window.c:718
+#: ../tracker-search-bar/src/tracker-results-window.c:734
 msgid "Other"
 msgstr "Друго"
 
-#: ../tracker-search-bar/tracker-results-window.c:719
+#: ../tracker-search-bar/src/tracker-results-window.c:719
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ../tracker-search-bar/tracker-results-window.c:720
+#: ../tracker-search-bar/src/tracker-results-window.c:720
 msgid "Tags"
 msgstr "Ознаке"
 
-#: ../tracker-search-bar/tracker-results-window.c:721
+#: ../tracker-search-bar/src/tracker-results-window.c:721
 msgid "Email Addresses"
 msgstr "Адресе ел. поште"
 
-#: ../tracker-search-bar/tracker-results-window.c:722
+#: ../tracker-search-bar/src/tracker-results-window.c:722
 msgid "Documents"
 msgstr "Документи"
 
-#: ../tracker-search-bar/tracker-results-window.c:723
+#: ../tracker-search-bar/src/tracker-results-window.c:723
 msgid "Applications"
 msgstr "Програми"
 
-#: ../tracker-search-bar/tracker-results-window.c:724
+#: ../tracker-search-bar/src/tracker-results-window.c:724
 msgid "Images"
 msgstr "Слике"
 
-#: ../tracker-search-bar/tracker-results-window.c:725
+#: ../tracker-search-bar/src/tracker-results-window.c:725
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../tracker-search-bar/tracker-results-window.c:726
+#: ../tracker-search-bar/src/tracker-results-window.c:726
 msgid "Folders"
 msgstr "Фасцикле"
 
-#: ../tracker-search-bar/tracker-results-window.c:727
+#: ../tracker-search-bar/src/tracker-results-window.c:727
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: ../tracker-search-bar/tracker-results-window.c:728
+#: ../tracker-search-bar/src/tracker-results-window.c:728
 msgid "Videos"
 msgstr "Видео снимци"
 
-#: ../tracker-search-bar/tracker-results-window.c:729
+#: ../tracker-search-bar/src/tracker-results-window.c:729
 msgid "Archives"
 msgstr "Архиве"
 
-#: ../tracker-search-bar/tracker-results-window.c:730
+#: ../tracker-search-bar/src/tracker-results-window.c:730
 msgid "Bookmarks"
 msgstr "Обележивачи"
 
-#: ../tracker-search-bar/tracker-results-window.c:731
+#: ../tracker-search-bar/src/tracker-results-window.c:731
 msgid "Links"
 msgstr "Везе"
 
-#: ../tracker-search-bar/tracker-results-window.c:1107
+#: ../tracker-search-bar/src/tracker-results-window.c:1107
 msgid "Category"
 msgstr "Категорија"
 
-#: ../tracker-search-bar/tracker-results-window.c:1135
+#: ../tracker-search-bar/src/tracker-results-window.c:1135
 msgid "Title"
 msgstr "Наслов"
 
-#: ../tracker-search-bar/tracker-results-window.c:1201
+#: ../tracker-search-bar/src/tracker-results-window.c:1201
 #, c-format
 msgid "No results found for “%s”"
 msgstr "Нема резултата за „%s“"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:1
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:1
 msgid "Copyright Tracker Authors 2005-2010"
 msgstr "Ауторска права 2005-2010 Аутори Трагача"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:2
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:2
 msgid "A search bar applet for finding content stored in Tracker"
 msgstr "Програмче траке претраге за налажење садржаја смештеног у Трагачу"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:3
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:3
 msgid ""
 "Tracker is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -3522,16 +3509,16 @@ msgstr ""
 "софтвера на адресу: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA  02110-1301, USA“."
 
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
+#: ../trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
+#: ../trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
 msgid "Go to Trash"
 msgstr "Иди до Смећа"
 
 # bug: plural-forms
-#: ../trashapplet/src/trashapplet.c:122
+#: ../trash/src/trash-applet.c:121
 #, c-format
 msgid "%d Item in Trash"
 msgid_plural "%d Items in Trash"
@@ -3540,11 +3527,11 @@ msgstr[1] "%d ставке у смећу"
 msgstr[2] "%d ставки у смећу"
 msgstr[3] "Једна ставка у смећу"
 
-#: ../trashapplet/src/trashapplet.c:130
+#: ../trash/src/trash-applet.c:129
 msgid "No Items in Trash"
 msgstr "Нема ставки у Смећу"
 
-#: ../trashapplet/src/trashapplet.c:363
+#: ../trash/src/trash-applet.c:362
 #, c-format
 msgid ""
 "Error while spawning Nautilus:\n"
@@ -3553,7 +3540,7 @@ msgstr ""
 "Грешка при позивању Наутилуса:\n"
 "%s"
 
-#: ../trashapplet/src/trashapplet.c:415
+#: ../trash/src/trash-applet.c:414
 msgid ""
 "A GNOME trash bin that lives in your panel. You can use it to view the trash "
 "or drag and drop items into the trash."
@@ -3561,41 +3548,37 @@ msgstr ""
 "Гномова канта за смеће на панелу. Користите је да прегледате смеће или да "
 "превучете и убаците ставке у смеће."
 
-#: ../trashapplet/src/trashapplet.c:440
+#: ../trash/src/trash-applet.c:439
 msgid "Delete Immediately?"
 msgstr "Да обришем одмах?"
 
-#: ../trashapplet/src/trashapplet.c:469
+#: ../trash/src/trash-applet.c:468
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr "Не могу да преместим ставке у смеће, желите ли да их одмах обришете?"
 
-#: ../trashapplet/src/trashapplet.c:474
+#: ../trash/src/trash-applet.c:473
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Не могу да преместим неке ставке у смеће, желите ли да их одмах обришете?"
 
-#: ../trashapplet/src/trashapplet.c:604
-msgid "Trash Applet"
-msgstr "Програмче за Смеће"
-
 #. Translators: the %s in this string should be read as %d.
-#: ../trashapplet/src/trash-empty.c:70
+#: ../trash/src/trash-empty.c:70
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "Уклања ставку %s од %s"
 
 #. Translators: %s is a file name
-#: ../trashapplet/src/trash-empty.c:96
+#: ../trash/src/trash-empty.c:96
 #, c-format
 msgid "Removing: %s"
 msgstr "Уклањам: %s"
 
-#: ../trashapplet/src/trash-empty.c:321
+#: ../trash/src/trash-empty.c:323
 msgid "Empty all of the items from the trash?"
 msgstr "Избацити све ставке из смећа?"
 
-#: ../trashapplet/src/trash-empty.c:328
+#: ../trash/src/trash-empty.c:330
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
@@ -3603,19 +3586,19 @@ msgstr ""
 "Уколико избаците смеће, све ставке из њега ће бити трајно уклоњене. "
 "Приметите да сваку можете засебно избацити."
 
-#: ../trashapplet/src/trash-empty.c:342 ../trashapplet/trashapplet-menu.xml.h:2
+#: ../trash/src/trash-empty.c:344 ../trash/src/trash-menu.xml.h:2
 msgid "_Empty Trash"
 msgstr "Из_баци смеће"
 
-#: ../trashapplet/trashapplet-empty-progress.ui.h:1
+#: ../trash/src/trash-empty.ui.h:1
 msgid "Emptying the Trash"
 msgstr "Избацивање смећа"
 
-#: ../trashapplet/trashapplet-empty-progress.ui.h:2
+#: ../trash/src/trash-empty.ui.h:2
 msgid "From:"
 msgstr "Из:"
 
-#: ../trashapplet/trashapplet-menu.xml.h:1
+#: ../trash/src/trash-menu.xml.h:1
 msgid "_Open Trash"
 msgstr "_Отвори смеће"
 
@@ -3664,6 +3647,20 @@ msgstr ""
 msgid "Close window"
 msgstr "Затвори прозор"
 
+#~| msgid "Command line"
+#~ msgid "Command Applet"
+#~ msgstr "Терминалчић"
+
+#~ msgid "Netspeed"
+#~ msgstr "Брзина мреже"
+
+#~| msgid "Trash Applet"
+#~ msgid "Timer Applet"
+#~ msgstr "Програмче одбројавања"
+
+#~ msgid "Trash Applet"
+#~ msgstr "Програмче за Смеће"
+
 #~ msgid "Close"
 #~ msgstr "Затвори"
 
diff --git a/po/sr latin po b/po/sr latin po
index ee156a4..37c177e 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -10,16 +10,16 @@ msgstr ""
 "Project-Id-Version: gnome-applets\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "applets&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-21 18:49+0000\n"
-"PO-Revision-Date: 2016-03-21 21:13+0200\n"
+"POT-Creation-Date: 2016-10-08 17:41+0000\n"
+"PO-Revision-Date: 2016-10-27 19:32+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <gnom prevod org>\n"
-"Language: sr@latin\n"
+"Language-Team: srpski <gnome-sr googlegroups org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../accessx-status/accessx-status-applet-menu.xml.h:1
@@ -28,16 +28,16 @@ msgstr "Postavke pristupačnosti _tastature"
 
 #: ../accessx-status/accessx-status-applet-menu.xml.h:2
 #: ../battstat/battstat-applet-menu.xml.h:2
-#: ../charpick/charpick-applet-menu.xml.h:2 ../charpick/properties.c:522
+#: ../charpick/charpick-applet-menu.xml.h:2 ../charpick/src/properties.c:522
 #: ../cpufreq/cpufreq-applet-menu.xml.h:2
 #: ../drivemount/drivemount-applet-menu.xml.h:1
-#: ../geyes/geyes-applet-menu.xml.h:2 ../geyes/themes.c:295
+#: ../geyes/geyes-applet-menu.xml.h:2 ../geyes/src/themes.c:295
 #: ../gweather/gweather-applet-menu.xml.h:4
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:2
 #: ../multiload/multiload-applet-menu.xml.h:3
 #: ../netspeed/data/netspeed-menu.xml.h:3 ../netspeed/src/preferences.c:324
-#: ../stickynotes/stickynotes-applet-menu.xml.h:6
-#: ../trashapplet/trashapplet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:6
+#: ../trash/src/trash-menu.xml.h:3
 msgid "_Help"
 msgstr "_Pomoć"
 
@@ -50,33 +50,30 @@ msgstr "_Pomoć"
 #: ../geyes/geyes-applet-menu.xml.h:3 ../gweather/gweather-applet-menu.xml.h:5
 #: ../inhibit/inhibit-applet-menu.xml.h:1
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:3
-#: ../modemlights/modem-applet-menu.xml.h:4
+#: ../modem-lights/modem-applet-menu.xml.h:4
 #: ../multiload/multiload-applet-menu.xml.h:4
 #: ../netspeed/data/netspeed-menu.xml.h:4
-#: ../stickynotes/stickynotes-applet-menu.xml.h:7
-#: ../tracker-search-bar/tracker-search-bar-menu.xml.h:1
-#: ../trashapplet/trashapplet-menu.xml.h:4 ../windowpicker/src/wp-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:7
+#: ../tracker-search-bar/src/tracker-search-bar-menu.xml.h:1
+#: ../trash/src/trash-menu.xml.h:4 ../windowpicker/src/wp-menu.xml.h:2
 msgid "_About"
 msgstr "_O programu"
 
-#: ../accessx-status/applet.c:138
+#: ../accessx-status/src/applet.c:138
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr ""
 "Prikazuje stanje funkcija Pristupačnosti Iksa kao što su zadržani izmenjivači"
 
-#. about.set_artists([])
-#. about.set_documenters([])
-#. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
-#: ../accessx-status/applet.c:143 ../battstat/battstat_applet.c:1203
-#: ../charpick/charpick.c:604 ../command/command.c:120
-#: ../cpufreq/src/cpufreq-applet.c:609 ../drivemount/drivemount.c:108
-#: ../geyes/geyes.c:178 ../gweather/gweather-about.c:60
-#: ../invest-applet/invest/about.py:29 ../mini-commander/src/about.c:53
-#: ../modemlights/modem-applet.c:1000 ../multiload/main.c:62
-#: ../netspeed/src/netspeed.c:637
-#: ../stickynotes/stickynotes_applet_callbacks.c:391
-#: ../timerapplet/timerapplet.c:286 ../trashapplet/src/trashapplet.c:420
+#: ../accessx-status/src/applet.c:143 ../battstat/src/battstat_applet.c:1203
+#: ../charpick/src/charpick.c:579 ../command/src/command.c:120
+#: ../cpufreq/src/cpufreq-applet.c:606 ../drivemount/src/drivemount.c:98
+#: ../geyes/src/geyes.c:176 ../gweather/src/gweather-about.c:60
+#: ../invest-applet/invest/invest-applet.c:273 ../mini-commander/src/about.c:53
+#: ../modem-lights/src/modem-applet.c:996 ../multiload/src/main.c:62
+#: ../netspeed/src/netspeed.c:634
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:395
+#: ../timer/src/timer-applet.c:286 ../trash/src/trash-applet.c:419
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <danilo prevod org>\n"
@@ -86,53 +83,53 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../accessx-status/applet.c:170
+#: ../accessx-status/src/applet.c:170
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "Došlo je do greške pri pokretanju pregledača pomoći: %s"
 
-#: ../accessx-status/applet.c:204
+#: ../accessx-status/src/applet.c:204
 msgid "Open the universal access preferences dialog"
 msgstr "Otvara prozorče postavki univerzalnog pristupa"
 
-#: ../accessx-status/applet.c:222
+#: ../accessx-status/src/applet.c:222
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "Došlo je do greške prikazivanja prozorčeta postavki tastature: %s"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:465 ../accessx-status/applet.c:505
+#: ../accessx-status/src/applet.c:465 ../accessx-status/src/applet.c:505
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:978 ../accessx-status/applet.c:1051
-#: ../accessx-status/applet.c:1119 ../accessx-status/applet.c:1298
+#: ../accessx-status/src/applet.c:978 ../accessx-status/src/applet.c:1117
+#: ../accessx-status/src/applet.c:1296
 msgid "AccessX Status"
 msgstr "Stanje pristupačnosti Iksa"
 
-#: ../accessx-status/applet.c:979 ../accessx-status/applet.c:1120
+#: ../accessx-status/src/applet.c:979 ../accessx-status/src/applet.c:1118
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "Prikazuje stanje tastature kada se koriste funkcije pristupačnosti."
 
-#: ../accessx-status/applet.c:1014
+#: ../accessx-status/src/applet.c:1014
 msgid "XKB Extension is not enabled"
 msgstr "HKB proširenje nije uključeno"
 
-#: ../accessx-status/applet.c:1019
+#: ../accessx-status/src/applet.c:1019
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../accessx-status/applet.c:1027
+#: ../accessx-status/src/applet.c:1027
 #, c-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: ../accessx-status/applet.c:1295
+#: ../accessx-status/src/applet.c:1293
 #: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "Stanje pristupačnosti tastature"
 
-#: ../accessx-status/applet.c:1300
+#: ../accessx-status/src/applet.c:1298
 msgid "Displays current state of keyboard accessibility features"
 msgstr "Prikazuje tekuće stanje funkcija pristupačnosti tastature"
 
@@ -148,30 +145,30 @@ msgstr "Proizvodnja programčeta stanja pristupačnosti tastature"
 msgid "Shows the status of keyboard accessibility features"
 msgstr "Prikazuje stanje funkcija pristupačnosti tastature"
 
-#: ../battstat/battstat_applet.c:62
+#: ../battstat/src/battstat_applet.c:62
 msgid "System is running on AC power"
 msgstr "Sistem se napaja iz električne mreže"
 
-#: ../battstat/battstat_applet.c:63
+#: ../battstat/src/battstat_applet.c:63
 msgid "System is running on battery power"
 msgstr "Sistem se napaja iz baterije"
 
-#: ../battstat/battstat_applet.c:329
+#: ../battstat/src/battstat_applet.c:329
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "Baterija je napunjena (%d%%)"
 
-#: ../battstat/battstat_applet.c:331
+#: ../battstat/src/battstat_applet.c:331
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "Nije poznato preostalo vreme (%d%%)"
 
-#: ../battstat/battstat_applet.c:333
+#: ../battstat/src/battstat_applet.c:333
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "Nije poznato preostalo vreme punjenja (%d%%)"
 
-#: ../battstat/battstat_applet.c:338
+#: ../battstat/src/battstat_applet.c:338
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
@@ -180,7 +177,7 @@ msgstr[1] "Preostaju %d minuta (%d%%)"
 msgstr[2] "Preostaje %d minuta (%d%%)"
 msgstr[3] "Preostao je jedan minut (%d%%)"
 
-#: ../battstat/battstat_applet.c:343
+#: ../battstat/src/battstat_applet.c:343
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
@@ -189,7 +186,7 @@ msgstr[1] "%d minuta do pune baterije (%d%%)"
 msgstr[2] "%d minuta do pune baterije (%d%%)"
 msgstr[3] "Još minut do pune baterije (%d%%)"
 
-#: ../battstat/battstat_applet.c:349
+#: ../battstat/src/battstat_applet.c:349
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
@@ -198,7 +195,7 @@ msgstr[1] "Preostaju %d sata (%d%%)"
 msgstr[2] "Preostaje %d sati (%d%%)"
 msgstr[3] "Preostao je jedan sat (%d%%)"
 
-#: ../battstat/battstat_applet.c:354
+#: ../battstat/src/battstat_applet.c:354
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -209,12 +206,12 @@ msgstr[3] "Jedan sat do pune baterije (%d%%)"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:361
+#: ../battstat/src/battstat_applet.c:361
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "Preostaje %d %s i %d %s (%d%%)"
 
-#: ../battstat/battstat_applet.c:362 ../battstat/battstat_applet.c:369
+#: ../battstat/src/battstat_applet.c:362 ../battstat/src/battstat_applet.c:369
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -222,7 +219,7 @@ msgstr[1] "sata"
 msgstr[2] "sati"
 msgstr[3] "sat"
 
-#: ../battstat/battstat_applet.c:363 ../battstat/battstat_applet.c:370
+#: ../battstat/src/battstat_applet.c:363 ../battstat/src/battstat_applet.c:370
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -232,30 +229,30 @@ msgstr[3] "minut"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:368
+#: ../battstat/src/battstat_applet.c:368
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "%d %s %d %s do pune baterije (%d%%)"
 
-#: ../battstat/battstat_applet.c:382
+#: ../battstat/src/battstat_applet.c:382
 msgid "Battery Monitor"
 msgstr "Praćenje stanja baterije"
 
-#: ../battstat/battstat_applet.c:392 ../battstat/battstat_applet.c:451
+#: ../battstat/src/battstat_applet.c:392 ../battstat/src/battstat_applet.c:451
 msgid "Your battery is now fully recharged"
 msgstr "Baterija je sada u potpunosti napunjena"
 
-#: ../battstat/battstat_applet.c:428 ../battstat/battstat_applet.c:583
+#: ../battstat/src/battstat_applet.c:428 ../battstat/src/battstat_applet.c:583
 msgid "Battery Notice"
 msgstr "Obaveštenje o bateriji"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:528
+#: ../battstat/src/battstat_applet.c:528
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "Preostalo vam je ukupno %d%% od kapaciteta baterije."
 
-#: ../battstat/battstat_applet.c:534
+#: ../battstat/src/battstat_applet.c:534
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -273,7 +270,7 @@ msgstr[3] ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:546
+#: ../battstat/src/battstat_applet.c:546
 msgid ""
 "To avoid losing your work:\n"
 " • plug your laptop into external power, or\n"
@@ -286,7 +283,7 @@ msgstr ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:554
+#: ../battstat/src/battstat_applet.c:554
 msgid ""
 "To avoid losing your work:\n"
 " • suspend your laptop to save power,\n"
@@ -298,56 +295,73 @@ msgstr ""
 " • priključite ga na električnu mrežu, ili\n"
 " • sačuvajte otvorene dokumente i isključite računar."
 
-#: ../battstat/battstat_applet.c:562
+#: ../battstat/src/battstat_applet.c:562
 msgid "Your battery is running low"
 msgstr "Baterija je skoro prazna"
 
-#: ../battstat/battstat_applet.c:657
+#: ../battstat/src/battstat_applet.c:657
 msgid "No battery present"
 msgstr "Baterija nije prisutna"
 
-#: ../battstat/battstat_applet.c:660
+#: ../battstat/src/battstat_applet.c:660
 msgid "Battery status unknown"
 msgstr "Nije poznato stanje baterije"
 
-#: ../battstat/battstat_applet.c:840
+#: ../battstat/src/battstat_applet.c:840
 msgid "N/A"
 msgstr "Nedostupno"
 
-#: ../battstat/battstat_applet.c:1143 ../drivemount/drivemount.c:136
-#: ../geyes/geyes.c:334 ../geyes/themes.c:231 ../gweather/gweather-applet.c:72
-#: ../gweather/gweather-pref.c:677 ../mini-commander/src/preferences.c:259
-#: ../stickynotes/stickynotes_applet_callbacks.c:358
-#: ../stickynotes/stickynotes_applet_callbacks.c:542
-#: ../trashapplet/src/trashapplet.c:386
+#: ../battstat/src/battstat_applet.c:1143 ../drivemount/src/drivemount.c:126
+#: ../geyes/src/geyes.c:332 ../geyes/src/themes.c:231
+#: ../gweather/src/gweather-applet.c:72 ../gweather/src/gweather-pref.c:677
+#: ../mini-commander/src/preferences.c:259
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:362
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:546
+#: ../trash/src/trash-applet.c:385
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Došlo je do greške pri prikazivanju pomoći: %s"
 
-#: ../battstat/battstat_applet.c:1189
+#: ../battstat/src/battstat_applet.c:1189
 msgid "This utility shows the status of your laptop battery."
 msgstr "Ova alatka prikazuje stanje baterije vašeg prenosnog računara."
 
 #. true
-#: ../battstat/battstat_applet.c:1191
+#: ../battstat/src/battstat_applet.c:1191
 msgid "upower backend enabled."
 msgstr "Uključen je pozadinac „upower“."
 
 #. false
-#: ../battstat/battstat_applet.c:1192
+#: ../battstat/src/battstat_applet.c:1192
 msgid "Legacy (non-HAL) backend enabled."
 msgstr "Uključen je običan pozadinac (ne-HAL)."
 
-#: ../battstat/battstat_applet.c:1563 ../battstat/battstat_applet.c:1616
+#: ../battstat/src/battstat_applet.c:1614
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "Praćenje stanja baterije"
 
-#: ../battstat/battstat_applet.c:1617
+#: ../battstat/src/battstat_applet.c:1615
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "Pratite preostalo napajanje prenosnog računara"
 
+#. TRANSLATOR: this is a selectable item in a drop-down menu to end
+#. * this sentence:
+#. *   "Warn when battery charge drops to: [XX] percent".
+#.
+#: ../battstat/src/properties.c:276
+msgid "Percent"
+msgstr "Postotak"
+
+#. TRANSLATOR: this is a selectable item in a drop-down menu to end
+#. * this sentence:
+#. *   "Warn when battery charge drops to: [XX] minutes remaining"
+#.
+#: ../battstat/src/properties.c:282
+msgid "Minutes Remaining"
+msgstr "Preostalo minuta"
+
 #: ../battstat/battstat-applet-menu.xml.h:1
 #: ../charpick/charpick-applet-menu.xml.h:1
 #: ../cpufreq/cpufreq-applet-menu.xml.h:1 ../geyes/geyes-applet-menu.xml.h:1
@@ -355,7 +369,7 @@ msgstr "Pratite preostalo napajanje prenosnog računara"
 #: ../mini-commander/src/mini-commander-applet-menu.xml.h:1
 #: ../multiload/multiload-applet-menu.xml.h:2
 #: ../netspeed/data/netspeed-menu.xml.h:2
-#: ../stickynotes/stickynotes-applet-menu.xml.h:5
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:5
 #: ../windowpicker/src/wp-menu.xml.h:1
 msgid "_Preferences"
 msgstr "_Postavke"
@@ -497,22 +511,6 @@ msgstr "Prikazuje vreme/postotak napunjenosti"
 msgid "0 for no label, 1 for percentage and 2 for time remaining."
 msgstr "0 za isključivanje oznake, 1 za procenat i 2 za preostalo vreme."
 
-#. TRANSLATOR: this is a selectable item in a drop-down menu to end
-#. * this sentence:
-#. *   "Warn when battery charge drops to: [XX] percent".
-#.
-#: ../battstat/properties.c:276
-msgid "Percent"
-msgstr "Postotak"
-
-#. TRANSLATOR: this is a selectable item in a drop-down menu to end
-#. * this sentence:
-#. *   "Warn when battery charge drops to: [XX] minutes remaining"
-#.
-#: ../battstat/properties.c:282
-msgid "Minutes Remaining"
-msgstr "Preostalo minuta"
-
 #: ../battstat/sounds/battstat_applet.soundlist.in.h:1
 msgid "Battery Status Utility"
 msgstr "Alatka za stanje baterije"
@@ -525,33 +523,34 @@ msgstr "Baterija je slaba"
 msgid "Battery fully re-charged"
 msgstr "Baterija je u potpunosti napunjena"
 
-#: ../brightness/brightness-applet.c:95
+#: ../brightness/src/brightness-applet.c:92
 #: ../brightness/org.gnome.BrightnessApplet.panel-applet.in.in.h:1
 msgid "Brightness Applet"
 msgstr "Programče osvetljenosti"
 
-#: ../brightness/brightness-applet.c:96
+#: ../brightness/src/brightness-applet.c:93
 msgid "Adjusts laptop panel brightness."
 msgstr "Doterajte osvetljenost panela prenosnog računara."
 
-#: ../brightness/brightness-applet.c:213
+#: ../brightness/src/brightness-applet.c:210
 msgid "Cannot connect to gnome-settings-daemon"
 msgstr "Ne mogu da se povežem sa uslužnikom podešavanja gnoma"
 
-#: ../brightness/brightness-applet.c:215
+#: ../brightness/src/brightness-applet.c:212
 msgid "Cannot get laptop panel brightness"
 msgstr "Ne mogu da dobavim osvetljenost panela prenosnog računara"
 
-#: ../brightness/brightness-applet.c:217
+#: ../brightness/src/brightness-applet.c:214
 #, c-format
 msgid "LCD brightness : %d%%"
 msgstr "Osvetljenost LCD-a : %d%%"
 
-#: ../brightness/brightness-applet.c:649 ../inhibit/inhibit-applet.c:297
+#: ../brightness/src/brightness-applet.c:646
+#: ../inhibit/src/inhibit-applet.c:294
 msgid "Licensed under the GNU General Public License Version 2"
 msgstr "Izdato pod Gnuovom Opštom javnom licencom izdanja 2"
 
-#: ../brightness/brightness-applet.c:650
+#: ../brightness/src/brightness-applet.c:647
 msgid ""
 "Brightness Applet is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -563,7 +562,7 @@ msgstr ""
 "je objavila Zadužbina slobodnog softvera; izdanja 2 licence\n"
 "ili (po vašem izboru) bilo kojeg novijeg izdanja."
 
-#: ../brightness/brightness-applet.c:654
+#: ../brightness/src/brightness-applet.c:651
 msgid ""
 "Brightness Applet is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -575,7 +574,8 @@ msgstr ""
 "TRŽIŠNE VREDNOSTI ili PRILAGOĐENOSTI ODREĐENOJ NAMENI.\n"
 "Pogledajte Gnuovu Opštu javnu licencu za više detalja."
 
-#: ../brightness/brightness-applet.c:658 ../inhibit/inhibit-applet.c:306
+#: ../brightness/src/brightness-applet.c:655
+#: ../inhibit/src/inhibit-applet.c:303
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
@@ -587,7 +587,7 @@ msgstr ""
 "softvera na adresu: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301, USA“."
 
-#: ../brightness/brightness-applet.c:672
+#: ../brightness/src/brightness-applet.c:669
 msgid "Copyright © 2006 Benjamin Canou"
 msgstr "Autorska prava © 2006 Bendžamin Kanu"
 
@@ -595,7 +595,7 @@ msgstr "Autorska prava © 2006 Bendžamin Kanu"
 msgid "Adjusts Laptop panel brightness"
 msgstr "Doterajte osvetljenost panela prenosnog računara"
 
-#: ../charpick/charpick.c:426
+#: ../charpick/src/charpick.c:403
 msgid "Available palettes"
 msgstr "Dostupne palete"
 
@@ -603,21 +603,21 @@ msgstr "Dostupne palete"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:473
+#: ../charpick/src/charpick.c:450
 #, c-format
 msgid "Insert \"%s\""
 msgstr "Umetni „%s“"
 
-#: ../charpick/charpick.c:476
+#: ../charpick/src/charpick.c:453
 msgid "Insert special character"
 msgstr "Umetni naročiti znak"
 
-#: ../charpick/charpick.c:480
+#: ../charpick/src/charpick.c:457
 #, c-format
 msgid "insert special character %s"
 msgstr "umeće naročiti znak %s"
 
-#: ../charpick/charpick.c:599
+#: ../charpick/src/charpick.c:574
 msgid ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
@@ -625,161 +625,155 @@ msgstr ""
 "Programče Gnomovog panela za izbor čudnih znakova koji se ne nalaze na mojoj "
 "tastaturi. Objavljeno pod Gnuovom Opštom javnom licencom (GNU GPL)."
 
-#: ../charpick/charpick.c:716 ../charpick/charpick.c:731
+#: ../charpick/src/charpick.c:691 ../charpick/src/properties.c:426
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
-#: ../charpick/properties.c:426
 msgid "Character Palette"
 msgstr "Paleta znakova"
 
-#: ../charpick/charpick.c:716
+#: ../charpick/src/charpick.c:691
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "Unesite znakove"
 
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
-msgid "Charpicker Applet Factory"
-msgstr "Fabrika programčeta za izbor znakova"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:1
-msgid "Characters shown on applet startup"
-msgstr "Znakovi koji se prikazuju po pokretanju programčeta"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:2
-msgid ""
-"The string that the user had selected when the applet was last used. This "
-"string will be displayed when the user starts the applet."
-msgstr ""
-"Niska koju je izabrao korisnik pri poslednjoj upotrebi programčeta. Ova niska "
-"će biti prikazana kada korisnik pokrene programče."
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:3
-#: ../charpick/properties.c:353
-msgid "List of available palettes"
-msgstr "Spisak dostupnih paleta"
-
-#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:4
-msgid "List of strings containing the available palettes."
-msgstr "Spisak niski koje sadrže dostupne palete."
-
-#: ../charpick/properties.c:73 ../modemlights/modem-applet.c:911
-#: ../trashapplet/src/trashapplet.c:497 ../trashapplet/src/trash-empty.c:339
+#: ../charpick/src/properties.c:73
+#: ../invest-applet/invest/invest-preferences.c:324
+#: ../modem-lights/src/modem-applet.c:907 ../trash/src/trash-applet.c:496
+#: ../trash/src/trash-empty.c:341
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../charpick/properties.c:74
+#: ../charpick/src/properties.c:74
+#: ../invest-applet/invest/invest-preferences.c:325
 msgid "_OK"
 msgstr "U _redu"
 
-#: ../charpick/properties.c:93
+#: ../charpick/src/properties.c:93
 msgid "_Palette:"
 msgstr "_Paleta:"
 
-#: ../charpick/properties.c:101
+#: ../charpick/src/properties.c:101
 msgid "Palette entry"
 msgstr "Unos u paleti"
 
-#: ../charpick/properties.c:102
+#: ../charpick/src/properties.c:102
 msgid "Modify a palette by adding or removing characters"
 msgstr "Izmenite paletu dodavanjem ili uklanjanjem znakova"
 
-#: ../charpick/properties.c:214
+#: ../charpick/src/properties.c:214
 msgid "Add Palette"
 msgstr "Dodaj paletu"
 
-#: ../charpick/properties.c:251
+#: ../charpick/src/properties.c:251
 msgid "Edit Palette"
 msgstr "Uredi paletu"
 
-#: ../charpick/properties.c:352
+#: ../charpick/src/properties.c:352
 msgid "Palettes list"
 msgstr "Spisak paleta"
 
-#: ../charpick/properties.c:431
+#: ../charpick/src/properties.c:353
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:3
+msgid "List of available palettes"
+msgstr "Spisak dostupnih paleta"
+
+#: ../charpick/src/properties.c:431
 msgid "_Palettes:"
 msgstr "_Palete:"
 
-#: ../charpick/properties.c:443
+#: ../charpick/src/properties.c:443
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../charpick/properties.c:447
+#: ../charpick/src/properties.c:447
 msgid "Add button"
 msgstr "Dugme dodavanja"
 
-#: ../charpick/properties.c:448
+#: ../charpick/src/properties.c:448
 msgid "Click to add a new palette"
 msgstr "Kliknite da dodate novu paletu"
 
-#: ../charpick/properties.c:450
+#: ../charpick/src/properties.c:450
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../charpick/properties.c:455
+#: ../charpick/src/properties.c:455
 msgid "Edit button"
 msgstr "Dugme uređivanja"
 
-#: ../charpick/properties.c:456
+#: ../charpick/src/properties.c:456
 msgid "Click to edit the selected palette"
 msgstr "Kliknite da uredite izabranu paletu"
 
-#: ../charpick/properties.c:458 ../trashapplet/src/trashapplet.c:499
+#: ../charpick/src/properties.c:458 ../trash/src/trash-applet.c:498
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../charpick/properties.c:463
+#: ../charpick/src/properties.c:463
 msgid "Delete button"
 msgstr "Dugme brisanja"
 
-#: ../charpick/properties.c:464
+#: ../charpick/src/properties.c:464
 msgid "Click to delete the selected palette"
 msgstr "Kliknite da obrišete izabranu paletu"
 
-#: ../charpick/properties.c:518
+#: ../charpick/src/properties.c:518
 msgid "Character Palette Preferences"
 msgstr "Postavke palete znakova"
 
-#: ../charpick/properties.c:521 ../command/command.c:143 ../geyes/themes.c:294
-#: ../netspeed/src/preferences.c:325 ../timerapplet/timerapplet.c:324
+#: ../charpick/src/properties.c:521 ../command/src/command.c:143
+#: ../geyes/src/themes.c:294 ../netspeed/src/preferences.c:325
+#: ../timer/src/timer-applet.c:324
 #: ../windowpicker/src/wp-preferences-dialog.ui.h:2
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../command/command.c:119
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
+msgid "Charpicker Applet Factory"
+msgstr "Fabrika programčeta za izbor znakova"
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:1
+msgid "Characters shown on applet startup"
+msgstr "Znakovi koji se prikazuju po pokretanju programčeta"
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:2
+msgid ""
+"The string that the user had selected when the applet was last used. This "
+"string will be displayed when the user starts the applet."
+msgstr ""
+"Niska koju je izabrao korisnik pri poslednjoj upotrebi programčeta. Ova niska "
+"će biti prikazana kada korisnik pokrene programče."
+
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:4
+msgid "List of strings containing the available palettes."
+msgstr "Spisak niski koje sadrže dostupne palete."
+
+#: ../command/src/command.c:119
 #: ../command/org.gnome.applets.CommandApplet.panel-applet.in.in.h:3
 msgid "Shows the output of a command"
 msgstr "Prikazuje ispis naredbe"
 
-#: ../command/command.c:140
-#| msgid "Command Line Preferences"
+#: ../command/src/command.c:140
 msgid "Command Applet Preferences"
 msgstr "Postavke terminalčića"
 
-#: ../command/command.c:153
-#| msgid "Co_mmand:"
+#: ../command/src/command.c:153
 msgid "Command:"
 msgstr "Naredba:"
 
-#: ../command/command.c:165
+#: ../command/src/command.c:161
 msgid "Interval (seconds):"
 msgstr "Period (u sekundama):"
 
-#: ../command/command.c:177
+#: ../command/src/command.c:169
 msgid "Maximum width (chars):"
 msgstr "Najveća širina (znakova):"
 
-#: ../command/command.c:189
+#: ../command/src/command.c:177
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:7
-#| msgid "Show notification"
 msgid "Show icon"
 msgstr "Prikazuje ikonicu"
 
-#: ../command/command.c:340
-#| msgid "Command line"
-msgid "Command Applet"
-msgstr "Terminalčić"
-
 #: ../command/org.gnome.applets.CommandApplet.panel-applet.in.in.h:1
-#| msgid "MiniCommander Applet Factory"
 msgid "Command Factory"
 msgstr "Proizvodnja terminalčića"
 
@@ -789,7 +783,6 @@ msgid "Command"
 msgstr "Naredba"
 
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:1
-#| msgid "Command Line Preferences"
 msgid "Command to execute"
 msgstr "Naredba za izvršavanje"
 
@@ -806,7 +799,6 @@ msgid "Interval to execute the command (in seconds)"
 msgstr "Period za izvršavanje naredbe (u sekundama)"
 
 #: ../command/org.gnome.gnome-applets.command.gschema.xml.in.in.h:5
-#| msgid "Width of the applet"
 msgid "Width of output"
 msgstr "Širina ispisa"
 
@@ -851,7 +843,7 @@ msgid "Show CPU frequency as _percentage"
 msgstr "Prikaži frekvenciju procesora u _procentima"
 
 #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:943 ../cpufreq/src/cpufreq-applet.c:999
+#: ../cpufreq/src/cpufreq-applet.c:992
 msgid "CPU Frequency Scaling Monitor"
 msgstr "Praćenje promene frekvencije procesora"
 
@@ -897,19 +889,19 @@ msgstr ""
 "Vrednost „frequency“ označava prikaz učestanosti procesora, „frequency-unit“ "
 "za prikaz učestanosti i jedinica, a „percentage“ postotak umesto učestanosti."
 
-#: ../cpufreq/src/cpufreq-applet.c:576 ../cpufreq/src/cpufreq-prefs.c:360
+#: ../cpufreq/src/cpufreq-applet.c:573 ../cpufreq/src/cpufreq-prefs.c:358
 msgid "Could not open help document"
 msgstr "Ne mogu da otvorim dokument pomoći"
 
-#: ../cpufreq/src/cpufreq-applet.c:604
+#: ../cpufreq/src/cpufreq-applet.c:601
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "Ova alatka prikazuje tekuće stanje frekvencije procesora."
 
-#: ../cpufreq/src/cpufreq-applet.c:1000
+#: ../cpufreq/src/cpufreq-applet.c:993
 msgid "This utility shows the current CPU Frequency"
 msgstr "Ova alatka prikazuje tekuću frekvenciju procesora"
 
-#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:120
+#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:118
 msgid "Frequency Scaling Unsupported"
 msgstr "Nije podržana promena frekvencije"
 
@@ -929,15 +921,15 @@ msgstr ""
 "Nećete moći da izmenite frekvenciju računara.  Računar možda nije dobro "
 "podešen ili ne podržava izmenu frekvencije procesora."
 
-#: ../cpufreq/src/cpufreq-prefs.c:495
+#: ../cpufreq/src/cpufreq-prefs.c:493
 msgid "Graphic"
 msgstr "Grafik"
 
-#: ../cpufreq/src/cpufreq-prefs.c:500
+#: ../cpufreq/src/cpufreq-prefs.c:498
 msgid "Text"
 msgstr "Tekst"
 
-#: ../cpufreq/src/cpufreq-prefs.c:505
+#: ../cpufreq/src/cpufreq-prefs.c:503
 msgid "Graphic and Text"
 msgstr "Grafik i tekst"
 
@@ -949,55 +941,55 @@ msgstr "Promene frekvencije procesora"
 msgid "Privileges are required to change the CPU Frequency scaling."
 msgstr "Potrebna su ovlašćenja za promenu frekvencije procesora."
 
-#: ../drivemount/drive-button.c:324 ../drivemount/drive-button.c:337
+#: ../drivemount/src/drive-button.c:324 ../drivemount/src/drive-button.c:337
 msgid "(mounted)"
 msgstr "(priključen)"
 
-#: ../drivemount/drive-button.c:326
+#: ../drivemount/src/drive-button.c:326
 msgid "(not mounted)"
 msgstr "(nije priključen)"
 
-#: ../drivemount/drive-button.c:546
+#: ../drivemount/src/drive-button.c:546
 msgid "Cannot start Nautilus File Manager"
 msgstr "Ne mogu da pokrenem Nautilus upravnika datoteka"
 
-#: ../drivemount/drive-button.c:553
+#: ../drivemount/src/drive-button.c:553
 msgid "Could not find Nautilus"
 msgstr "Ne mogu da pronađem Nautilus"
 
-#: ../drivemount/drive-button.c:863
+#: ../drivemount/src/drive-button.c:863
 msgid "_Play DVD"
 msgstr "_Pusti DVD"
 
-#: ../drivemount/drive-button.c:867
+#: ../drivemount/src/drive-button.c:867
 msgid "_Play CD"
 msgstr "_Pusti CD"
 
-#: ../drivemount/drive-button.c:870
+#: ../drivemount/src/drive-button.c:870
 #, c-format
 msgid "_Open %s"
 msgstr "_Otvori %s"
 
-#: ../drivemount/drive-button.c:878
+#: ../drivemount/src/drive-button.c:878
 #, c-format
 msgid "Un_mount %s"
 msgstr "Is_ključi %s"
 
-#: ../drivemount/drive-button.c:884
+#: ../drivemount/src/drive-button.c:884
 #, c-format
 msgid "_Mount %s"
 msgstr "_Priključi %s"
 
-#: ../drivemount/drive-button.c:892
+#: ../drivemount/src/drive-button.c:892
 #, c-format
 msgid "_Eject %s"
 msgstr "_Izbaci %s"
 
-#: ../drivemount/drivemount.c:105
+#: ../drivemount/src/drivemount.c:95
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "Programče za priključivanje i isključivanje blok uređaja."
 
-#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:200
+#: ../drivemount/src/drivemount.c:184
 #: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "Priključenje diska"
@@ -1014,73 +1006,68 @@ msgstr "Proizvodnja programčeta za priključivanje diskova"
 msgid "Mount local disks and devices"
 msgstr "Priključite lokalne diskove i uređaje"
 
-#: ../geyes/geyes.c:173
+#: ../geyes/src/geyes.c:171
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "Šašave oči za Gnomov panel koja prate kursor miša."
 
-#: ../geyes/geyes.c:373 ../geyes/geyes.c:406 ../geyes/geyes.c:408
+#: ../geyes/src/geyes.c:401 ../geyes/src/geyes.c:403
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "Oči"
 
-#: ../geyes/geyes.c:409
+#: ../geyes/src/geyes.c:404
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "Pogledom oči verno prate kretnju miša"
 
-#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
-msgid "Geyes Applet Factory"
-msgstr "Fabrika programčeta GOči"
-
-#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
-msgid "A set of eyeballs for your panel"
-msgstr "Par očiju za vaš panel"
-
-#: ../geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in.h:1
-msgid "Directory in which the theme is located"
-msgstr "Direktorijum u kom se nalazi tema"
-
-#: ../geyes/themes.c:139
+#: ../geyes/src/themes.c:139
 msgid "Can not launch the eyes applet."
 msgstr "Ne mogu da pokrenem programče s očima."
 
-#: ../geyes/themes.c:140
+#: ../geyes/src/themes.c:140
 msgid "There was a fatal error while trying to load the theme."
 msgstr "Došlo je do kobne greške pri pokušaju učitavanja teme."
 
-#: ../geyes/themes.c:292
+#: ../geyes/src/themes.c:292
 msgid "Geyes Preferences"
 msgstr "Postavke GOčiju"
 
-#: ../geyes/themes.c:325
+#: ../geyes/src/themes.c:325
 msgid "Themes"
 msgstr "Teme"
 
-#: ../geyes/themes.c:346
+#: ../geyes/src/themes.c:346
 msgid "_Select a theme:"
 msgstr "_Izaberite temu:"
 
-#: ../gweather/gweather-about.c:55
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
+msgid "Geyes Applet Factory"
+msgstr "Fabrika programčeta GOči"
+
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
+msgid "A set of eyeballs for your panel"
+msgstr "Par očiju za vaš panel"
+
+#: ../geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in.h:1
+msgid "Directory in which the theme is located"
+msgstr "Direktorijum u kom se nalazi tema"
+
+#: ../gweather/src/gweather-about.c:55
 msgid "© 1999-2005 by S. Papadimitriou and others"
 msgstr "© 1999–2005 — S. Papadimitrou i drugi"
 
-#: ../gweather/gweather-about.c:56
+#: ../gweather/src/gweather-about.c:56
 msgid "A panel application for monitoring local weather conditions."
 msgstr "Programče panela za praćenje lokalnih vremenskih prilika."
 
-#: ../gweather/gweather-applet.c:336
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
-msgid "Weather Report"
-msgstr "Izveštaj o vremenu"
-
-#: ../gweather/gweather-applet.c:354 ../gweather/gweather-applet.c:358
+#: ../gweather/src/gweather-applet.c:351 ../gweather/src/gweather-applet.c:355
 msgid "GNOME Weather"
 msgstr "Gnom vreme"
 
-#: ../gweather/gweather-applet.c:463
+#: ../gweather/src/gweather-applet.c:460
 msgid "Weather Forecast"
 msgstr "Vremenska prognoza"
 
-#: ../gweather/gweather-applet.c:475
+#: ../gweather/src/gweather-applet.c:472
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1091,147 +1078,144 @@ msgstr ""
 "Nebo: %s\n"
 "Temperatura: %s"
 
-#: ../gweather/gweather-applet.c:529
+#: ../gweather/src/gweather-applet.c:526
 msgid "Updating..."
 msgstr "Osvežava..."
 
-#: ../gweather/gweather-applet-menu.xml.h:1
-msgid "_Details"
-msgstr "_Detalji"
+#: ../gweather/src/gweather-dialog.c:158
+msgid "Details"
+msgstr "Detalji"
 
-#: ../gweather/gweather-applet-menu.xml.h:2 ../gweather/gweather-dialog.c:160
+#: ../gweather/src/gweather-dialog.c:160
+#: ../gweather/gweather-applet-menu.xml.h:2
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../gweather/gweather-dialog.c:158
-msgid "Details"
-msgstr "Detalji"
-
-#: ../gweather/gweather-dialog.c:199
+#: ../gweather/src/gweather-dialog.c:199
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../gweather/gweather-dialog.c:207
+#: ../gweather/src/gweather-dialog.c:207
 msgid "Last update:"
 msgstr "Poslednja dopuna:"
 
-#: ../gweather/gweather-dialog.c:215
+#: ../gweather/src/gweather-dialog.c:215
 msgid "Conditions:"
 msgstr "Uslovi:"
 
-#: ../gweather/gweather-dialog.c:223
+#: ../gweather/src/gweather-dialog.c:223
 msgid "Sky:"
 msgstr "Nebo:"
 
-#: ../gweather/gweather-dialog.c:231
+#: ../gweather/src/gweather-dialog.c:231
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: ../gweather/gweather-dialog.c:239
+#: ../gweather/src/gweather-dialog.c:239
 msgid "Feels like:"
 msgstr "Oseća se kao:"
 
-#: ../gweather/gweather-dialog.c:247
+#: ../gweather/src/gweather-dialog.c:247
 msgid "Dew point:"
 msgstr "Tačka rose:"
 
-#: ../gweather/gweather-dialog.c:255
+#: ../gweather/src/gweather-dialog.c:255
 msgid "Relative humidity:"
 msgstr "Relativna vlažnost:"
 
-#: ../gweather/gweather-dialog.c:263
+#: ../gweather/src/gweather-dialog.c:263
 msgid "Wind:"
 msgstr "Vetar:"
 
-#: ../gweather/gweather-dialog.c:271
+#: ../gweather/src/gweather-dialog.c:271
 msgid "Pressure:"
 msgstr "Pritisak:"
 
-#: ../gweather/gweather-dialog.c:279
+#: ../gweather/src/gweather-dialog.c:279
 msgid "Visibility:"
 msgstr "Vidljivost:"
 
-#: ../gweather/gweather-dialog.c:287
+#: ../gweather/src/gweather-dialog.c:287
 msgid "Sunrise:"
 msgstr "Zora:"
 
-#: ../gweather/gweather-dialog.c:295
+#: ../gweather/src/gweather-dialog.c:295
 msgid "Sunset:"
 msgstr "Zalazak:"
 
-#: ../gweather/gweather-dialog.c:429
+#: ../gweather/src/gweather-dialog.c:429
 msgid "Current Conditions"
 msgstr "Tekuće prilike"
 
-#: ../gweather/gweather-dialog.c:444
+#: ../gweather/src/gweather-dialog.c:444
 msgid "Forecast Report"
 msgstr "Vremenska prognoza"
 
-#: ../gweather/gweather-dialog.c:444
+#: ../gweather/src/gweather-dialog.c:444
 msgid "See the ForeCast Details"
 msgstr "Pogledajte detaljnu prognozu"
 
-#: ../gweather/gweather-dialog.c:454
+#: ../gweather/src/gweather-dialog.c:454
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../gweather/gweather-dialog.c:460
+#: ../gweather/src/gweather-dialog.c:460
 msgid "Radar Map"
 msgstr "Radarska mapa"
 
 #. XXX: weather.com? is this an advert?
-#: ../gweather/gweather-dialog.c:492
+#: ../gweather/src/gweather-dialog.c:492
 msgid "_Visit Weather.com"
 msgstr "_Poseti „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:493
+#: ../gweather/src/gweather-dialog.c:493
 msgid "Visit Weather.com"
 msgstr "Posetite „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:493
+#: ../gweather/src/gweather-dialog.c:493
 msgid "Click to Enter Weather.com"
 msgstr "Kliknite da posetite „Weather.com“"
 
-#: ../gweather/gweather-dialog.c:571
+#: ../gweather/src/gweather-dialog.c:571
 msgid "Forecast not currently available for this location."
 msgstr "Prognoza nije trenutno dostupna za ovo mesto."
 
 #. Accessible Name and Description for the components in Preference Dialog
-#: ../gweather/gweather-pref.c:135
+#: ../gweather/src/gweather-pref.c:135
 msgid "Location view"
 msgstr "Pregled prema mestu"
 
-#: ../gweather/gweather-pref.c:135
+#: ../gweather/src/gweather-pref.c:135
 msgid "Select Location from the list"
 msgstr "Izaberite mesto iz spiska"
 
-#: ../gweather/gweather-pref.c:136
+#: ../gweather/src/gweather-pref.c:136
 msgid "Update spin button"
 msgstr "Osveži vrteće dugme"
 
-#: ../gweather/gweather-pref.c:136
+#: ../gweather/src/gweather-pref.c:136
 msgid "Spinbutton for updating"
 msgstr "Vrteće dugme za osvežavanje"
 
-#: ../gweather/gweather-pref.c:137
+#: ../gweather/src/gweather-pref.c:137
 msgid "Address Entry"
 msgstr "Unos adrese"
 
-#: ../gweather/gweather-pref.c:137
+#: ../gweather/src/gweather-pref.c:137
 msgid "Enter the URL"
 msgstr "Unesite adresu"
 
-#: ../gweather/gweather-pref.c:372
+#: ../gweather/src/gweather-pref.c:372
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr ""
 "Nije uspelo učitavanje IksML baze sa mestima.  Prijavite ovo kao grešku."
 
-#: ../gweather/gweather-pref.c:736
+#: ../gweather/src/gweather-pref.c:736
 msgid "Weather Preferences"
 msgstr "Postavke vremena"
 
-#: ../gweather/gweather-pref.c:767 ../gweather/gweather-pref.c:932
+#: ../gweather/src/gweather-pref.c:767 ../gweather/src/gweather-pref.c:932
 msgid "_Automatically update every:"
 msgstr "_Samostalno osveži svakih:"
 
@@ -1239,160 +1223,165 @@ msgstr "_Samostalno osveži svakih:"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:778
+#: ../gweather/src/gweather-pref.c:778
 msgid "_Temperature unit:"
 msgstr "_Jedinica temperature:"
 
 #. Default means device with default route set
-#: ../gweather/gweather-pref.c:787 ../gweather/gweather-pref.c:804
-#: ../gweather/gweather-pref.c:827 ../gweather/gweather-pref.c:852
+#: ../gweather/src/gweather-pref.c:787 ../gweather/src/gweather-pref.c:804
+#: ../gweather/src/gweather-pref.c:827 ../gweather/src/gweather-pref.c:852
 #: ../netspeed/src/preferences.c:162
 msgid "Default"
 msgstr "Osnovna"
 
-#: ../gweather/gweather-pref.c:788
+#: ../gweather/src/gweather-pref.c:788
 msgid "Kelvin"
 msgstr "Kelvini"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:790
+#: ../gweather/src/gweather-pref.c:790
 msgid "Celsius"
 msgstr "Celzijusi"
 
-#: ../gweather/gweather-pref.c:791
+#: ../gweather/src/gweather-pref.c:791
 msgid "Fahrenheit"
 msgstr "Farenhajti"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:795
+#: ../gweather/src/gweather-pref.c:795
 msgid "_Wind speed unit:"
 msgstr "Jedinica _brzine vetra:"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:806
+#: ../gweather/src/gweather-pref.c:806
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:808
+#: ../gweather/src/gweather-pref.c:808
 msgid "km/h"
 msgstr "km/č"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:810
+#: ../gweather/src/gweather-pref.c:810
 msgid "mph"
 msgstr "milja/č"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:812
+#: ../gweather/src/gweather-pref.c:812
 msgid "knots"
 msgstr "čvorova"
 
-#: ../gweather/gweather-pref.c:814
+#: ../gweather/src/gweather-pref.c:814
 msgid "Beaufort scale"
 msgstr "Boforova skala"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:818
+#: ../gweather/src/gweather-pref.c:818
 msgid "_Pressure unit:"
 msgstr "Jedinica _pritiska:"
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:829
+#: ../gweather/src/gweather-pref.c:829
 msgid "kPa"
 msgstr "kPa"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:831
+#: ../gweather/src/gweather-pref.c:831
 msgid "hPa"
 msgstr "hPa"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:833
+#: ../gweather/src/gweather-pref.c:833
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:835
+#: ../gweather/src/gweather-pref.c:835
 msgid "mmHg"
 msgstr "mmHg"
 
 # Kod nas treba mmHg
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:837
+#: ../gweather/src/gweather-pref.c:837
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:839
+#: ../gweather/src/gweather-pref.c:839
 msgid "atm"
 msgstr "atmosfera"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:843
+#: ../gweather/src/gweather-pref.c:843
 msgid "_Visibility unit:"
 msgstr "Jedinica _vidljivosti:"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:854
+#: ../gweather/src/gweather-pref.c:854
 msgid "meters"
 msgstr "metara"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:856
+#: ../gweather/src/gweather-pref.c:856
 msgid "km"
 msgstr "km"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:858
+#: ../gweather/src/gweather-pref.c:858
 msgid "miles"
 msgstr "milja"
 
-#: ../gweather/gweather-pref.c:889
+#: ../gweather/src/gweather-pref.c:889
 msgid "Enable _radar map"
 msgstr "Uključi _radarsku mapu"
 
-#: ../gweather/gweather-pref.c:901
+#: ../gweather/src/gweather-pref.c:901
 msgid "Use _custom address for radar map"
 msgstr "Koristi proizvoljnu _adresu za radarsku mapu"
 
-#: ../gweather/gweather-pref.c:916
+#: ../gweather/src/gweather-pref.c:916
 msgid "A_ddress:"
 msgstr "A_dresa:"
 
-#: ../gweather/gweather-pref.c:928
+#: ../gweather/src/gweather-pref.c:928
 msgid "Update"
 msgstr "Osveži"
 
 # bug:plural-forms
-#: ../gweather/gweather-pref.c:952
+#: ../gweather/src/gweather-pref.c:952
 msgid "minutes"
 msgstr "minuta"
 
-#: ../gweather/gweather-pref.c:964
+#: ../gweather/src/gweather-pref.c:964
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../gweather/gweather-pref.c:979 ../mini-commander/src/mini-commander.ui.h:12
+#: ../gweather/src/gweather-pref.c:979
+#: ../mini-commander/src/mini-commander.ui.h:12
 msgid "General"
 msgstr "Opšte"
 
-#: ../gweather/gweather-pref.c:992
+#: ../gweather/src/gweather-pref.c:992
 msgid "_Select a location:"
 msgstr "Izaberite _mesto:"
 
-#: ../gweather/gweather-pref.c:1017
+#: ../gweather/src/gweather-pref.c:1017
 msgid "_Find:"
 msgstr "_Nađi:"
 
-#: ../gweather/gweather-pref.c:1024
+#: ../gweather/src/gweather-pref.c:1024
 msgid "Find _Next"
 msgstr "Nađi _sledeće"
 
-#: ../gweather/gweather-pref.c:1042
+#: ../gweather/src/gweather-pref.c:1042
 msgid "Location"
 msgstr "Mesto"
 
+#: ../gweather/gweather-applet-menu.xml.h:1
+msgid "_Details"
+msgstr "_Detalji"
+
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
 msgid "Gweather Applet Factory"
 msgstr "Fabrika programčeta Gprognoze"
@@ -1401,6 +1390,10 @@ msgstr "Fabrika programčeta Gprognoze"
 msgid "Factory for creating the weather applet."
 msgstr "Fabrika za pravljenje programčeta za vreme."
 
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
+msgid "Weather Report"
+msgstr "Izveštaj o vremenu"
+
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
 msgid "Monitor the current weather conditions, and forecasts"
 msgstr "Praćenje trenutnih vremenskih prilika i vremenske prognoze"
@@ -1449,32 +1442,32 @@ msgid "If true, additional details about weather will be downloaded and shown."
 msgstr ""
 "Ako je izabrano, dodatne pojedinosti o vremenu će biti skinute i prikazane."
 
-#: ../inhibit/inhibit-applet.c:85
+#: ../inhibit/src/inhibit-applet.c:82
 #: ../inhibit/org.gnome.InhibitApplet.panel-applet.in.in.h:1
 msgid "Inhibit Applet"
 msgstr "Programče sprečavanja"
 
-#: ../inhibit/inhibit-applet.c:86
+#: ../inhibit/src/inhibit-applet.c:83
 msgid "Allows user to inhibit automatic power saving."
 msgstr "Omogućava korisnicima da spreče samostalno čuvanje energije."
 
-#: ../inhibit/inhibit-applet.c:233
+#: ../inhibit/src/inhibit-applet.c:230
 msgid "Cannot connect to gnome-session"
 msgstr "Ne mogu da se povežem sa gnomovom sesijom"
 
-#: ../inhibit/inhibit-applet.c:236
+#: ../inhibit/src/inhibit-applet.c:233
 msgid "Automatic sleep inhibited"
 msgstr "Samostalno spavanje je sprečeno"
 
-#: ../inhibit/inhibit-applet.c:238
+#: ../inhibit/src/inhibit-applet.c:235
 msgid "Automatic sleep enabled"
 msgstr "Samostalno spavanje je uključeno"
 
-#: ../inhibit/inhibit-applet.c:266
+#: ../inhibit/src/inhibit-applet.c:263
 msgid "Manual inhibit"
 msgstr "Ručno spreči"
 
-#: ../inhibit/inhibit-applet.c:298
+#: ../inhibit/src/inhibit-applet.c:295
 msgid ""
 "Inhibit Applet is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -1486,7 +1479,7 @@ msgstr ""
 "je objavila Zadužbina slobodnog softvera; izdanja 2 licence\n"
 "ili (po vašem izboru) bilo kojeg novijeg izdanja."
 
-#: ../inhibit/inhibit-applet.c:302
+#: ../inhibit/src/inhibit-applet.c:299
 msgid ""
 "Inhibit Applet is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -1498,7 +1491,7 @@ msgstr ""
 "TRŽIŠNE VREDNOSTI ili PRILAGOĐENOSTI ODREĐENOJ NAMENI.\n"
 "Pogledajte Gnuovu Opštu javnu licencu za više detalja."
 
-#: ../inhibit/inhibit-applet.c:320
+#: ../inhibit/src/inhibit-applet.c:317
 msgid "Copyright © 2006-2007 Richard Hughes"
 msgstr "Autorska prava © 2006-2007 Ričard Hjudžis"
 
@@ -1507,7 +1500,7 @@ msgid "Allows user to inhibit automatic power saving"
 msgstr "Omogućava korisnicima da spreče samostalno čuvanje energije"
 
 #: ../invest-applet/data/financialchart.ui.h:1
-#: ../invest-applet/invest/chart.py:108
+#: ../invest-applet/invest/invest-chart.c:358
 msgid "Financial Chart"
 msgstr "Finansijski grafikon"
 
@@ -1719,15 +1712,32 @@ msgid "Factory for creating the invest applet."
 msgstr "Fabrika za pravljenje programčeta ulaganja."
 
 #: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3
-#: ../invest-applet/invest/about.py:17
+#: ../invest-applet/invest/invest-applet.c:271
 msgid "Invest"
 msgstr "Ulaganja"
 
 #: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4
-#: ../invest-applet/invest/about.py:20
+#: ../invest-applet/invest/invest-applet.c:268
 msgid "Track your invested money."
 msgstr "Pratite vaš uložen novac."
 
+# Da nije ovo nešto kao kursna lista???
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:1
+#: ../invest-applet/data/prefs-dialog.ui.h:12
+msgid "Currency"
+msgstr "Promet"
+
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:2
+#: ../invest-applet/data/prefs-dialog.ui.h:9
+msgid "Hide charts in quotes list"
+msgstr "Sakrij grafike na spisku akcija"
+
+#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to 
also show the quotes of the stocks an index is based on.
+#: ../invest-applet/data/org.gnome.gnome-applets.invest.gschema.xml.in.in.h:3
+#: ../invest-applet/data/prefs-dialog.ui.h:7
+msgid "Show stocks of index values"
+msgstr "Prikaži berze vrednosti indeksa"
+
 #: ../invest-applet/data/prefs-dialog.ui.h:1
 msgid "Invest Preferences"
 msgstr "Postavke za ulaganja"
@@ -1746,11 +1756,6 @@ msgctxt " "
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to 
also show the quotes of the stocks an index is based on.
-#: ../invest-applet/data/prefs-dialog.ui.h:7
-msgid "Show stocks of index values"
-msgstr "Prikaži berze vrednosti indeksa"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:8
 msgid ""
 "An index value, for instance the <i>NASDAQ Composite</i> (^IXIC), is based "
@@ -1761,10 +1766,6 @@ msgstr ""
 "broju berzi. Ova opcija omogućava takođe prikazivanje akcija <i><b>berze</b></"
 "i> na kojima se zasniva indeks."
 
-#: ../invest-applet/data/prefs-dialog.ui.h:9
-msgid "Hide charts in quotes list"
-msgstr "Sakrij grafike na spisku akcija"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:10
 msgid ""
 "A small chart image is shown next to each quote. The retrieval of each chart "
@@ -1783,27 +1784,21 @@ msgstr ""
 "<i><small><b>Izvor:</b> <a href=\"http://finance.yahoo.com/\";>Jahu! "
 "Finansije</a> (sa najmanje 15 minuta kašnjenja)</small></i>"
 
-# Da nije ovo nešto kao kursna lista???
-#: ../invest-applet/data/prefs-dialog.ui.h:12
-msgid "Currency"
-msgstr "Promet"
-
 #: ../invest-applet/data/prefs-dialog.ui.h:13
 msgid ""
 "Type the target currency to which all stock quotes will be converted to."
 msgstr ""
 "Upišite ciljnu novčanu jedinicu u kojoj će biti pretvorene sve akcije berze."
 
-#. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:70
+#: ../invest-applet/invest/invest-applet.c:368
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>Još uvek niste uneli podatke o berzi</b>"
 
-#: ../invest-applet/invest/applet.py:75
+#: ../invest-applet/invest/invest-applet.c:384
 msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>Trenutno nisu dostupna stanja na berzi</b>"
 
-#: ../invest-applet/invest/applet.py:76
+#: ../invest-applet/invest/invest-applet.c:385
 msgid ""
 "The server could not be contacted. The computer is either offline or the "
 "servers are down. Try again later."
@@ -1811,114 +1806,124 @@ msgstr ""
 "Ne mogu da se povežem na ovaj server. Ili računar radi van mreže ili su "
 "serveri ugašeni. Probajte ponovo kasnije."
 
-#: ../invest-applet/invest/chart.py:157
-#, python-format
+#: ../invest-applet/invest/invest-chart.c:129
+msgid "Chart downloaded"
+msgstr "Grafikon je preuzet"
+
+#: ../invest-applet/invest/invest-chart.c:139
+msgid "Chart could not be downloaded"
+msgstr "Ne mogu da preuzmen grafikon"
+
+#: ../invest-applet/invest/invest-chart.c:242
+#, c-format
 msgid "Financial Chart - %s"
 msgstr "Finansijski grafikon — %s"
 
-#: ../invest-applet/invest/chart.py:224
+#: ../invest-applet/invest/invest-chart.c:281
 msgid "Opening Chart"
 msgstr "Otvara grafikon"
 
-#: ../invest-applet/invest/chart.py:239
-msgid "Chart downloaded"
-msgstr "Grafikon je preuzet"
+#: ../invest-applet/invest/invest-preferences.c:229
+msgid "Stock Group"
+msgstr "Grupa berze"
 
-#: ../invest-applet/invest/chart.py:241
-msgid "Chart could not be downloaded"
-msgstr "Ne mogu da preuzmen grafikon"
+#. Translators: Asks the user to confirm deletion of a group of stocks
+#: ../invest-applet/invest/invest-preferences.c:322
+msgid "Delete entire stock group?"
+msgstr "Da obrišem celu grupu berze?"
+
+#. Translators: stocks can be grouped together into a "stock group".
+#. * The user wants to delete a group, but the group still contains
+#. * stocks. By deleting the group, also all stocks will be removed
+#. * from configuration.
+#.
+#: ../invest-applet/invest/invest-preferences.c:339
+msgid ""
+"This removes all stocks contained in this stock group!\n"
+"Do you really want to remove this stock group?"
+msgstr ""
+"Ovo će ukloniti sve berze koje se nalaze u ovoj grupi!\n"
+"Da li zaista želite da uklonite ovu grupu berzi?"
+
+# Da nije ovo nešto kao kursna lista?
+#: ../invest-applet/invest/invest-preferences.c:554
+msgid "Currency Rate"
+msgstr "Prometna stopa"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:749
 msgid "Symbol"
 msgstr "Simbol"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:750
 msgid "Label"
 msgstr "Naziv"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:751
 msgid "Amount"
 msgstr "Iznos"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:752
 msgid "Price"
 msgstr "Cena"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/invest-preferences.c:753
 msgid "Commission"
 msgstr "Provizija"
 
-# Da nije ovo nešto kao kursna lista?
-#: ../invest-applet/invest/preferences.py:44
-msgid "Currency Rate"
-msgstr "Prometna stopa"
-
-#: ../invest-applet/invest/preferences.py:246
-msgid "Stock Group"
-msgstr "Grupa berze"
-
-#. translators: Asks the user to confirm deletion of a group of stocks
-#: ../invest-applet/invest/preferences.py:271
-msgid "Delete entire stock group?"
-msgstr "Da obrišem celu grupu berze?"
+#. Translators: This is share-market jargon. It is the average
+#. * percentage change of all stock prices. The %s gets replaced
+#. * with the string value of the change (localized), including
+#. * the percent sign.
+#.
+#: ../invest-applet/invest/invest-quotes.c:179
+#, c-format
+#| msgid "Average change: %s"
+msgid "Average change: %+.2f%%"
+msgstr "Srednja promena: %+.2f%%"
+
+#. Translators: This is share-market jargon. It refers to the total
+#. * difference between the current price and purchase price for all
+#. * the shares put together for a particular currency. i.e. How much
+#. * money would be earned if they were sold right now. The first string
+#. * is the change value, the second the currency, and the third value
+#. * is the percentage of the change, formatted using user's locale.
+#.
+#: ../invest-applet/invest/invest-quotes.c:202
+#, c-format
+#| msgid "Positions balance: %s %s (%s)"
+msgid "Positions balance: %'+.2f %s (%'+.2f%%)"
+msgstr "Balans položaja: %'+.2f %s (%'+.2f%%)"
 
-#. translators: stocks can be grouped together into a "stock group".
-#. The user wants to delete a group, but the group still contains stocks.
-#. By deleting the group, also all stocks will be removed from configuration
-#: ../invest-applet/invest/preferences.py:279
-msgid ""
-"This removes all stocks contained in this stock group!\n"
-"Do you really want to remove this stock group?"
-msgstr ""
-"Ovo će ukloniti sve berze koje se nalaze u ovoj grupi!\n"
-"Da li zaista želite da uklonite ovu grupu berzi?"
+#: ../invest-applet/invest/invest-quotes.c:209
+#, c-format
+msgid "Updated at %s"
+msgstr "Ažurirano %s"
 
-#: ../invest-applet/invest/quotes.py:286
+#: ../invest-applet/invest/invest-quotes.c:1131
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "Ne mogu da se povežem na Jahuove finansije"
 
-#. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s 
gets replaced with the string value of the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:329
-#, python-format
-msgid "Average change: %s"
-msgstr "Srednja promena: %s"
-
-#. Translators: This is share-market jargon. It refers to the total difference between the current price and 
purchase price for all the shares put together for a particular currency. i.e. How much money would be earned 
if they were sold right now. The first string is the change value, the second the currency, and the third 
value is the percentage of the change, formatted using user's locale.
-#: ../invest-applet/invest/quotes.py:338
-#, python-format
-msgid "Positions balance: %s %s (%s)"
-msgstr "Balans pozicije: %s %s (%s)"
-
-#: ../invest-applet/invest/quotes.py:340
-#, python-format
-msgid "Updated at %s"
-msgstr "Ažurirano %s"
-
-#. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB
-#. Translators: these words all refer to a stock. Last is short
-#. for "last price". Gain is referring to the gain since the
-#. stock was purchased.
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:255
 msgid "Ticker"
 msgstr "Tiker"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:306
 msgid "Last"
 msgstr "Zadnja"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:356
 msgid "Change %"
 msgstr "Promena %"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:376
 msgid "Chart"
 msgstr "Grafikon"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:434
 msgid "Gain"
 msgstr "Dobit"
 
-#: ../invest-applet/invest/widgets.py:49
+#: ../invest-applet/invest/invest-widget.c:493
 msgid "Gain %"
 msgstr "Dobit %"
 
@@ -1969,17 +1974,11 @@ msgstr "Pritisnite ovo dugme da vidite spisak prethodnih naredbi"
 msgid "Command line has been disabled by your system administrator"
 msgstr "Liniju za unos naredbe je isključio administrator vašeg sistema"
 
-# Komanda!
-#: ../mini-commander/src/mini-commander_applet.c:363
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
-msgid "Command Line"
-msgstr "Naredba"
-
-#: ../mini-commander/src/mini-commander_applet.c:411
+#: ../mini-commander/src/mini-commander_applet.c:407
 msgid "Mini-Commander applet"
 msgstr "Programče Mali-narednik"
 
-#: ../mini-commander/src/mini-commander_applet.c:412
+#: ../mini-commander/src/mini-commander_applet.c:408
 msgid "This applet adds a command line to the panel"
 msgstr "Ovo programče dodaje polje za izdavanje naredbi na panel"
 
@@ -2000,15 +1999,17 @@ msgid "Size"
 msgstr "Veličina"
 
 #: ../mini-commander/src/mini-commander.ui.h:5
-#: ../stickynotes/stickynotes-preferences.ui.h:3
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:3
 msgid "_Width:"
 msgstr "_Širina:"
 
-#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:476
+#: ../mini-commander/src/mini-commander.ui.h:6
+#: ../multiload/src/properties.c:476
 msgid "pixels"
 msgstr "piksela"
 
-#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:521
+#: ../mini-commander/src/mini-commander.ui.h:7
+#: ../multiload/src/properties.c:521
 msgid "Colors"
 msgstr "Boje"
 
@@ -2060,6 +2061,11 @@ msgstr "_Naredba:"
 msgid "MiniCommander Applet Factory"
 msgstr "Proizvodnja terminalčića"
 
+# Komanda!
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
+msgid "Command Line"
+msgstr "Naredba"
+
 #: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
 msgid "Mini-Commander"
 msgstr "Terminalčić"
@@ -2156,25 +2162,20 @@ msgstr "Ne možete dvostruko navesti iste obrasce"
 msgid "Pattern"
 msgstr "Obrazac"
 
-#: ../modemlights/modem-applet.c:161
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
-msgid "Modem Monitor"
-msgstr "Praćenje modema"
-
-#: ../modemlights/modem-applet.c:671
+#: ../modem-lights/src/modem-applet.c:667
 msgid "Connection active, but could not get connection time"
 msgstr "Veza je uspostavljena, ali ne mogu da saznam njeno trajanje"
 
-#: ../modemlights/modem-applet.c:687
+#: ../modem-lights/src/modem-applet.c:683
 #, c-format
 msgid "Time connected: %.1d:%.2d"
 msgstr "Trajanje veze: %.1d:%.2d"
 
-#: ../modemlights/modem-applet.c:691
+#: ../modem-lights/src/modem-applet.c:687
 msgid "Not connected"
 msgstr "Nepovezan"
 
-#: ../modemlights/modem-applet.c:713
+#: ../modem-lights/src/modem-applet.c:709
 msgid ""
 "To connect to your Internet service provider, you need administrator "
 "privileges"
@@ -2182,7 +2183,7 @@ msgstr ""
 "Da se povežete na vašeg dobavljača Internet usluga, trebaju vam "
 "administratorska ovlašćenja"
 
-#: ../modemlights/modem-applet.c:714
+#: ../modem-lights/src/modem-applet.c:710
 msgid ""
 "To disconnect from your Internet service provider, you need administrator "
 "privileges"
@@ -2190,11 +2191,11 @@ msgstr ""
 "Da prekinete vezu sa vašim dobavljačem Internet usluga, trebaju vam "
 "administratorska ovlašćenja"
 
-#: ../modemlights/modem-applet.c:789
+#: ../modem-lights/src/modem-applet.c:785
 msgid "The entered password is invalid"
 msgstr "Uneta lozinka je neispravna"
 
-#: ../modemlights/modem-applet.c:791
+#: ../modem-lights/src/modem-applet.c:787
 msgid ""
 "Check that you have typed it correctly and that you haven't activated the "
 "\"caps lock\" key"
@@ -2202,27 +2203,27 @@ msgstr ""
 "Proverite da li ste je ispravno uneli i da niste pritisnuli „Caps Lock“ "
 "taster"
 
-#: ../modemlights/modem-applet.c:902
+#: ../modem-lights/src/modem-applet.c:898
 msgid "Do you want to connect?"
 msgstr "Želite da uspostavite vezu?"
 
-#: ../modemlights/modem-applet.c:903
+#: ../modem-lights/src/modem-applet.c:899
 msgid "Do you want to disconnect?"
 msgstr "Želite da prekinete vezu?"
 
-#: ../modemlights/modem-applet.c:912
+#: ../modem-lights/src/modem-applet.c:908
 msgid "C_onnect"
 msgstr "P_oveži se"
 
-#: ../modemlights/modem-applet.c:912
+#: ../modem-lights/src/modem-applet.c:908
 msgid "_Disconnect"
 msgstr "_Prekini vezu"
 
-#: ../modemlights/modem-applet.c:971
+#: ../modem-lights/src/modem-applet.c:967
 msgid "Could not launch network configuration tool"
 msgstr "Ne mogu da pokrenem alat za podešavanje mreže"
 
-#: ../modemlights/modem-applet.c:973
+#: ../modem-lights/src/modem-applet.c:969
 msgid ""
 "Check that it's installed in the correct path and that it has the correct "
 "permissions"
@@ -2230,44 +2231,48 @@ msgstr ""
 "Proverite da li je instaliran na ispravnom mestu i da ima odgovarajuća "
 "ovlašćenja"
 
-#: ../modemlights/modem-applet.c:997
+#: ../modem-lights/src/modem-applet.c:993
 msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "Programče za povezivanje i praćenje modemske mrežne veze."
 
-#: ../modemlights/modem-applet-menu.xml.h:1
+#: ../modem-lights/modem-applet-menu.xml.h:1
 msgid "_Activate"
 msgstr "_Uspostavi"
 
-#: ../modemlights/modem-applet-menu.xml.h:2
+#: ../modem-lights/modem-applet-menu.xml.h:2
 msgid "_Deactivate"
 msgstr "Pre_kini"
 
-#: ../modemlights/modem-applet-menu.xml.h:3
-#: ../stickynotes/stickynotes-note-menu.xml.h:4
+#: ../modem-lights/modem-applet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:4
 msgid "_Properties"
 msgstr "Oso_bine"
 
-#: ../modemlights/modemlights.ui.h:1
+#: ../modem-lights/modemlights.ui.h:1
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: ../modemlights/modemlights.ui.h:2
+#: ../modem-lights/modemlights.ui.h:2
 msgid "Root password required"
 msgstr "Potrebna je administratorska lozinka"
 
-#: ../modemlights/modemlights.ui.h:3
+#: ../modem-lights/modemlights.ui.h:3
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../modemlights/modemlights.ui.h:4
+#: ../modem-lights/modemlights.ui.h:4
 msgid "Connecting with Internet Service Provider"
 msgstr "Povezujem se sa prodavcem Internet usluga"
 
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
+#: ../modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
+msgid "Modem Monitor"
+msgstr "Praćenje modema"
+
+#: ../modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
 msgid "Activate and monitor a dial-up network connection"
 msgstr "Pokreni i prati modemsku mrežnu vezu"
 
-#: ../multiload/main.c:57
+#: ../multiload/src/main.c:57
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
@@ -2275,43 +2280,43 @@ msgstr ""
 "Praćenje opterećenja sistema omogućava prikaz grafika za procesor, memoriju, i "
 "memoriju na disku, a uz to i mrežni saobraćaj."
 
-#: ../multiload/main.c:131
+#: ../multiload/src/main.c:131
 msgid "Start system-monitor"
 msgstr "Pokreće praćenje sistema"
 
-#: ../multiload/main.c:152
+#: ../multiload/src/main.c:152
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "Došlo je do greške pri izvršavanju „%s“: %s"
 
-#: ../multiload/main.c:275 ../multiload/properties.c:546
+#: ../multiload/src/main.c:275 ../multiload/src/properties.c:546
 msgid "Processor"
 msgstr "Procesor"
 
-#: ../multiload/main.c:277 ../multiload/properties.c:554
+#: ../multiload/src/main.c:277 ../multiload/src/properties.c:554
 msgid "Memory"
 msgstr "Memorija"
 
-#: ../multiload/main.c:279 ../multiload/properties.c:562
+#: ../multiload/src/main.c:279 ../multiload/src/properties.c:562
 msgid "Network"
 msgstr "Mreža"
 
-#: ../multiload/main.c:281 ../multiload/properties.c:569
+#: ../multiload/src/main.c:281 ../multiload/src/properties.c:569
 msgid "Swap Space"
 msgstr "Zamenska memorija"
 
-#: ../multiload/main.c:283 ../multiload/main.c:362
+#: ../multiload/src/main.c:283 ../multiload/src/main.c:362
 msgid "Load Average"
 msgstr "Prosečno opterećenje"
 
-#: ../multiload/main.c:285
+#: ../multiload/src/main.c:285
 msgid "Disk"
 msgstr "Disk"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:301
+#: ../multiload/src/main.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -2322,13 +2327,13 @@ msgstr ""
 "%u%% upotrebljavaju programi\n"
 "%u%% je u upotrebi kao ostava"
 
-#: ../multiload/main.c:309
+#: ../multiload/src/main.c:309
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "Prosečno opterećenje sistema je %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:317
+#: ../multiload/src/main.c:317
 #, c-format
 msgid ""
 "%s:\n"
@@ -2339,7 +2344,7 @@ msgstr ""
 "Prima %s\n"
 "Šalje %s"
 
-#: ../multiload/main.c:333
+#: ../multiload/src/main.c:333
 #, c-format
 msgid ""
 "%s:\n"
@@ -2360,40 +2365,172 @@ msgstr[3] ""
 "%s:\n"
 "%u%% u upotrebi"
 
-#: ../multiload/main.c:358
+#: ../multiload/src/main.c:358
 msgid "CPU Load"
 msgstr "Opterećenje procesora"
 
-#: ../multiload/main.c:359
+#: ../multiload/src/main.c:359
 msgid "Memory Load"
 msgstr "Opterećenje memorije"
 
 # bug: Ili je ovo "net" kao "ukupno"?
-#: ../multiload/main.c:360
+#: ../multiload/src/main.c:360
 msgid "Net Load"
 msgstr "Opterećenje mreže"
 
-#: ../multiload/main.c:361
+#: ../multiload/src/main.c:361
 msgid "Swap Load"
 msgstr "Opterećenje memorije na disku"
 
-#: ../multiload/main.c:363
+#: ../multiload/src/main.c:363
 msgid "Disk Load"
 msgstr "Opterećenje diska"
 
-#: ../multiload/main.c:473
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
-msgid "System Monitor"
-msgstr "Praćenje sistema"
+#: ../multiload/src/netspeed.c:40
+#, c-format
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../multiload/src/properties.c:308
+msgid "Monitored Resources"
+msgstr "Praćeni resursi"
+
+#: ../multiload/src/properties.c:333
+msgid "_Processor"
+msgstr "_Procesor"
+
+#: ../multiload/src/properties.c:346
+msgid "_Memory"
+msgstr "_Memorija"
+
+#: ../multiload/src/properties.c:359
+msgid "_Network"
+msgstr "M_reža"
+
+#: ../multiload/src/properties.c:372
+msgid "S_wap Space"
+msgstr "_Zamena za memoriju (swap)"
+
+#: ../multiload/src/properties.c:385
+msgid "_Load"
+msgstr "_Opterećenje"
+
+#: ../multiload/src/properties.c:398
+msgid "_Harddisk"
+msgstr "_Tvrdi disk"
+
+#: ../multiload/src/properties.c:413
+msgid "Options"
+msgstr "Opcije"
+
+#: ../multiload/src/properties.c:443
+msgid "System m_onitor width: "
+msgstr "_Širina programčeta: "
+
+#: ../multiload/src/properties.c:445
+msgid "System m_onitor height: "
+msgstr "_Visina programčeta: "
+
+#: ../multiload/src/properties.c:484
+msgid "Sys_tem monitor update interval: "
+msgstr "_Vreme između dva osvežavanja prikaza: "
+
+#: ../multiload/src/properties.c:510
+msgid "milliseconds"
+msgstr "milisekundi"
+
+#: ../multiload/src/properties.c:548 ../multiload/src/properties.c:556
+msgid "_User"
+msgstr "_Korisnik"
+
+#: ../multiload/src/properties.c:549
+msgid "S_ystem"
+msgstr "_Sistem"
+
+#: ../multiload/src/properties.c:550
+msgid "N_ice"
+msgstr "_Manje prioritetno"
+
+#: ../multiload/src/properties.c:551
+msgid "I_OWait"
+msgstr "U_Ičekanje"
+
+#: ../multiload/src/properties.c:552
+msgid "I_dle"
+msgstr "_Neuposlen"
+
+#: ../multiload/src/properties.c:557
+msgid "Sh_ared"
+msgstr "_Deljena"
+
+#: ../multiload/src/properties.c:558
+msgid "_Buffers"
+msgstr "_Baferi"
+
+#: ../multiload/src/properties.c:559
+msgid "Cach_ed"
+msgstr "Keš_irana"
+
+#: ../multiload/src/properties.c:560
+msgid "F_ree"
+msgstr "_Slobodna"
+
+#: ../multiload/src/properties.c:564
+msgid "_In"
+msgstr "_Primljeno"
+
+#: ../multiload/src/properties.c:565
+msgid "_Out"
+msgstr "P_oslato"
+
+#: ../multiload/src/properties.c:566
+msgid "_Local"
+msgstr "_Lokalno"
+
+#: ../multiload/src/properties.c:567 ../multiload/src/properties.c:577
+#: ../multiload/src/properties.c:583
+msgid "_Background"
+msgstr "_Pozadina"
+
+#: ../multiload/src/properties.c:571
+msgid "_Used"
+msgstr "Is_korišćeno"
+
+#: ../multiload/src/properties.c:572
+msgid "_Free"
+msgstr "_Slobodno"
+
+#: ../multiload/src/properties.c:574
+msgid "Load"
+msgstr "Opterećenje"
+
+#: ../multiload/src/properties.c:576
+msgid "_Average"
+msgstr "Pro_sečno"
+
+#: ../multiload/src/properties.c:579
+msgid "Harddisk"
+msgstr "Tvrdi disk"
+
+#: ../multiload/src/properties.c:581
+msgid "_Read"
+msgstr "_Čitanje"
+
+#: ../multiload/src/properties.c:582
+msgid "_Write"
+msgstr "_Upis"
+
+#: ../multiload/src/properties.c:609
+msgid "System Monitor Preferences"
+msgstr "Postavke praćenja sistema"
 
 #: ../multiload/multiload-applet-menu.xml.h:1
 msgid "_Open System Monitor"
 msgstr "_Pokreni Praćenje sistema"
 
-#: ../multiload/netspeed.c:40
-#, c-format
-msgid "%s/s"
-msgstr "%s/s"
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
+msgid "System Monitor"
+msgstr "Praćenje sistema"
 
 #: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
 msgid "A system load indicator"
@@ -2531,139 +2668,6 @@ msgid "The desktop description file to execute as the system monitor"
 msgstr ""
 "Pokretačka datoteka koju treba pokrenuti kao program za praćenje sistema"
 
-#: ../multiload/properties.c:308
-msgid "Monitored Resources"
-msgstr "Praćeni resursi"
-
-#: ../multiload/properties.c:333
-msgid "_Processor"
-msgstr "_Procesor"
-
-#: ../multiload/properties.c:346
-msgid "_Memory"
-msgstr "_Memorija"
-
-#: ../multiload/properties.c:359
-msgid "_Network"
-msgstr "M_reža"
-
-#: ../multiload/properties.c:372
-msgid "S_wap Space"
-msgstr "_Zamena za memoriju (swap)"
-
-#: ../multiload/properties.c:385
-msgid "_Load"
-msgstr "_Opterećenje"
-
-#: ../multiload/properties.c:398
-msgid "_Harddisk"
-msgstr "_Tvrdi disk"
-
-#: ../multiload/properties.c:413
-msgid "Options"
-msgstr "Opcije"
-
-#: ../multiload/properties.c:443
-msgid "System m_onitor width: "
-msgstr "_Širina programčeta: "
-
-#: ../multiload/properties.c:445
-msgid "System m_onitor height: "
-msgstr "_Visina programčeta: "
-
-#: ../multiload/properties.c:484
-msgid "Sys_tem monitor update interval: "
-msgstr "_Vreme između dva osvežavanja prikaza: "
-
-#: ../multiload/properties.c:510
-msgid "milliseconds"
-msgstr "milisekundi"
-
-#: ../multiload/properties.c:548 ../multiload/properties.c:556
-msgid "_User"
-msgstr "_Korisnik"
-
-#: ../multiload/properties.c:549
-msgid "S_ystem"
-msgstr "_Sistem"
-
-#: ../multiload/properties.c:550
-msgid "N_ice"
-msgstr "_Manje prioritetno"
-
-#: ../multiload/properties.c:551
-msgid "I_OWait"
-msgstr "U_Ičekanje"
-
-#: ../multiload/properties.c:552
-msgid "I_dle"
-msgstr "_Neuposlen"
-
-#: ../multiload/properties.c:557
-msgid "Sh_ared"
-msgstr "_Deljena"
-
-#: ../multiload/properties.c:558
-msgid "_Buffers"
-msgstr "_Baferi"
-
-#: ../multiload/properties.c:559
-msgid "Cach_ed"
-msgstr "Keš_irana"
-
-#: ../multiload/properties.c:560
-msgid "F_ree"
-msgstr "_Slobodna"
-
-#: ../multiload/properties.c:564
-msgid "_In"
-msgstr "_Primljeno"
-
-#: ../multiload/properties.c:565
-msgid "_Out"
-msgstr "P_oslato"
-
-#: ../multiload/properties.c:566
-msgid "_Local"
-msgstr "_Lokalno"
-
-#: ../multiload/properties.c:567 ../multiload/properties.c:577
-#: ../multiload/properties.c:583
-msgid "_Background"
-msgstr "_Pozadina"
-
-#: ../multiload/properties.c:571
-msgid "_Used"
-msgstr "Is_korišćeno"
-
-#: ../multiload/properties.c:572
-msgid "_Free"
-msgstr "_Slobodno"
-
-#: ../multiload/properties.c:574
-msgid "Load"
-msgstr "Opterećenje"
-
-#: ../multiload/properties.c:576
-msgid "_Average"
-msgstr "Pro_sečno"
-
-#: ../multiload/properties.c:579
-msgid "Harddisk"
-msgstr "Tvrdi disk"
-
-#: ../multiload/properties.c:581
-msgid "_Read"
-msgstr "_Čitanje"
-
-#: ../multiload/properties.c:582
-msgid "_Write"
-msgstr "_Upis"
-
-#: ../multiload/properties.c:609
-msgid "System Monitor Preferences"
-msgstr "Postavke praćenja sistema"
-
 #: ../netspeed/data/netspeed-menu.xml.h:1
 msgid "Device _Details"
 msgstr "Podaci _uređaja"
@@ -2736,55 +2740,55 @@ msgstr "Programče brzine mreže"
 msgid "Network Monitor"
 msgstr "Nadzornik mreže"
 
-#: ../netspeed/src/netspeed.c:368
+#: ../netspeed/src/netspeed.c:365
 msgid "b/s"
 msgstr "b/s"
 
-#: ../netspeed/src/netspeed.c:368
+#: ../netspeed/src/netspeed.c:365
 msgid "B/s"
 msgstr "B/s"
 
-#: ../netspeed/src/netspeed.c:370
+#: ../netspeed/src/netspeed.c:367
 msgid "bits"
 msgstr "bita"
 
-#: ../netspeed/src/netspeed.c:370
+#: ../netspeed/src/netspeed.c:367
 msgid "bytes"
 msgstr "bajta"
 
-#: ../netspeed/src/netspeed.c:377
+#: ../netspeed/src/netspeed.c:374
 msgid "kb/s"
 msgstr "kb/s"
 
-#: ../netspeed/src/netspeed.c:377
+#: ../netspeed/src/netspeed.c:374
 msgid "KiB/s"
 msgstr "KiB/s"
 
-#: ../netspeed/src/netspeed.c:379
+#: ../netspeed/src/netspeed.c:376
 msgid "kb"
 msgstr "kb"
 
-#: ../netspeed/src/netspeed.c:379
+#: ../netspeed/src/netspeed.c:376
 msgid "KiB"
 msgstr "KiB"
 
-#: ../netspeed/src/netspeed.c:388
+#: ../netspeed/src/netspeed.c:385
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../netspeed/src/netspeed.c:388
+#: ../netspeed/src/netspeed.c:385
 msgid "MiB/s"
 msgstr "MiB/s"
 
-#: ../netspeed/src/netspeed.c:390
+#: ../netspeed/src/netspeed.c:387
 msgid "Mb"
 msgstr "Mb"
 
-#: ../netspeed/src/netspeed.c:390
+#: ../netspeed/src/netspeed.c:387
 msgid "MiB"
 msgstr "MiB"
 
-#: ../netspeed/src/netspeed.c:634
+#: ../netspeed/src/netspeed.c:631
 msgid ""
 "A little applet that displays some information on the traffic on the "
 "specified network device"
@@ -2792,70 +2796,70 @@ msgstr ""
 "Mali programčić koji prikazuje neke podatke o saobraćaju na naznačenom "
 "mrežnom uređaju"
 
-#: ../netspeed/src/netspeed.c:639
+#: ../netspeed/src/netspeed.c:636
 msgid "Netspeed Website"
 msgstr "Veb stranica Brzine mreže"
 
-#: ../netspeed/src/netspeed.c:902
+#: ../netspeed/src/netspeed.c:899
 #, c-format
 msgid "Device Details for %s"
 msgstr "Podaci uređaja za %s"
 
-#: ../netspeed/src/netspeed.c:927
+#: ../netspeed/src/netspeed.c:924
 msgid "_In graph color"
 msgstr "Boja grafika _ulaza"
 
-#: ../netspeed/src/netspeed.c:928
+#: ../netspeed/src/netspeed.c:925
 msgid "_Out graph color"
 msgstr "Boja grafika _izlaza"
 
-#: ../netspeed/src/netspeed.c:944
+#: ../netspeed/src/netspeed.c:941
 msgid "Internet Address:"
 msgstr "Internet adresa:"
 
-#: ../netspeed/src/netspeed.c:945
+#: ../netspeed/src/netspeed.c:942
 msgid "Netmask:"
 msgstr "Mrežna maska:"
 
-#: ../netspeed/src/netspeed.c:946
+#: ../netspeed/src/netspeed.c:943
 msgid "Hardware Address:"
 msgstr "Hardverska adresa:"
 
-#: ../netspeed/src/netspeed.c:947
+#: ../netspeed/src/netspeed.c:944
 msgid "P-t-P Address:"
 msgstr "T-d-T adresa:"
 
-#: ../netspeed/src/netspeed.c:948
+#: ../netspeed/src/netspeed.c:945
 msgid "Bytes in:"
 msgstr "Primljenih bajtova:"
 
-#: ../netspeed/src/netspeed.c:949
+#: ../netspeed/src/netspeed.c:946
 msgid "Bytes out:"
 msgstr "Poslatih bajtova:"
 
-#: ../netspeed/src/netspeed.c:951 ../netspeed/src/netspeed.c:952
-#: ../netspeed/src/netspeed.c:953 ../netspeed/src/netspeed.c:954
+#: ../netspeed/src/netspeed.c:948 ../netspeed/src/netspeed.c:949
+#: ../netspeed/src/netspeed.c:950 ../netspeed/src/netspeed.c:951
 msgid "none"
 msgstr "ništa"
 
-#: ../netspeed/src/netspeed.c:993
+#: ../netspeed/src/netspeed.c:990
 msgid "IPv6 Address:"
 msgstr "IPv6 adresa:"
 
-#: ../netspeed/src/netspeed.c:1025
+#: ../netspeed/src/netspeed.c:1022
 msgid "Signal Strength:"
 msgstr "Jačina signala:"
 
-#: ../netspeed/src/netspeed.c:1026
+#: ../netspeed/src/netspeed.c:1023
 msgid "ESSID:"
 msgstr "ESSID:"
 
-#: ../netspeed/src/netspeed.c:1076
+#: ../netspeed/src/netspeed.c:1073
 #, c-format
 msgid "%s is down"
 msgstr "%s je ugašen"
 
-#: ../netspeed/src/netspeed.c:1081
+#: ../netspeed/src/netspeed.c:1078
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -2864,11 +2868,11 @@ msgstr ""
 "%s: %s\n"
 "prijem: %s slanje: %s"
 
-#: ../netspeed/src/netspeed.c:1083 ../netspeed/src/netspeed.c:1092
+#: ../netspeed/src/netspeed.c:1080 ../netspeed/src/netspeed.c:1089
 msgid "has no ip"
 msgstr "nema ip"
 
-#: ../netspeed/src/netspeed.c:1090
+#: ../netspeed/src/netspeed.c:1087
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -2877,7 +2881,7 @@ msgstr ""
 "%s: %s\n"
 "ukupno: %s"
 
-#: ../netspeed/src/netspeed.c:1099
+#: ../netspeed/src/netspeed.c:1096
 #, c-format
 msgid ""
 "\n"
@@ -2888,21 +2892,21 @@ msgstr ""
 "ESSID: %s\n"
 "Jačina: %d %%"
 
-#: ../netspeed/src/netspeed.c:1100
+#: ../netspeed/src/netspeed.c:1097
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../netspeed/src/netspeed.c:1165
+#: ../netspeed/src/netspeed.c:1162
 #, c-format
 msgid "Do you want to disconnect %s now?"
 msgstr "Da li želite da prekinete vezu „%s“ sada?"
 
-#: ../netspeed/src/netspeed.c:1167
+#: ../netspeed/src/netspeed.c:1164
 #, c-format
 msgid "Do you want to connect %s now?"
 msgstr "Da li želite da povežete vezu „%s“ sada?"
 
-#: ../netspeed/src/netspeed.c:1190
+#: ../netspeed/src/netspeed.c:1187
 #, c-format
 msgid ""
 "<b>Running command %s failed</b>\n"
@@ -2911,10 +2915,6 @@ msgstr ""
 "<b>Nije uspelo izvršavanje naredbe „%s“</b>\n"
 "%s"
 
-#: ../netspeed/src/netspeed.c:1457
-msgid "Netspeed"
-msgstr "Brzina mreže"
-
 #: ../netspeed/src/netspeed.c:1549
 #, c-format
 msgid ""
@@ -2948,37 +2948,36 @@ msgstr "Promeni _ikonicu u skladu sa izabranim uređajem"
 msgid "Netspeed Preferences"
 msgstr "Postavke Brzine mreže"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
 msgid "Sticky Notes Applet Factory"
 msgstr "Proizvodnja programčeta za beleške"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:146
-#: ../stickynotes/stickynotes_applet.c:380
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
+#: ../sticky-notes/src/stickynotes_applet.c:385
 msgid "Sticky Notes"
 msgstr "Beleške"
 
-#: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
+#: ../sticky-notes/data/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "Napravite, gledajte i upravljajte beleškama na radnoj površini"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:1
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:1
 msgid "Default width for new notes"
 msgstr "Uobičajena širina za nove beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:2
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:2
 msgid "Default width for new sticky notes in pixels."
 msgstr "Uobičajena širina u tačkama za nove beleške."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:3
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:3
 msgid "Default height for new notes"
 msgstr "Uobičajena visina za nove beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:4
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:4
 msgid "Default color for new notes"
 msgstr "Uobičajena boja za nove beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:5
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:5
 msgid ""
 "Default color for new sticky notes. This can be standard name, hexadecimal "
 "value, RGB color or RGBA color."
@@ -2986,11 +2985,11 @@ msgstr ""
 "Osnovna boja za nove lepljive beleške. Ovo može biti uobičajeni naziv, "
 "heksadecimalna vrednost, RGB boja ili RGBA boja."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:6
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:6
 msgid "Default color for font"
 msgstr "Osnovna boja slovnog lika"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:7
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:7
 msgid ""
 "Default font color for new sticky notes. This can be standard name, "
 "hexadecimal value, RGB color or RGBA color."
@@ -2998,11 +2997,11 @@ msgstr ""
 "Osnovna boja slova za nove lepljive beleške. Ovo može biti uobičajeni naziv, "
 "heksadecimalna vrednost, RGB boja ili RGBA boja."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:8
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:8
 msgid "Default font for new notes"
 msgstr "Osnovna slova za nove beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:9
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:9
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
@@ -3010,29 +3009,29 @@ msgstr ""
 "Osnovna slova za nove lepljive beleške. Ovo treba da bude naziv slova za "
 "Pango, npr. „Sans Italic 10“."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:10
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:10
 msgid "Sticky notes' workspace stickyness"
 msgstr "Lepljivost beleški za radnu površinu"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:11
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:11
 msgid ""
 "Specifies whether the sticky notes are visible on ALL workspaces on the "
 "desktop, or not."
 msgstr "Određuje da li se beleške vide na SVIM radnim površinama, ili ne."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:12
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:12
 msgid "Sticky notes' locked state"
 msgstr "Zaključano stanje beleški"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:13
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:13
 msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "Određuje da li su beleške zaključane (ne mogu se izmeniti) ili ne."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:14
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:14
 msgid "Date format of note's title"
 msgstr "Obrazac za datum u naslovima beleški"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:15
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:15
 msgid ""
 "By default, sticky notes are given the current date as the title when they "
 "are created. This format is used; anything that can be parsed by strftime() "
@@ -3041,11 +3040,11 @@ msgstr ""
 "Uobičajeno, kada se naprave beleške, koristi se tekući datum za naslov. Ovaj "
 "obrazac se koristi; sve što prihvata „strftime()“ je dozvoljeno."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:16
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:16
 msgid "Whether to use the default system color"
 msgstr "Da li se koristi podrazumevana boja sistema"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:17
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:17
 msgid ""
 "If this option is disabled, a custom color can be used as the default color "
 "for all sticky notes."
@@ -3053,11 +3052,11 @@ msgstr ""
 "Ukoliko je ova opcija isključena, može se koristiti boja po izboru kao "
 "uobičajena boja za sve beleške."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:18
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:18
 msgid "Whether to use the default system font"
 msgstr "Da li se koristi podrazumevani sistemski slovni lik"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:19
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:19
 msgid ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
@@ -3065,11 +3064,11 @@ msgstr ""
 "Ukoliko je ova opcija isključena, može se koristiti slovni lik po izboru kao "
 "uobičajeni slovni lik za sve beleške."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:20
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:20
 msgid "Whether to force the default color and font on all notes"
 msgstr "Da li da nametnem podrazumevanu boju i slovni lik za sve beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:21
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:21
 msgid ""
 "If this option is enabled, the custom colors and fonts that have been "
 "assigned to individual notes will be ignored."
@@ -3077,11 +3076,11 @@ msgstr ""
 "Ukoliko je ova opcija uključena, neće se koristiti podešavanja boja i slovnih "
 "likova za pojedinačne beleške."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:22
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:22
 msgid "Whether to hide all notes when the desktop is selected"
 msgstr "Da li da sakrijem sve beleške pri izboru radne površi"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:23
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:23
 msgid ""
 "If this option is enabled, selecting the desktop in any way will "
 "automatically hide all the open notes."
@@ -3089,15 +3088,23 @@ msgstr ""
 "Ukoliko je ova opcija uključena, izbor radne površine na bilo koj način će "
 "sakriti sve otvorene beleške."
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:24
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:24
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "Da li se traži odobrenje pri brisanju beleške"
 
-#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:25
+#: ../sticky-notes/src/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:25
 msgid "Empty notes are always deleted without confirmation."
 msgstr "Prazne beleške se uvek brišu bez potvrde."
 
-#: ../stickynotes/stickynotes_applet.c:539
+#: ../sticky-notes/src/stickynotes.c:594
+msgid "This note is locked."
+msgstr "Ova beleška je zaključana."
+
+#: ../sticky-notes/src/stickynotes.c:598
+msgid "This note is unlocked."
+msgstr "Ova beleška je otključana."
+
+#: ../sticky-notes/src/stickynotes_applet.c:544
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
@@ -3106,392 +3113,372 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "Jedna beleška"
 
-#: ../stickynotes/stickynotes_applet.c:540
+#: ../sticky-notes/src/stickynotes_applet.c:545
 msgid "Show sticky notes"
 msgstr "Prikaži beleške"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:387
+#: ../sticky-notes/src/stickynotes_applet_callbacks.c:391
 msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "Beleške za radno okruženje Gnom"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:1
-#: ../stickynotes/stickynotes-note-menu.xml.h:1
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:1
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:1
 msgid "_New Note"
 msgstr "_Nova beleška"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:2
 msgid "Hi_de Notes"
 msgstr "Sak_rij beleške"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:3
 msgid "_Lock Notes"
 msgstr "_Zaključaj beleške"
 
-#: ../stickynotes/stickynotes-applet-menu.xml.h:4
+#: ../sticky-notes/src/sticky-notes-applet-menu.xml.h:4
 msgid "_Delete Notes"
 msgstr "_Ukloni beleške"
 
-#: ../stickynotes/stickynotes.c:591
-msgid "This note is locked."
-msgstr "Ova beleška je zaključana."
-
-#: ../stickynotes/stickynotes.c:595
-msgid "This note is unlocked."
-msgstr "Ova beleška je otključana."
-
-#: ../stickynotes/stickynotes-delete-all.ui.h:1
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:1
 msgid "_Delete All"
 msgstr "Obriši _sve"
 
-#: ../stickynotes/stickynotes-delete-all.ui.h:2
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:2
 msgid "Delete all sticky notes?"
 msgstr "Da obrišem sve lepljive beleške?"
 
-#: ../stickynotes/stickynotes-delete-all.ui.h:3
-#: ../stickynotes/stickynotes-delete.ui.h:2
+#: ../sticky-notes/src/sticky-notes-delete-all.ui.h:3
+#: ../sticky-notes/src/sticky-notes-delete.ui.h:2
 msgid "This cannot be undone."
 msgstr "Ovo ne možete poništiti."
 
-#: ../stickynotes/stickynotes-delete.ui.h:1
+#: ../sticky-notes/src/sticky-notes-delete.ui.h:1
 msgid "Delete this sticky note?"
 msgstr "Da obrišem lepljivu belešku?"
 
-#: ../stickynotes/stickynotes-note-menu.xml.h:2
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:2
 msgid "_Delete Note..."
 msgstr "_Obriši belešku..."
 
-#: ../stickynotes/stickynotes-note-menu.xml.h:3
+#: ../sticky-notes/src/sticky-notes-note-menu.xml.h:3
 msgid "_Lock Note"
 msgstr "_Zaključaj belešku"
 
-#: ../stickynotes/stickynotes-note.ui.h:1
+#: ../sticky-notes/src/sticky-notes-note.ui.h:1
 msgid "Sticky Note"
 msgstr "Beleške"
 
-#: ../stickynotes/stickynotes-note.ui.h:2
+#: ../sticky-notes/src/sticky-notes-note.ui.h:2
 msgid "Lock/Unlock note"
 msgstr "Zaključaj/otključaj belešku"
 
-#: ../stickynotes/stickynotes-note.ui.h:3
+#: ../sticky-notes/src/sticky-notes-note.ui.h:3
 msgid "Close note"
 msgstr "Zatvori belešku"
 
-#: ../stickynotes/stickynotes-note.ui.h:4
+#: ../sticky-notes/src/sticky-notes-note.ui.h:4
 msgid "Resize note"
 msgstr "Promeni veličinu beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:1
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:1
 msgid "Sticky Notes Preferences"
 msgstr "Postavke za belešku"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:2
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:2
 msgid "Default Note Properties"
 msgstr "Podešavanje podrazumevane beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:4
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:4
 msgid "H_eight:"
 msgstr "_Visina:"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:5
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:5
 msgid "Specify the default width (in pixels) of new notes"
 msgstr "Izaberite podrazumevanu širinu beleške (u pikselima)"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:6
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:6
 msgid "1"
 msgstr "1"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:7
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:7
 msgid "Specify the default height (in pixels) of new notes"
 msgstr "Izaberite podrazumevanu visinu beleške (u pikselima)"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:8
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:8
 msgid "0"
 msgstr "0"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:9
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:9
 msgid "Use co_lor from the system theme"
 msgstr "Koristi boju iz _sistemske teme"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:10
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:10
 msgid "Font Co_lor:"
 msgstr "Bo_ja slovnog lika:"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:11
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:11
 msgid "Note C_olor:"
 msgstr "_Boja beleške:"
 
 # tooltip??? ~Miloš
-#: ../stickynotes/stickynotes-preferences.ui.h:12
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:12
 msgid "Choose a base color to use for all sticky notes"
 msgstr "Postavlja podrazumevanu boju za sve beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:13
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:13
 msgid "Pick a default sticky note color"
 msgstr "Izaberite podrazumevanu boju za beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:14
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:14
 msgid "Use fo_nt from the system theme"
 msgstr "Koristi slovni lik iz _sistemske teme"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:15
-#: ../stickynotes/stickynotes-properties.ui.h:11
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:15
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:11
 msgid "_Font:"
 msgstr "_Slovni lik:"
 
 # tooltip??? ~Miloš
-#: ../stickynotes/stickynotes-preferences.ui.h:16
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:16
 msgid "Choose a font to use for all sticky notes"
 msgstr "Postavlja podrazumevani slovni lik za sve beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:17
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:17
 msgid "Pick a default sticky note font"
 msgstr "Izaberite podrazumevani slovni lik za beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:18
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:18
 msgid "Behavior"
 msgstr "Ponašanje"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:19
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:19
 msgid "_Put notes on all workspaces"
 msgstr "Postavi na sve _radne površine"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:20
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:20
 msgid "Choose if notes are visible on all workspaces"
 msgstr "Da li da prikažem beleške na svim radnim prostorima"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:21
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:21
 msgid "Force _default color and font on notes"
 msgstr "Da li da _nametnem podrazumevanu boju i slovni lik za sve beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:22
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:22
 msgid "Choose if the default style is forced on all notes"
 msgstr "Da li da nametnem podrazumevani stil za sve beleške"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:23
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:23
 msgid "Hide notes when the des_ktop is clicked on"
 msgstr "_Sakrij beleške kada kliknem na radnu površ"
 
-#: ../stickynotes/stickynotes-preferences.ui.h:24
+#: ../sticky-notes/src/sticky-notes-preferences.ui.h:24
 msgid "Choose whether to hide all notes when selecting on the desktop"
 msgstr "Da li da sakrijem sve beleške kada kliknete na radnu površinu"
 
-#: ../stickynotes/stickynotes-properties.ui.h:1
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:1
 msgid "Sticky Note Properties"
 msgstr "Osobine beleške"
 
-#: ../stickynotes/stickynotes-properties.ui.h:2
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:2
 msgid "Properties"
 msgstr "Osobine"
 
-#: ../stickynotes/stickynotes-properties.ui.h:3
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:3
 msgid "_Title:"
 msgstr "_Naslov:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:4
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:4
 msgid "Specify a title for the note"
 msgstr "Upišite naslov za belešku"
 
-#: ../stickynotes/stickynotes-properties.ui.h:5
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:5
 msgid "Use default co_lor"
 msgstr "_Koristi podrazumevanu boju"
 
-#: ../stickynotes/stickynotes-properties.ui.h:6
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:6
 msgid "Font C_olor:"
 msgstr "Boja _slovnog lika:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:7
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:7
 msgid "Note _Color:"
 msgstr "Boja _beleške:"
 
-#: ../stickynotes/stickynotes-properties.ui.h:8
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:8
 msgid "Use default fo_nt"
 msgstr "_Koristi podrazumevani slovni lik"
 
-#: ../stickynotes/stickynotes-properties.ui.h:9
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:9
 msgid "Choose a color for the note"
 msgstr "Uobičajena boja beleške"
 
-#: ../stickynotes/stickynotes-properties.ui.h:10
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:10
 msgid "Pick a color for the sticky note"
 msgstr "Izaberite boju za beleške"
 
-#: ../stickynotes/stickynotes-properties.ui.h:12
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:12
 msgid "Choose a font for the note"
 msgstr "Uobičajeni slovni lik beleške"
 
-#: ../stickynotes/stickynotes-properties.ui.h:13
+#: ../sticky-notes/src/sticky-notes-properties.ui.h:13
 msgid "Pick a font for the sticky note"
 msgstr "Izaberite slovni lik za belešku"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:1
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:1
 msgid "Timer Factory"
 msgstr "Proizvodnja vremena"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:2
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:2
 msgid "Timer"
 msgstr "Odbrojavač"
 
-#: ../timerapplet/org.gnome.applets.TimerApplet.panel-applet.in.in.h:3
-#: ../timerapplet/timerapplet.c:285
+#: ../timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in.h:3
+#: ../timer/src/timer-applet.c:285
 msgid "Start a timer and receive a notification when it is finished"
 msgstr "Pokrenite odbrojavač i primite obaveštenje kada bude završio"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:1
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:1
 msgid "'Timer'"
 msgstr "'Odbrojavač'"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:2
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:2
 msgid "Name of timer"
 msgstr "Naziv odbrojavača"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:3
-#| msgid "Refresh time in milliseconds"
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:3
 msgid "Duration of timer in seconds"
 msgstr "Vreme odbrojavača u sekundama"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:4
-#| msgid "Show notifications for critical weather conditions"
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:4
 msgid "Show notification popup when timer finish"
 msgstr "Prikazuje oblačić obaveštenja kada se završi odbrojavanje"
 
-#: ../timerapplet/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:5
+#: ../timer/src/org.gnome.gnome-applets.timer.gschema.xml.in.in.h:5
 msgid "Show dialog window when timer finish"
 msgstr "Prikazuje prozorčić kada se završi odbrojavanje"
 
-#: ../timerapplet/timerapplet.c:158
+#: ../timer/src/timer-applet.c:158
 msgid "Finished"
 msgstr "Završeno"
 
-#: ../timerapplet/timerapplet.c:165 ../timerapplet/timerapplet.c:177
+#: ../timer/src/timer-applet.c:165 ../timer/src/timer-applet.c:177
 msgid "Timer finished!"
 msgstr "Odbrojavanje je završeno!"
 
-#: ../timerapplet/timerapplet.c:321
-#| msgid "Geyes Preferences"
+#: ../timer/src/timer-applet.c:321
 msgid "Timer Applet Preferences"
 msgstr "Postavke odbrojavača"
 
-#: ../timerapplet/timerapplet.c:334
+#: ../timer/src/timer-applet.c:334
 msgid "Name:"
 msgstr "Naziv:"
 
-#: ../timerapplet/timerapplet.c:347
+#: ../timer/src/timer-applet.c:343
 msgid "Hours:"
 msgstr "Časovi:"
 
 # bug:plural-forms
-#: ../timerapplet/timerapplet.c:362
-#| msgid "minutes"
+#: ../timer/src/timer-applet.c:354
 msgid "Minutes:"
 msgstr "Minuti:"
 
-#: ../timerapplet/timerapplet.c:377
-#| msgid "milliseconds"
+#: ../timer/src/timer-applet.c:365
 msgid "Seconds:"
 msgstr "Sekunde:"
 
-#: ../timerapplet/timerapplet.c:392
-#| msgid "Show notification"
+#: ../timer/src/timer-applet.c:376
 msgid "Show notification popup"
 msgstr "Prikaži oblačić obaveštenja"
 
-#: ../timerapplet/timerapplet.c:398
-#| msgid "Show handle"
+#: ../timer/src/timer-applet.c:380
 msgid "Show dialog"
 msgstr "Prikaži prozorče"
 
-#: ../timerapplet/timerapplet.c:422
-#| msgid "Trash Applet"
-msgid "Timer Applet"
-msgstr "Programče odbrojavanja"
-
-#: ../tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in.h:1
+#: ../tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in.h:1
 msgid "Tracker Search Bar"
 msgstr "Tragačeva traka pretrage"
 
-#: ../tracker-search-bar/org.gnome.panel.SearchBar.panel-applet.in.in.h:2
+#: ../tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in.h:2
 msgid "Find your data quickly using Tracker"
 msgstr "Nađite vaše podatke koristeći Tragača"
 
-#: ../tracker-search-bar/tracker-results-window.c:718
-#: ../tracker-search-bar/tracker-results-window.c:734
+#: ../tracker-search-bar/src/tracker-results-window.c:718
+#: ../tracker-search-bar/src/tracker-results-window.c:734
 msgid "Other"
 msgstr "Drugo"
 
-#: ../tracker-search-bar/tracker-results-window.c:719
+#: ../tracker-search-bar/src/tracker-results-window.c:719
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../tracker-search-bar/tracker-results-window.c:720
+#: ../tracker-search-bar/src/tracker-results-window.c:720
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../tracker-search-bar/tracker-results-window.c:721
+#: ../tracker-search-bar/src/tracker-results-window.c:721
 msgid "Email Addresses"
 msgstr "Adrese el. pošte"
 
-#: ../tracker-search-bar/tracker-results-window.c:722
+#: ../tracker-search-bar/src/tracker-results-window.c:722
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: ../tracker-search-bar/tracker-results-window.c:723
+#: ../tracker-search-bar/src/tracker-results-window.c:723
 msgid "Applications"
 msgstr "Programi"
 
-#: ../tracker-search-bar/tracker-results-window.c:724
+#: ../tracker-search-bar/src/tracker-results-window.c:724
 msgid "Images"
 msgstr "Slike"
 
-#: ../tracker-search-bar/tracker-results-window.c:725
+#: ../tracker-search-bar/src/tracker-results-window.c:725
 msgid "Audio"
 msgstr "Audio"
 
-#: ../tracker-search-bar/tracker-results-window.c:726
+#: ../tracker-search-bar/src/tracker-results-window.c:726
 msgid "Folders"
 msgstr "Fascikle"
 
-#: ../tracker-search-bar/tracker-results-window.c:727
+#: ../tracker-search-bar/src/tracker-results-window.c:727
 msgid "Fonts"
 msgstr "Slovni likovi"
 
-#: ../tracker-search-bar/tracker-results-window.c:728
+#: ../tracker-search-bar/src/tracker-results-window.c:728
 msgid "Videos"
 msgstr "Video snimci"
 
-#: ../tracker-search-bar/tracker-results-window.c:729
+#: ../tracker-search-bar/src/tracker-results-window.c:729
 msgid "Archives"
 msgstr "Arhive"
 
-#: ../tracker-search-bar/tracker-results-window.c:730
+#: ../tracker-search-bar/src/tracker-results-window.c:730
 msgid "Bookmarks"
 msgstr "Obeleživači"
 
-#: ../tracker-search-bar/tracker-results-window.c:731
+#: ../tracker-search-bar/src/tracker-results-window.c:731
 msgid "Links"
 msgstr "Veze"
 
-#: ../tracker-search-bar/tracker-results-window.c:1107
+#: ../tracker-search-bar/src/tracker-results-window.c:1107
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../tracker-search-bar/tracker-results-window.c:1135
+#: ../tracker-search-bar/src/tracker-results-window.c:1135
 msgid "Title"
 msgstr "Naslov"
 
-#: ../tracker-search-bar/tracker-results-window.c:1201
+#: ../tracker-search-bar/src/tracker-results-window.c:1201
 #, c-format
 msgid "No results found for “%s”"
 msgstr "Nema rezultata za „%s“"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:1
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:1
 msgid "Copyright Tracker Authors 2005-2010"
 msgstr "Autorska prava 2005-2010 Autori Tragača"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:2
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:2
 msgid "A search bar applet for finding content stored in Tracker"
 msgstr "Programče trake pretrage za nalaženje sadržaja smeštenog u Tragaču"
 
-#: ../tracker-search-bar/tracker-search-bar.ui.h:3
+#: ../tracker-search-bar/src/tracker-search-bar.ui.h:3
 msgid ""
 "Tracker is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -3522,16 +3509,16 @@ msgstr ""
 "softvera na adresu: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA  02110-1301, USA“."
 
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
+#: ../trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
+#: ../trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
 msgid "Go to Trash"
 msgstr "Idi do Smeća"
 
 # bug: plural-forms
-#: ../trashapplet/src/trashapplet.c:122
+#: ../trash/src/trash-applet.c:121
 #, c-format
 msgid "%d Item in Trash"
 msgid_plural "%d Items in Trash"
@@ -3540,11 +3527,11 @@ msgstr[1] "%d stavke u smeću"
 msgstr[2] "%d stavki u smeću"
 msgstr[3] "Jedna stavka u smeću"
 
-#: ../trashapplet/src/trashapplet.c:130
+#: ../trash/src/trash-applet.c:129
 msgid "No Items in Trash"
 msgstr "Nema stavki u Smeću"
 
-#: ../trashapplet/src/trashapplet.c:363
+#: ../trash/src/trash-applet.c:362
 #, c-format
 msgid ""
 "Error while spawning Nautilus:\n"
@@ -3553,7 +3540,7 @@ msgstr ""
 "Greška pri pozivanju Nautilusa:\n"
 "%s"
 
-#: ../trashapplet/src/trashapplet.c:415
+#: ../trash/src/trash-applet.c:414
 msgid ""
 "A GNOME trash bin that lives in your panel. You can use it to view the trash "
 "or drag and drop items into the trash."
@@ -3561,41 +3548,37 @@ msgstr ""
 "Gnomova kanta za smeće na panelu. Koristite je da pregledate smeće ili da "
 "prevučete i ubacite stavke u smeće."
 
-#: ../trashapplet/src/trashapplet.c:440
+#: ../trash/src/trash-applet.c:439
 msgid "Delete Immediately?"
 msgstr "Da obrišem odmah?"
 
-#: ../trashapplet/src/trashapplet.c:469
+#: ../trash/src/trash-applet.c:468
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr "Ne mogu da premestim stavke u smeće, želite li da ih odmah obrišete?"
 
-#: ../trashapplet/src/trashapplet.c:474
+#: ../trash/src/trash-applet.c:473
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Ne mogu da premestim neke stavke u smeće, želite li da ih odmah obrišete?"
 
-#: ../trashapplet/src/trashapplet.c:604
-msgid "Trash Applet"
-msgstr "Programče za Smeće"
-
 #. Translators: the %s in this string should be read as %d.
-#: ../trashapplet/src/trash-empty.c:70
+#: ../trash/src/trash-empty.c:70
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "Uklanja stavku %s od %s"
 
 #. Translators: %s is a file name
-#: ../trashapplet/src/trash-empty.c:96
+#: ../trash/src/trash-empty.c:96
 #, c-format
 msgid "Removing: %s"
 msgstr "Uklanjam: %s"
 
-#: ../trashapplet/src/trash-empty.c:321
+#: ../trash/src/trash-empty.c:323
 msgid "Empty all of the items from the trash?"
 msgstr "Izbaciti sve stavke iz smeća?"
 
-#: ../trashapplet/src/trash-empty.c:328
+#: ../trash/src/trash-empty.c:330
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
@@ -3603,19 +3586,19 @@ msgstr ""
 "Ukoliko izbacite smeće, sve stavke iz njega će biti trajno uklonjene. "
 "Primetite da svaku možete zasebno izbaciti."
 
-#: ../trashapplet/src/trash-empty.c:342 ../trashapplet/trashapplet-menu.xml.h:2
+#: ../trash/src/trash-empty.c:344 ../trash/src/trash-menu.xml.h:2
 msgid "_Empty Trash"
 msgstr "Iz_baci smeće"
 
-#: ../trashapplet/trashapplet-empty-progress.ui.h:1
+#: ../trash/src/trash-empty.ui.h:1
 msgid "Emptying the Trash"
 msgstr "Izbacivanje smeća"
 
-#: ../trashapplet/trashapplet-empty-progress.ui.h:2
+#: ../trash/src/trash-empty.ui.h:2
 msgid "From:"
 msgstr "Iz:"
 
-#: ../trashapplet/trashapplet-menu.xml.h:1
+#: ../trash/src/trash-menu.xml.h:1
 msgid "_Open Trash"
 msgstr "_Otvori smeće"
 
@@ -3664,6 +3647,20 @@ msgstr ""
 msgid "Close window"
 msgstr "Zatvori prozor"
 
+#~| msgid "Command line"
+#~ msgid "Command Applet"
+#~ msgstr "Terminalčić"
+
+#~ msgid "Netspeed"
+#~ msgstr "Brzina mreže"
+
+#~| msgid "Trash Applet"
+#~ msgid "Timer Applet"
+#~ msgstr "Programče odbrojavanja"
+
+#~ msgid "Trash Applet"
+#~ msgstr "Programče za Smeće"
+
 #~ msgid "Close"
 #~ msgstr "Zatvori"
 



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