Updated Serbian translation.

svn path=/trunk/; revision=29166
author: Danilo Šegan <danilo@src.gnome.org> 2005-04-06 15:23:59 +0800
committer: Danilo Šegan <danilo@src.gnome.org> 2005-04-06 15:23:59 +0800
commit: cc78be472f491386522cbe860725f49d4a33a335 (patch)
tree: f559958be1d6afd93506ed39fe60766525786af2 /po
parent: b6fb54466f30b83d74cf118f2f9aa73b5ee61505 (diff)
download: gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.tar.gz
gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.tar.zst
gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.zip
3 files changed, 10536 insertions, 10814 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 72708ef684..8c50d35920 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-06  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
 2005-04-05  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
diff --git a/po/sr.po b/po/sr.po
index fbbcdcf1af..2779541faa 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.0\n"
+"Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 08:58+0100\n"
-"PO-Revision-Date: 2005-03-05 08:53+0100\n"
+"POT-Creation-Date: 2005-04-06 09:23+0200\n"
+"PO-Revision-Date: 2005-04-06 08:10+0200\n"
 "Last-Translator: Игор Несторовић <jung@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,144 +17,134 @@ msgstr ""
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:166
 msgid "evolution addressbook"
 msgstr "адресар еволуције"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:196
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:196
 msgid "New Contact"
 msgstr "Нови контакт"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:204
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:204
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: a11y/addressbook/ea-minicard-view.c:149
-#, fuzzy, c-format
+#: ../a11y/addressbook/ea-minicard-view.c:149
+#, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "текући директоријум адресара"
-msgstr[1] "текући директоријум адресара"
-msgstr[2] "текући директоријум адресара"
+msgstr[0] "текући директоријум адресара има %d карту"
+msgstr[1] "текући директоријум адресара има %d карте"
+msgstr[2] "текући директоријум адресара има %d карти"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:876
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:879
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Отвори"
 
-#: a11y/addressbook/ea-minicard.c:138
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard.c:138
 msgid "Contact List: "
-msgstr "Контакт ли_ста"
+msgstr "Контакт ли_ста: "
 
-#: a11y/addressbook/ea-minicard.c:139
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard.c:139
 msgid "Contact: "
-msgstr "Контакти: "
+msgstr "Контакт: "
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "миникарта еволуције"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
-msgstr ""
+msgstr "Има аларме."
 
-#: a11y/calendar/ea-cal-view-event.c:238
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
-msgstr "_Без понављања"
+msgstr "Има понављања."
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
-msgstr ""
+msgstr "То је састанак."
 
-#: a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-cal-view-event.c:247
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Календарски догађаји"
+msgstr "Календарски догађај: преглед је %s."
 
-#: a11y/calendar/ea-cal-view-event.c:249
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
-msgstr "Календарски догађаји"
+msgstr "Календарски догађај: нема преглед."
 
-#: a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
-msgstr "Календарски догађаји"
+msgstr "догађај прегледа календара"
 
-#: a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
-msgstr "Има фокус"
+msgstr "Ухвати фокус"
 
-#: a11y/calendar/ea-cal-view.c:306
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
-msgstr "Нов _заказани састанак"
+msgstr "Нов састанак"
 
-#: a11y/calendar/ea-cal-view.c:307
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
-msgstr "Нов целодневни _догађај"
+msgstr "Нов целодневни догађај"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1376
 msgid "New Meeting"
 msgstr "Нов састанак"
 
-#: a11y/calendar/ea-cal-view.c:309
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
-msgstr "Иди на _данашњи дан"
+msgstr "Иди на данашњи дан"
 
-#: a11y/calendar/ea-cal-view.c:310
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
-msgstr "Иди на _датум"
+msgstr "Иди на датум"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
-#, fuzzy
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
-msgstr "време у односу на тренутно време"
+msgstr "табела за приказ и избор текућег временског распона"
 
-#: a11y/calendar/ea-day-view.c:146 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Има %d догађај."
+msgstr[1] "Има %d догађаја."
+msgstr[2] "Има %d догађаја."
 
-#: a11y/calendar/ea-day-view.c:148 a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
-msgstr ""
+msgstr "Нема догађаја."
 
-#: a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-day-view.c:152
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "Преглед радне недеље"
+msgstr "Преглед радне недеље: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-day-view.c:155
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "Дневни преглед"
+msgstr "Дневни преглед: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:186
-#, fuzzy
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
-msgstr "подаци о календару"
+msgstr "преглед календара за радну недељу"
 
-#: a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "приказ календара за једна или више дана"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -169,22 +159,30 @@ msgstr "%A, %d. %b %Y."
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:663
-#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1511
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:665
-#: calendar/gui/calendar-component.c:670 calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/calendar-component.c:670
+#: ../calendar/gui/calendar-component.c:672
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:684 calendar/gui/calendar-component.c:691
-#: calendar/gui/calendar-component.c:697 calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:697
+#: ../calendar/gui/calendar-component.c:699
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -197,105 +195,101 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:689
-#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1527
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:726
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "Гном календар"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
-msgstr "Основа за _претрагу:"
+msgstr "трака претраге"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
-msgstr "Прегледник Еволуција календара"
+msgstr "трака претраге еволуција календара"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
-msgstr ""
+msgstr "Дугме за прескакање"
 
-#: a11y/calendar/ea-jump-button.c:158
-#, fuzzy
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
-msgstr "Притисните овде да додате учесника"
+msgstr "Кликните овде, можете наћи још догађаја."
 
-#: a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:155
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "Месечни преглед"
+msgstr "Месечни преглед: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:159
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "Недељни преглед"
+msgstr "Недељни преглед: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:190
-#, fuzzy
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
-msgstr "подаци о календару"
+msgstr "преглед календара за месец"
 
-#: a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "приказ календара за један или више недеља"
 
-#: a11y/widgets/ea-calendar-item.c:296 a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:304
-#, fuzzy, c-format
+#: ../a11y/widgets/ea-calendar-item.c:304
+#, c-format
 msgid "Calendar: from %s to %s"
-msgstr "Информација о календару"
+msgstr "Календар: од %s до %s"
 
-#: a11y/widgets/ea-calendar-item.c:339
-#, fuzzy
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
-msgstr "Прегледник Еволуција календара"
+msgstr "Предмет еволуција календара"
 
-#: a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
-msgstr ""
+msgstr "Дугме за комбиновање"
 
-#: a11y/widgets/ea-combo-button.c:50
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
-msgstr "Користи _подразумевано"
+msgstr "Активирај подразумевано"
 
-#: a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
-msgstr ""
+msgstr "Искачући мени"
 
 # мало аориста ;-)
 #. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
 msgstr "Овај адресар није могуће отворити."
 
 #. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"Овај сервер адресара је или недоступан или је његово име погрешно унето или "
+"Сервер овог адресара је или недоступан или је његово име погрешно унето или "
 "је мрежа недоступна."
 
 #. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook-errors.xml.h:6
 msgid "Failed to authenticate with LDAP server."
 msgstr "Неуспешна пријава на LDAP сервер."
 
 #. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -306,12 +300,12 @@ msgstr ""
 "велика слова. укључена."
 
 #. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Овај сервер адресара не садржи предложене основе за претрагу."
 
 #. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook-errors.xml.h:12
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -322,40 +316,38 @@ msgstr ""
 "претрагу."
 
 #. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook-errors.xml.h:14
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Овај сервер не подржава податке LDAPv3 шеме података."
 
 #. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook-errors.xml.h:16
 msgid "Could not get schema information for LDAP server."
 msgstr "Неуспешно преузимање шеме података са LDAP сервера."
 
 #. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook-errors.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP сервер није одговорио исправном шемом података."
 
 #. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook-errors.xml.h:20
 msgid "Could not remove addressbook."
 msgstr "Неуспешно уклањање адресара."
 
 #. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:22
 msgid "Delete address book '{0}'?"
-msgstr "Изаберите одредишни адресар."
+msgstr "Обрисати адресар '{0}'?"
 
 # мало аориста ;-)
 #. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:24
 msgid "This address book will be removed permanently."
-msgstr "Овај адресар није могуће отворити."
+msgstr "Овај адресар биће трајно уклоњен."
 
 #. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Уређивач категорија није доступан."
 
@@ -381,13 +373,13 @@ msgstr "Уређивач категорија није доступан."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:75
-#: mail/mail-errors.xml.h:77 mail/mail-errors.xml.h:79
-#: mail/mail-errors.xml.h:81 mail/mail-errors.xml.h:83
-#: mail/mail-errors.xml.h:85 mail/mail-errors.xml.h:89
-#: mail/mail-errors.xml.h:93
+#: ../addressbook/addressbook-errors.xml.h:28
+#: ../addressbook/addressbook-errors.xml.h:36
+#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
+#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
+#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
+#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
+#: ../mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
@@ -396,49 +388,49 @@ msgstr "{0}"
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:97
+#: ../addressbook/addressbook-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Немогуће отварање адресара"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Грешка код учитавања адресара."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Претрага није могућа."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Желите ли да сачувате промене?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
+#: ../addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Изменили сте овај контакт. Желите ли да сачувате ове измене?"
 
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Одбаци"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Контакт није могуће преместити."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -447,144 +439,143 @@ msgstr ""
 "може уклонити из извора. Желите ли да направите копију уместо тога?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
+#: ../addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Чување контак(а)та није могуће."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: ../addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Грешка при чувању контакта у {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Адресар Еволуције је неочекивано завршио."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Ваши контакти за {0} неће бити доступни док се Еволуција не покрене поново."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
-msgstr "Директоријум већ постоји"
+msgstr "Адреса '{0}' већ постоји"
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
 msgstr ""
-"Промењена електронска адреса или име овог контакта\n"
-"већ постоји у овом директоријуму. Желите ли свеједно да додате?"
+"Контакт са овом адресом већ постоји.  Желите ли ипак да додате нову карту са "
+"истом адресом?"
 
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
+#: ../plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Додај"
 
 #. addressbook:server-version title
 #. calendar:server-version title
-#: addressbook/addressbook-errors.xml.h:64 calendar/calendar-errors.xml.h:142
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:146
 msgid "Server Version"
-msgstr "Верзија"
+msgstr "Верзија сервера"
 
 #. addressbook:server-version primary
 #. calendar:server-version primary
-#: addressbook/addressbook-errors.xml.h:66 calendar/calendar-errors.xml.h:144
+#: ../addressbook/addressbook-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:148
 msgid "Your server needs to be updated"
-msgstr ""
+msgstr "Серверу је потребно освежавање"
 
 #. addressbook:server-version secondary
-#: addressbook/addressbook-errors.xml.h:68
+#: ../addressbook/addressbook-errors.xml.h:68
 msgid "Some features may not work correctly with your current server version"
-msgstr ""
+msgstr "На текућој верзији сервера неке опције неће исправно радити"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за синхронизовање:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Неуспело отварање адресара"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Неуспело читање програмског блока адреса пилота"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Самодопуњавање"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "К_онтакти"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Сертификати"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Подесите самодопуњавање овде"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:235 calendar/gui/migration.c:385
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Контакти"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Еволуција адресар"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Искачући прозор за адресе Еволуција адресара"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Приказивач адреса Еволуција адресара"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Приказивач карата Еволуција адресара"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Део Еволуција адресара"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Контрола управљања S/Mime сертификатима Еволуције"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Контрола подешавања директоријума Еволуције"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Управљајте S/MIME сертификатима овде"
 
 # On This Computer is always first and VFolders is always last
 #. create the local source group
 #. On This Computer is always first and vFolders is always last
-#: addressbook/gui/component/addressbook-component.c:133
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/calendar-component.c:208 calendar/gui/migration.c:459
-#: calendar/gui/migration.c:552 calendar/gui/tasks-component.c:188
-#: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
-#: mail/mail-component.c:290 mail/mail-vfolder.c:222
+#: ../addressbook/gui/component/addressbook-component.c:133
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:290 ../mail/mail-vfolder.c:222
 msgid "On This Computer"
 msgstr "На овом рачунару"
 
@@ -596,137 +587,132 @@ msgstr "На овом рачунару"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: addressbook/gui/component/addressbook-component.c:141
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/calendar-component.c:216 calendar/gui/migration.c:467
-#: calendar/gui/migration.c:560 calendar/gui/tasks-component.c:196
-#: filter/filter-label.c:123 mail/em-migrate.c:1043 mail/mail-config.c:78
-#: mail/mail-config.glade.h:101
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:103
 msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:149
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "На LDAP серверима"
 
-#: addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:197
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:198
 msgid "Create a new contact"
 msgstr "Направи нови контакт"
 
-#: addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:205
 msgid "Contact _List"
 msgstr "Контакт ли_ста"
 
-#: addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:206
 msgid "Create a new contact list"
 msgstr "Направи нову контакт листу"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#: addressbook/gui/component/addressbook-config.c:1120
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:212
+#: ../addressbook/gui/component/addressbook-config.c:1120
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:213
 msgid "Address _Book"
 msgstr "_Адресар"
 
-#: addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:214
 msgid "Create a new address book"
 msgstr "Направи нови адресар"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:287
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Неуспешно дограђивање подешавања или директоријума адресара."
 
-#: addressbook/gui/component/addressbook-config.c:315
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
-msgstr "Налепи"
+msgstr "База"
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: addressbook/gui/component/addressbook-config.c:609
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
-msgstr "Копирај садржај директоријума локално за рад ван мреже"
-
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372 mail/em-folder-properties.c:215
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+msgstr "Копирај садржај књиге локално за рад ван мреже"
+
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.c:361
+#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:84
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Опште"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Адресар"
 
-#: addressbook/gui/component/addressbook-config.c:909
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
-msgstr "<b>Подаци сервера</b>"
+msgstr "Подаци сервера"
 
-#: addressbook/gui/component/addressbook-config.c:911
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
-msgstr "SMTP пријава"
+msgstr "Пријава"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Детаљи"
 
-#: addressbook/gui/component/addressbook-config.c:915
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
-msgstr "Тражим..."
+msgstr "Претрага"
 
-#: addressbook/gui/component/addressbook-config.c:917
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
-msgstr "<b>Преузимање</b>"
+msgstr "Преузимање"
 
-#: addressbook/gui/component/addressbook-config.c:1118
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Подешавања адресара"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Преносим..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Преносим `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Подешавање самодопуњавања"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -738,7 +724,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -748,7 +734,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -758,7 +744,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -768,214 +754,208 @@ msgstr ""
 "\n"
 "Будите·стрпљиви·док·Еволуција·преноси·податке са Pilot·Sync уређаја..."
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:935
-#: calendar/gui/calendar-component.c:526 calendar/gui/tasks-component.c:430
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Обриши"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:527 calendar/gui/tasks-component.c:431
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Подешавања..."
 
-#: addressbook/gui/component/addressbook-view.c:1130
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
-msgstr "Извори нису изабрани."
+msgstr "Бирач извора контакта"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:98
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимно приступам LDAP серверу"
 
-#: addressbook/gui/component/addressbook.c:193
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:194
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Неуспела пријава.\n"
 
-#: addressbook/gui/component/addressbook.c:200
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
-#, fuzzy, c-format
+#: ../addressbook/gui/component/addressbook.c:201
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:461
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "%sУнесите лозинку за %s (корисник %s)"
+msgstr "Унесите лозинку за %s (корисник %s)"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
-msgstr "Самодопуњавање"
+msgstr "Дужина самодопуњавања"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML за списак адреса (url) за допуњавање"
+msgstr "EFolderList XML за списак адреса (URI) за допуњавање"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML за списак адреса (url) за допуњавање"
+msgstr "EFolderList XML за списак адреса (URI) за допуњавање."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "Положај усправног панела у месечном прегледу"
+msgstr ""
+"Положај вертикалног панела, између карте и списка прегледа и панела за "
+"преглед, у пикселима."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
-msgstr "Прикажи панел \"Преглед\""
+msgstr "Прикажи панел прегледа"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Број знакова који се морају укуцати пре него еволуција покуша да самодопуни"
+"Број знакова који се морају укуцати пре него Еволуција покуша да самодопуни."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "Адреса (URL) за последњи кориштен директоријум у прозорчету за избор имена"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
-"Адреса (URL) за последњи кориштен директоријум у прозорчету за избор имена"
+"Адреса (URI) за последњи кориштен директоријум у прозорчету за избор имена."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Vertical pane position"
-msgstr "Географски положај"
+msgstr "Положај вертикалног панела"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
-msgstr "Да ли се приказује површ са директоријумима"
-
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/cal-attachment.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:6
-#: mail/message-tags.glade.h:1 plugins/shared-folder/properties.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgstr "Да ли се приказује панел прегледа."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/shared-folder/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Идентификација</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Приказ</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Преузимање</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Претрага</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Подаци сервера</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Тип:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Додај адресар"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:302
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302
 msgid "Always"
 msgstr "Увек"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Основно"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Посебно име"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Електронска адреса"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Еволуција ће користити ову електронску адресу за пријаву на сервер."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Нађи могуће основе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "При_јава:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:300
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300
 msgid "Never"
 msgstr "Никада"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Један"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Основа за _претрагу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -983,7 +963,7 @@ msgstr ""
 "Избор ове опције значи да ће се Еволуција повезати на LDAP сервер само ако "
 "сервер подржава SSL или TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -995,7 +975,7 @@ msgstr ""
 "послу, онда нема потребе да Еволуција користи SSL/TLS пошто је веза већ "
 "безбедна."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -1004,15 +984,15 @@ msgstr ""
 "Одабир ове опције значи да сервер не подржава ни SSL ни TLS.  То значи да "
 "ваша беза неће бити сигурна, и да ћете бити рањиви на сигурносне нападе. "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Под"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Подржане базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1021,7 +1001,7 @@ msgstr ""
 "База за претрагу је посебно име (DN)  уноса одакле ће ваша претрага почети. "
 "Ако ово оставите празно, претрага ће почети из корена стабла директоријума."
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1033,13 +1013,13 @@ msgstr ""
 "претрагу. Обим претраге \"one\" ће укључити само уносеједан ниво испод ваше "
 "базе."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ово је пуно име вашег ldap сервера. На пример, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1047,18 +1027,17 @@ msgstr ""
 "Ово је највећи број уноса за преузимање. Ако унесете сувише велики број "
 "успорићете ваш адресар."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Ово је метод који ће еволуција користити да вас пријави. Запазите да "
-"укључивање овога на \"Email Address\" захтева анонимни приступ на ldap "
+"Ово је метод који ће Еволуција користити да вас пријави.  Запазите да "
+"укључивање овога на \"Електронска адреса\" захтева анонимни приступ на ldap "
 "сервер."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1066,7 +1045,7 @@ msgstr ""
 "Ово је име сервера које ће се појавити у листи директоријума Еволуције. То "
 "је само за потребе приказивања. "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1076,1393 +1055,1372 @@ msgstr ""
 "је списак стандардних портова. Питајте свог систем администратора који порт "
 "да одаберете."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Коришћење посебног имена (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Корисшћење електронске адресе"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Кадгод је могуће"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Додај у _адресар"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Нађи могуће базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Log in method:"
 msgstr "Метод _пријаве:"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:160
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:163
 msgid "_Name:"
 msgstr "_Име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "Обим п_ретраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Рок:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Користи безбедну везу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "карте"
 
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1885 plugins/calendar-http/calendar-http.c:263
-#: plugins/calendar-weather/calendar-weather.c:564
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1882
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "минута"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Е-пошта</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Почетак</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Брзе поруке</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Посао</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разно</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Остало</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Телефон</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web адресе</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Посао</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Уређивач контаката"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Пуно _име..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
-msgstr "Страна"
+msgstr "Слика"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN гласник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Поштанска адреса"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Надимак:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Лични подаци"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
-msgstr "<b>Телефон</b>"
+msgstr "Телефон"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
-#: filter/filter-label.c:122 mail/em-migrate.c:1042 mail/mail-config.c:77
-#: mail/mail-config.glade.h:148
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:151
 msgid "Work"
 msgstr "Посао"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
-msgstr "Годишњица:"
+msgstr "_Годишњица:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
-msgstr "Помоћник:"
+msgstr "_Помоћник:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
-msgstr "Рођендан:"
+msgstr "_Рођендан:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1619
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1619
 msgid "_Calendar:"
-msgstr "Календар:"
+msgstr "_Календар:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Категорије"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
-msgstr "Место:"
+msgstr "_Место:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
-msgstr "Предузеће:"
+msgstr "Пр_едузеће:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
-msgstr "Држава:"
+msgstr "_Држава:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
-msgstr "Одељење:"
+msgstr "_Одељење:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Смести _под:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
-msgstr "С_лободан/заузет:"
+msgstr "С_лободно/заузето:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
-msgstr "Лична страница:"
+msgstr "_Лична страна:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
-msgstr "Управник:"
+msgstr "_Управник:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
-msgstr "Белешке:"
+msgstr "_Белешке:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
-msgstr "Канцеларија:"
+msgstr "_Канцеларија:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Поштански број:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
-msgstr "Занимање:"
+msgstr "_Занимање:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
-msgstr "Супружник:"
+msgstr "С_упружник:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Република/покрајина:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Титула:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
-msgstr "Видео разговор:"
+msgstr "_Видео разговор:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
-msgstr "Жели да прима HTML пошту"
+msgstr "_Жели да прима HTML пошту"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
-msgstr "Блог:"
+msgstr "Б_лог:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Где:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
-msgstr "Zip/Поштански број:"
+msgstr "Zip/Пош_тански број:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Адреса"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:310
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Изменљиво"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Сједињене Државе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Авганистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Албанија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Алжир"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Америчка Самоа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Андора"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Ангола"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Ангила"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Антартик"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Антига и Барбуда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Јерменија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Аруба"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Аустралија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Аустрија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Азејрбејџан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Бахами"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Бахреин"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Белорусија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Белгија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Белизе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Бенин"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Бермуда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Боливија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Босна и Херцеговина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Боцвана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Буве Острво"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Бразил"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Британска Територија Индијског Океана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Брунеј"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Бугарска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Буркина Фасо"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Камбоџа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Зеленортска Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Кајманска Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Централно Афричка Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Чад"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Чиле"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Кина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Божићна острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокос (Килинг) Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Колумбија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Комори"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Конго"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Конго, Демократска Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Кук Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Обала Слоноваче"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Хрватска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Куба"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Кипар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Чешка република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Данска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Џибути"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Доминика"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Доминиканска република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Египат"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "Ел Салвадор"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Екваторијална Гвинеја"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Еритреја"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Естонија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Етиопија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Фокландска острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Фарска острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Фиџи"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Француска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Француска Гвајана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Француска Полинезија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Француске Јужне Територије"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Габон"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Гамбија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Грузија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Немачка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Гана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Грчка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Гренланд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Гренада"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Гвадалупе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Гуам"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Гвирнзи"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Гвинеја"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Гвинеја Бисао"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Гвајана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Хаити"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Херд и Мекдоналд Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Света Столица"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Хондурас"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Хонг Конг"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Мађарска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Исланд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Индија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Индонезија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Иран"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Ирак"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Ирска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Човеково острво"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Израел"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Италија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Јамајка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Јапан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "Џерси"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Јордан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Кенија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Кореја, Демократска Народна Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Кореја, Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Кувајт"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Киргистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Лаос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Латвија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Либан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Либерија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Либија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Лихтенштајн"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Литванија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Луксембург"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Макао"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Македонија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Малави"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Малезија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Малдиви"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Мали"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Малта"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Маршалова острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Мартиник"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Мауританија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Маурицијус"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Мејот"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Мексико"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Микронезија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Република Молдавија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Монако"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Монголија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Монсерат"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Мароко"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Мианмар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Намибија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Науру"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Непал"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Холандски Антили"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Нова Каледонија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Нови Зеланд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Никарагва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Нигерија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Ниу"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Норфолк Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Острва Северна Мариана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Норвешка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Оман"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Палау"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Палестинска Територија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Панама"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Папуа Нова Гвинеја"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Парагвај"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Перу"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Филипини"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Питкрејн"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Пољска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Португал"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Порторико"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Катар"
 
 # За ову државу нисам чуо ни у сну, тако да сам оставио у оригиналу.
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Реунион"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Румунија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Руска Федерација"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Свети Китс и Невис"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Света Луција"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Свети Винсент и Гренадини"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Самоа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "Сао Томе и Принципе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Саудијска Арабија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Србија и Црна Гора"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Сејшели"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Сиера Леоне"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Словачка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Словенија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Соломонска острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Сомалија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Јужна Африка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Јужна Џорџија и Јужна Сендвич Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Шпанија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "Св. Хелена"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Св. Пјер и Микелон"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Судан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Суринам"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Свалбард и Јан Мајен Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Шведска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Швајцарска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Сирија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Таџикистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "УР Танзанија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Тајланд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Тимор-Лест"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Того"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Тонга"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Тринидад и Тобаго"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Турска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Туркс и Кокос Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Уганда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Украјина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Уједињени Арапски Емирати"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Велика Британија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Рубна Острва САД"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Уругвај"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Вијетнам"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Британска Девичанска Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Америчка Девичанска Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Волис и Фотуна Острва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Јемен"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Замбија"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Име"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL брзи гласник"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Џабер"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo гласник"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Услуга"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Место"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Корисничко име"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Кућа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Друго"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Изворни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Одредишни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
-msgstr "_Обавезне људе"
+msgstr "_Обавезна поља"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Промењено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 msgid "Please select an image for this contact"
 msgstr "Изаберите слику за овај контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 msgid "No image"
 msgstr "Без слике"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2470,27 +2428,27 @@ msgstr ""
 "Подаци о контакту су неисправни:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 msgid "_Full name:"
 msgstr "_Пуно име:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "Е-_пошта:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2498,7 +2456,7 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете ове контакте?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2506,187 +2464,184 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете овај контакт?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адреса _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Место:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Држав_а:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Пуна адреса"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP код:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Др."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Г-дин"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Пуно име"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Мл."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Г-ђица"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Г."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Г-ђа"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Г-ђица"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Ст."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Име:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Презиме:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Средње:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Суфикс:"
 
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Додај налог брзог гласника"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "Име н_алога:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_Брзогласничка услуга:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
-#: plugins/calendar-weather/calendar-weather.c:410
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Место:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Додај електронску адресу у списак"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Уређивач контакт листе"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Убаците електронске адресе из адресара"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Чланови"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Уклони електронску адресу из списка"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Сакриј адресе када шаљеш пошту на ову листу"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Име _листе:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
-msgstr "Одабери"
+msgstr "_Изабери"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Укуцајте електронску адресу или превуците контакт у доњу листу:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:296
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Књига"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Је нова листа"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
-msgstr "Чланови"
+msgstr "_Чланови"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
-msgstr "Испиши чланове"
+msgstr "Чланови конкакт листе"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Промењен контакт:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Споран контакт:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Откривен дуплиран контакт"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2694,15 +2649,15 @@ msgstr ""
 "Промењена електронска адреса или име овог контакта\n"
 "већ постоји у овом директоријуму. Желите ли свеједно да додате?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Нови контакт:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Оригиналан контакт:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2711,16 +2666,16 @@ msgstr ""
 "у овом директоријуму.  Желите ли свеједно да додате?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Нема контакта"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2728,273 +2683,274 @@ msgstr[0] "%d контакт"
 msgstr[1] "%d контакта"
 msgstr[2] "%d контаката"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Упит"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "Грешка код учитавања прегледа адресара"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Модел"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Категорија је"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Напредно..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Извор"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:319
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:320
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:541
 msgid "Address Book"
 msgstr "Адресар"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Сачувај као ВКарту..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact..."
 msgstr "Нов контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:919
 msgid "New Contact List..."
 msgstr "Нова контакт листа..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Проследи контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
 msgid "Send Message to Contact"
 msgstr "Пошаљи контакту поруку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2489
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Штампај"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Copy to Address Book..."
 msgstr "Копирај у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "Move to Address Book..."
 msgstr "Премести у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Исеци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:525 calendar/gui/tasks-component.c:429
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копирај"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Налепи"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
 msgid "Print cards"
 msgstr "Штампај карте"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Помоћник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Телефон асистента"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Пословни факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Телефон на послу"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Телефон на послу 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Повратни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Телефон у колима"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Категорије"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Телефон предузећа"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Презиме"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Смести као"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Дато име"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Кућни факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Кућни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Кућни телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Дневник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Управник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:379
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Надимак"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
 msgid "Note"
 msgstr "Напомена"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Канцеларија"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
 msgid "Organization"
 msgstr "Организација"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Други факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Други телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Пејџер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Главни телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:326
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:327
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Улога"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Супружник"
 
@@ -3004,63 +2960,62 @@ msgstr "Супружник"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Назив"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Јединица"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Web адреса"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Висина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Има фокус"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поље"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Име поља"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Модел текста"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Највећа дужина имена поља"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Ширина колоне"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -3070,11 +3025,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Нема ставки за приказивање.\n"
+"Потражите контакт\n"
 "\n"
-"Кликните двапут да направите нов контакт."
+"или кликните двапут овде за прављење новог контакта."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3088,15 +3043,17 @@ msgstr ""
 "\n"
 "Кликните двапут да направите нов контакт."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "Претрага за контактима..."
+msgstr ""
+"\n"
+"\n"
+"Претрага за контактима."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3106,104 +3063,104 @@ msgstr ""
 "\n"
 "Нема ставки за приказивање."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Одабрано"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Има курсор"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
 msgstr "(мапа)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:143
+#: ../addressbook/gui/widgets/eab-contact-display.c:209
 msgid "map"
 msgstr "мапа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:274
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Испиши чланове"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:337
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Положај"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Видео конференције"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Факс"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "посао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Блог"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "лично"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Позиција на послу"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Лична страница"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Успех"
 
 # E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Основни процес је заузет"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Архива ван мреже"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Адресар не постоји"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Лични контакт није дефинисан"
 
@@ -3212,75 +3169,79 @@ msgstr "Лични контакт није дефинисан"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Забрањен приступ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Контакт није пронађен"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "ID контакта већ постоји"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:660
-#: calendar/gui/e-calendar-table.c:458 calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Поништено"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Није могуће отказивање"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Неуспела пријава"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Пријава обавезна"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS није доступан"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Нема таквог извора"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
+"Нисмо у могућности да отворимо овај адресар. То или значи да он није означен "
+"за коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
+"овај адресар када се повежете ради преутимања садржаја"
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -3288,7 +3249,7 @@ msgstr ""
 "Отварање овог адресара није успело.  Проверите да путања постоји и да имате "
 "права приступа."
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3296,7 +3257,7 @@ msgstr ""
 "Отварање овог адресара није успело.  То значи да сте или унели погрешну "
 "адресу (URL), или је LDAP сервер недоступан."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3306,7 +3267,7 @@ msgstr ""
 "користите LDAP у Еволуцији, морате да инсталирате пакет Еволуције са "
 "подршком за LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3314,7 +3275,7 @@ msgstr ""
 "Отварање овог адресара није успело.  То значи да сте или унели погрешну "
 "адресу (URL), или је сервер недоступан."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3326,7 +3287,7 @@ msgstr ""
 "Прецизније формулишите упит или повећајте лимит\n"
 "броја резултата у поставкама адресара за сервер директоријума."
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3338,46 +3299,46 @@ msgstr ""
 "упит или повећајте временски лимит у поставкама адресара\n"
 "за сервер директоријума."
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Основни процес овог адресара није могао да обради упит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Основни процес овог адресара је одбио да обради овај упит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "Овај упит није успешно завршен."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Грешка код додавања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Грешка код додавања контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Грешка код измене листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Грешка код измене контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Грешка код уклањања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Грешка код уклањања контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3385,22 +3346,16 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"Отварање %d контакта ће отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате овај контакт?Отварање %d контаката ће "
-"отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате све ове контакте?"
+"Отварање %d контакта ће отворити и %d нов прозор.\n"
+"Да ли стварно желите да погледате ове контакте?"
 msgstr[1] ""
-"Отварање %d контакта ће отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате овај контакт?Отварање %d контаката ће "
-"отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате све ове контакте?"
+"Отварање %d контакта ће отворити и %d нова прозора.\n"
+"Да ли стварно желите да погледате ове контакте?"
 msgstr[2] ""
 "Отварање %d контакта ће отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате овај контакт?Отварање %d контаката ће "
-"отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате све ове контакте?"
+"Да ли стварно желите да погледате ове контакте?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3409,44 +3364,44 @@ msgstr ""
 "%s већ постоји\n"
 "Желите ли да препишете?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Препиши"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "листа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Премести контакт у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Копирај контакт у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Премести контакте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Копирај контакте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Изаберите одредишни адресар."
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Бројне ВКарте"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "ВКарта за %s"
@@ -3458,382 +3413,378 @@ msgstr "ВКарта за %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(празно)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Основна Е-пошта"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Одаберите акцију"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Направи нов контакт \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Додај адресу постојећем контакту \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Претражујем адресар..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Споји електронске адресе"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "и још један контакт."
-msgstr[1] "и још %d контакта."
-msgstr[2] "и још %d контаката."
+msgstr[0] "Постоји још %d контакт."
+msgstr[1] "Постоји још %d контакта."
+msgstr[2] "Постоји још %d контаката."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Прикажи целу ВКарту"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Прикажи сажету визит ВКарту"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Сачувај у адресар"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Преглед карте"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "Преглед GTK стабла"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Еволуција LDIF увозник"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP формат размене података (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Еволуција ВКарта увозник"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "ВКарта (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Штампај коверту"
 
-#: addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Штампај контакте"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Штампај контакт"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 п. Тахома"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 п. Тахома"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Празни обрасци на крају:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Тело"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Дно:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Димензије:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "Ф_онт..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Подножје:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Формат"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Заглавље"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Заглавље/Подножје"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Заглавља"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Заглавља за свако писмо"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Висина:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Одмах прати једно друго"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Укључи:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Положено"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Лево:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Језичци са словима са стране"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Маргине"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Број колона:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Опције"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Оријентација"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Страна"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Подешавање стране:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Папир"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Извор папира:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Усправно"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Изглед:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Штампај користећи сиве тонове"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Обрнуто на парним странама"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Десно:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Одељци:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Сенчење"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Величина:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Почни на новој страни"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Име стила:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Врх:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Тип:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Ширина:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Фонт..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "Проба уређивача стила за штампање контакта"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Задржана права (C) 2000, Ximian, Inc."
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "Ово испробава елемент уређивача стила за штампање контакта"
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "Проба штампе контакта"
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "Ово испробава код за штампу контаката"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Датотека не може бити отворена"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "Списак адресара није доступан"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "неуспело отварање књиге"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "ИЗЛАЗНА-ДАТОТЕКА"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "Испиши локалне датотеке адресара"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Прикажи карте као вкарте или csv датотеку"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "Извези у асинхроном режиму"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
-"Број карти у једној излазној датотеци у асинхроном режиму, подразумевано је "
-"100."
+"Број карти у једној излазној датотеци у асинхроном режиму, подразумевано 100."
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "БРОЈ"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Грешка у аргументима наредбе, користите опцију --help да видите како се "
 "користи."
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Подржава само csv или vcard формате."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "У асинхроном режиму, излаз мора бити датотека."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "У нормалном режиму, нема потребе за подешавањем величине."
 
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Грешка код учитавања предефинисаног адресара."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Улазна датотека"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Име датотеке није дато."
 
 # calendar:prompt-cancel-task primary
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Желите ли да пошаљете свим учесницима обавештење о отказивању?"
 
 #. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar-errors.xml.h:4
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3841,31 +3792,31 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је састанак отказан."
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
+#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
+#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
+#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
+#: ../calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Не шаљи"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
+#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
+#: ../calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Пошаљи обавештење"
 
 #. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar-errors.xml.h:8
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурно желите да обришете овај састанак?"
 
 #. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Сви подаци о овом састанку биће уклоњени и неће се моћи повратити."
 
 #. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar-errors.xml.h:14
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -3874,7 +3825,7 @@ msgstr ""
 "знати да је задужење обрисано."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете ово задужење?"
 
@@ -3883,18 +3834,18 @@ msgstr "Сигурно желите да обришете ово задужењ�
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
+#: ../calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Сви подаци о овом задужењу ће бити обрисани и неће се моћи повратити."
 
 #. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Желите ли да пошаљете обавештење о отказивању за овај унос у дневник?"
 
 #. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar-errors.xml.h:24
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -3903,12 +3854,12 @@ msgstr ""
 "знати да је овај дневник обрисан."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Сигурно желите да обришете овај унос у дневник?"
 
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3916,14 +3867,14 @@ msgstr ""
 "Сви подаци о овом уносу у дневник ће бити обрисани и неће се моћи повратити."
 
 #. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:32
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Сигурно желите да обришете састанак назван '{0}'?"
 
 # calendar:prompt-delete-appointment secondary
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
@@ -3931,36 +3882,36 @@ msgstr ""
 "повратити."
 
 #. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar-errors.xml.h:36
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурно желите да обришете овај састанак?"
 
 #. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar-errors.xml.h:40
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Сигурно желите да обришете '{0}' задужење?"
 
 #. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar-errors.xml.h:48
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Сигурно·желите·да·обришете унос у дневник '{0}'?"
 
 # calendar:prompt-delete-journal secondary
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "Сви подаци у овом дневнику биће уклоњени и неће се моћи повратити."
 
 # bug: plural-forms
 #. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar-errors.xml.h:56
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Сигурно желите да обришете ових {0} састанака?"
 
 #. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3968,23 +3919,23 @@ msgstr "Сви подаци о овим састанцима биће уклоњ
 
 # bug: plural-forms
 #. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar-errors.xml.h:60
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Сигурно желите да обришете ових {0} задужења?"
 
 #. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Сви подаци о овим задужењима биће уклоњени и неће се моћи повратити."
 
 # bug: plural-forms
 #. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:64
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Сигурно желите да обришете ових {0} уноса у дневник?"
 
 #. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3992,68 +3943,68 @@ msgstr ""
 "Сви подаци у овим уносима у дневник биће уклоњени и неће се моћи повратити."
 
 #. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar-errors.xml.h:68
 msgid "Save Appointment"
 msgstr "Сачувај састанак"
 
 #. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar-errors.xml.h:70
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Желите ли да сачувате измене за овај састанак?"
 
 #. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar-errors.xml.h:72
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Променили сте овај састанак, али промене још нису сачуване."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Занемари промене"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Сачувај промене"
 
 #. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
+#: ../calendar/calendar-errors.xml.h:76
 msgid "Save Task"
 msgstr "Сачувај задужење"
 
 #. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar-errors.xml.h:78
 msgid "Would you like to save your changes to this task?"
 msgstr "Желите ли да сачувате промене за ово задужење?"
 
 #. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
+#: ../calendar/calendar-errors.xml.h:80
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Променили сте ово задужење, али промене још нису сачуване."
 
 #. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar-errors.xml.h:84
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Желите ли да пошаљете позиве на састанак учесницима?"
 
 # bug: what's RSVP?
 #. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar-errors.xml.h:86
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr "Позивнице е-поштом биће послате свим учесницима да би се припремили."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
+#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Пошаљи"
 
 #. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о састанку учесницима?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar-errors.xml.h:92
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4062,12 +4013,12 @@ msgstr ""
 "у току."
 
 #. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar-errors.xml.h:96
 msgid "Would you like to send this task to participants?"
 msgstr "Желите ли да пошаљете ово задужење учесницима?"
 
 #. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar-errors.xml.h:98
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4076,12 +4027,12 @@ msgstr ""
 "задужење."
 
 #. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar-errors.xml.h:102
 msgid "Would you like to send updated task information to participants?"
 msgstr "Желите ли да пошаљете освежене податке о задужењу учесницима?"
 
 #. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar-errors.xml.h:104
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4090,305 +4041,303 @@ msgstr ""
 "задужења буде у току."
 
 #. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar-errors.xml.h:108
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Еволуција задужења су неочекивано завршила."
 
 #. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ваша задужења неће бити доступна док се Еволуција поново не покрене."
 
 #. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar-errors.xml.h:112
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календар Еволуције је неочекивано завршио."
 
 #. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Ваши календари неће бити доступни док се Еволуција поново не покрене."
 
-#. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#. calendar:editor-error primary
+#: ../calendar/calendar-errors.xml.h:116
 #, fuzzy
+msgid "Editor could not be loaded."
+msgstr "Објекат није могао бити пронађен\n"
+
+#. calendar:editor-error secondary
+#. mail:async-error-nodescribe secondary
+#: ../calendar/calendar-errors.xml.h:118 ../mail/mail-errors.xml.h:73
+msgid "{0}."
+msgstr "{0}."
+
+#. calendar:prompt-delete-calendar primary
+#: ../calendar/calendar-errors.xml.h:120
 msgid "Delete calendar '{0}'?"
-msgstr "Обрисати \"{0}\"?"
+msgstr "Обрисати календар \"{0}\"?"
 
 #. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar-errors.xml.h:122
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "Овај календар ће бити трајно уклоњен."
 
 #. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:124
 msgid "Delete task list '{0}'?"
-msgstr "Обриши ову листу"
+msgstr "Обрисати списак задужења '{0}'?"
 
 #. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar-errors.xml.h:126
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "Овај списак задужења ће бити трајно уклоњен."
 
 #. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:128
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Сигурно желите да пошаљете поруку без наслова?"
+msgstr "Сигурно желите да пошаљете састанак без прегледа?"
 
 #. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:130
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"Убацивањем смисленог наслова у ваше поруке даћете примаоцима до знања о чему "
-"је реч у њој."
+"Убацивањем смисленог прегледа у ваш састанак даћете примаоцима до знања у "
+"вези чега је састанак."
 
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:131 ../calendar/calendar-errors.xml.h:136
+#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
+#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:133
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Сигурно желите да пошаљете поруку без наслова?"
+msgstr "Сигурно желите да пошаљете задужење без прегледа?"
 
 #. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:135
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Убацивањем смисленог наслова у ваше поруке даћете примаоцима до знања о чему "
-"је реч у њој."
+"Убацивањем смисленог прегледа у ваше задужење даћете примаоцима до знања шта "
+"је задужење."
 
 #. calendar:prompt-no-contents-offline-calendar primary
-#: calendar/calendar-errors.xml.h:134
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:138
 msgid "Error loading calendar"
-msgstr "Грешка код отварања календара"
+msgstr "Грешка у учитавању календара"
 
 #. calendar:prompt-no-contents-offline-calendar secondary
-#: calendar/calendar-errors.xml.h:136
+#: ../calendar/calendar-errors.xml.h:140
 msgid "The calendar is not marked for offline usage"
-msgstr ""
+msgstr "Овај календар није означен за коришћење ван мреже"
 
 #. calendar:prompt-no-contents-offline-tasks primary
-#: calendar/calendar-errors.xml.h:138
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:142
 msgid "Error loading task list"
-msgstr "Грешка код додавања листе"
+msgstr "Грешка у учитавању списка задужења"
 
 #. calendar:prompt-no-contents-offline-tasks secondary
-#: calendar/calendar-errors.xml.h:140
+#: ../calendar/calendar-errors.xml.h:144
 msgid "The task list is not marked for offline usage"
-msgstr ""
+msgstr "Овај списак заду-ења није означен за коришћење ван мреже"
 
 #. calendar:server-version secondary
-#: calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version"
-msgstr ""
+#: ../calendar/calendar-errors.xml.h:150
+#, fuzzy
+msgid "Some features may not work correctly with your current server version "
+msgstr " На текућој верзији сервера неке опције можда неће исправно радити "
 
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Унесите лозинку"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Подели вишедневне догађаје:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Неуспело покретање еволуција-сервера-података"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Неуспело читање програмског блока календара"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Предефинисан приоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неуспело читање пилотовог ToDo програмског блока"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Календар и задужења"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "Календари"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Подесите временску зону, календар и листу задужења овде "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Еволуција календар и задужења"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Контрола подешавања Еволуција календара"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Прегледник заказаних порука Еволуција календара"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Уређивач Еволуција календара/задужења"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Део Еволуција календара"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Део Еволуција задужења"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1219 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:508 calendar/gui/tasks-component.c:981
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:992
+#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Задужења"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Календари"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Задужења"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Сервис за аларм обавештења Еволуција календара"
 
 # bug: plural-forms
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "минута"
+msgstr[0] "минут"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:140 calendar/gui/print.c:2298
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Састанак"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Appointment Title"
-msgstr "Састанак"
+msgstr "Наслов састанка"
 
 #. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:876
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../plugins/itip-formatter/itip-view.c:876
 msgid "End time:"
-msgstr "Време _завршетка:"
+msgstr "Време завршетка:"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:859
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Место:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "Snooze _time:"
-msgstr "Време _дремања (минути):"
+msgstr "Време _дремања:"
 
 #. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:867
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "Start time:"
-msgstr "_Време почетка:"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+msgstr "Време почетка:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:156
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:38
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "Дре_мај"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "description of appointment"
-msgstr "почетак састанка"
+msgstr "опис састанка"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 msgid "end-time"
-msgstr "Време _завршетка:"
+msgstr "време-завршетка"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
 msgid "location"
-msgstr "Место"
+msgstr "место"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
 msgid "start-time"
-msgstr "_Време почетка:"
+msgstr "време-почетка"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: ../calendar/gui/alarm-notify/alarm-queue.c:880
 msgid "Dismiss"
 msgstr "Одбаци"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:878
+#: ../calendar/gui/alarm-notify/alarm-queue.c:881
 msgid "Dismiss All"
 msgstr "Одбаци све"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:960
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:963
 msgid "No summary available."
-msgstr "Нема описа."
+msgstr "Нема доступног описа."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:969
-#: calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:972
+#: ../calendar/gui/alarm-notify/alarm-queue.c:974
 msgid "No description available."
 msgstr "Нема описа."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:982
 msgid "No location information available."
-msgstr "Нема описа."
+msgstr "Нема доступног податка о локацији."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:995
+#: ../calendar/gui/alarm-notify/alarm-queue.c:998
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4401,12 +4350,12 @@ msgstr ""
 "Почиње у %s\n"
 "Завршава се у %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1097
-#: calendar/gui/alarm-notify/alarm-queue.c:1121
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1101
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1125
 msgid "Warning"
 msgstr "Упозорење"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1101
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1105
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4418,7 +4367,7 @@ msgstr ""
 "подсетник подешен да пошаље поруку. Еволуција ће\n"
 "уместо тога показати нормалан прозор за дијалог."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1127
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1131
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4435,370 +4384,351 @@ msgstr ""
 "\n"
 "Сигурно желите да покренете овај програм?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1141
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1145
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Неуспело покренетање Бонобо"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Неуспело покренетање сервиса за аларм обавештења"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "погрешно време"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
-msgstr "Покрени програм"
+msgstr "Програми за аларм"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Ask for confirmation when deleting items"
-msgstr "_Тражи потврду за брисање података"
+msgstr "Тражи потврду за брисање предмета"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Боја задужења за данас"
+msgstr "Боја позадине задужења за данас, у формату \"#rrggbb\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Боја закаснелих задужења"
+msgstr "Боја позадине закаснелих задужења, у формату \"#rrggbb\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Календари за које се покреће аларм"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Compress weekends in month view"
-msgstr "_Скупи недеље у месечни приказ"
+msgstr "Скупи недеље у месечни приказ"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Confirm expunge"
-msgstr "_Потврди када празниш директоријум"
+msgstr "Потврди пражњење"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
+msgstr "Потребно је означити дане којима почињу и завршавају се радни сати."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Default appointment reminder"
-msgstr "Обриши састанак"
+msgstr "Подразумевани подсетник за састанак"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Default reminder units"
-msgstr "Подразумевана ширина прозора"
+msgstr "Подразумеване јединице подсетника"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default reminder value"
-msgstr "Подразумевани календар за сервер"
+msgstr "Подразумевана вредност подсетника"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Free/busy server urls"
-msgstr "Слободно/заузето захтев"
+msgstr "Адресе (url) сервера слободно/заузето"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Free/busy template url"
-msgstr "Слободно/заузето одговор"
+msgstr "Модел адреса слободно/заузето"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Hide completed tasks"
-msgstr "_Сакриј испуњена задужења после"
+msgstr "Сакриј испуњена задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Hide task units"
-msgstr "Нови списак задужења"
+msgstr "Сакриј јединице задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide task value"
-msgstr ""
+msgstr "Сакриј вредност задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Horizontal pane position"
-msgstr "Географски положај"
+msgstr "Хоризонтални положај панела"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
+"Сат којим се завршава радна недеља, у двадесетчетворочасовном формату, од 0 "
+"до 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
+"Сат којим почиње радна недеља, у двадесетчетворочасовном формату, од 0 до 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Last alarm time"
-msgstr ""
+msgstr "Последње време за аларм"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "List of server urls for free/busy publishing."
-msgstr "Списак адреса (url) за објављивање слободан/заузет"
+msgstr "Списак адреса (url) сервера за објављивање слободно/заузето."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Minute the workday ends on, 0 to 59"
-msgstr "Минут којим се завршава радни дан"
+msgstr "Минут којим се завршава радни дан, од 0 до 59"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Minute the workday starts on, 0 to 59."
-msgstr "Минут којим почиње радни дан"
+msgstr "Минут којим почиње радни дан, од 0 до 59."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Month view horizontal pane position"
-msgstr "Положај водоравног панела"
+msgstr "Положај водоравног панела месечног приказа"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Month view vertical pane position"
-msgstr "Положај усправног панела у главном прегледу"
+msgstr "Положај вертикалног панела месечног приказа"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Number of units for determining for a default reminder."
-msgstr "Број јединица за предефинисани подсетник"
+msgstr "Број јединица за подразумевани подсетник."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Number of units for determining when to hide tasks."
-msgstr "Број јединица за одређивање када сакрити задужења"
+msgstr "Број јединица за одређивање када сакрити задужења."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Overdue tasks color"
-msgstr "_Неиспуњена задужења:"
+msgstr "Боја неиспуњених задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
+"Позиција хоризонталног панела, између календаровог навигатора за датум и "
+"списка задужења када није постављен месечни приказ, у пикселима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Позиција хоризонталног панела, између приказа и календаровог навигатора "
+"датума и списка задужења у месечном приказу, у пикселима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid ""
 "Position of the vertical pane, between task list and the task preview pane, "
 "in pixels."
-msgstr "Положај усправног панела у прегледу задужења"
+msgstr ""
+"Положај вертикалног панела, између списка задужења и панела за преглед "
+"задужења, у пикселима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Позиција вертикалног панела, између приказа и календаровог навигаторадатума "
+"и списка задужења у месечном приказу, у пикселима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
+"Позиција вертикалног панела, између приказа и календаровог навигатора "
+"календара и списка задужења када није постављен месечни приказ, у пикселима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Programs that are allowed to be run by alarms."
-msgstr "Програми који могу да се покрену као део аларма"
+msgstr "Програми који могу бити покренути алармима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid "Show appointment end times in week and month views"
-msgstr "_Покажи времена завршетка састанака у недељним и месечним приказима"
+msgstr "Приказује времена завршетка састанака у недељним и месечним приказима"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "Приказује аларме у обавештајној зони"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Show week numbers in date navigator"
-msgstr "Покажи _бројеве недеља у навигатору за датуме"
+msgstr "Приказује бројеве недеља у навигатору за датуме"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid "Tasks due today color"
-msgstr "З_адужења за данас:"
+msgstr "Боја задужења за данас"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid "Tasks vertical pane position"
-msgstr "Географски положај"
+msgstr "Положај вертикалног панела задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
+"Подразумевана временска зона коју календар користи за датуме и времена, "
+"каонепреведено место базе временске зоне Olsen као \"Америка/Њујорк\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
+"Модел адресе (url) за коришћење у повраћају података слободно/заузето, %u се "
+"замењује корисничким делом електронске адресе а %d доменом."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
 "minutes."
-msgstr "Интервали приказани у прегледима дана и радне недеље"
+msgstr ""
+"Поделе времена</short> <short>Интервали приказани у дневним и недељним "
+"прегледима, у минутима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Time the last alarm ran, in time_t."
-msgstr "Време последњег покретања аларма"
+msgstr "Време последњег покретања аларма, у времену_t."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Twenty four hour time format"
-msgstr ""
+msgstr "Давадесетчетворочасовни формат времена"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
+"Јединице за подразумевани подсетник, \"минути\", \"сати\" или \"дани\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Јединице за одређивање када сакрити задужења"
+msgstr ""
+"Јединице за одређивање када сакрити задужења, \"минути\", \"сати\", или "
+"\"дани\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Week start"
-msgstr "Почетак н_едеље:"
+msgstr "Почетак недеље"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Дан којим почиње недеља"
+msgstr "Дан којим почиње недеља, од недеље (0) до суботе (6)."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Да ли да користи обавештајну зону за приказивање аларма"
+msgstr "Да ли да користи обавештајну зону за приказивање аларма."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Да ли да тражи потврду брисања састанака"
+msgstr "Да ли да тражи потврду брисања састанака или задужења."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Да ли да тражи потврду брисања састанака"
+msgstr "Да ли да тражи потврду брисања састанака и задужења."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
+"Да ли да сабије викенде у месечном приказу, који суботу и недељу ставља у "
+"простор радног дана."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "_Покажи времена завршетка састанака у недељним и месечним приказима"
+msgstr ""
+"Да ли да прикаже времена завршетка састанака у недељним и месечним приказима."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Да ли да сакрије урађена задужења"
+msgstr "Да ли да сакрије обављена задужења у прегледу задужења."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether to set a default reminder for appointments."
-msgstr "Да ли да постави предефинисани подсетник за догађаје"
+msgstr "Да ли да постави подразумевани подсетник за састанке."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Да ли да прикаже време у 24ч облику уместо am/pm"
+msgstr ""
+"Да ли да прикаже време у двадесеточасовном облику уместо коришћења am/pm."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Да ли да прикаже бројеве недеља у избирачу датума"
+msgstr "Да ли да прикаже бројеве недеља у навигатору датума."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Work days"
-msgstr "Радни дани:"
+msgstr "Радни дани"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Workday end hour"
-msgstr "Час којим се завршава радни дан"
+msgstr "Сат којим се завршава радни дан"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Workday end minute"
-msgstr "_Рад на мрежи"
+msgstr "Минут којим се завршава радни дан"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Workday start hour"
-msgstr "Час којим почиње радни дан"
+msgstr "Сат којим почиње радни дан"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Workday start minute"
-msgstr "Час којим почиње радни дан"
+msgstr "Минут којим почиње радни дан"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Преглед садржи"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Путања садржи"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Нерасподељено"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1942
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/dialogs/calendar-setup.c:362
+#: ../calendar/gui/gnome-cal.c:1950
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4807,817 +4737,822 @@ msgstr ""
 "Ова операција ће трајно обрисати све догађаје пре изабраног рока. Уколико "
 "наставите, нећете моћи да повратите ове догађаје."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Обриши догађаје старије од"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
-#: plugins/calendar-weather/calendar-weather.c:566
-#: widgets/misc/e-send-options.glade.h:39
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "дана"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: calendar/gui/calendar-component.c:223 calendar/gui/migration.c:486
-#: calendar/gui/migration.c:579 calendar/gui/tasks-component.c:204
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "На интернету"
 
-#: calendar/gui/calendar-component.c:241 calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Рођендани и годишњице"
 
 #. Create the weather group
-#: calendar/gui/calendar-component.c:247
-#: plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:258
+#: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "абаЕаМаЕ"
 
-#: calendar/gui/calendar-component.c:524
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Нов календар"
 
-#: calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:843
 msgid "Failed upgrading calendars."
 msgstr "Неуспешно дограђивање календара."
 
-#: calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Није могуће отварити календар '%s' за прављење догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1155
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:1265
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
-msgstr "Путања календара"
+msgstr "Бирач извора календара"
 
-#: calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "Нов састанак"
 
-#: calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "_Састанак"
 
-#: calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "Закажи састанак"
 
-#: calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "Нов састанак"
 
-#: calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "Направи нови захтев за састанак"
 
-#: calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "Нови целодневни састанак"
 
-#: calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "Цело_дневни састанак"
 
-#: calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "Направи нови целодневни састанак"
 
-#: calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/calendar-component.c:1481
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "Направи нови календар"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Дневни преглед"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Преглед радне недеље"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Недељни преглед"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Месечни преглед"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Грешка код отварања календара"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Метод није подржан код отварања календара"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Забрањен приступ календару"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1264
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1264
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
-msgstr "<b>Аларм</b>\t"
+msgstr "<b>Аларм</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Подешавања</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Понови</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Додај аларм"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Произвољна _порука"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Произвољни звук аларма"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "По_рука:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Пусти звук"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Искачуће упозорење"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Покрени програм"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "Пошаљи:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Пошаљи електронску поруку"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Аргументи:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Програм:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "По_нови аларм"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Звук:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "после"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "пре"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "дан(а)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "крај састанка"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "покажи још на сваких"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "сат(а)"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
-#: plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "сати"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "минут(а)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "почетак састанка"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Акција/покретач"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "_Додај"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Аларми"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
+#: ../composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
+#: ../composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:922
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:922
+#: ../composer/e-msg-composer-attachment-bar.c:295 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "прилог"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:439
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:437
-#: plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
+#: ../calendar/gui/dialogs/meeting-page.c:784
+#: ../composer/e-msg-composer-attachment-bar.c:437
+#: ../plugins/shared-folder/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:438 mail/em-folder-tree.c:2818
-#: ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
+#: ../composer/e-msg-composer-attachment-bar.c:438
+#: ../mail/em-folder-tree.c:2820 ../ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "По_ставке"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:440
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
+#: ../composer/e-msg-composer-attachment-bar.c:440
 msgid "_Add attachment..."
-msgstr "Додај прилог..."
+msgstr "_Додај прилог..."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:699
-#: composer/e-msg-composer-attachment-bar.c:703
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:699
+#: ../composer/e-msg-composer-attachment-bar.c:703
 msgid "Attachment Bar"
-msgstr "Прилог"
-
-#: calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: calendar/gui/dialogs/cal-attachment.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:95
-#: composer/e-msg-composer-select-file.c:115
+msgstr "Трака прилога"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:95
+#: ../composer/e-msg-composer-select-file.c:115
 msgid "Suggest automatic display of attachment"
 msgstr "Предложи аутоматско отварање прилога"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:231
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:231
 msgid "Attach file(s)"
 msgstr "Приложи датотеку(е)"
 
-#: calendar/gui/dialogs/cal-attachment.c:197
-#: calendar/gui/dialogs/cal-attachment.c:213
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:197
+#: ../calendar/gui/dialogs/cal-attachment.c:213
+#: ../composer/e-msg-composer-attachment.c:174
+#: ../composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Није могуће прилагање датотеке %s: %s"
 
-#: calendar/gui/dialogs/cal-attachment.c:205
-#: composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:205
+#: ../composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Није могуће прилагање датотеке %s: није регуларна датотека"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:2
-#: composer/e-msg-composer-attachment.glade.h:2
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Подешавања прилога"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:68
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:68
 msgid "Description:"
 msgstr "Опис:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:4
-#: composer/e-msg-composer-attachment.glade.h:4
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Име датотеке:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:5
-#: composer/e-msg-composer-attachment.glade.h:5
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "МИМЕ тип:"
 
 # has "activatable" set.
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:476
-#: mail/em-composer-prefs.c:888 plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Омогућено"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Сигурно желите да уклоните ову адресу (URL)?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Уклони"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Не уклањај"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:382
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Онемогући"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:384
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Омогући"
 
 # bug: is zero needed?
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Узбуне</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>К_алендари за слободно/заузето</b>"
+msgstr "<b>Подразумевани сервер за слободно/заузето</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Опште</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
-msgstr "<b>Учесталост објављивања</b>"
+msgstr "<b>Објављивање</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Списак задужења</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Време</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Радна недеља</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
+"<i>%u и %d биће замењени корисником и доменом из електронске адресе.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Подешавања календара и задужења"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Боја неизвршених задужења после рока"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Боја задужења за данас"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Крај _дана:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Дани"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Приказ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: mail/mail-config.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:73
 msgid "E_nable"
 msgstr "О_могући"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
-msgstr "С_лободан/заузет:"
+msgstr "С_лободно/заузето"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Петак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Сати"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Понедељак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Publishing Table"
+msgstr "<b>Објављивање</b>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "Н_ед"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
 msgstr "По_кажи подсетник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
 msgstr "Покажи _бројеве недеља у навигатору за датуме"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Недеља"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
 msgstr "З_адужења за данас:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr "У_то"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
-msgstr "Одељење:"
+msgstr "Модел:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:1043
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
 msgstr "Временска зона:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "Формат времена:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr "Почетак н_едеље:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Среда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Work days:"
 msgstr "Радни дани:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
 msgstr "_12 очасовни (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
 msgstr "_24-очасовни"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr "Додај _адресу (URL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Тражи потврду за брисање података"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
 msgstr "_Скупи недеље у месечни приказ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr "Почетак _дана:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr "_Пет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
 msgstr "_Сакриј испуњена задужења после"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr "_Пон"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
 msgstr "_Неиспуњена задужења:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr "_Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
 msgstr "_Покажи времена завршетка састанака у недељним и месечним приказима"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr "Подела _времена:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr "_Уто"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr "_Сре"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
 msgstr "пре сваког састанка"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
-msgstr ""
+msgstr "мени са опцијама за бирање јединица подсетника"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
-msgstr ""
+msgstr "мени са опцијама за бирање јединица времена"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:284
 msgid "Copy calendar contents locally for offline operation"
-msgstr "Копирај садржај директоријума локално за рад ван мреже"
+msgstr "Копира садржај календара локално за рад ван мреже"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Боја:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:373
 msgid "Tasks List"
 msgstr "Списак задужења"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:440
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Task List Properties"
 msgstr "Особине списка задужења"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Додај календар"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Додај списак задужења"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:104
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Додај календар"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Додај списак задужења"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "О_свежи:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_Адреса (URL):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "недеље"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ово задужење је обрисано."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Овај унос у дневник је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Начинили сте промене. Да их занемарим и затворим уређивач?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Нисте начинили промене, да затворим уређивач?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Овај догађај је промењен."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ово задужење је промењено."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Овај унос у дневник је промењен."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Начинили сте промене. Да их занемарим и освежим уређивач?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили промене, да освежим уређивач?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " за "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Завршено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Завршено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (До "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "До "
 
-#: calendar/gui/dialogs/comp-editor.c:181 composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2676
 #, c-format
 msgid "Attached message - %s"
 msgstr "Приложена порука - %s"
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:186
-#: calendar/gui/dialogs/comp-editor.c:349 composer/e-msg-composer.c:2681
-#: composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:186
+#: ../calendar/gui/dialogs/comp-editor.c:349 ../composer/e-msg-composer.c:2681
+#: ../composer/e-msg-composer.c:2844
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Приложена порука"
+msgstr[0] "%d прикачена порука"
 msgstr[1] "%d прикачене поруке"
 msgstr[2] "%d прикачених порука"
 
-#: calendar/gui/dialogs/comp-editor.c:412 calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1402 composer/e-msg-composer.c:2906
-#: mail/em-folder-tree.c:1046 mail/em-folder-view.c:966
-#: mail/message-list.c:1707 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:105 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/dialogs/comp-editor.c:412
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1406 ../composer/e-msg-composer.c:2906
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:980
+#: ../mail/message-list.c:1707 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:105 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Копирај"
 
-#: calendar/gui/dialogs/comp-editor.c:413 composer/e-msg-composer.c:2907
-#: mail/em-folder-tree.c:1047 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862 mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:413 ../composer/e-msg-composer.c:2907
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:876 ../mail/message-list.c:1708
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: calendar/gui/dialogs/comp-editor.c:415 composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1049 mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:415 ../composer/e-msg-composer.c:2909
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1710
 msgid "Cancel _Drag"
 msgstr "Откажи _превлачење"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: ../calendar/gui/dialogs/comp-editor.c:682
 msgid "Could not update object"
 msgstr "Нисам могао да освежим објекат"
 
-#: calendar/gui/dialogs/comp-editor.c:843 composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:843 ../composer/e-msg-composer.c:2310
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -5625,323 +5560,323 @@ msgstr[0] "<b>%d</b> датотека прикачена"
 msgstr[1] "<b>%d</b> датотеке прикачене"
 msgstr[2] "<b>%d</b> датотека прикачено"
 
-#: calendar/gui/dialogs/comp-editor.c:900 composer/e-msg-composer.c:2339
+#: ../calendar/gui/dialogs/comp-editor.c:900 ../composer/e-msg-composer.c:2339
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Сакриј _траку прилога (овде превуците прилоге)"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:955 composer/e-msg-composer.c:2342
-#: composer/e-msg-composer.c:3471
+#: ../calendar/gui/dialogs/comp-editor.c:903
+#: ../calendar/gui/dialogs/comp-editor.c:955 ../composer/e-msg-composer.c:2342
+#: ../composer/e-msg-composer.c:3487
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Прикажи _траку прилога (овде превуците прилоге)"
 
-#: calendar/gui/dialogs/comp-editor.c:979 composer/e-msg-composer.c:3493
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../composer/e-msg-composer.c:3509
 msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
+msgstr "Дугме за прилоге: притисни размакницу за приказ траке за прилоге"
 
-#: calendar/gui/dialogs/comp-editor.c:1526
-#: calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1540
+#: ../calendar/gui/dialogs/comp-editor.c:1583
 msgid "Edit Appointment"
 msgstr "Уреди састанак"
 
-#: calendar/gui/dialogs/comp-editor.c:1532
-#: calendar/gui/dialogs/comp-editor.c:1575
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:1546
+#: ../calendar/gui/dialogs/comp-editor.c:1589
+#, c-format
 msgid "Meeting - %s"
-msgstr "Састанак"
+msgstr "Састанак - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1534
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Састанак - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1538
-#: calendar/gui/dialogs/comp-editor.c:1581
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:1552
+#: ../calendar/gui/dialogs/comp-editor.c:1595
+#, c-format
 msgid "Assigned Task - %s"
-msgstr "_Добијено задужење"
+msgstr "Добијено задужење - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1540
-#: calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1597
 #, c-format
 msgid "Task - %s"
 msgstr "Задужење - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1543
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1600
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Унос у дневник - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1554
-#: calendar/gui/dialogs/comp-editor.c:1596
+#: ../calendar/gui/dialogs/comp-editor.c:1568
+#: ../calendar/gui/dialogs/comp-editor.c:1610
 msgid "No summary"
 msgstr "Нема прегледа"
 
-#: calendar/gui/dialogs/comp-editor.c:2030
-#: calendar/gui/dialogs/comp-editor.c:2063
-#: calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2106
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промене начињене на овом предмету могу бити занемарене ако буде освежен"
 
-#: calendar/gui/dialogs/comp-editor.c:2111
+#: ../calendar/gui/dialogs/comp-editor.c:2130
 msgid "Unable to use current version!"
 msgstr "Није могуће корисшћење текуће верзије!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Није могуће отварање извора"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Није могуће отворање одредишта"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Одредиште се може само читати"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Догађај није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задужење није могло бити избрисано због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Унос у дневник није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Унос није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Догађај није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задужење није могло бити обрисано због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Унос у дневник није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Унос није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Догађај није могао бити обрисан услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Задужење није могло бити обрисано услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Унос у дневник није могао бити обрисан услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Унос није могао бити обрисан услед грешке"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "_Контакти..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Делегирај:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Повраћај"
 
-#: calendar/gui/dialogs/event-editor.c:161
-#: calendar/gui/dialogs/event-editor.c:233
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:402
 msgid "Scheduling"
 msgstr "Заказивање"
 
-#: calendar/gui/dialogs/event-editor.c:168
-#: calendar/gui/dialogs/event-editor.c:236
-#: calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:173
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:405
 msgid "Invitations"
 msgstr "Позивнице"
 
-#: calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:721
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:724
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: calendar/gui/dialogs/event-page.c:894 calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:557
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:900
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:923
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:930
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1676
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Није могуће отварање календара '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1881
+#: ../calendar/gui/dialogs/event-page.c:1882
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "%d дан пре састанка"
+msgstr[0] "%d дан пре заказаног састанка"
 msgstr[1] "%d дана пре заказаног састанка"
 msgstr[2] "%d дана пре заказаног састанка"
 
-#: calendar/gui/dialogs/event-page.c:1889
+#: ../calendar/gui/dialogs/event-page.c:1890
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "%d час пре састанка"
+msgstr[0] "%d час пре заказаног састанка"
 msgstr[1] "%d часа пре заказаног састанка"
 msgstr[2] "%d часова пре заказаног састанка"
 
-#: calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/event-page.c:1898
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "%d минут пре састанка"
+msgstr[0] "%d минут пре заказаног састанка"
 msgstr[1] "%d минута пре заказаног састанка"
 msgstr[2] "%d минута пре заказаног састанка"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "1 дан пре састанка"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 час пре састанка"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 минута пре састанка"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Основе</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Date and Time</b>"
 msgstr "<b>Датум и време</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
-msgstr "<b>Подешавања</b>"
+msgstr "<b>Подешавања слања</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Ц_елодневни догађај"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Ad_vanced  send options"
-msgstr ""
+msgstr "На_предне  опције слања"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "_Прилагоди..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ка_тегорије..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Кале_ндар:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "_Разврставање:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Поверљиво"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
-msgstr "ааПаИб"
+msgstr "Опис догађаја"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Место:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
-#: calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Лично"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Јавно"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Прикажи време као _заузето"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "Пре_глед:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Овај састанак има произвољне аларме"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Аларм"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Опис:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
@@ -5955,453 +5890,454 @@ msgstr "_Време почетка:"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2117 filter/filter-rule.c:878
-#: mail/em-account-editor.c:685 mail/em-account-editor.c:1291
-#: mail/em-account-prefs.c:437 mail/em-folder-view.c:993
-#: plugins/calendar-weather/calendar-weather.c:371
-#: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1376
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:296
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2117
+#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1288 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1009
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
+#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ништа"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:435
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:441
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:456
 msgid "At least one attendee is required."
 msgstr "Најмање један учесник је потребан."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:781
 msgid "_Delegate To..."
 msgstr "_Делегирај..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:308
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:309
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "_Учесник"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Притисните овде да додате учесника"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Заједничко име"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Делегирано од"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Делегирано за"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Језик"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Члан"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:333
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:334
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:146
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:340
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:341
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стање"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "<b>Att_endees</b>"
 msgstr "<b>Учесни_ци</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "C_hange Organizer"
 msgstr "_Промени организатора"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Кон_такти..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
-#, fuzzy
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
 msgid "Organizer"
-msgstr "Организатор:"
+msgstr "Организатор"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Подешавања календара</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Додај нови календар"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Група календара"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Путања календара"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Име календара"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Подешавања списка задужења</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Додај нови списак задужења"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Група списка задужења"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Име списка задужења"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Мењате повратни догађај, шта желите да измените?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Мењате повратно задужење, шта желите да измените?"
 
 # повратни > редовни
-#: calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Мењате повратни унос у дневник, шта желите да измените?"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Само овај унос"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Овај и претходне уносе"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Овај и будуће уносе"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Све уносе"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Овај састанак садржи повратне податке које Еволуција не може да уреди."
 
-#: calendar/gui/dialogs/recurrence-page.c:812
+#: ../calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Датум повраћаја је неисправан"
 
-#: calendar/gui/dialogs/recurrence-page.c:923
+#: ../calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "првој"
 
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "другој"
 
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "трећој"
 
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "четвртој"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "последњој"
 
-#: calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Други датум"
 
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "дан"
 
-#: calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "појаве"
 
-#: calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Датум/време"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Изузеци</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Приказ</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Понављање</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Сваких"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "Овај састанак се по_навља"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "за"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "увек"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "месец(а)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "до"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "недеља(е)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "година(е)"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: calendar/gui/dialogs/task-details-page.c:522
-#, fuzzy
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
-msgstr "Web страница:"
+msgstr "Web страна"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#, fuzzy
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Разно\t</span>"
+msgstr "<span weight=\"bold\">Разно</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Стање</span>"
 
 # timezone.
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:658
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361
 msgid "Completed"
 msgstr "Готово"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1006
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1007
 msgid "High"
 msgstr "Високо"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-cal-model-tasks.c:731 calendar/gui/e-calendar-table.c:456
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "У току"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:384 mail/message-list.c:1004
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1005
 msgid "Low"
 msgstr "Ниско"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1005
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../mail/message-list.c:1006
 msgid "Normal"
 msgstr "Обично"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Није покренуто"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "П_роценат завршеног:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Недефинисано"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Датум завршетка:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Важност:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Web страница:"
 
-#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Задужење"
 
-#: calendar/gui/dialogs/task-editor.c:157
-#: calendar/gui/dialogs/task-editor.c:219
-#: calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Задатак"
 
-#: calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:530
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:874
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Није могуће отварање задужења у '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ad_vanced send options"
-msgstr ""
+msgstr "На_предне опције слања"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Опис:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Датум п_очетка:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-#, fuzzy
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
-msgstr "ааПаИб"
+msgstr "Опис задужења"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "Датум _за завршетак:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Група:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>К_алендари за слободно/заузето</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Учесталост објављивања</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Место објављивања</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
-msgstr "Путања објављивања стања слободан/заузет"
+msgstr "Подешавања објављивања слободно/заузето"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Дневно"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Ручно"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "_Запамти лозинку"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Недељно"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6409,7 +6345,7 @@ msgstr[0] "%d дан"
 msgstr[1] "%d дана"
 msgstr[2] "%d дана"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -6417,7 +6353,7 @@ msgstr[0] "%d недеља"
 msgstr[1] "%d недеље"
 msgstr[2] "%d недеља"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -6425,7 +6361,7 @@ msgstr[0] "%d сат"
 msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -6433,7 +6369,7 @@ msgstr[0] "%d минут"
 msgstr[1] "%d минута"
 msgstr[2] "%d минута"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -6441,130 +6377,134 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунде"
 msgstr[2] "%d секунди"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната акција"
 
-#: calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пре почетка састанка"
 
-#: calendar/gui/e-alarm-list.c:477
+#: ../calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s након почетка састанка"
 
-#: calendar/gui/e-alarm-list.c:482
+#: ../calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s на почетку састанка"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s пре краја састанка"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s након завршетка састанка"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s на крају састанка"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s на %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2573
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2614
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
 
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Без имена"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Преглед:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Датум завршетка:"
 
 #. write status
 #. translators: exchange out of office status header
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:209
-#: plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:209
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Стање:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Важност:"
 
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Web страница:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Датум завршетка"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Датум почетка"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Summary"
 msgstr "Преглед"
 
-#: calendar/gui/e-cal-model-calendar.c:179 calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
 msgid "Free"
 msgstr "Слободно"
 
-#: calendar/gui/e-cal-model-calendar.c:182 calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Заузето"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "С"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "Ј"
 
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "И"
 
-#: calendar/gui/e-cal-model-tasks.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6574,260 +6514,268 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1173 plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1398
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:139
+#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
+#: ../plugins/itip-formatter/itip-formatter.c:251
+#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:201 ../shell/e-component-registry.c:205
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Непознато"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Повратно"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Додељено"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:516
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
-msgstr "Освежавање задужења"
+msgstr "Табела задужења"
 
-#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Брисање изабраних објеката"
 
-#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Освеживање објеката"
 
-#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1066 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1399 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отвори"
 
-#: calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "Отвори _Web страну"
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1396
-#: mail/em-folder-view.c:976 mail/em-popup.c:494
-#: ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1400 ../mail/em-folder-view.c:990
+#: ../mail/em-popup.c:494 ../ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1376
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1380
+#: ../calendar/gui/e-calendar-view.c:1401 ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Штам_пај..."
 
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1401
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1405 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Исеци"
 
-#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-view.c:1403 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:119 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1407 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "На_лепи"
 
-#: calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "_Додели задужење"
 
-#: calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Проследи као iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Обележи као завршено"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Обележи изабрана задужења као завршена"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1414
-#: mail/em-folder-tree.c:2814 mail/em-folder-view.c:980
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1418 ../mail/em-folder-tree.c:2816
+#: ../mail/em-folder-view.c:994 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "_Обриши изабрана задужења"
 
-#: calendar/gui/e-calendar-table.c:1328
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Притисни за ново задужење"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Готово"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Завршено"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Датум за завршетак"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Важност"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Датум почетка"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Разврставање задужења"
 
-#: calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1187
 msgid "Moving items"
 msgstr "Премештање уноса"
 
-#: calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1189
 msgid "Copying items"
 msgstr "Копирање уноса"
 
-#: calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1374
 msgid "New _Appointment..."
 msgstr "Нов _састанак..."
 
-#: calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1375
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1377
 msgid "New Task"
 msgstr "Ново задужење"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1387
 msgid "Current View"
 msgstr "Тренутан поглед"
 
-#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1389 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Изабери _данашњи дан"
 
-#: calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1390
 msgid "_Select Date..."
 msgstr "_Изабери датум..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1391 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Објави податак слободно/заузето"
 
-#: calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1411
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ирај у календар..."
 
-#: calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1412
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1413
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1414
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1419
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1420
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1421
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
@@ -6840,8 +6788,8 @@ msgstr "Обриши _све појаве"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -6854,12 +6802,12 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6870,7 +6818,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
@@ -6886,28 +6834,28 @@ msgstr "%02i минутни размаци"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1494
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1494
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложени повраћај)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6915,7 +6863,7 @@ msgstr[0] "Сваки %d дан"
 msgstr[1] "Свака %d дана"
 msgstr[2] "Сваких %d дана"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6924,7 +6872,7 @@ msgstr[1] "Сваке %d недеље"
 msgstr[2] "Сваких %d недеља"
 
 # ово ће тешко бити 21, 31, 41, ...
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6932,22 +6880,22 @@ msgstr[0] "Сваке недеље у "
 msgstr[1] "Сваке %d недеље у "
 msgstr[2] "Сваких %d недеља у "
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "%s дан "
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
 # слично као за недеље
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6956,7 +6904,7 @@ msgstr[1] "свака %d месеца"
 msgstr[2] "сваких %d месеци"
 
 # слично као за месеце и недеље
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6964,7 +6912,7 @@ msgstr[0] "Сваке године"
 msgstr[1] "Сваке %d године"
 msgstr[2] "Сваких %d година"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6972,42 +6920,42 @@ msgstr[0] "укупно %d пут"
 msgstr[1] "укупно %d пута"
 msgstr[2] "укупно %d пута"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", завршавајући се "
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Почиње"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Завршава се"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Рок"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar подаци"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar грешка"
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:329
-#: plugins/itip-formatter/itip-view.c:330
-#: plugins/itip-formatter/itip-view.c:397
-#: plugins/itip-formatter/itip-view.c:398
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
 msgid "An unknown person"
 msgstr "Непозната особа"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7015,410 +6963,417 @@ msgstr ""
 "<br>  Проверите следећу информацију, и потом одаберите акцију из доњег "
 "менија."
 
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:421 plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:424
-#: plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453
-#: plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Одбијено"
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Састанак је отказан, међутим, не може се наћи у вашим калндарима"
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "Задужење је отказано, међутим, не може се наћи у вашим списковима задужења"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> је објавио(ла) информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Информација о састанку"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> захтева присуство %s на састанку."
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> захтева Ваше присуство на састанку."
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Предлог за састанак"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жели да дода постојећем састанку"
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Промена састанка"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добије најновију информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Захтев за променама о састанку"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> је одговорио(ла) на захтев за састанак."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Одговор за састанак"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> је отказо(ла) састанак."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Отказивање састанка"
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> је послао(ла) неразумљиву поруку."
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Лоша порука о састанку"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> је објавио(ла) информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> тражи %s за обављање задужења."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> тражи да Ви извршите задужење."
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Предлог за задужење"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b жели да дода постојећем задужењу."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Освежавање задужења"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Захтев за променама задужења"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> је одговорио(ла) на додељено задужење."
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Одговор на задужење"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> је отказао(ла) задужење."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Отказивање задужења"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Лоша порука о задужењу"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> је објавио(ла) слободно/заузето информацију."
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Слободно/заузето информација"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> тражи Вашу слободно/заузето информацију."
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Слободно/заузето захтев"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> је одговорио(ла) на слободно/заузето захтев."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Слободно/заузето одговор"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободно/заузето порука"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Порука изгледа да није исправно сачињена"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Порука садржи само неподржане захтеве."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прилог не садржи исправну поруку за календар"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема уносе календара који се могу прегледати"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Освежавање завршено\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат је неисправан и не може бити освежен\n"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао присутан учесник.  Да га додам у присутне?"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Статус учесника није освежен због неисправног статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Освежен статус учесника\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:852
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:852
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Статус учесника није освежен јер унос више не постоји"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Уклањање завршено"
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Унос послат!\n"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Унос није могао бити послат!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Изаберите акцију:"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Освежи"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Прихвати"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Одбиј"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободно/заузето информацију"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Освежи статус странке"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Пошаљи најновију информацију"
 
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:441
-#: mail/mail-send-recv.c:414 mail/mail-send-recv.c:466
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
+#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Одустани"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--за--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Порука календара"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Датум:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Учитавање календара"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Учитавање календара..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Порука сервера:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "датум-завршетка"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "датум-почетка"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Председавајући"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:60
+#: ../calendar/gui/e-meeting-list-view.c:124
 msgid "Required Participants"
 msgstr "Захтевано присуствовање"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Могући учесници"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Извори"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:135
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Појединац"
 
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:136
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Група"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:137
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Извор"
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:138
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Соба"
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Место"
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Потребна акција"
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "С резервом"
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Делегирано"
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "У току"
 
 # %B = full month name, %d = month day, %Y = full year.
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7433,9 +7388,9 @@ msgstr "%A, %B %d, %Y"
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:448
-#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7450,69 +7405,69 @@ msgstr "%a %m/%d/%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Нема информације"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "По_дешавања"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Покажи _само радне сате"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Покажи _умањено"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Освежи слободно/заузето"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Аутоматски одабери"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Све људе и ресурсе"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Све _људе и један ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један ресурс"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2372
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2382
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7521,189 +7476,187 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Учитавање задужења"
 
-#: calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварање задужења у %s"
 
-#: calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Завршавање задужења..."
 
-#: calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Брисање изабраних објеката..."
 
-#: calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Избацивање"
 
-#: calendar/gui/e-timezone-entry.c:133
-#, fuzzy
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
-msgstr "Временска зона"
+msgstr "Дугме за временску зону"
 
 # month name. You can change the order but don't
 # change the specifiers or add anything.
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:722
 msgid "Updating query"
 msgstr "Освежавање упита"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2057 widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2065 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
-#: calendar/gui/gnome-cal.c:2058
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:2066
 msgid "Save Custom View"
-msgstr "Сачувај прилагођен преглед..."
+msgstr "Чува прилагођен приказ"
 
-#: calendar/gui/gnome-cal.c:2063 widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2071 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Одреди прегледе..."
 
-#: calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2231
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавање састанака са %s"
 
-#: calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2250
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавање задужења са %s"
 
-#: calendar/gui/gnome-cal.c:2338
+#: ../calendar/gui/gnome-cal.c:2348
 #, c-format
 msgid "Opening %s"
 msgstr "Отварање %s"
 
-#: calendar/gui/gnome-cal.c:3228
+#: ../calendar/gui/gnome-cal.c:3238
 msgid "Purging"
 msgstr "Брисање"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Август"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Децембар"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Фебруар"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Јануар"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Јул"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Јун"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Март"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Мај"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Новембар"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Октобар"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Изаберите датум"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Септембар"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Изабери данашњи дан"
 
-#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318
-#: calendar/gui/itip-utils.c:350
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: calendar/gui/itip-utils.c:305
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Информација о догађају"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Информација о уносу у дневник"
 
-#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Слободно/заузето информација"
 
-#: calendar/gui/itip-utils.c:401
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Информација о календару"
 
-#: calendar/gui/itip-utils.c:437
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Освежено"
 
-#: calendar/gui/itip-utils.c:445
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Освежи"
 
-#: calendar/gui/itip-utils.c:449
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Контра-предлог"
 
-#: calendar/gui/itip-utils.c:520
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Слободно/заузето информација (%s до %s)"
 
-#: calendar/gui/itip-utils.c:530
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar информација"
 
-#: calendar/gui/itip-utils.c:672
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7715,7 +7668,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7728,250 +7681,260 @@ msgstr ""
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:745 calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Није могућ пренос старих подешавања из evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Није могућ пренос календара `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Није могућ пренос задужења `%s'"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "Не"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "По"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ут"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "Че"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Пе"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Су"
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Изабрани дан (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d. %Y."
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d. %b %Y."
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Изабрана недеља (%s т %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Изабран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Изабрана година (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Summary: %s"
+msgstr "Преглед:"
+
+#: ../calendar/gui/print.c:2328
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "Место:"
+
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Проценат завршеног: %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса (URL): %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Контакти: "
 
-#: calendar/gui/print.c:2565 calendar/gui/print.c:2653
-#: calendar/gui/print.c:2779 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Приказ штампе"
 
-#: calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Штампај унос"
 
-#: calendar/gui/tasks-component.c:428
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr "Нови списак задужења"
 
-#: calendar/gui/tasks-component.c:504
+#: ../calendar/gui/tasks-component.c:515
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7979,7 +7942,7 @@ msgstr[0] "%d задужење"
 msgstr[1] "%d задужења"
 msgstr[2] "%d задужења"
 
-#: calendar/gui/tasks-component.c:506 mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:544
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7987,62 +7950,61 @@ msgstr[0] "%d изабрано"
 msgstr[1] "%d изабрана"
 msgstr[2] "%d изабраних"
 
-#: calendar/gui/tasks-component.c:553
+#: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Неуспешно дограђивање задужења."
 
-#: calendar/gui/tasks-component.c:847
+#: ../calendar/gui/tasks-component.c:858
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Није могуће отварање списка задужења '%s' за прављење догађаја и састанака"
 
-#: calendar/gui/tasks-component.c:862
+#: ../calendar/gui/tasks-component.c:873
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за прављење задужења"
 
-#: calendar/gui/tasks-component.c:956
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:967
 msgid "Task Source Selector"
-msgstr "Извори нису изабрани."
+msgstr "Бирач извора задужења"
 
-#: calendar/gui/tasks-component.c:1139
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New task"
 msgstr "Ново задужење"
 
-#: calendar/gui/tasks-component.c:1140
+#: ../calendar/gui/tasks-component.c:1151
 msgid "_Task"
 msgstr "_Задужење"
 
-#: calendar/gui/tasks-component.c:1141
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new task"
 msgstr "Направи ново задужење"
 
-#: calendar/gui/tasks-component.c:1147
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New assigned task"
 msgstr "Ново добијено задужење"
 
-#: calendar/gui/tasks-component.c:1148
+#: ../calendar/gui/tasks-component.c:1159
 msgid "Assigne_d Task"
 msgstr "_Добијено задужење"
 
-#: calendar/gui/tasks-component.c:1149
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new assigned task"
 msgstr "Додели ново задужење"
 
-#: calendar/gui/tasks-component.c:1155
+#: ../calendar/gui/tasks-component.c:1166
 msgid "New task list"
 msgstr "Нови списак задужења"
 
-#: calendar/gui/tasks-component.c:1156
+#: ../calendar/gui/tasks-component.c:1167
 msgid "Task l_ist"
 msgstr "_Списак задужења"
 
-#: calendar/gui/tasks-component.c:1157
+#: ../calendar/gui/tasks-component.c:1168
 msgid "Create a new task list"
 msgstr "Направи нови списак задужења"
 
-#: calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:370
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8054,52 +8016,52 @@ msgstr ""
 "\n"
 "Стварно да обришем ова задужења?"
 
-#: calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Не питај ме поново."
 
-#: calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Штампај задужења"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "НПУСЧПС"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Еволуција календар интелигентни увозник"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Еволуција iCalendar увозник"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Еволуција vCalendar увозник"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar датотеке (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar датотеке (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Састанци"
 
-#: calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Подсетник!!"
 
-#: calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Календарски догађаји"
 
-#: calendar/importers/icalendar-importer.c:719
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -8114,1539 +8076,1540 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Африка/Абиџан"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Африка/Акра"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Африка/Адис_Абеба"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Африка/Алжир"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Африка/Асмера"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Африка/Бамако"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Африка/Бангуи"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Африка/Бањуи"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Африка/Бисао"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Африка/Биантир"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Африка/Бразавил"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Африка/Буџумбура"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Африка/Каиро"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Африка/Казабланка"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Африка/Сеута"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Африка/Конакри"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Африка/Дакар"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Африка/Дар_ес_Салам"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Африка/Џибути"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Африка/Дуала"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Африка/Ел_Аун"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Африка/Фритаун"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Африка/Габорони"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Африка/Хараре"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Африка/Јоханесбург"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Африка/Кампала"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Африка/Катум"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Африка/Кигали"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Африка/Киншаса"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Африка/Лагос"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Африка/Либервил"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Африка/Ломи"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Африка/Луанда"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Африка/Лубумбаши"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Африка/Лусака"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Африка/Малабо"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Африка/Мапуто"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Африка/Масеру"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Африка/Мбабане"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "АфрикаМогадиш"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Африка/Монровија"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Африка/Наироби"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Африка/Нџамена"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Африка/Ниамеј"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Африка/Нуакшот"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Африка/Угадугу"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Африка/Порто-Ново"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Африка/Сао_Томе"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Африка/Тимбукту"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Африка/Триполи"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Африка/Тунис"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Африка/Виндек"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Америка/Адак"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Америка/Анкорејџ"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Америка/Ангила"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Америка/Антигва"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Америка/Арагвајана"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Америка/Аруба"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Америка/Асанкон"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Америка/Барбадос"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Америка/Белем"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Америка/Белизе"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Америка/Боа_Виста"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Америка/Богота"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Америка/Болзе"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Америка/Буенос_Аирес"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Америка/Кембриџ_Беј"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Америка/Канкун"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Америка/Каракас"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Америка/Катамарка"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Америка/Кајен"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Америка/Кајман"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Америка/Чикаго"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Америка/Чихуахуа"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Америка/Кордоба"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Америка/Костарика"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Америка/Кулаба"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Америка/Куракао"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Америка/Денмаркшон"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Америка/Досон"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Америка/Досон_Крик"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Америка/Денвер"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Америка/Детроит"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Америка/Доминика"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Америка/Едмонтон"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Америка/Ерунепе"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Америка/Ел_Салвадор"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Америка/Форталеза"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Америка/Глејс_Беј"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Америка/Готаб"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Америка/Гус_Беј"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Америка/Гренд_Турк"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Америка/Гренада"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Америка/Гвадалуп"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Америка/Гватемала"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Америка/Гвајакил"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Америка/Гвајана"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Америка/Халифакс"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Америка/Хавана"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Америка/Хермосило"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Америка/Индијана/Индијанаполис"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Америка/Индијана/Нокс"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Америка/Индијана/Маренго"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Америка/Индијана/Вивеј"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Америка/Индијанаполис"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Америка/Ајнувик"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Америка/Иквалит"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Америка/Јамајка"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Америка/Џуџуи"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Америка/Џуно"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Америка/Кентаки/Лиусвил"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Америка/Кентаки/Монтикело"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Америка/Ла_Паз"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Америка/Лима"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Америка/Лос_Анђелес"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Америка/Луисвил"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Америка/Макио"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Америка/Манагва"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Америка/Манаус"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Америка/Мартиник"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Америка/Мацатиан"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Америка/Мендоза"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Америка/Меномини"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Америка/Мерида"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Америка/Мексико_Сити"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "Америка/Микуелон"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Америка/Монтереј"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Америка/Монтевидео"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Америка/Монтреал"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Америка/Монсерат"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Америка/Насау"
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Америка/Њујорк"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Америка/Нипигон"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Америка/Номи"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Америка/Нороха"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Америка/Северна_Дакота/Сентер"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Америка/Панама"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Америка/Пангниртунг"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Америка/Парамарибо"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Америка/Феникс"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Америка/Порто_Принс"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Америка/Порт_Оф_Спејн"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Америка/Портовело"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Америка/Порторико"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Америка/Рејни_Ривер"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Америка/Ренкин_Инлет"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Америка/Ресифи"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Америка/Регина"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Америка/Рио_Бранко"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Америка/Розарио"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Америка/Сантјаго"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Америка/Санто_Доминго"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Америка/Сап_Паоло"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Америка/Скорсбајсанд"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Америка/Шипрок"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Америка/Сент_Џон"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Америка/Сент_Китс"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Америка/Сент_Лусија"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Америка/Сент_Томас"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Америка/Сент_Винсент"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Америка/Свифт_Карент"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Америка/Тегусигалпа"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Америка/Туле"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Америка/Тандер_Беј"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Америка/Тихуана"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Америка/Тортола"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Америка/Ванкувер"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Америка/Вајтхорс"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Америка/Вивипег"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Америка/Јакутат"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Америка/Јелоунајф"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Антарктика/Кејси"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Антарктика/Дејвис"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Антарктика/Думонтдурвил"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Антарктика/Мосон"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Антарктика/Мек_Мардо"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Антарктика/Палмер"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Антарктика/Саут_Пол"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Антарктика/Сијова"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Антарктика/Восток"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Арктик/Лонгјербијен"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Азија/Аден"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Азија/Ајмати"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Азија/Аман"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Азија/Анадир"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Азија/Акто"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Азија/Актобе"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Азија/Ашгабат"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Азија/Багдад"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Азија/Бахрејн"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Азија/Баку"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Азија/Банкок"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Азија/Бејрут"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Азија/Бишкек"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Азија/Брунеј"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Азија/Калкута"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Азија/Кобајсан"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Азија/Чонгкинг"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Азија/Коломбо"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Азија/Дамаск"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Азија/Дака"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Азија/Дили"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Азија/Дубаи"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Азија/Душанбе"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Азија/Газа"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Азија/Харбин"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Азија/Хонг_Конг"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Азија/Хоуд"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Азија/Иркутск"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Азија/Истанбул"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Азија/Џакарта"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Азија/Џајапура"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Азија/Јерусалим"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Азија/Кабул"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Азија/Камчатка"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Азија/Карачи"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Азија/Кашгар"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Азија/Катманду"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Азија/Краснојарск"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Азија/Куала_Лумпур"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Азија/Кучинг"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Азија/Кувајт"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Азија/Макао"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Азија/Макау"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Азија/Магадан"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Азија/Макасар"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Азија/Манила"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Азија/Мускат"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Азија/Никозија"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Азија/Новосибирск"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Азија/Омск"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Азија/Орал"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Азија/Фом_Пен"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Азија/Понтианак"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Азија/Пекинг"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Азија/Катар"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Азија/Кизилорда"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Азија/Рангун"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Азија/Ријад"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Азија/Сајгон"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Азија/Сахалин"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Азија/Самаркард"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Азија/Сеул"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Азија/Шангај"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Азија/Сингапур"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Азија/Тајпеј"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Азија/Ташкент"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Азија/Тбилиси"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Азија/Техеран"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Азија/Тимфу"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Азија/Токио"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Азија/Уџунг_Панданг"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Азија/Улан_Батор"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Азија/Урумки"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Азија/Вијентан"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Азија/Владивосток"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Азија/Јакутск"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Азија/Јекатеринбург"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Азија/Јереван"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Атлантик/Азори"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Атлантик/Бермуда"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Атлантик/Канари"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Атлантик/Кејп_Верде"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Атлантик/Ферое"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Атлантик/Јан_Мајен"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Атлантик/Мадера"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Атлантик/Реикјавик"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Атлантик/Саут_Џорџија"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Атлантик/Сент_Хелена"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Атлантик/Стенли"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Аустралија/Аделаида"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Аустралија/Брисбејн"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Аустралија/Брокен_Хил"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Аустралија/Дарвин"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Аустралија/Хобарт"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Аустралија/Линдерман"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Аустралија/Лорд_Ове"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Аустралија/Мелбурн"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Аустралија/Перт"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Аустралија/Сиднеј"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Европа/Амстердам"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Авропа/Андора"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Европа/Атина"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Европа/Белфаст"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Европа/Београд"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Европа/Берлин"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Европа/Братислава"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Европа/Брисел"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Европа/Букурешт"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Европа/Будимпешта"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Европа/Чисинау"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Авропа/Копенхаген"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Европа/Даблин"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Европа/Гибралтар"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Европа/Хелсинки"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Европа/Истанбул"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Европа/Каљинград"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Европа/Кијев"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Европа/Лисабон"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Европа/Љубљана"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Европа/Лондон"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Европа/Луксембург"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Европа/Мадрид"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Европа/Малта"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Европа/Минск"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Европа/Монако"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Европа/Москва"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Европа/Никозија"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Европа/Осло"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Европа/Париз"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Европа/Праг"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Европа/Рига"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Европа/Рим"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Европа/Самара"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Европа/Сан_Марино"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Европа/Сарајево"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Европа/Симферопол"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Европа/Скопље"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Европа/Софија"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Европа/Стокхолм"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Европа/Талин"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Европа/Тирана"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Европа/Узногород"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Европа/Вадуз"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Европа/Ватикан"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Европа/Беч"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Европа/Вилнус"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Европа/Варшава"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Европа/Загреб"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Европа/Заропозје"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Европа/Цирих"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Индијски/Антананариво"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Индијски/Кагос"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Индијски/Кристмас"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Индијски/Кокос"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Индијски/Коморо"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Индијски/Кергелен"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Индијски/Махе"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Индијски/Малдиви"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Индијски/Маурицијус"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Индијски/Мајот"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Индисјки/Рејунион"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Пацифик/Апиа"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Пацифик/Окленд"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Пацифик/Чатам"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Пацифик/Истер"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Пацифик/Ефате"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Пацифик/Енденбури"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Пацифик/Факаофо"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Пацифик/Фиџи"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Пацифик/Фунафути"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Пацифик/Галапагос"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Пацифик/Гамблер"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Пацифик/Гвадаканал"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Пацифик/Гуам"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Пацифик/Хонолулу"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Пацифик/Џонсон"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Пацифик/Киритимати"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Пацифик/Козре"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Пацифик/Куаџалин"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Пацифик/Маџуро"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Пацифик/Маркесас"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Пацифик/Мидвеј"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Пацифик/Науру"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Пацифик/Ние"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Пацифик/Норфолк"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Пацифи/Нумеа"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Пацифик/Паго_Паго"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Пацифик/Палау"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Пацифик/Питкерн"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Пацифик/Понапе"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Пацифик/Порт_Моресби"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Пацифик/Раротонга"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Пацифик/Сајпан"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Пацифик/Тахити"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Пацифик/Тарава"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Пацифик/Тонгатапу"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Пацифик/Трук"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Пацифик/Вејк"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Пацифик/Волис"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Posting destination"
 msgstr "Одредиште"
 
-#: composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:521
 msgid "Choose folders to post the message to."
 msgstr "Изаберите директоријуме за слање поруке."
 
-#: composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:555
 msgid "Click here for the address book"
 msgstr "Притисните овде за адресар."
 
@@ -9661,51 +9624,45 @@ msgstr "Притисните овде за адресар."
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:584
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:585
 msgid "_Reply-To:"
-msgstr "Одговор-за:"
+msgstr "_Одговор:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:591
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:592
 msgid "Fr_om:"
-msgstr "Од:"
+msgstr "Ш_аље:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:598
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:599
 msgid "S_ubject:"
-msgstr "Наслов:"
+msgstr "На_слов:"
 
-#: composer/e-msg-composer-hdrs.c:608
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "_To:"
-msgstr "За:"
+msgstr "_Прима:"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:610
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: composer/e-msg-composer-hdrs.c:612
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "_Cc:"
-msgstr "Копија:"
+msgstr "_Копија (Cc):"
 
-#: composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити копију (cc) поруке"
 
-#: composer/e-msg-composer-hdrs.c:616
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid "_Bcc:"
-msgstr "Невидљива копија:"
+msgstr "_Невидљива копија (Bcc):"
 
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9716,27 +9673,26 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:624
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Post To:"
-msgstr "Пошаљи:"
+msgstr "С_лање на:"
 
-#: composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Click here to select folders to post to"
 msgstr "Притисните овде да изаберете директоријуме за слање"
 
-#: composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:636
 msgid "Post To:"
 msgstr "Пошаљи:"
 
-#: composer/e-msg-composer.c:730
+#: ../composer/e-msg-composer.c:730
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављен сертификат за "
 "потписивање за овај налог"
 
-#: composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:737
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9744,44 +9700,42 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављен сертификат за "
 "шифровање за овај налог"
 
-#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
-#: composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1292
 msgid "Could not open file"
 msgstr "Није могуће отварање датотеке"
 
-#: composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1300
 msgid "Unable to retrieve message from editor"
 msgstr "Није могуће добити поруку из уређивача"
 
-#: composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1570
 msgid "Untitled Message"
 msgstr "Неименована порука"
 
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1604
-#, fuzzy
+#: ../composer/e-msg-composer.c:1604
 msgid "Open File"
-msgstr "Отвори датотеку"
+msgstr "Отвара датотеку"
 
-#: composer/e-msg-composer.c:2001 mail/em-account-editor.c:588
-#: mail/em-account-editor.c:633 mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2001 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Аутогенерисан"
 
-#: composer/e-msg-composer.c:2100
-#, fuzzy
+#: ../composer/e-msg-composer.c:2100
 msgid "Si_gnature:"
-msgstr "Потпис:"
+msgstr "Потп_ис:"
 
-#: composer/e-msg-composer.c:2359 composer/e-msg-composer.c:3360
-#: composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2359 ../composer/e-msg-composer.c:3376
+#: ../composer/e-msg-composer.c:3377
 msgid "Compose a message"
 msgstr "Састави поруку"
 
-#: composer/e-msg-composer.c:4542
+#: ../composer/e-msg-composer.c:4570
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9789,22 +9743,22 @@ msgstr ""
 "<b>(Састављач у телу поруке не садржи текст, што не може бити измењено.)<b>"
 
 #. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Не можете приложити датотеку `{0}' овој поруци."
 
 #. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Датотека `{0}' није регуларна и не може бити послата у поруци."
 
 #. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
 msgstr "Директоријуми се не могу прилагати порукама."
 
 #. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer-errors.xml.h:10
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9813,7 +9767,7 @@ msgstr ""
 "појединачно, или направите архиву директоријума и приложите је."
 
 #. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer-errors.xml.h:12
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Није могуће добити поруке за прилагање од {0}."
 
@@ -9828,25 +9782,25 @@ msgstr "Није могуће добити поруке за прилагање
 #. mail:no-delete-folder secondary
 #. system:no-save-file secondary
 #. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:105
-#: mail/mail-errors.xml.h:117 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
+#: ../composer/mail-composer-errors.xml.h:14
+#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
+#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
+#: ../widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Због \"{1}\"."
 
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Пронађене недовршене поруке"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Желите ли да спасите недовршене поруке?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9854,38 +9808,38 @@ msgstr ""
 "Еволуција је неочекивано завршила током писања нове поруке. Спашавање поруке "
 "ће вам омогућити да наставите где сте стали."
 
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Не спашавај"
 
-#: composer/mail-composer-errors.xml.h:22
+#: ../composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Спаси"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Није могуће чување у самочувајућу датотеку \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Грешка у чувању самочувајуће датотеке због \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
+#: ../composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Упозорење: измењена порука"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Сигурно желите да одбаците поруку, насловљену '{0}', коју састављате?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9895,56 +9849,54 @@ msgstr ""
 "одлучите да сачувате поруку у директоријуму Припрема. Ово ће вам омогућити "
 "да наставите поруку касније."
 
-#: composer/mail-composer-errors.xml.h:33
-#, fuzzy
+#: ../composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
-msgstr "Занемари промене"
+msgstr "_Занемари промене"
 
-#: composer/mail-composer-errors.xml.h:34
-#, fuzzy
+#: ../composer/mail-composer-errors.xml.h:34
 msgid "_Save Message"
-msgstr "Сачувај поруку"
+msgstr "Сач_увај поруку"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Није могуће прављење поруке."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Због \"{0}\", може бити потребно бирање другачијих подешавања поште."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
+#: ../composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Није могуће читање датотеке потписа \"{0}\"."
 
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Сви налози су уклоњени."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Морате да подесите налог пре састављања поруке."
 
 # mail-composer:no-editor-control primary
 #. mail-composer:no-address-control primary
 #. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
+#: ../composer/mail-composer-errors.xml.h:48
+#: ../composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Није могуће направити прозор за састављање поруке."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: ../composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Није могуће покретање контроле бирања адреса."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9955,23 +9907,23 @@ msgstr ""
 "\n"
 "Проверите да ли имате одговарајуће верзије gtkhtml и libgtkhtml на систему."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:521
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:517
 msgid "Evolution"
 msgstr "Еволуција"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Пакет програма Еволуција"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "карта адресара"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "подаци о календару"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9981,15 +9933,15 @@ msgstr ""
 "\n"
 "Желите ли да промените статус у \"У канцеларији\"? "
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Порука за ван канцеларије:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Статус:</b>"
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9999,39 +9951,39 @@ msgstr ""
 "пошаље\n"
 "пошту док сте ван канцеларије.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "Тренутно сам у канцеларији"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Тренутно сам ван канцеларије"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Не, не мењај статус"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Асистент ван кацеларије"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Да, промени статус"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Примање поште</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Слање поште:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10043,37 +9995,37 @@ msgstr ""
 "поруку ради обавештења када буде прочитана, и да одредите шта Еволуција да "
 "ради када неко вама пошаље признаницу.</small>"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
 msgstr "Увек врати признаницу"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Питај ме желим ли да вратим признаницу"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Никада враћај признаницу"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Признанице"
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Затражи повраћај признанице за све поруке које пошаљем"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Осим ако је порука послата дописном друштву, а не лично мени"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "Када примите поруку са признаницом, шта Еволуција да ради?"
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10082,7 +10034,7 @@ msgstr ""
 "Преписати је?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Преписати датотеку?"
 
@@ -10093,7 +10045,7 @@ msgstr "Преписати датотеку?"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -10104,73 +10056,73 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # in 12-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # in 24-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
 # without seconds.
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y. %I:%M %p"
 
 # without seconds.
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y. %H:%M"
 
 # without minutes or seconds.
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y. %I %p"
 
 # without minutes or seconds.
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y. %H"
 
 # strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 # strftime format of a time in 24-hour format.
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -10183,8 +10135,8 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10195,22 +10147,21 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
-#: e-util/eggtrayicon.c:119
-#, fuzzy
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
-msgstr "Опис прилога."
+msgstr "Оријентација зоне."
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10218,7 +10169,7 @@ msgstr[0] "пре једне секунда"
 msgstr[1] "пре %d секунде"
 msgstr[2] "пре %d секунди"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10226,7 +10177,7 @@ msgstr[0] "пре једног минута"
 msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10234,7 +10185,7 @@ msgstr[0] "пре једног сата"
 msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10242,7 +10193,7 @@ msgstr[0] "јуче"
 msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10250,7 +10201,7 @@ msgstr[0] "прошле недеље"
 msgstr[1] "пре %d недеље"
 msgstr[2] "пре %d недеља"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10258,7 +10209,7 @@ msgstr[0] "прошлог месеца"
 msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10266,165 +10217,165 @@ msgstr[0] "прошле године"
 msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<притисните овде да изаберете датум>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 msgid "now"
 msgstr "сада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Изаберите име за поређење"
 
 #. filter:no-date primary
-#: filter/filter-errors.xml.h:2
+#: ../filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Недостаје датум."
 
 #. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
+#: ../filter/filter-errors.xml.h:4
 msgid "You must choose a date."
 msgstr "Морате да изаберете датум."
 
 #. filter:no-file primary
-#: filter/filter-errors.xml.h:6
+#: ../filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Недостаје име датотеке."
 
 # filter:bad-file secondary
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Морате дати име датотеци."
 
 #. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
+#: ../filter/filter-errors.xml.h:10
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Датотека \"{0}\" не постоји или није регуларна."
 
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
+#: ../filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Лош регуларан израз \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
+#: ../filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Није могуће компајлирање регуларног израза \"{1}\"."
 
 # mail:no-name-vfolder primary
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:219
+#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:223
 msgid "Missing name."
 msgstr "Недостаје име."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
+#: ../filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Морате дати име овом филтеру."
 
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
+#: ../filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Име \"{0}\" је већ употребљено."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
+#: ../filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Изаберите друго име."
 
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Изабери датотеку"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1041
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1044 mail/mail-config.c:79
-#: mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:143
 msgid "To Do"
 msgstr "За урадити"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1045 mail/mail-config.c:80
-#: mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Касније"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Проба"
 
-#: filter/filter-rule.c:790
-#, fuzzy
+#: ../filter/filter-rule.c:790
 msgid "_Rule name:"
-msgstr "Име правила:"
+msgstr "_Име правила:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:818
 msgid "<b>If</b>"
 msgstr "<b>Ако</b>"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "ако су сви услови задовољени"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "ако је било који услов задовољен"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Изврши акције"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "All related"
 msgstr "Све повезано"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies"
 msgstr "Одговори"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:880
 msgid "Include threads"
 msgstr "Укључи нити"
 
-#: filter/filter-rule.c:975 filter/filter.glade.h:3
+#: ../filter/filter-rule.c:975 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Долазеће"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "Одлазећи"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Пр_авила филтера</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Упореди са"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "Прикажи филтере за пошту:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10432,7 +10383,7 @@ msgstr ""
 "Датум поруке ће бити упоређен са\n"
 "00:00 наведеног датума."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10440,7 +10391,7 @@ msgstr ""
 "Датум поруке ће бити упоређен са\n"
 "временом када се филтрирање десило."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10448,114 +10399,116 @@ msgstr ""
 "Датум поруке ће бити упоређен са\n"
 "тренутним временом када се филтрирање десило."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "време у односу на тренутно време"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "пре"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:175
 msgid "seconds"
 msgstr "секунде"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "тренутно време"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "време које сте одредили"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "године"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Уреди правило"
 
-#: filter/rule-editor.c:693
+#: ../filter/rule-editor.c:693
 msgid "Rule name"
 msgstr "Име правила"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Подешавања састављача"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr "Подесите пошту, укључујући сигурност и приказ поруке, овде"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Подесите налоге за пошту овде"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Еволуција пошта"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Контрола подешавања Еволуција налога за пошту"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Део Еволуција поште"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Састављач Еволуција поште"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Контрола подешавања Еволуција састављача"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Контрола поставки Еволуција поште"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:469
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:557
-#: mail/mail-component.c:608
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:480
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:557
+#: ../mail/mail-component.c:608
 msgid "Mail"
 msgstr "Пошта"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:95
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s уговор о лиценци"
 
-#: mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10568,87 +10521,92 @@ msgstr ""
 "за %s\n"
 "и означите кућицу да би га прихватили\n"
 
-#: mail/em-account-editor.c:464 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-account-editor.c:1664 mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1661 ../mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Идентитет"
 
-#: mail/em-account-editor.c:1700 mail/mail-config.glade.h:114
+#: ../mail/em-account-editor.c:1697 ../mail/mail-config.glade.h:116
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: mail/em-account-editor.c:1877
+#: ../mail/em-account-editor.c:1874
 msgid "Automatically check for _new mail every"
 msgstr "_Аутоматски провери за нову пошту сваких"
 
-#: mail/em-account-editor.c:2045 mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:2042 ../mail/mail-config.glade.h:126
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: mail/em-account-editor.c:2089 mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2086 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Подразумевано"
 
-#: mail/em-account-editor.c:2148 mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:2145 ../mail/mail-config.glade.h:121
 msgid "Security"
 msgstr "Безбедност"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2185 mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2256
 msgid "Receiving Options"
 msgstr "Опције за примање"
 
-#: mail/em-account-editor.c:2186 mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2183 ../mail/em-account-editor.c:2257
 msgid "Checking for New Mail"
 msgstr "Провера за нове поруке"
 
-#: mail/em-account-editor.c:2585 mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: mail/em-account-editor.c:2585 mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Помоћник Еволуција налога"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:428
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Предефинисано]"
 
-#: mail/em-account-prefs.c:482
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Име налога"
 
-#: mail/em-account-prefs.c:484
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Протокол"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:429
-#: mail/mail-config.c:935
+#: ../mail/em-account-prefs.c:489
+#, fuzzy
+msgid "Mail Accounts Table"
+msgstr "Поштански налози"
+
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Без имена"
 
-#: mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
-#: mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Додај скрипту за потпис"
 
-#: mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: mail/em-composer-utils.c:911
+#: ../mail/em-composer-utils.c:849
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: mail/em-composer-utils.c:1521
+#: ../mail/em-composer-utils.c:1459
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
@@ -10657,7 +10615,7 @@ msgstr "непознати пошиљалац"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1568
+#: ../mail/em-composer-utils.c:1506
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10665,278 +10623,277 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month}. ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "Пр_авила филтера"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Прерачунај"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Додели боју"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Додели резултат"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Прилози"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Звоно"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "садржи"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Копирај у директоријум"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Датум примања"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Датум слања"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "не садржи"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "не завршава се са"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "не постоји"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "не враћа"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "не звучи као"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "не почиње са"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Припрема"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "завршава се са"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Постоји"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "постоји"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Израз"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Следи"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "је"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "је после"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "је пре"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "је означен"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "је већи од"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "је мањи од"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "није"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "није означен"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ђубре"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Провера ђубрета"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:992
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1008
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Етикета"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Дописно друштво"
 
-#: mail/em-filter-i18n.h:39
-#, fuzzy
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
-msgstr "Резервиши све"
+msgstr "Упореди све"
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Тело поруке"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Заглавље поруке"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Порука је ђубре"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Порука није ђубре"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Премести у директоријум"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Повежи на програм"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Пусти звук"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Читај"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Примаоци"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Regex одговара"
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Одговорено"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "повраћаји"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "повраћаји већи од"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "повраћаји мањи од"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Покрени програм"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Резултат"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Пошиљалац"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Додели статус"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Величина (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "звучи као"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Изворни налог"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Одређено заглавље"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "почиње са"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:7 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1532
+#: ../mail/em-format-quote.c:306 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Наслов"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Недодељен статус"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>Онда</b>"
 
-#: mail/em-folder-browser.c:133
-#, fuzzy
+#: ../mail/em-folder-browser.c:133
 msgid "Create _vFolder From Search..."
-msgstr "Направи _Виртуелни директоријум из претраге..."
+msgstr "Направи _вДиректоријум из претраге..."
 
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Укупно порука:"
@@ -10944,338 +10901,339 @@ msgstr[1] "Укупно порука:"
 msgstr[2] "Укупно порука:"
 
 # bug: no need for plural-forms
-#: mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Непрочитаних порука:"
 msgstr[1] "Непрочитаних порука:"
 msgstr[2] "Непрочитаних порука:"
 
-#: mail/em-folder-properties.c:278 plugins/shared-folder/properties.glade.h:3
+#: ../mail/em-folder-properties.c:278
+#: ../plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Поставке директоријума"
 
-#: mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<протисните овде да изаберете директоријум>"
 
-#: mail/em-folder-selector.c:166
+#: ../mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2527
-#: mail/mail-component.c:770 plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2528
+#: ../mail/mail-component.c:770 ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "Наведите где да направим директоријум:"
 
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Направи"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "_Име директоријума:"
 
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
-#: mail/mail-vfolder.c:899 mail/mail-vfolder.c:969
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:899 ../mail/mail-vfolder.c:969
 msgid "vFolders"
 msgstr "vДиректоријуми"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:207 mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "НЕПОКЛОПЉЕН"
 
-#: mail/em-folder-tree-model.c:468 mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:142
 msgid "Drafts"
 msgstr "Припрема"
 
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471 mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:141
 msgid "Inbox"
 msgstr "Сандуче"
 
-#: mail/em-folder-tree-model.c:474 mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:143
 msgid "Outbox"
 msgstr "За слање"
 
-#: mail/em-folder-tree-model.c:476 mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:144
 msgid "Sent"
 msgstr "Послато"
 
-#: mail/em-folder-tree-model.c:495 mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
 msgid "Loading..."
 msgstr "Учитавање..."
 
-#: mail/em-folder-tree.c:688
-#, fuzzy
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
-msgstr "_Директоријум за пошту"
+msgstr "Стабло директоријума за пошту"
 
-#: mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештање директоријума %s"
 
-#: mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирање директоријума %s"
 
-#: mail/em-folder-tree.c:930 mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1612
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештање порука у директоријум %s"
 
-#: mail/em-folder-tree.c:932 mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1614
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирање порука у директоријум %s"
 
-#: mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Није могуће убацити поруке у смештај на највишем нивоу"
 
-#: mail/em-folder-tree.c:1044 ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Копирај у директоријум"
 
-#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:115
 msgid "_Move to Folder"
 msgstr "_Премести у директоријум"
 
-#: mail/em-folder-tree.c:1750 mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претрага директоријума у \"%s\""
 
-#: mail/em-folder-tree.c:2023
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:2024
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Копирање порука у %s"
+msgstr "Копирање `%s' у `%s'"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862 mail/em-folder-view.c:877
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:876 ../mail/em-folder-view.c:891
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-view.c:877
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-view.c:891
 msgid "C_opy"
 msgstr "Ко_пирај"
 
-#: mail/em-folder-tree.c:2338 plugins/shared-folder/share-folder-common.c:138
+#: ../mail/em-folder-tree.c:2339
+#: ../plugins/shared-folder/share-folder-common.c:140
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Прављење директоријума `%s'"
 
-#: mail/em-folder-tree.c:2527 mail/mail-component.c:770
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-tree.c:2528 ../mail/mail-component.c:770
+#: ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:353
 msgid "Create folder"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-tree.c:2720
+#: ../mail/em-folder-tree.c:2722
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуј директоријум \"%s\" у:"
 
-#: mail/em-folder-tree.c:2722
+#: ../mail/em-folder-tree.c:2724
 msgid "Rename Folder"
 msgstr "Преименуј директоријум"
 
-#: mail/em-folder-tree.c:2728
-#, fuzzy
+#: ../mail/em-folder-tree.c:2730
 msgid "Folder names cannot contain '/'"
-msgstr "Име директоријума не може да садржи знак \"/\"."
+msgstr "Имена директоријума не могу да садрже '/'"
 
-#: mail/em-folder-tree.c:2802 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2804 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "П_риказ"
 
-#: mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2805
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
-#: mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2809
 msgid "_Copy..."
 msgstr "_Копирај..."
 
-#: mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2810
 msgid "_Move..."
 msgstr "_Премести..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2814
 msgid "_New Folder..."
 msgstr "_Нови директоријум..."
 
-#: mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2817
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: mail/em-folder-view.c:970 mail/em-popup.c:499
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:984 ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: mail/em-folder-view.c:971 ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:985 ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-folder-view.c:972 mail/em-popup.c:501
-#: ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:986 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: mail/em-folder-view.c:975 ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:989 ../ui/evolution-mail-message.xml.h:109
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: mail/em-folder-view.c:977
+#: ../mail/em-folder-view.c:991
 msgid "_Print"
 msgstr "_Штампај"
 
-#: mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:995
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:996
 msgid "Mo_ve to Folder..."
 msgstr "Преме_сти у директоријум..."
 
-#: mail/em-folder-view.c:983 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:997 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копирај у директоријум..."
 
-#: mail/em-folder-view.c:986
+#: ../mail/em-folder-view.c:1000 ../ui/evolution-mail-message.xml.h:50
+msgid "Mar_k as Read"
+msgstr "О_значи као прочитано"
+
+#: ../mail/em-folder-view.c:1001 ../ui/evolution-mail-message.xml.h:52
+msgid "Mark as U_nread"
+msgstr "Означи као _непрочитано"
+
+#: ../mail/em-folder-view.c:1002
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:1003
 msgid "_Mark as Unimportant"
 msgstr "_Означи као неважно"
 
-#: mail/em-folder-view.c:988 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1004 ../ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: mail/em-folder-view.c:989 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1005 ../ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: mail/em-folder-view.c:990
-#, fuzzy
+#: ../mail/em-folder-view.c:1006
 msgid "Mark for Follo_w Up..."
-msgstr "Пр_ати..."
+msgstr "Обележи за _праћење..."
 
-#: mail/em-folder-view.c:998
+#: ../mail/em-folder-view.c:1014
 msgid "Fla_g Completed"
 msgstr "Означ_и завршене"
 
-#: mail/em-folder-view.c:999
+#: ../mail/em-folder-view.c:1015
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: mail/em-folder-view.c:1002
+#: ../mail/em-folder-view.c:1018
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
-#: mail/em-folder-view.c:1003
-#, fuzzy
+#: ../mail/em-folder-view.c:1019
 msgid "vFolder on _Subject"
-msgstr "VДиректоријум на _Наслов"
+msgstr "вДиректоријум на _наслов"
 
-#: mail/em-folder-view.c:1004
-#, fuzzy
+#: ../mail/em-folder-view.c:1020
 msgid "vFolder on Se_nder"
-msgstr "VДиректоријум на П_ошиљаоца"
+msgstr "вДиректоријум на п_ошиљаоца"
 
-#: mail/em-folder-view.c:1005
-#, fuzzy
+#: ../mail/em-folder-view.c:1021
 msgid "vFolder on _Recipients"
-msgstr "VДиректоријум на _Примаоце"
+msgstr "вДиректоријум на _примаоце"
 
-#: mail/em-folder-view.c:1006
-#, fuzzy
+#: ../mail/em-folder-view.c:1022
 msgid "vFolder on Mailing _List"
-msgstr "VДиректоријум на дописну _листу"
+msgstr "вДиректоријум на дописну _листу"
 
-#: mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1026
 msgid "Filter on Sub_ject"
 msgstr "Филтер на насло_в"
 
-#: mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1027
 msgid "Filter on Sen_der"
 msgstr "Филтер на п_ошиљаоца"
 
-#: mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1028
 msgid "Filter on Re_cipients"
 msgstr "Филтер на п_римаоце"
 
-#: mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1029
 msgid "Filter on _Mailing List"
 msgstr "Филтер на _дописну листу"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1844 mail/em-folder-view.c:1888
+#: ../mail/em-folder-view.c:1863 ../mail/em-folder-view.c:1907
 msgid "Default"
 msgstr "Предефинисано"
 
-#: mail/em-folder-view.c:1987
+#: ../mail/em-folder-view.c:2006
 msgid "Print Message"
 msgstr "Штампај поруку"
 
-#: mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2336
 msgid "_Copy Link Location"
 msgstr "_Копирај путању везе"
 
-#: mail/em-folder-view.c:2297
-#, fuzzy
+#: ../mail/em-folder-view.c:2338
 msgid "Create _vFolder"
-msgstr "Направи директоријум"
+msgstr "Направи _вДиректоријум"
 
-#: mail/em-folder-view.c:2298
-#, fuzzy
+#: ../mail/em-folder-view.c:2339
 msgid "_From this Address"
-msgstr "Кућна адреса"
+msgstr "_Са ове адресе"
 
-#: mail/em-folder-view.c:2299
-#, fuzzy
+#: ../mail/em-folder-view.c:2340
 msgid "_To this Address"
-msgstr "Друга адреса"
+msgstr "_на ову адресу"
 
-#: mail/em-folder-view.c:2568
+#: ../mail/em-folder-view.c:2609
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
-#: mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Поклапања: %d"
 
-#: mail/em-format-html-display.c:680 mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:680 ../mail/em-format-html.c:579
 msgid "Unsigned"
 msgstr "Непотписано"
 
-#: mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:680
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ова порука није потписана. Нема гаранција да је ова порука аутентична."
 
-#: mail/em-format-html-display.c:681 mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:681 ../mail/em-format-html.c:580
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
-#: mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:681
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11283,22 +11241,22 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно аутентичан."
 
-#: mail/em-format-html-display.c:682 mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:682 ../mail/em-format-html.c:581
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
-#: mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:682
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Потпис ове поруке није могао бити проверен, можда је измењена у преносу."
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid "Valid signature, cannot verify sender"
 msgstr "Исправан потпис, није могућа провера пошиљаоца"
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11306,11 +11264,11 @@ msgstr ""
 "Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
 "бити проверен."
 
-#: mail/em-format-html-display.c:689 mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:689 ../mail/em-format-html.c:588
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
-#: mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:689
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11318,11 +11276,11 @@ msgstr ""
 "Ова порука није шифрована.  Њен садржај је могуће видети у преносу преко "
 "Интернета."
 
-#: mail/em-format-html-display.c:690 mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:690 ../mail/em-format-html.c:589
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
-#: mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:690
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11331,11 +11289,11 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом.  Тешко је, али не и немогуће "
 "да неко са стране у догледно време види садржај ове поруке."
 
-#: mail/em-format-html-display.c:691 mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:590
 msgid "Encrypted"
 msgstr "Шифровано"
 
-#: mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:691
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11343,11 +11301,11 @@ msgstr ""
 "Ова порука је шифрована.  Тешко је могуће да неко са стране види садржај ове "
 "поруке."
 
-#: mail/em-format-html-display.c:692 mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:591
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
-#: mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:692
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11356,188 +11314,190 @@ msgstr ""
 "Ова порука је шифрована, и то јаким алгоритмом. Веома је тешко да неко са "
 "стране у догледно време види садржај ове поруке."
 
-#: mail/em-format-html-display.c:793 smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:793 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "При_кажи сертификат"
 
-#: mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:808
 msgid "This certificate is not viewable"
 msgstr "Овај сертификат се не може приказати"
 
-#: mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1037
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено у %B·%d,·%Y,·%l:%M·%p"
 
-#: mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1045
 msgid "Overdue:"
 msgstr "Прекорачено:"
 
-#: mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1048
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "до %B·%d,·%Y,·%l:%M·%p"
 
-#: mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1095
 msgid "_View Inline"
 msgstr "При_кажи унутра"
 
-#: mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1096
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: mail/em-format-html-display.c:1340
-#, fuzzy
+#: ../mail/em-format-html-display.c:1340
 msgid "Attachment Button"
-msgstr "Прилог"
+msgstr "Дугме за прилог"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d страна од %d"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Добијање `%s'"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:582
 msgid "Valid signature but cannot verify sender"
 msgstr "Исправан потпис али није могућа провера пошиљаоца"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Лоше сложен спољни део."
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Показивач на FTP адресу (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Показивач на локалну датотеку (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Показивач на мрежни податак (%s)"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Показивач на непознати спољни податак (тип \"%s\")"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Обликовање поруке"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:848
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Од"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Одговор"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "За"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Копија"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Невидљива копија"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1536 ../mail/em-format-quote.c:315
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Пошиљалац"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1563
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1566
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1577 mail/em-format-quote.c:322 mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-format.c:857 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Датум"
 
-#: mail/em-format-html.c:1600 mail/em-format.c:855 mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1599 ../mail/em-format.c:858
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Дискусионе групе"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1107
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1146 ../mail/em-format.c:1279
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Није могућа обрада S/MIME поруке: непозната грешка"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1269
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржана врста шифровања за multipart/encrypted"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1417
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Није могућа обрада MIME поруке. Приказ извора."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1436
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1444
 msgid "Error verifying signature"
 msgstr "Грешка у провери потписа"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1444
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка у провери потписа"
 
-#: mail/em-junk-filter.c:111
+#: ../mail/em-junk-filter.c:111
 msgid "Spamassassin (built-in)"
 msgstr "Спам убица (уграђен)"
 
 # слично као за месеце и недеље
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Сваки пут"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Једном дневно"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Једном недељно"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Једном месечно"
 
-#: mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11549,48 +11509,48 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција преноси директоријуме..."
 
-#: mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Није могуће прављење новог директоријума `%s': %s"
 
-#: mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Није могуће копирање директоријума `%s' у `%s': %s"
 
-#: mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Није могуће скенирање за постојећим mailbox-има у `%s': %s"
 
-#: mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Није могуће отварање старог POP чувај-на-серверу податка `%s: %s"
 
-#: mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Није могуће прављење POP3 чувај-на-серверу директоријума података `%s': %s"
 
-#: mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Није могуће копирање POP3 чувај-на-серверу податка `%s': %s"
 
-#: mail/em-migrate.c:2561 mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Није успело прављење локалне оставе поште `%s': %s"
 
-#: mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Није могуће прављење локалних директоријума поште  `%s': %s"
 
-#: mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11598,213 +11558,212 @@ msgstr ""
 "Није могуће читање подешавања претходне инсталације Еволуције, `evolution/"
 "config.xmldb' не постоји или је оштећен."
 
-#: mail/em-popup.c:382
+#: ../mail/em-popup.c:382
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: mail/em-popup.c:401
+#: ../mail/em-popup.c:401
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неименована_слика.%s"
 
-#: mail/em-popup.c:495
+#: ../mail/em-popup.c:495
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
-#: mail/em-popup.c:497
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-popup.c:498 ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: mail/em-popup.c:549
+#: ../mail/em-popup.c:549
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у читачу"
 
-#: mail/em-popup.c:550
-#, fuzzy
+#: ../mail/em-popup.c:550
 msgid "_Send New Message To..."
-msgstr "Пошаљи _поруку..."
+msgstr "_Пошаљи поруку за..."
 
-#: mail/em-popup.c:551
+#: ../mail/em-popup.c:551
 msgid "_Add to Addressbook"
 msgstr "Додај у _адресар"
 
-#: mail/em-popup.c:666
+#: ../mail/em-popup.c:666
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
 
-#: mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:611
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Овај смештај не подржава пријаве, или нису омогућене."
 
-#: mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Пријављено"
 
-#: mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Директоријум"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Изаберите сервер."
 
-#: mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "Није изабран сервер"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Не приказуј поново ову поруку."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Филтери"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "порука"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Сачувај поруку..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Додај адресу"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1071
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке од %s"
 
-#: mail/em-vfolder-editor.c:104
-#, fuzzy
+#: ../mail/em-vfolder-editor.c:104
 msgid "v_Folders"
-msgstr "vДиректоријуми"
+msgstr "v_Директоријуми"
 
-#: mail/em-vfolder-rule.c:574
-#, fuzzy
+#: ../mail/em-vfolder-rule.c:574
 msgid "vFolder source"
-msgstr "VДиректоријум извор"
+msgstr "вДиректоријум извор"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Аутоматско препознавање веза"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Аутоматско препознавање смешака"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Провери да ли је пристигла пошта ђубре"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Боја истицања цитата."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Предефинисана висина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Предефинисана ширина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Предефинисани скуп знакова за састављање порука"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Предефинисани скуп знакова за састављање порука."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Предефинисани скуп знакова за приказ порука"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Предефинисани скуп знакова за приказ порука."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Предефинисани стил прослеђивања"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Предефинисана висина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Предефинисана висина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Предефинисана висина прозора за пријаву"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Предефинисани стил одговора"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Предефинисана ширина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Предефинисана ширина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Предефинисана ширина прозора за пријаву"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Исцртава ознаке грешака у куцању уз речи док куцате."
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Празни директоријуме са смећем на излазу"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све директоријуме са смећем при затварању Еволуције."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курзора, тако да видите курзор док читате поруку."
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курзора"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Висина панела списка порука"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Висина панела списка порука."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
+"Уколико корисник покуша да отвори 10 или више порука одједном, пита га да ли "
+"заиста жели то да уради."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -11814,23 +11773,23 @@ msgstr ""
 "mime типови из овог списка који су везани Бонобо приказивачем делова у "
 "Гномовој бази mime типова могу бити коришћени за приказ садржаја."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и одговарајућих боја"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Списак прихваћених лиценци"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Списак налога"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11838,11 +11797,11 @@ msgstr ""
 "Списак налога које познаје поштански део Еволуције. Списак садржи низове "
 "које именују поддиректоријуме у односу на /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Списак произвољних заглавља и да ли су укључена."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11850,19 +11809,19 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи низове "
 "облика име:боја где боја користи HTML хекс кодирање."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Списак mime типова ради провере за Бонобо приказивачима"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Списак имена протокола чија је лиценца прихваћена."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Учитава слике за HTML поруке преко http-а"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -11872,93 +11831,92 @@ msgstr ""
 "не учитавај слике са мреже 1. - Учитавај слике уколико је пошиљалац у "
 "адресару 2 - Увек учитавај слике са мреже"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Бележи акције филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи акције филтера у наведену датотеку дневника."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење акција филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење акција филтера."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава као виђену након наведеног времена"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава као виђену након наведеног времена."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Предефинисана висина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Предефинисана ширина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Стил приказа поруке (обичан, сва заглавља, извор)"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Звучна датотека за обавештење о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Врста обавештења о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Пита када је тема празна"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Пита корисника када покуша да испразни директоријум."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Пита корисника када покуша да пошаље поруку без наслова."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Пита при пражњењу"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Пита када корисник унесе само невидљиву копију (Bcc)"
 
-#: mail/evolution-mail.schemas.in.in.h:60
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Пита корисника када покуша да пошаље поруку без прималаца."
+msgstr "Пита корисника када покуша да отвори 10 или више порука одједном"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11966,95 +11924,95 @@ msgstr ""
 "Пита када корисник покуша да пошаље HTML пошту примаоцима који можда не желе "
 "да примају HTML пошту."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Пита корисника када покуша да пошаље поруку без прималаца."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Пита када корисник покуша да пошаље нежељени HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Препознаje везе у тексту и замењује их."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Препознаје смешке у тексту и замењује их сликама."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Провери да ли има ђубрета у долазећој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Подразумевано шаљи пошту као HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Подразумевано шаље пошту као HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Прикажи анимације"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (прецртане) у списку порука."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Прикажи обрисане поруке у списку порука"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Прикажи панел \"Преглед\""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Приказује панел \"Преглед\"."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Звучна датотека за пуштање када стигне нова пошта."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Наводи врсту обавештења о новој пошти које корисник жели да користи."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Истовремена провера правописа"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Предефинисана висина прозора за пријаву"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Предефинисана ширина прозора за пријаву"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Фонт терминала"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Време пражњења смећа, у данима од почетка епохе."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Фонт терминала за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Фонт променљиве ширине за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12065,102 +12023,100 @@ msgstr ""
 "заглавља и потребу њиховог приказивања. XML структура је формата &lt;"
 "header·enabled&gt; - омогућено за приказивање заглавља у прегледу поште."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Листа поруке према низу разговора."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Излистај поруке према низу разговора"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Излистај поруке према низу разговора на наслов"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Време за означавање порука као виђене"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Време за означавање порука као виђене."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "ЈИБ низ главног налога."
 
-#: mail/evolution-mail.schemas.in.in.h:91
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Користи сервис и клијента Убице спама"
 
-#: mail/evolution-mail.schemas.in.in.h:92
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Користи сервис и клијента Убице спама (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Користи произвољне фонтове"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Користи произвољне фонтове за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Користи само локалне провере спама."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без DNS-а)."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Фонт променљиве ширине"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Опција Приказ/невидљива копија (Bcc) је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Опција Приказ/невидљива копија (Bcc) је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Опција Приказ/копија (Cc) је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Опција Приказ/копија (Cc) је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Опција Приказ/шаље је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Опција Приказ/шаље је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Опција Приказ/пошаљи је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Опција Приказ/пошаљи је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Опција Приказ/одговори је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Опција Приказ/одговори је изабрана."
 
 # Да ли ово треба оставити на енглеском, пошто су дословна имена заглавља?
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12168,65 +12124,67 @@ msgstr ""
 "Да ли покушати приказ низа расправе по наслову када поруке не садрже "
 "заглавља Одговор-на и Референце."
 
-#: mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr "порт за покретање корисниковог spamd-а"
 
-#: mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "spamd порт"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Еволуција Elm увозник"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Еволуција Netscape пошта увозник"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Еволуција Outlook Express 4 увозник"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Еволуција Pine увозник"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "Еволуција mbox увозник"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MБокс (mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Еволуција увози стару Elm пошту"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Увожење..."
 
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Сачекајте"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Увожење Елм података"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -12234,43 +12192,43 @@ msgstr ""
 "Еволуција је пронашла Elm датотеке поште\n"
 "Желите ли да их увезете у Еволуцију?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Одредишни директоријум:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Изаберите директоријум за увожење"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увожење `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Увожење mailbox-а"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Претрага %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Приоритетни филтер \"%s\""
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12296,7 +12254,7 @@ msgstr ""
 "приоритета. Проверите увежене филтере да се уверите\n"
 "да ли све ради као што би требало."
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12308,7 +12266,7 @@ msgstr ""
 "коју Еволуција не подржава.\n"
 "Ови филтери биће изостављени."
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12322,23 +12280,23 @@ msgstr ""
 "су промењени да проверавају да ли тај низ јесте\n"
 "или није садржан у телу поруке."
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Еволуција увози старе Netscape податке"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Увожење Netscape података"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Подешавања"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Филтери поште"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12346,15 +12304,15 @@ msgstr ""
 "Еволуција је пронашла Netscape датотеке поште.\n"
 "Желите ли да буду увежене у Еволуцију?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Еволуција увози старе Pine податке."
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Увожење Pine података"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12362,35 +12320,35 @@ msgstr ""
 "Еволуција је пронашла Pine датотеке поште.\n"
 "Желите ли да их увезете у Еволуцију?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: mail/mail-autofilter.c:238 mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслов је %s"
 
-#: mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
-#: mail/mail-component.c:505
+#: ../mail/mail-component.c:505
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -12398,7 +12356,7 @@ msgstr[0] "%d обрисано"
 msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 
-#: mail/mail-component.c:507
+#: ../mail/mail-component.c:507
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -12406,7 +12364,7 @@ msgstr[0] "%d ђубре"
 msgstr[1] "%d ђубрета"
 msgstr[2] "%d ђубрета"
 
-#: mail/mail-component.c:530
+#: ../mail/mail-component.c:530
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -12414,7 +12372,7 @@ msgstr[0] "%d у припреми"
 msgstr[1] "%d недовршене"
 msgstr[2] "%d недовршених"
 
-#: mail/mail-component.c:532
+#: ../mail/mail-component.c:532
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -12422,7 +12380,7 @@ msgstr[0] "%d послато"
 msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 
-#: mail/mail-component.c:534
+#: ../mail/mail-component.c:534
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -12430,7 +12388,7 @@ msgstr[0] "%d непослато"
 msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 
-#: mail/mail-component.c:538
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -12438,7 +12396,7 @@ msgstr[0] "%d укупно"
 msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 
-#: mail/mail-component.c:540
+#: ../mail/mail-component.c:540
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
@@ -12446,265 +12404,260 @@ msgstr[0] "%d непрочитано"
 msgstr[1] "%d непрочитане"
 msgstr[2] "%d непрочитаних"
 
-#: mail/mail-component.c:722
+#: ../mail/mail-component.c:722
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: mail/mail-component.c:723
+#: ../mail/mail-component.c:723
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: mail/mail-component.c:724
+#: ../mail/mail-component.c:724
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:730
+#: ../mail/mail-component.c:730
 msgid "New Mail Folder"
 msgstr "Нови директоријум за пошту"
 
-#: mail/mail-component.c:731
+#: ../mail/mail-component.c:731
 msgid "Mail _Folder"
 msgstr "_Директоријум за пошту"
 
-#: mail/mail-component.c:732
+#: ../mail/mail-component.c:732
 msgid "Create a new mail folder"
 msgstr "Направи нови директоријум за пошту"
 
-#: mail/mail-component.c:879
+#: ../mail/mail-component.c:879
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Није успело дограђивање подешавања поште или директоријума."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Провери подржане типове "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL није подржан у овој верзији еволуције</b>"
+msgstr "<b>SSL није подржан у овој верзији Еволуције</b>"
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
 msgstr "<b>По_тписи</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Језици</b>"
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Ово ће учинити филтер поузданијим, али споријим</small>"
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Подаци о налогу</span>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Упозорења</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Начин пријаве</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Идентификација</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Састављање порука</span>"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Подешавања</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Предефинисано понашање</span>"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Бриши пошту</span>"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Приказана _заглавља порука</span>"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Подешавања филтера</span>"
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1667
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Опште</span>"
 
-#: mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Ознаке и боје</span>"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Учитавање слика</span>"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Приказ поруке</span>"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Фонтови поруке</span>"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Обавештавање о новој пошти</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Опциони подаци</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Подешавања</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Прилично добра приватност (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Фонтови за штампу</span>"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Потребни подаци</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Безбедни MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Безбедност</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Послате и поруке у припреми</span>"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Подешавање сервера</span>"
 
-#: mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Управљање налозима"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "Додај ск_рипту"
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Увек потпиши одлазеће поруке са овог налога"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "_Такође шифруј на мене при слању шифроване поште"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _копију (cc):"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _скривену копију (Bcc):"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Увек _веруј кључевима мог ланца при шифровању"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Ув_ек шифруј на мене при слању шифроване поште"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Приложи оригиналну поруку"
 
-#: mail/mail-config.glade.h:44 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прилог"
 
-#: mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:45
 msgid "Automatically _insert smiley images"
 msgstr "Аутомат_ски убаци слике са осмесима"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
 msgstr "С_вирни када стигне нова пошта"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "К_одна страна:"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "_Провери подржане типове "
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:51
 msgid "Check _incoming mail for junk"
 msgstr "Провери има ли ђубрета у _пристиглој пошти"
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Провери да пристигле поруке нису ђубре"
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
+#: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
-msgstr "абаИббаИ"
+msgstr "Очи_сти"
 
-#: mail/mail-config.glade.h:55
-#, fuzzy
+#: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
-msgstr "абаИббаИ"
+msgstr "Очис_ти"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешно написане речи:"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:57
 msgid "Colors"
 msgstr "Боје"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Потврди када празниш директоријум"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12720,125 +12673,135 @@ msgstr ""
 "\n"
 "Притисните \"Примени\" да сачувате подешавања."
 
-#: mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Пре_дефинисано"
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "Подразумевано _кодирање знакова:"
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Дигитално потпиши одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Не цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:71 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:71 ../shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:72
 msgid "Drafts _Folder:"
 msgstr "Д_иректоријум Припрема:"
 
-#: mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "Налози е-поште"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:75
 msgid "Email _Address:"
 msgstr "Електронска _адреса:"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
 msgstr "Испразни директоријуме са _смећем на излазу"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за ши_фровање:"
 
-#: mail/mail-config.glade.h:78
-#, fuzzy
+#: ../mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Шифруј одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Изврши команду..."
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
 msgstr "У_тврђена-ширина:"
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Подешавања фонта"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Среди поруке у H_TML"
 
-#: mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:85
 msgid "HTML Mail"
 msgstr "HTML пошта"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:86
 msgid "Headers"
 msgstr "Заглавља"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:88
 msgid "I_nclude remote tests"
 msgstr "У_кључи мрежне провере"
 
-#: mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Унутар"
 
-#: mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Languages Table"
+msgstr "Језик"
+
+#: ../mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Headers Table"
+msgstr "Стабло директоријума за пошту"
+
+#: ../mail/mail-config.glade.h:98
 msgid "Mailbox location"
 msgstr "Mailbox локација"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:99
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Напомена: нећете бити упитани за лозинку док се не повежете први пут"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG ИБ _кључа:"
 
-#: mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Пусти звучну датотеку када стигне нова пошта"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
+"Унесите доле описно име за овај налог.\n"
+"Ово име ће бити коришћено само за потребе приказа."
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12846,7 +12809,7 @@ msgstr ""
 "Унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
 "питајте администратора система или понуђача Интернет услуге."
 
-#: mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12855,119 +12818,119 @@ msgstr ""
 "Унесите доле име и електронску адресу. \"Опциона\" поља доле не морају бити "
 "попуњена, осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid "Please select among the following options"
 msgstr "Изаберите од следећих опција"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:111
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са наведеним Bcc примаоцима"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
 msgid "Quote original message"
 msgstr "Цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:113
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:114
 msgid "Re_member password"
 msgstr "З_апамти лозинку"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:115
 msgid "Re_ply-To:"
 msgstr "Од_говори:"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:117
 msgid "Remember _password"
 msgstr "Запа_мти лозинку"
 
-#: mail/mail-config.glade.h:116
-#, fuzzy
+#: ../mail/mail-config.glade.h:118
 msgid "S_elect..."
 msgstr "Изабери..."
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:119
 msgid "S_tandard Font:"
 msgstr "_Стандардни фонт:"
 
-#: mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:120
 msgid "Se_lect..."
-msgstr "Изабери..."
+msgstr "Иза_бери..."
 
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Одабери HTML фонт фиксиране величине"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Одабери HTML фонт фиксиране величине за штампу"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Одабери HTML фонт варијабилне величине"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Одабери HTML фонт варијабилне величине за штампу"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:127
 msgid "Sending Mail"
 msgstr "Слање поште"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Sent _Messages Folder:"
 msgstr "Директоријум Послатих _порука:"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:129
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи идентификацију"
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
 msgid "Server _Type: "
 msgstr "_Тип сервера:"
 
-#: mail/mail-config.glade.h:129
-#, fuzzy
+#: ../mail/mail-config.glade.h:131
 msgid "Sig_ning certificate:"
 msgstr "Сертификат за _потписивање:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Signat_ure:"
 msgstr "Потп_ис:"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 msgid "Signatures"
 msgstr "Потписи"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signatures Table"
+msgstr "Потписи"
+
+#: ../mail/mail-config.glade.h:135
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:136
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:137
 msgid "T_erminal Font:"
 msgstr "_Фонт терминала:"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:138
 msgid "T_ype: "
 msgstr "_Тип:"
 
-#: mail/mail-config.glade.h:136
-#, fuzzy
+#: ../mail/mail-config.glade.h:139
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Ова страна вам омогућава да подесите проверу правописа и језик. Листа језика "
-"овде осликава само оне језике за које имате инсталиран речник."
+"Листа језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:140
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12977,7 +12940,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану. "
 
-#: mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12985,15 +12948,15 @@ msgstr ""
 "Укуцајте име по коме желите да назовете овај налог.\n"
 "На пример: \"Пословни\" или \"Лични\""
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "V_ariable-width:"
 msgstr "В_аријабилна ширина:"
 
-#: mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13003,160 +12966,145 @@ msgstr ""
 "\n"
 "Притисните \"Напред\" за почетак. "
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:153
 msgid "_Always load images from the Internet"
 msgstr "_Увек учитавај слике са Интернета"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:154
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Немој да ме обавештаваш када стигне нова пошта"
 
-#: mail/mail-config.glade.h:152
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанцима (Outlook компатибилност)"
 
-#: mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања:"
 
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "_Full Name:"
 msgstr "_Пуно име:"
 
-#: mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Домаћин:"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "_Load images if sender is in address book"
 msgstr "_Учитавај слике ако је пошиљалац у адресару"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој главни налог"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане након"
 
-#: mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
 msgstr "_Никада не учитавај слике са Интернета"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "_Путања:"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:170
 msgid "_Show animated images"
 msgstr "_Покажи анимиране слике"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
+#: ../mail/mail-config.glade.h:171
 msgid "_Use Secure Connection:"
 msgstr "_Користи безбедну везу:"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте фонтове као други програми"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "color"
 msgstr "боја"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-" Пажљиво прочитајте доле приказан уговор о лиценци\n"
-" и означите кућицу за прихватате\n"
-
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>vДиректоријум извори</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Дигитални потпис</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Шифровање</span>"
 
-#: mail/mail-dialogs.glade.h:10
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
-msgstr "Осетљиво на величину слова"
+msgstr "_Осетљиво на величину слова"
 
 # timezone.
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
-msgstr "Готово"
+msgstr "Го_тово"
 
-#: mail/mail-dialogs.glade.h:13
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
-msgstr "Нађи:"
+msgstr "Н_ађи:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Пронађи у поруци"
 
-#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Пријаве на директоријуме"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Уговор о лиценци"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "Ништа није изабрано"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "С_ервер:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Безбедносни подаци"
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13164,55 +13112,53 @@ msgstr ""
 "Поруке које сте изабрали за праћење су доле излистане.\n"
 "Одаберите акцију за праћење из менија \"Ознака\"."
 
-#: mail/mail-dialogs.glade.h:24
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
-msgstr "Прихватам уговор"
+msgstr "_Прихватам лиценцу"
 
-#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Рок:"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Ознака:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "При_јави се"
 
-#: mail/mail-dialogs.glade.h:28
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
-msgstr "Означите ово да прихватите уговор о лиценци"
+msgstr "Оз_начите ово да прихватите уговор о лиценци"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Unsubscribe"
 msgstr "_Одјави се"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "само наведени директоријуми"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "са свим активним мрежним директоријумима"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "са свим локалним и активним мрежним директоријумима"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "са свим локалним директоријумима"
 
 #. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
+#: ../mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
 msgstr "Неисправна идентификација"
 
 #. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
+#: ../mail/mail-errors.xml.h:4
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13221,12 +13167,12 @@ msgstr ""
 "подржава идентификацију."
 
 #. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
+#: ../mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Пријава на сервер \"{0}\" као \"{0}\" није успела."
 
 #. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
+#: ../mail/mail-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13235,12 +13181,12 @@ msgstr ""
 "лозинки величина слова битна; можда је caps lock укључен."
 
 #. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
+#: ../mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Сигурно желите да пошаљете поруку у HTML облику?"
 
 #. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13252,12 +13198,12 @@ msgstr ""
 "Свакако послати?"
 
 #. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурно желите да пошаљете поруку без наслова?"
 
 #. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+#: ../mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13268,12 +13214,12 @@ msgstr ""
 # mail:ask-send-only-bcc primary
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Сигурно желите да пошаљете поруку само са невидљивим примаоцима (BCC)?"
 
 #. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13289,7 +13235,7 @@ msgstr ""
 "Да би избегли ово, додајте барем једног Прима: илиКопија (CC): примаоца."
 
 #. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-errors.xml.h:31
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13302,13 +13248,13 @@ msgstr ""
 "примаоца."
 
 #. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-errors.xml.h:34
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "Ова порука се не може послати пошто нисте навели примаоце"
 
 #. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
+#: ../mail/mail-errors.xml.h:36
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13317,12 +13263,12 @@ msgstr ""
 "електронске адресе притиском на дугме Прима: поред поља за унос."
 
 #. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
 msgstr "Користити подразумевани директоријум за припрему?"
 
 #. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
+#: ../mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -13330,12 +13276,12 @@ msgstr ""
 "Није могуће отварање директоријума за припрему за овај налог.  Користити "
 "системски директоријум за припрему?"
 
-#: mail/mail-errors.xml.h:41
+#: ../mail/mail-errors.xml.h:41
 msgid "Use _Default"
 msgstr "Користи _подразумевано"
 
 #. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
+#: ../mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -13346,49 +13292,47 @@ msgstr ""
 # mail:ask-empty-trash secondary
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ако наставите, нећете моћи да вратите ове поруке."
 
-#: mail/mail-errors.xml.h:46
+#: ../mail/mail-errors.xml.h:46
 msgid "_Expunge"
 msgstr "Из_баци"
 
 #. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
+#: ../mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих директоријума?"
 
-#: mail/mail-errors.xml.h:51
+#: ../mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "Избаци _смеће"
 
 #. mail:ask-open-many primary
-#: mail/mail-errors.xml.h:53
-#, fuzzy
+#: ../mail/mail-errors.xml.h:53
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Сигурно желите да измените свих %d порука?"
+msgstr "Сигурно желите да отворите {0} порука одједном?"
 
 #. mail:ask-open-many secondary
-#: mail/mail-errors.xml.h:55
+#: ../mail/mail-errors.xml.h:55
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "Отварање превише порука одједном може сувише да потраје."
 
-#: mail/mail-errors.xml.h:56
-#, fuzzy
+#: ../mail/mail-errors.xml.h:56
 msgid "_Open Messages"
-msgstr "_Отвори поруку"
+msgstr "_Отвори поруке"
 
 #. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:58
+#: ../mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, желите ли свеједно да изађете?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:60
+#: ../mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13397,12 +13341,12 @@ msgstr ""
 "Еволуцију."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:62
+#: ../mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Порука насловњена \"{0}\" није испоручена."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -13415,37 +13359,32 @@ msgstr ""
 "поново је пошаљите."
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:67
+#: ../mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Грешка приликом {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:69
+#: ../mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:71
+#: ../mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Грешка током операције."
 
-#. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:73
-msgid "{0}."
-msgstr "{0}."
-
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:87
+#: ../mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Унесите лозинку."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:91
+#: ../mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Грешка у учитавању дефиниција филтера."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:95
+#: ../mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Није могуће чување у директоријум \"{0}\"."
 
@@ -13454,38 +13393,38 @@ msgstr "Није могуће чување у директоријум \"{0}\"."
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
-#: mail/mail-errors.xml.h:111
+#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
+#: ../mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Није могуће чување у директоријум \"{0}\"."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:101
+#: ../mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Није могуће прављење директоријума за чување, због \"{1}\""
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:103
+#: ../mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Није могуће прављење привременог директоријум за чување."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:109
+#: ../mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "Датотека постоји, није могуће преписивање."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:113
+#: ../mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "Датотека постоји али није регуларна."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:115
+#: ../mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Није могуће брисање директоријума \"{0}\"."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:119
+#: ../mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Није могуће брисање системског директоријума \"{0}\"."
 
@@ -13493,7 +13432,7 @@ msgstr "Није могуће брисање системског директо
 # mail:no-rename-spethal-folder secondary
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:121 mail/mail-errors.xml.h:125
+#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13502,23 +13441,25 @@ msgstr ""
 "преименовати, преместити или обрисати."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:123
+#: ../mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 "Није могуће преименовати или преместити системски директоријум \"{0}\"."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:127
+#. mail:ask-delete-vfolder title
+#: ../mail/mail-errors.xml.h:127 ../mail/mail-errors.xml.h:133
 msgid "Delete \"{0}\"?"
 msgstr "Обрисати \"{0}\"?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:129
+#. mail:ask-delete-vfolder primary
+#: ../mail/mail-errors.xml.h:129 ../mail/mail-errors.xml.h:135
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Заиста обрисати директоријум \"{0}\" и све поддиректоријуме?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:131
+#: ../mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13529,163 +13470,162 @@ msgstr ""
 # mail:no-rename-folder primary
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:133 mail/mail-errors.xml.h:137
+#: ../mail/mail-errors.xml.h:137 ../mail/mail-errors.xml.h:141
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Није могуће преименовање \"{0}\" у \"{1}\"."
 
 # mail:vfolder-notunique secondary
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:135 mail/mail-errors.xml.h:197
+#: ../mail/mail-errors.xml.h:139 ../mail/mail-errors.xml.h:201
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Директоријум назван \"{1} већ постоји. Употребите друго име."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:139
+#: ../mail/mail-errors.xml.h:143
 msgid "Because \"{2}\"."
 msgstr "Због \"{2}\"."
 
 # mail:no-move-folder-to-nostore primary
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:141 mail/mail-errors.xml.h:145
+#: ../mail/mail-errors.xml.h:145 ../mail/mail-errors.xml.h:149
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Није могуће преместити директоријум \"{0}\" у \"{1}\"."
 
 # mail:no-copy-folder-nostore secondary
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:143 mail/mail-errors.xml.h:151
+#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
 msgid "Cannot open source \"{2}\"."
 msgstr "Није могуће отварање извора \"{2}\"."
 
 # mail:no-copy-folder-to-nostore secondary
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:147 mail/mail-errors.xml.h:155
+#: ../mail/mail-errors.xml.h:151 ../mail/mail-errors.xml.h:159
 msgid "Cannot open target \"{2}\"."
 msgstr "Није могуће отварање циља \"{2}\"."
 
 # mail:no-copy-folder-to-nostore primary
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:149 mail/mail-errors.xml.h:153
+#: ../mail/mail-errors.xml.h:153 ../mail/mail-errors.xml.h:157
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Није могуће копирање директоријума \"{0}\" у \"{1}\"."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:157
+#: ../mail/mail-errors.xml.h:161
 msgid "Cannot create folder \"{0}\"."
 msgstr "Није могуће прављење директоријума \"{0}\"."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:159
+#: ../mail/mail-errors.xml.h:163
 msgid "Cannot open source \"{1}\""
 msgstr "Није могуће отварање извора \"{1}\""
 
 # mail:account-notunique primary
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:161 mail/mail-errors.xml.h:165
+#: ../mail/mail-errors.xml.h:165 ../mail/mail-errors.xml.h:169
 msgid "Cannot save changes to account."
 msgstr "Није могуће чување измена на налогу."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:163
+#: ../mail/mail-errors.xml.h:167
 msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:167
+#: ../mail/mail-errors.xml.h:171
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете отворити два налога са истим именом."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:169
+#: ../mail/mail-errors.xml.h:173
 msgid "Delete account?"
 msgstr "Обрисати налог?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail-errors.xml.h:175
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail-errors.xml.h:177
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци налога биће трајно обрисани."
 
-#: mail/mail-errors.xml.h:174
+#: ../mail/mail-errors.xml.h:178
 msgid "Don't delete"
 msgstr "Не бриши"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:176
+#: ../mail/mail-errors.xml.h:180
 msgid "Could not save signature file."
 msgstr "Није могуће чување датотеке потписа."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:178
+#: ../mail/mail-errors.xml.h:182
 msgid "Because \"{0}\"."
 msgstr "Због \"{0}\"."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:180
+#: ../mail/mail-errors.xml.h:184
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Није могуће поставити скрипту за потпис \"{0}\"."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:182
+#: ../mail/mail-errors.xml.h:186
 msgid "The script file must exist and be executable."
 msgstr "Датотека скрипте мора постојати и бити извршна."
 
 # bug: s/changed/changes/?
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail-errors.xml.h:188
 msgid "Discard changed?"
 msgstr "Занемарити промењено?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail-errors.xml.h:190
 msgid "Do you wish to save your changes?"
 msgstr "Желите ли да сачувате промене?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail-errors.xml.h:192
 msgid "This signature has been changed, but has not been saved."
 msgstr "Овај потпис је промењен, али није сачуван."
 
-#: mail/mail-errors.xml.h:189
+#: ../mail/mail-errors.xml.h:193
 msgid "_Discard changes"
 msgstr "_Занемари промене"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:191
+#: ../mail/mail-errors.xml.h:195
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "Није могуће изменити vДиректоријум \"{0}\" пошто не постоји."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:193
-#, fuzzy
+#: ../mail/mail-errors.xml.h:197
 msgid ""
 "This folder may have been added implicitly, go to the vFolder editor to add "
 "it explicitly, if required."
 msgstr ""
-"Овај директоријум је можда посредно додат, идите у уређивач виртуелних "
-"директоријума и додајте га изричито, ако желите."
+"Овај директоријум је можда посредно додат, идите у уређивач вДиректоријума и "
+"додајте га изричито, ако желите."
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:195
+#: ../mail/mail-errors.xml.h:199
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "Није могуће додавање vДиректоријума \"{0}\"."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:199
+#: ../mail/mail-errors.xml.h:203
 msgid "vFolders automatically updated."
 msgstr "ВДиректоријуми су аутоматски освежени."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:201
+#: ../mail/mail-errors.xml.h:205
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -13700,12 +13640,12 @@ msgstr ""
 "И сада су освежени."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:207
+#: ../mail/mail-errors.xml.h:211
 msgid "Mail filters automatically updated."
 msgstr "Филтери поште су аутоматски освежени."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:209
+#: ../mail/mail-errors.xml.h:213
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13720,27 +13660,27 @@ msgstr ""
 "И сада је(су) освежено(а)."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:215
+#: ../mail/mail-errors.xml.h:219
 msgid "Missing folder."
 msgstr "Недостаје директоријум."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:217
+#: ../mail/mail-errors.xml.h:221
 msgid "You must specify a folder."
 msgstr "Морате навести директоријум."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:221
+#: ../mail/mail-errors.xml.h:225
 msgid "You must name this vFolder."
 msgstr "Морате именовати овај vДиректоријум."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:223
+#: ../mail/mail-errors.xml.h:227
 msgid "No sources selected."
 msgstr "Извори нису изабрани."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:225
+#: ../mail/mail-errors.xml.h:229
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -13752,12 +13692,12 @@ msgstr ""
 "или и једних и других."
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:229
+#: ../mail/mail-errors.xml.h:233
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем у преносу старог директоријума поште \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:231
+#: ../mail/mail-errors.xml.h:235
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13769,81 +13709,82 @@ msgstr ""
 "Можете изабрати да игноришете овај директоријум, преписати га или допунити "
 "његов садржај, или изаћи.\n"
 
-#: mail/mail-errors.xml.h:235
+#: ../mail/mail-errors.xml.h:239
 msgid "Ignore"
 msgstr "Занемари"
 
-#: mail/mail-errors.xml.h:236 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail-errors.xml.h:240 ../widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Препиши"
 
-#: mail/mail-errors.xml.h:237
+#: ../mail/mail-errors.xml.h:241
 msgid "_Append"
 msgstr "_Допуни"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:239
-#, fuzzy
+#: ../mail/mail-errors.xml.h:243
 msgid "Unable to read license file."
-msgstr ""
-"Не могу да тражим датотеку: %s\n"
-"%s"
+msgstr "Није могуће читање датотеке лиценце."
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:241
+#: ../mail/mail-errors.xml.h:245
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider "
 "until\n"
 "      you can accept its license."
 msgstr ""
+"Није могуће читање датотеке лиценце \"{0}\", због\n"
+"      проблема са инсталацијом.  Нећете моћи да користите овог пружаоца док\n"
+"      не прихватите лиценцу."
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:245
+#: ../mail/mail-errors.xml.h:249
 msgid "Querying server"
-msgstr ""
+msgstr "Слање упита серверу"
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:247
-#, fuzzy
+#: ../mail/mail-errors.xml.h:251
 msgid "Please wait."
-msgstr "Сачекајте"
+msgstr "Сачекајте."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:249
-#, fuzzy
+#: ../mail/mail-errors.xml.h:253
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Неопходно шифровање за тражени механизам пријаве"
+msgstr "Слање упита серверу за списак подржаних механизама пријаве."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:251
-#, fuzzy
+#: ../mail/mail-errors.xml.h:255
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
-msgstr "Неуспешно повезивање са LDAP сервером"
+msgstr ""
+"Неуспешно повезивање на GroupWise\n"
+"сервер."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:254
+#: ../mail/mail-errors.xml.h:258
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
 msgstr ""
+"\n"
+"Проверите подешавања налога и покушајте поново.\n"
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Пинговање %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Филтрирање директоријума"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Узимање поште"
 
-#: mail/mail-ops.c:542 mail/mail-ops.c:585
+#: ../mail/mail-ops.c:556 ../mail/mail-ops.c:598
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13853,106 +13794,106 @@ msgstr ""
 "Допуњавање у локални директоријум Послато."
 
 #. sending mail, filtering failed
-#: mail/mail-ops.c:564
+#: ../mail/mail-ops.c:577
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Није успела примена одлазећих филтера: %s"
 
-#: mail/mail-ops.c:602
+#: ../mail/mail-ops.c:615
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Није успело допуњавање у локални директоријум Послато: %s"
 
-#: mail/mail-ops.c:702
+#: ../mail/mail-ops.c:727
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Слање поруке %d од %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:727
+#: ../mail/mail-ops.c:752
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Није успело слање %d од %d порука"
 
-#: mail/mail-ops.c:729 mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:754 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Поништено."
 
-#: mail/mail-ops.c:731
+#: ../mail/mail-ops.c:756
 msgid "Complete."
 msgstr "Готово."
 
-#: mail/mail-ops.c:828
+#: ../mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Чување поруке у директоријум"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештање порука у %s"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирање порука у %s"
 
-#: mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварање директоријума %s"
 
-#: mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1279
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварање оставе %s"
 
-#: mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1357
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањање директоријума %s"
 
-#: mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1451
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештање директоријума '%s'"
 
-#: mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1516
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Пражњење и смештање налога '%s'"
 
-#: mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештање налога %s'"
 
-#: mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1572
 msgid "Refreshing folder"
 msgstr "Освежавање директоријума"
 
-#: mail/mail-ops.c:1583 mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1608 ../mail/mail-ops.c:1659
 msgid "Expunging folder"
 msgstr "Пражњење директоријума"
 
-#: mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1656
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацивање смећа у '%s'"
 
-#: mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657
 msgid "Local Folders"
 msgstr "Локални директоријуми"
 
-#: mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Узимање поруке %s"
 
-#: mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13960,7 +13901,7 @@ msgstr[0] "Узимање %d поруке"
 msgstr[1] "Учитавам %d поруке"
 msgstr[2] "Учитавам %d порука"
 
-#: mail/mail-ops.c:1873
+#: ../mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -13968,7 +13909,7 @@ msgstr[0] "Чување %d поруке"
 msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 
-#: mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1948
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13977,7 +13918,7 @@ msgstr ""
 "Није могуће прављење излазне датотеке: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1976
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13986,11 +13927,11 @@ msgstr ""
 "Грешка у чувању поруке у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2047
 msgid "Saving attachment"
 msgstr "Чување прилога"
 
-#: mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2059
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13999,789 +13940,741 @@ msgstr ""
 "Није могуће прављење излазне датотеке: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2069
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Није могућ упис података: %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидање везе са %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поновно повезивање на %s"
 
-#: mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2335
 msgid "Checking Service"
 msgstr "Провера сервиса"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Поништавање..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, тип: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Путања: %s, тип: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Пошаљи и прими пошту"
 
-#: mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:327
 msgid "Cancel _All"
 msgstr "Поништи _све"
 
-#: mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:416
 msgid "Updating..."
 msgstr "Освежавање..."
 
-#: mail/mail-send-recv.c:416 mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Чекање..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Корисник је поништио операцију."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Уреди потпис"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Унеси име за овај потпис."
 
-#: mail/mail-signature-editor.c:415 plugins/shared-folder/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Име:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Није могуће прављење spool директоријума `%s': %s"
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Покушава премештање поште из не-mbox извора `%s'"
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Прослеђена порука - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:243
 msgid "Forwarded message"
 msgstr "Прослеђена порука"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:283
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Неисправан директоријум %s"
 
-#: mail/mail-vfolder.c:90
-#, fuzzy, c-format
+#: ../mail/mail-vfolder.c:90
+#, c-format
 msgid "Setting up vFolder: %s"
-msgstr "Подешавање vдиректоријума: %s"
+msgstr "Подешавање вДиректоријума: %s"
 
-#: mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Освежавање vДиректоријума за '%s: %s'"
 
-#: mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:246
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Освежавање vДиректоријума за '%s'"
 
-#: mail/mail-vfolder.c:1008
-#, fuzzy
+#: ../mail/mail-vfolder.c:1008
 msgid "Edit vFolder"
-msgstr "Уреди VДиректоријум"
+msgstr "Уређује вДиректоријум"
 
-#: mail/mail-vfolder.c:1092
-#, fuzzy
+#: ../mail/mail-vfolder.c:1092
 msgid "New vFolder"
-msgstr "_Нови директоријум"
+msgstr "Нови вДиректоријум"
 
-#: mail/message-list.c:994
+#: ../mail/message-list.c:995
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: mail/message-list.c:995
+#: ../mail/message-list.c:996
 msgid "Seen"
 msgstr "Виђено"
 
-#: mail/message-list.c:996
+#: ../mail/message-list.c:997
 msgid "Answered"
 msgstr "Одговорено"
 
-#: mail/message-list.c:997
+#: ../mail/message-list.c:998
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: mail/message-list.c:998
+#: ../mail/message-list.c:999
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:1003
 msgid "Lowest"
 msgstr "Најниже"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1004
 msgid "Lower"
 msgstr "Ниже"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1008
 msgid "Higher"
 msgstr "Више"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1009
 msgid "Highest"
 msgstr "Највише"
 
-#: mail/message-list.c:1336
+#: ../mail/message-list.c:1337
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1343 plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1344 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "Данас %l:%M %p"
 
-#: mail/message-list.c:1352
+#: ../mail/message-list.c:1353
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %l:%M %p"
 
-#: mail/message-list.c:1364
+#: ../mail/message-list.c:1365
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1372
+#: ../mail/message-list.c:1373
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1374
+#: ../mail/message-list.c:1375
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2041
-#, fuzzy
+#: ../mail/message-list.c:2041
 msgid "Message List"
-msgstr "По_руке"
+msgstr "Списак порука"
 
-#: mail/message-list.c:3384
+#: ../mail/message-list.c:3386
 msgid "Generating message list"
 msgstr "Прављење списка порука"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Рок до"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Статус ознаке"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Означено"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Следи ознаку"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Оргинална локација"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Примљено"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Величина"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Позив"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Не проследи"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Следи"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "За вашу информацију"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Проследи"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Одговори"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Одговори свима"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Прочитај"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Тело садржи"
 
-#: mail/searchtypes.xml.h:2
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Порука садржи"
 
-#: mail/searchtypes.xml.h:3
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
-#: mail/searchtypes.xml.h:6
-#, fuzzy
+#: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
-msgstr "Наслов садржи"
+msgstr "Наслов или пошиљалац садрже"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
-msgstr ""
+msgstr "Изаберите име архиве Еволуције"
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "_Поново покрени Еволуцију након прављења резерве"
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
-msgstr ""
+msgstr "Одаберите архиву Еволуције за повраћај"
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr ""
+msgstr "_Поново покрени Еволуцију након повраћаја"
 
-#: plugins/backup-restore/backup.c:109
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
-msgstr "Упит Еволуције"
+msgstr "Директоријум за резерву Еволуције"
 
-#: plugins/backup-restore/backup.c:111
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
-msgstr "Еволуција LDIF увозник"
+msgstr "Директоријум за повраћај Еволуције"
 
-#: plugins/backup-restore/backup.c:113
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
-msgstr "Пакет програма Еволуција"
+msgstr "Проверава архиву Еволуције"
 
 # shell:noshell-reason title
-#: plugins/backup-restore/backup.c:115
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
-msgstr "Није могуће покретање Еволуције"
+msgstr "Поново покреће Еволуцију"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
-msgstr "_Подешавања..."
+msgstr "Подешавања за резерву..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr "Измени подешавања Еволуције"
+msgstr "Прави резерву и опоравља податке и подешавања Еволуције"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
-msgstr "Подешавања пилота..."
+msgstr "Опоравља подешавања..."
 
-#: plugins/bbdb/bbdb.c:388
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:390
 msgid "Automatic Contacts"
-msgstr "Јавни контакти"
+msgstr "Аутоматски контакти"
 
-#: plugins/bbdb/bbdb.c:397
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:399
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Идентификација</span>"
+msgstr "<span weight=\"bold\">Аутоматски контакти</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:412
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+msgstr "_Аутоматски направи уносе у адресар при одговарању на пошту"
 
-#: plugins/bbdb/bbdb.c:428
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:430
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Фонтови поруке</span>"
+msgstr "<span weight=\"bold\">Контакти брзих гласника</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:443
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
-msgstr ""
+msgstr "Повремено усклади податке о контактима и слике са мог_брзог гласника"
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:450
 msgid "Synchronize with _buddy list now"
-msgstr ""
+msgstr "Усклади са _списком другара сада"
 
-#: plugins/calendar-weather/calendar-weather.c:54
-#: plugins/calendar-weather/calendar-weather.c:60
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
-msgstr "абаЕаМаЕ"
+msgstr "Време: облачно"
 
-#: plugins/calendar-weather/calendar-weather.c:61
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr "абаЕаМаЕ"
+msgstr "Време: магла"
 
-#: plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "Време: местимично облачно"
 
-#: plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
-msgstr "абаЕаМаЕ"
+msgstr "Време: киша"
 
-#: plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
-msgstr "абаЕаМаЕ"
+msgstr "Време: снег"
 
-#: plugins/calendar-weather/calendar-weather.c:65
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
-msgstr "абаЕаМаЕ"
+msgstr "Време: сунчано"
 
-#: plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "Време: Грмљавине"
 
-#: plugins/calendar-weather/calendar-weather.c:268
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:268
 msgid "Select a location"
-msgstr "Одаберите акцију"
+msgstr "Бирање локације"
 
-#: plugins/calendar-weather/calendar-weather.c:655
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:655
 msgid "_Units:"
-msgstr "Јединица"
+msgstr "_Јединице:"
 
-#: plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "Метрично (Целзијус, cm, итд.)"
 
-#: plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:663
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "Империјално (Фаренхајт, инчи, итд.)"
 
-#: plugins/default-source/default-source.c:82
-#, fuzzy
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark  as default folder"
-msgstr "Путања до подразумеваног директоријума поште"
+msgstr "Означава  као подразумевани директоријум"
 
-#: plugins/default-source/default-source.c:108
-#, fuzzy
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
-msgstr "Користити подразумевани директоријум за припрему?"
+msgstr "Означава као подразумевани директоријум"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:59
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:59
 msgid "Secure Password"
-msgstr "Унесите лозинку"
+msgstr "Безбедна лозинка"
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:62
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:62
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr "Ова опција ће повезати на сервер коришћењем Kerberos 5 пријаве."
+msgstr ""
+"Ова опција ће повезати на Exchange сервер коришћењем пријаве безбедном "
+"лозинком (NTLM)."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:70
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:70
 msgid "Plaintext Password"
-msgstr "Унесите лозинку"
+msgstr "Текстуална лозинка"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:72
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:72
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
+"Ова опција ће повезати на Exchange сервер коришћењем пријаве текстуалне "
+"лозинке."
 
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:193
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:193
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
-"<small>Доле одабрана порука биће аутоматски послата свакој особи која вам "
-"пошаље\n"
-"пошту док сте ван канцеларије.</small>"
+"Доле изабрана порука биће аутоматски послата свакој особи \n"
+"која вам пошаље пошту док сте ван канцеларије.</small>"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:221
-#: plugins/exchange-account-setup/exchange-account-setup.c:231
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:221
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:231
 msgid "I am out of the office"
-msgstr "Тренутно сам ван канцеларије"
+msgstr "Ван канцеларије сам"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:224
-#: plugins/exchange-account-setup/exchange-account-setup.c:228
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:224
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:228
 msgid "I am in the office"
-msgstr "Тренутно сам у канцеларији"
+msgstr "У канцеларији сам"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:257
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:257
 msgid "Out of office Message:"
-msgstr "<b>Порука за ван канцеларије:</b>"
+msgstr "Порука за ван канцеларије:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:302
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:302
 msgid "Exchange Settings"
-msgstr "Подешавања времена"
+msgstr "Exchange подешавања"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:448
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:475
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
-msgstr ""
+msgstr "_OWA адреса (Url):"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:456
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:500
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
-msgstr "Неуспела пријава"
+msgstr "_Пријава"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:664
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:722
 msgid "Authentication Type"
-msgstr "_Тип идентификације: "
+msgstr "Тип пријаве"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:678
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:736
 msgid "Ch_eck for Supported Types"
-msgstr "_Провери подржане типове "
+msgstr "_Провери подржане типове"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
-#, fuzzy, c-format
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "Одјављујем претплату са директоријума \"%s\""
+msgstr "Одјава са директоријума \"%s\""
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Попис"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "Додај опције слања groupwise порукама"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: widgets/misc/e-send-options.glade.h:20
-#, fuzzy
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Send Options"
-msgstr "Опције"
+msgstr "Опције слања"
 
-#: plugins/itip-formatter/itip-formatter.c:704
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:704
 msgid "Unable to parse item"
-msgstr "Није могуће читање садржаја поруке"
+msgstr "Није могућа обрада предмета"
 
-#: plugins/itip-formatter/itip-formatter.c:757
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:757
+#, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Није могуће отварање календара '%s'."
+msgstr "Није могуће слање предмета календару '%s'.  %s"
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:768
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "Послато календару '%s' као прихваћено·"
 
-#: plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:772
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "Послато календару '%s' као резервисано"
 
-#: plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:777
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "Послато календару '%s' као одбијено"
 
-#: plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
-msgstr ""
+msgstr "Послато календару '%s' као поништено"
 
-#: plugins/itip-formatter/itip-formatter.c:833
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:833
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Статус учесника није освежен због неисправног статуса!\n"
+msgstr "Статус учесника није освежен због неисправног статуса"
 
-#: plugins/itip-formatter/itip-formatter.c:844
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:844
+#, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Није могућ пренос календара `%s'"
+msgstr "Није могуће освежавање за учесника %s"
 
-#: plugins/itip-formatter/itip-formatter.c:848
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:848
 msgid "Attendee status updated"
-msgstr "Освежен статус учесника\n"
+msgstr "Освежен статус учесника"
 
-#: plugins/itip-formatter/itip-formatter.c:973
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:973
 msgid "The calendar attached is not valid"
-msgstr "Наведена врста директоријума није исправна"
+msgstr "Приложен календар није исправан"
 
-#: plugins/itip-formatter/itip-formatter.c:974
+#: ../plugins/itip-formatter/itip-formatter.c:974
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
-msgstr ""
+msgstr "Порука пријављује календар, али календар није исправан иКалендар."
 
-#: plugins/itip-formatter/itip-formatter.c:1008
-#: plugins/itip-formatter/itip-formatter.c:1064
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1008
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
-msgstr "Преглед који приказује када почиње календар"
+msgstr "Предмет у календару није исправан"
 
-#: plugins/itip-formatter/itip-formatter.c:1009
-#: plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
+"Порука садржи календар, али он не садржи догађаје, задужења или слободно/"
+"заузето податке."
 
-#: plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "Календар у прилогу садржи више предмета"
 
-#: plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1035
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
+"Ради обраде свих ових предмета, потребно је датотеку сачувати а календар "
+"увести"
 
-#: plugins/itip-formatter/itip-formatter.c:1658
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
-msgstr "Календар и задужења"
+msgstr "Састанци и задужења"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "_Обриши поруку након акције"
 
-#: plugins/itip-formatter/itip-formatter.c:1691
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Подешавања</span>"
+msgstr "<span weight=\"bold\">Претрага за преклапањем</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
+msgstr "Бира календаре за претрагу преклапања у састанцима"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1735
+msgid "Conflict Search Table"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:175 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "Данас"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:180
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:180
 msgid "Today %H:%M"
-msgstr "Данас %l:%M %p"
+msgstr "Данас %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:184
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:184
 msgid "Today %H:%M:%S"
-msgstr "Данас %l:%M %p"
+msgstr "Данас %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:193
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %l:%M:%S %p"
-msgstr "Данас %l:%M %p"
+msgstr "Данас %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:203
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Tomorrow"
-msgstr "Комори"
+msgstr "Сутра"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Tomorrow %H:%M"
-msgstr ""
+msgstr "Сутра %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:212
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "Сутра %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %l:%M %p"
-msgstr "Данас %l:%M %p"
+msgstr "Сутра %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:221
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Данас %l:%M %p"
+msgstr "Сутра %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:240
 #, c-format
 msgid "%A"
-msgstr ""
+msgstr "%A"
 
 # strftime format of a time in 24-hour format,
 # without seconds.
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:245
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:245
 msgid "%A %H:%M"
-msgstr "%H:%M"
+msgstr "%A·%H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:249
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "%A·%H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A·%l:%M·%p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:258
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %l:%M:%S %p"
-msgstr "%I:%M:%S %p"
+msgstr "%A·%l:%M:%S·%p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:267
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A, %B %e"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:273
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e·%H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:277
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e·%H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A,·%B·%e·%l:%M·%p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:286
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A,·%B·%e·%l:%M:%S·%p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:292
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e, %Y"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e,·%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:297
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e,·%Y·%H:%M"
 
 # strptime format of a weekday, a date and a time,
 # in 24-hour format.
@@ -14789,209 +14682,204 @@ msgstr "%A, %e. %B %Y."
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:301
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%A,·%B·%e,·%Y·%H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "до %B·%d,·%Y,·%l:%M·%p"
+msgstr "%A,·%B·%e,·%Y·%l:%M·%p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:310
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "до %B·%d,·%Y,·%l:%M·%p"
+msgstr "%A,·%B·%e,·%Y·%l:%M:%S·%p"
 
-#: plugins/itip-formatter/itip-view.c:335
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:335
+#, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> је објавио(ла) информацију о састанку."
+msgstr "<b>%s</b> преко %s је објавио(ла) следећу информацију о састанку:"
 
-#: plugins/itip-formatter/itip-view.c:337
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:337
+#, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> је објавио(ла) информацију о састанку."
+msgstr "<b>%s</b> је објавио(ла) следећу информацију о састанку:"
 
-#: plugins/itip-formatter/itip-view.c:342
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:342
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-msgstr "<b>%s</b> захтева присуство %s на састанку."
+msgstr "<b>%s</b> захтева присуство %s наследећем састанку:"
 
-#: plugins/itip-formatter/itip-view.c:345
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:345
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> захтева Ваше присуство на састанку."
+msgstr "<b>%s</b> преко %s захтева Ваше присуство на следећем састанку:"
 
-#: plugins/itip-formatter/itip-view.c:347
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:347
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> захтева Ваше присуство на састанку."
+msgstr "<b>%s</b> захтева Ваше присуство на следећем састанку:"
 
-#: plugins/itip-formatter/itip-view.c:353
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:353
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> жели да дода постојећем састанку"
+msgstr "<b>%s</b> преко %s жели да дода постојећем састанку:"
 
-#: plugins/itip-formatter/itip-view.c:355
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:355
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> жели да дода постојећем састанку"
+msgstr "<b>%s</b> жели да дода постојећем састанку:"
 
-#: plugins/itip-formatter/itip-view.c:358
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:358
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
+msgstr "<b>%s</b> жели да прими најновију информацију о следећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:361
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:361
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> је послао(ла) неразумљиву поруку."
+msgstr "<b>%s</b> је послао(ла) следећи одговор за састанак:"
 
-#: plugins/itip-formatter/itip-view.c:365
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:365
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> је отказо(ла) састанак."
+msgstr "<b>%s</b> преко %s је отказо(ла) следећи састанак:"
 
-#: plugins/itip-formatter/itip-view.c:367
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> је отказо(ла) састанак."
+msgstr "<b>%s</b> је отказо(ла) следећи састанак."
 
-#: plugins/itip-formatter/itip-view.c:370
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:370
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> је одговорио(ла) на захтев за састанак."
+msgstr "<b>%s</b> је предложио(ла) следеће промене састанка."
 
-#: plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:374
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> је одговорио(ла) на захтев за састанак."
+msgstr "<b>%s</b> преко %s је одбио(ла) следеће промене састанка:"
 
-#: plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> је одговорио(ла) на захтев за састанак."
+msgstr "<b>%s</b> је одбио(ла) следеће промене састанка."
 
-#: plugins/itip-formatter/itip-view.c:403
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:403
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> је објавио(ла) информацију о задужењу."
+msgstr "<b>%s</b> преко %s је објавио(ла) информацију о следећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:405
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:405
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> је објавио(ла) информацију о задужењу."
+msgstr "<b>%s</b> је објавио(ла) информацију о следећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:410
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:410
+#, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> захтева присуство %s на састанку."
+msgstr "<b>%s</b> захтева да %s преузме следеће задужење:"
 
-#: plugins/itip-formatter/itip-view.c:413
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:413
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> је отказао(ла) задужење."
+msgstr "<b>%s</b> преко %s Вам је доделио(ла) задужење:"
 
-#: plugins/itip-formatter/itip-view.c:415
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:415
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> је отказао(ла) задужење."
+msgstr "<b>%s</b> Вам је доделио(ла) задужење:"
 
-#: plugins/itip-formatter/itip-view.c:421
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:421
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b жели да дода постојећем задужењу."
+msgstr "<b>%s</b преко %s жели да дода постојећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:423
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:423
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b жели да дода постојећем задужењу."
+msgstr "<b>%s</b жели да дода постојећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:426
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:426
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
+msgstr "<b>%s</b> жели да прими најновију информацију о следећем задужењу:"
 
-#: plugins/itip-formatter/itip-view.c:429
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:429
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> је послао(ла) неразумљиву поруку."
+msgstr "<b>%s</b> је послао(ла) следећи одговор на додељено задужење:"
 
-#: plugins/itip-formatter/itip-view.c:433
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:433
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> је отказао(ла) задужење."
+msgstr "<b>%s</b> преко %s је отказао(ла) следееће задужење:"
 
-#: plugins/itip-formatter/itip-view.c:435
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:435
+#, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b> је отказао(ла) задужење."
+msgstr "<b>%s</b> је отказао(ла) следеће задужење:"
 
-#: plugins/itip-formatter/itip-view.c:438
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:438
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> је одговорио(ла) на додељено задужење."
+msgstr "<b>%s</b> је предложио(ла) следеће промене задужења:"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b> преко %s је одбио следеће задужење:"
 
-#: plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> је одговорио(ла) на додељено задужење."
+msgstr "<b>%s</b> је одбио(ла) следеће додељено задужење:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:892
-#: plugins/itip-formatter/itip-view.c:942
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
-msgstr "Наредба:"
+msgstr "Коментар:"
 
 #. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
 msgid "Action not available"
-msgstr "TLS није доступан"
+msgstr "Акција није доступна"
 
 #. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
+msgstr "Ова порука не садржи потребне податке у заглављу за ову акцију."
 
 #. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
 msgid "Posting not allowed"
-msgstr "Сервер не дозвољава слање чланака"
+msgstr "Слање није дозвољено"
 
 #. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
+"Слање на ову дописну листу није дозвољено. Можда је ова листа само за "
+"читање. Обратите се власнику листе за детаље."
 
 #. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
 msgid "Send e-mail message to mailing list?"
-msgstr "Пошаљи _поруку на листу"
+msgstr "Послати електронску_поруку на дописну листу?"
 
 #. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -14999,443 +14887,469 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
+"Електронска порука ће бити послата на адресу (URL) \"{0}\". Можете поруку да "
+"пошаљете аутоматски, или је прво погледати и изменити.\n"
+"\n"
+"Требало би да добијете одговор са дописне листе убрзо након слања поруке."
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
 msgid "_Send message"
-msgstr "Слање поруке"
+msgstr "_Пошаљи поруку"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
 msgid "_Edit message"
-msgstr "Слање поруке"
+msgstr "_Уреди поруку"
 
 #. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
 msgid "Malformed header"
-msgstr "Неисправан потпис"
+msgstr "Неисправно заглавље"
 
 #. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
 msgstr ""
+"Заглавље {0} ове поруке није исправно састављено и не може бити обрађено.\n"
+"\n"
+"Заглавље: {1}"
 
 #. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
 msgid "No e-mail action"
-msgstr "Бележи акције филтера"
+msgstr "Нема акције за е-пошту"
 
 #. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
+"Акцију није могуће извести. То значи да заглавље за ову акцију није садржало "
+"обрадиву акцију.\n"
+"\n"
+"Заглавље: {0}"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/new-mail-notify/new-mail-notify.c:66
-#, fuzzy
+#: ../plugins/new-mail-notify/new-mail-notify.c:66
 msgid "_Generates a D-BUS message when new mail arrives"
-msgstr "С_вирни када стигне нова пошта"
+msgstr "·Обавести D-BUS поруком када стигне нова пошта"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Укључује и искључује додатке"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Manage Plugins..."
-msgstr "Поништавање..."
+msgstr "Управљање додацима..."
 
-#: plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
-msgstr "сат(а)"
+msgstr "Аутор(и)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
-msgstr "I"
+msgstr "Иб"
 
-#: plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
-msgstr "_Путања:"
+msgstr "Путања"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "ааПаИб"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
-msgstr "Управник"
+msgstr "Управљач додацима"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "Напомена: неке измене неће бити укључене пре поновног покретања"
 
-#: plugins/plugin-manager/plugin-manager.c:210
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
-msgstr "Брисање"
+msgstr "Додатак"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
-msgstr ""
+msgstr "Прикажи HTML ако постоји"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "По могућству PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "Искључиво приказуј PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:150
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
-msgstr "HTML пошта"
+msgstr "HTML мод"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-#, fuzzy
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
-msgstr "Сачувај прилог..."
+msgstr "Чува прилоге ..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-#, fuzzy
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
-msgstr "Сачувај прилог"
+msgstr "Чува све прилоге"
 
-#: plugins/save-attachments/save-attachments.c:331
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
-msgstr "Изаберите временску зону"
+msgstr "Бира име за снимање базе"
 
-#: plugins/save-attachments/save-attachments.c:351
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
-msgstr "МИМЕ тип:"
+msgstr "MIME тип"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Сачувај"
 
-#: plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:168
 #, c-format
 msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr ""
+msgstr "%s%d/%s%d/%s%d·%s%d:%s%d:%s%d"
 
-#: plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 #, c-format
 msgid ""
 "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
 "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
 "sAttendees List%sLocation%sModified%s"
 msgstr ""
+"Јиб%sПреглед%sСписак описа%sСписак категорија%sСписак коментара%sЗавршено%"
+"sНаправљено%sКонтакт листа%sПочетак%sЗавршетак%sДо%sПроценат завршеног%"
+"sВажност%sАреса (Url)%sСписак присутних%sЛокација%sИзмењено%s"
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "Напредне опције за CSV формат"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a header"
-msgstr ""
+msgstr "Прво укључи заглавље"
 
-#: plugins/save-calendar/csv-format.c:535
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "Value delimiter:"
-msgstr "Локална достава"
+msgstr "Разграничник вредности:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:542
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Разграничник записа:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "Споји вредности са:"
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "Зарезом одвојен формат вредности (.csv)"
 
-#: plugins/save-calendar/ical-format.c:136
-#, fuzzy
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
-msgstr "iCalendar датотеке (.ics)"
+msgstr "иКалендар формат (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:391
 msgid "RDF format (.rdf)"
-msgstr ""
+msgstr "RDF формат (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:171
-#: plugins/save-calendar/save-calendar.c:181
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
-msgstr "Изаберите одредиште"
+msgstr "Изаберите одредишну датотеку"
 
-#: plugins/save-calendar/save-calendar.c:216
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
+"Наведена екстензија за овај тип датотеке (%s) изабрано име датотеке не "
+"користи. Желите ли да наставите?"
 
-#: plugins/send-options/send-options.c:82
+#: ../plugins/send-options/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУнесите лозинку за %s (корисник %s)"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-#, fuzzy
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
 msgid "Invalid user"
-msgstr "Неисправна сврха"
+msgstr "Неисправан корисник"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
 msgid ""
 "\n"
 "You cannot share folder with specified user \"{0}\" \n"
 msgstr ""
+"\n"
+"жне можете да делите директоријум са наведеним корисником \"{0}\" \n"
 
 #. org.gnome.evolution.mail_shared_folder:no-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-#, fuzzy
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
 msgid "Specify User"
-msgstr "Одређено заглавље"
+msgstr "Одредите корисника"
 
 #. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
 msgid ""
 "\n"
 "\tYou have to specify a user name whom you want to add to the list \n"
 msgstr ""
+"\n"
+"\tМорате да наведете корисничко име које желите да додате на списак \n"
 
-#: plugins/shared-folder/properties.glade.h:2
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:2
 msgid "<b>Users :</b>"
-msgstr "<b>Узбуне</b>"
+msgstr "<b>Корисници:</b>"
 
-#: plugins/shared-folder/properties.glade.h:4
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:4
 msgid "Message"
-msgstr "По_руке"
+msgstr "Порука"
 
-#: plugins/shared-folder/properties.glade.h:6
+#: ../plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Обавештавање о дељеном директоријуму"
 
-#: plugins/shared-folder/properties.glade.h:8
+#: ../plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "Учесници ће примити следеће обавештење.\n"
 
-#: plugins/shared-folder/properties.glade.h:11
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Контакти..."
 
-#: plugins/shared-folder/properties.glade.h:12
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:12
 msgid "_Cutomize notification message"
-msgstr "Није могуће прављење поруке."
+msgstr "_Прилагоди поруку за обавештавање"
 
-#: plugins/shared-folder/properties.glade.h:13
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
-msgstr "Није покренуто"
+msgstr "_Није дељено"
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr ""
+msgstr "_Дељено са ..."
 
-#: plugins/shared-folder/properties.glade.h:16
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
-msgstr "Сенчење"
+msgstr "_Дељење"
 
-#: plugins/shared-folder/share-folder-common.c:315
+#. e_error_run (NULL,  _("Cannot create GroupWise folders in offline mode."), NULL, NULL);
+#: ../plugins/shared-folder/share-folder-common.c:220
 #, fuzzy
+msgid "Cannot Create shared folder in offline mode."
+msgstr "Није могуће прављење директоријума тог имена."
+
+#: ../plugins/shared-folder/share-folder-common.c:323
 msgid "Users"
-msgstr "_Корисник:"
+msgstr "Корисници"
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/shared-folder/share-folder-common.c:324
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Унесите кориснике и поставите овлашћења"
 
-#: plugins/shared-folder/share-folder-common.c:401
-#, fuzzy
+#: ../plugins/shared-folder/share-folder-common.c:411
 msgid "Sharing"
-msgstr "Сенчење"
+msgstr "Дељење"
+
+#: ../plugins/startup-wizard/startup-wizard.c:255
+#: ../shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Помоћник Еволуција подешавања"
+
+#: ../plugins/startup-wizard/startup-wizard.c:260
+#: ../shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Добро дошли"
+
+#: ../plugins/startup-wizard/startup-wizard.c:261
+#: ../shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Добро дошли у Еволуцију. Неколико наредних екрана ће омогућити да се "
+"Еволуција повеже на налоге елетронске поште и да увезе датотеке из других "
+"програма.\n"
+"\n"
+"Притисните дугме \"Напред\" да наставите. "
+
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
+msgid "Please select the information that you would like to import:"
+msgstr "Изаберите податке које желите да увезете:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
+#, c-format
+msgid "From %s:"
+msgstr "Од %s:"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "Врати се на поруке у нанизане по нас_лову"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Еволуција конзола"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Проба Еволуције"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Пробни део Еволуције"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "Гном опис штампе текућих подешавања штампача"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
-msgstr "Верзија подешавања Еволуције"
+msgstr "Верзија подешавања"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
-msgstr "Подразумевана ширина прозора"
+msgstr "Подразумевана ширина помоћне траке"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Подразумевана висина прозора"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Подразумевана ширина прозора"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ИБ или алијас дела који се подразумевано приказује по покретању."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
-msgstr "Последња доступна верзија подешавања Еволуције"
+msgstr "Последња освежена верзија подешавања"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Списак путања директоријума који се усклађују на диску за рад ван мреже"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
-msgstr "Подешавања времена"
+msgstr "Подешавања штампача"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
-msgstr "Да ли да прескочи прозорче са упозорењем о развоју"
+msgstr "Прескаче прозорче са упозорењем о развоју"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11 shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:472
 msgid "Start in offline mode"
 msgstr "Почни рад ван мреже"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level"
-msgstr ""
+msgstr "Верзија подешавања Еволуције, уз ниво подешавања главно/споредно/"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
-msgstr "Предефинисана висина прозора за поруку"
+msgstr "Подразумевана висина прозора за поруку, у пикселима."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default width for the main window, in pixels."
-msgstr "Предефинисана ширина прозора за поруку"
+msgstr "Подразумевана ширина главног прозора, у пикселима."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the sidebar, in pixels."
-msgstr "Подразумевана ширина панела директоријума"
+msgstr "Подразумевана ширина помоћне траке, у пикселима."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
 msgstr ""
+"Последња освежена верзија подешавања Еволуције, уз ниво подешавања главно/"
+"споредно/"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#, fuzzy
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
+"Стил дугмади прозора. Може бити \"текст\", \"иконе\", \"обоје\", \"трака "
+"алата\". Ако је постављено \"трака алата\",Гномово подешавање траке алата "
+"утврђује стил дугмади."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
 msgstr "Трака алата је видљива"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Ако је постављено, Еволуција ће се покренути у режиму за рад ван мреже "
-"уместо у режиму за рад на мрежи."
+msgstr "Да ли ће се Еволуција покренути у режиму за рад ван мреже."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Да ли да трака алата буде видљива."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
-"Ако је постављено, прозорче са упозорењем у развојним верзијама Еволуције "
-"неће бити приказано."
+"Да ли ће прозорче са упозорењем у развојним верзијама Еволуције бити "
+"приказано."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
-msgstr "Да ли да трака алата буде видљива."
+msgstr "Да ли да дугмад прозора буду видљива."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Window button style"
-msgstr ""
+msgstr "Стил дугмади прозора"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Window buttons are visible"
-msgstr ""
+msgstr "Дугмад прозора су видљива"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Активне везе</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Активне везе"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr "Кликните OK да прекинете везу и радите ван мреже"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Безимено)"
 
-#: shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Изаберите врсту увозника:"
 
-#: shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15449,15 +15363,11 @@ msgstr ""
 "Можете изабрати \"Аутоматско\" уколико не знате, и Еволуција ће покушати да "
 "сама заврши посао."
 
-#: shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Изаберите одредиште за овај увоз"
 
-#: shell/e-shell-importer.c:159 shell/e-shell-startup-wizard.c:750
-msgid "Please select the information that you would like to import:"
-msgstr "Изаберите податке које желите да увезете:"
-
-#: shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -15469,7 +15379,7 @@ msgstr ""
 "која би се могла увести. Уколико желите да покушате\n"
 "поново, кликните на дугме \"Назад\".\n"
 
-#: shell/e-shell-importer.c:233 shell/e-shell-importer.c:267
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15478,30 +15388,30 @@ msgstr ""
 "Увожење %s\n"
 "Увожење предмета %d."
 
-#: shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Изаберите увозника"
 
-#: shell/e-shell-importer.c:462 shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "Датотека %s не постоји"
 
-#: shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Увожење"
 
-#: shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Увожење %s.\n"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Грешка код учитавања %s"
 
-#: shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15510,31 +15420,31 @@ msgstr ""
 "Увожење %s\n"
 "Увожење 1. предмета."
 
-#: shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Аутоматско"
 
-#: shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "_Име датотеке:"
 
-#: shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Одаберите датотеку"
 
-#: shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "_Тип датотеке:"
 
-#: shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Увези податке и подешавања из _старијих програма"
 
-#: shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
-#: shell/e-shell-importer.c:766 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15542,41 +15452,36 @@ msgstr ""
 "Сачекајте...\n"
 "Претрага за постојећим подешавањима"
 
-#: shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Покрећање интелигентних увозника"
 
-#: shell/e-shell-importer.c:899 shell/e-shell-startup-wizard.c:700
-#, c-format
-msgid "From %s:"
-msgstr "Од %s:"
-
-#: shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Нема доступног увозника за датотеку %s"
 
-#: shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Није могуће покретање увозника"
 
-#: shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "У_воз"
 
-#: shell/e-shell-offline-handler.c:589
+#: ../shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Затварање веза..."
 
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Подешавања Еволуције"
 
-#: shell/e-shell-startup-wizard.c:577
+#: ../shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Почетак увоза"
 
-#: shell/e-shell-startup-wizard.c:797
+#: ../shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15590,202 +15495,178 @@ msgstr ""
 "\n"
 "Желите ли сада да затворите помоћника?"
 
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Није наведено име директоријума."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Име директоријума не може да садржи Return знак."
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Име директоријума не може да садржи знак \"/\"."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Име директоријума не може да садржи знак \"#\"."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' и '..' су непромењива имена директоријума."
 
-#: shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Изгледа да овај систем нема инсталиране Гном пилот алате.."
 
-#: shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка код покретања %s."
 
-#: shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy није инсталиран."
 
-#: shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може бити покренут."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:501
+#: ../shell/e-shell-window-commands.c:501
 msgid "translator-credits"
-msgstr ""
+msgstr "заслужни-преводиоци"
 
-#: shell/e-shell-window-commands.c:515
+#: ../shell/e-shell-window-commands.c:515
 msgid "Groupware Suite"
 msgstr "Groupware пакет програма"
 
-#: shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:742
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: shell/e-shell-window-commands.c:755 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:755 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Ра_д ван мреже"
 
-#: shell/e-shell-window-commands.c:768 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:768 ../ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Рад ван мреже"
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Еволуција је тренутно на мрежи.  Кликните на ово дугме за рад ван мреже."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Еволуција је у процесу одласка за рад ван мреже."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Еволуција је тренутно ван мреже.  Кликните на ово дугме за рад на мрежи."
 
-#: shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:713
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: shell/e-shell.c:598
+#: ../shell/e-shell.c:598
 msgid "Uknown system error."
 msgstr "Непозната системска грешка."
 
-#: shell/e-shell.c:800 shell/e-shell.c:801
+#: ../shell/e-shell.c:800 ../shell/e-shell.c:801
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1254 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1254 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "ОК"
 
-#: shell/e-shell.c:1256
+#: ../shell/e-shell.c:1256
 msgid "Invalid arguments"
 msgstr "Неисправни аргументи"
 
-#: shell/e-shell.c:1258
+#: ../shell/e-shell.c:1258
 msgid "Cannot register on OAF"
 msgstr "Није могућа регистрација на OAF"
 
-#: shell/e-shell.c:1260
+#: ../shell/e-shell.c:1260
 msgid "Configuration Database not found"
 msgstr "База са подешавањима није нађена"
 
-#: shell/e-shell.c:1262
+#: ../shell/e-shell.c:1262
 msgid "Generic error"
 msgstr "Општа грешка"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Ново"
 
-#: shell/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Помоћник Еволуција подешавања"
-
-#: shell/evolution-startup-wizard.glade.h:3
+#: ../shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Увожење датотека"
 
-#: shell/evolution-startup-wizard.glade.h:4
+#: ../shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Временска зона"
 
-#: shell/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Добро дошли"
-
-#: shell/evolution-startup-wizard.glade.h:6
-#, fuzzy
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Добро дошли у Еволуцију. Неколико наредних екрана\n"
-"ће вам омогућити да се Еволуција повеже на налоге елетронске\n"
-"поште и да увезе датотеке из других програма.\n"
-"\n"
-"Притисните дугме \"Напред\" да наставите. "
-
-#: shell/evolution-startup-wizard.glade.h:9
-#, fuzzy
+#: ../shell/evolution-startup-wizard.glade.h:9
 msgid ""
 "You have successfully entered all of the information needed to set up "
 "Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Успешно сте унели све податке неопходне за\n"
-"подешавање Еволуције.\n"
+"Успешно сте унели све податке неопходне за подешавање Еволуције.\n"
 "\n"
 "Притисните дугме \"Примени\" да сачувате подешавања. "
 
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Нова проба"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Проба"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Направи нову пробну ставку"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Кликните на \"Увези\" да започнете увоз датотеке у Еволуцију. "
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Помоћник Еволуције за увоз"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Увези датотеку"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Увези путању"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Врста увозника"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Изаберите увознике"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Изаберите датотеку"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -15795,28 +15676,28 @@ msgstr ""
 "Овај помоћник ће вас провести кроз поступак\n"
 "увоза спољних датотека у Еволуцију."
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Увозници"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Увези"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Не увози"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Не питај ме поново"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Еволуција може да увезе податке из следећих датотека:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:238
+#: ../shell/main.c:234
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15851,7 +15732,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваш допринос!\n"
 
-#: shell/main.c:262
+#: ../shell/main.c:258
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15859,40 +15740,39 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: shell/main.c:269
+#: ../shell/main.c:265
 msgid "Don't tell me again"
 msgstr "Немој ми поново рећи"
 
-#: shell/main.c:474
+#: ../shell/main.c:470
 msgid "Start Evolution activating the specified component"
 msgstr "Покрени Еволуцију уз наведени део"
 
-#: shell/main.c:478
+#: ../shell/main.c:474
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: shell/main.c:481
-#, fuzzy
+#: ../shell/main.c:477
 msgid "Forcibly shut down all Evolution components"
-msgstr "Силом угаси све делове еволуције"
+msgstr "Силом гаси све делове Еволуције"
 
-#: shell/main.c:485
+#: ../shell/main.c:481
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Приморај понован пренос података из Еволуције 1.4"
 
-#: shell/main.c:488
+#: ../shell/main.c:484
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: shell/main.c:491
+#: ../shell/main.c:487
 msgid "Disable the mono plugin environment."
-msgstr ""
+msgstr "Искључује додатак за моно окружење."
 
-#: shell/main.c:494
+#: ../shell/main.c:490
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Искључује учитавање свих додатака."
 
-#: shell/main.c:525
+#: ../shell/main.c:521
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15902,12 +15782,12 @@ msgstr ""
 "  Користите %s --help за више података.\n"
 
 #. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
 msgstr "Недовољно места на диску за дограђивање."
 
 #. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
+#: ../shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -15922,7 +15802,7 @@ msgstr ""
 "да наставите."
 
 #. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
+#: ../shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
@@ -15931,7 +15811,7 @@ msgstr ""
 "{0}"
 
 #. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
 "\n"
@@ -15943,19 +15823,19 @@ msgstr ""
 "Уколико одлучите да наставите, можда нећете моћи да приступите неким старим "
 "подацима.\n"
 
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Настави"
 
 # shell:upgrade-remove-1-4 primary
 #. shell:upgrade-remove-1-4 title
 #. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr "Обрисати старе податке из верзије {0}?"
 
 #. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -15970,23 +15850,23 @@ msgstr ""
 "\"evolution\" биће трајно обрисан.  Уколико се одлучите  да задржите ове "
 "податке, мораћете ручно да уклоните овај садржај када вам буде згодно.\n"
 
-#: shell/shell-errors.xml.h:25
+#: ../shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Подсети ме касније"
 
-#: shell/shell-errors.xml.h:26
+#: ../shell/shell-errors.xml.h:26
 msgid "_Keep Data"
 msgstr "_Задржи податке"
 
 # shell:upgrade-remove-1-4-confirm primary
 #. shell:upgrade-remove-1-4-confirm title
 #. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr "Заиста обрисати старе податке?"
 
 #. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
 "permanently removed.\n"
@@ -16009,19 +15889,19 @@ msgstr ""
 # shell:noshell-reason title
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Није могуће покретање Еволуције"
 
 # shell:noshell-reason primary
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Еволуција се не може покренути."
 
 #. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -16032,7 +15912,7 @@ msgstr ""
 "Кликните на помоћ за детаље"
 
 #. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -16046,7 +15926,7 @@ msgstr ""
 "\n"
 "Кликните на помоћ за детаље"
 
-#: smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -16057,7 +15937,7 @@ msgstr ""
 "\n"
 "Подесите поверење:"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -16066,7 +15946,7 @@ msgstr ""
 "Пошто верујете издаваоцу овог сертификата, онда верујете и у аутентичност "
 "овог сертификата осим ако овде не назначите другачије"
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -16075,55 +15955,60 @@ msgstr ""
 "Пошто не верујете издаваоцу овог сертификата, онда не верујете ни у "
 "аутентичност овог сертификата осим ако овде не назначите другачије"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:377 smime/gui/certificate-manager.c:385
-#: smime/gui/certificate-manager.c:597 smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
 msgid "Select a cert to import..."
 msgstr "Изаберите сертификат за увоз..."
 
-#: smime/gui/certificate-manager.c:265 smime/gui/certificate-manager.c:474
-#: smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Име сертификата"
 
-#: smime/gui/certificate-manager.c:274 smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Намене"
 
-#: smime/gui/certificate-manager.c:283 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Истиче"
 
-#: smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "Електронска адреса"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Прегледач сертификата: %s"
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Унесите лозинку за `%s'"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Унесите нову лозинку за базу сертификата"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Унесите нову лозинку"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16132,7 +16017,7 @@ msgstr ""
 "Издато:\n"
 "  Наслов: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16141,59 +16026,59 @@ msgstr ""
 "Издао:\n"
 "  Наслов: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Изабери сертификат"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<није део сертификата>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Поља сертификата</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Хијерархија сертификата</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Вредност поља</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Отисци</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Издао</b> "
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Издато</b> "
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>Овај сертификат је проверен за наредне потребе:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Исправност</b>"
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Издаваоци"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Резервиши"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Резервиши све"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -16201,364 +16086,369 @@ msgstr ""
 "Пре веровања овом издаваоцу сертификата, прво прегледајте његов сертификат, "
 "политику и процедуре (ако су доступни)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Сертификат"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Поверење издаваоцу сертификата"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Детаљи сертификата"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
+#, fuzzy
+msgid "Certificates Table"
+msgstr "Име сертификата"
+
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Заједничко име (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Сертификати контакта"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Не веруј у аутентичност овог сертификата"
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "Само глупи прозор"
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Уређивање"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "Подешавања поверења у сертификате е-поште"
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "Сертификат примаоца е-поруке"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "Сертификат потписника е-поруке"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Истиче"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Издат"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "МД5 отисак"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Организација (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Организациона јединица (OU)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 отисак"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Сертификат SSL клијента"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Сертификат SSL сервера"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Веруј у аутентичност овог сертификата"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Веруј овом издаваоцу сертификата за препознавање е-адреса."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Веруј овом издаваоцу сертификата за препознавање програмера."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Веруј овом издаваоцу сертификата за препознавање web страница."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Приказ"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Имате сертификате ових организација који вас одређују:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Држите сертификате који одређују ове издаваоце сертификата:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Држите сертификате који одређују ове особе:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Ваши сертификати"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "_Уреди поверење у CA"
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr "прозорче1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:642
 msgid "Certificate already exists"
 msgstr "Сертификат већ постоји"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Потпиши"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Верзија"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Верзија 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Верзија 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "ОЈ"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "О"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA шифровање"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Употреба кључа сертификата"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape тип сертификата"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Идентификатор кључа издаваоца сертификата"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "ЈИБ"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Идентификатор предмета (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Идентификатор алгоритма"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Параметри алгоритма"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Подаци о јавном кључу субјекта"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Алгоритам јавног кључа субјекта"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Јавни кључ субјекта"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Грешка: није могућа обрада проширења"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Потписник предмета"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL издавач сертификата"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Издавач сертификата е-поште"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Потписивање"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Без одрицања"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Замућивање кључа"
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Замућивање података"
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Сагласност кључа"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Потписник сертификата"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL потписник"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Критично"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Некритично"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Проширења"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритам потписа сертификата"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Издавалац"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Јединствени ИБ издавача"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Јединствени ИБ субјекта"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа сертификата"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 лозинка датотеке"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Унесите лозинку за PKCS12 датотеку:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Увежен сертификат"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Прилог за додавање."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Тип садржаја прилога."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Име датотеке које се приказује у поруци."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Опис прилога."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Означи да се прилог подразумевано приказује унутар поруке."
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Подразумеван наслов поруке."
 
@@ -16566,1405 +16456,1385 @@ msgstr "Подразумеван наслов поруке."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Није могуће извршавање '%s': %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Гашење %s (%s)\n"
 
 # bug: plural-forms
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Копирај контакт(е) у други директоријум..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Копирај одабрано"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Копирај у директоријум..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Исеци означено"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Обриши одабране контакте"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Премести контакт(е) у други директоријум..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Премести у директоријум..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Налепи меморисано"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Прегледа контакте пре штампе"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Пре_гледај пре штампе"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Штампа одабраних контаката"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Сачувај одабране контакте као VКарту."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Изабери све"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Бира све контакте"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Шаље поруку изабраним контактима."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Шаље поруку контакту"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Шаље изабране контакте другој особи."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Прикажи прозор за преглед контакта"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Прекини"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Прекида учитавање"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Прегледај текући контакт"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-global.xml.h:14 ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-messagedisplay.xml.h:4 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Акције"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Проследи контакт..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Премести у директоријум..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:16
 msgid "_Preview Pane"
 msgstr "_Панел за преглед"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Сачувај као вКарту..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Изабери све"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Пошаљи поруку контакту..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Дан"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Обриши све појаве"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Обриши састанак"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Обриши ову појаву"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Обриши ову појаву"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Иди на"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Иди назад"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Иди напред"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Списак"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Месец"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Следеће"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Преглед календара пре штампе"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Претходно"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Штампај овај календар"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Објави податак слободно/заузето за овај календар"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Изба_ци"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Избаци старе састанке"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Изабери _датум"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Бира одређени датум"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Изабери данашњи дан"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Прикажи као списак"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Прикажи радну недељу"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Прегледај текући састанак"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Недеља"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Радна недеља"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Копирај изабрани текст у меморију"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "И_сеци"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Исеци изабрани текст у меморију"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Налепи текст из меморије"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Изабери св_е"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Изабери сав текст"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Прилагоди Моју еволуцију"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Откажи текућу операцију са поштом"
 
-#: ui/evolution-mail-global.xml.h:3
+#: ../ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Направи или уреди правила за филтрирање нове поште"
 
-#: ui/evolution-mail-global.xml.h:5
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit vFolder definitions"
-msgstr "Направи или уреди дефиниције виртуелних директоријума"
+msgstr "Прави или уређује дефиниције вДиректоријума"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
 msgstr "Отвори прозор за састављање поруке"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Трајно уклони све обрисане поруке из свих директоријума"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "Пошаљи но_ву поруку"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Пошаљи поруку у јавни директоријум"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "П_ријави се на директоријуме..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "Прикажи прозор за преглед поруке"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријави се или одјави на директоријуме на мрежним серверима"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Филтери..."
 
-#: ui/evolution-mail-global.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "vFolder _Editor..."
-msgstr "Уређивач виртуелног _директоријума..."
+msgstr "_Уређивач вДиректоријума..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Измените поставке овог директоријума"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Копирај изабрану(е) поруку(е) у меморију"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Исеци изабрану(е) поруку(е) у меморију"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
 msgstr "Изба_ци"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Са_криј изабране поруке"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Сакриј о_брисане поруке"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Сакриј про_читане поруке"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Сакриј обрисане поруке уместо њиховог прецртавања"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
 msgstr "Означи све као п_рочитано"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Означи све видљиве поруке као прочитане"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Налепи поруку(е) из меморије"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Трајно уклони све обрисане поруке из овог директоријума"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Изабери _низ"
 
 # bug:
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Изабери све и само поруке које тренутно нису изабране"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Изабери све поруке истог низа као што је изабрана порука"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "При_кажи скривене поруке"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Прикажи поруке које су привремено скривене"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Привремено сакриј све прочитане поруке"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Привремено сакриј изабране поруке"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Списак порука према низу разговора"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "_Директоријум"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Обрни избор"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Списак порука према _низу разговора"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Додај _пошиљаоца у адресар"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "При_мени филтере"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Примени правила филтрирања на изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
 msgstr "Начин у_метања"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Састави одговор свим примаоцима изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Састави одговор дописној листи изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Састави одговор пошиљаоцу изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Копирај изабране поруке у други директоријум"
 
-#: ui/evolution-mail-message.xml.h:12
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Create _vFolder From Message"
-msgstr "_Направи филтер од поруке"
+msgstr "Направи _вДиректоријум од поруке"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направи правило за филтрирање порука од овог пошиљаоца"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направи правило за филтрирање порука овим примаоцима"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Направи правило за филтрирање порука на ову дописну листу"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направи правило за филтрирање порука са овим насловом"
 
-#: ui/evolution-mail-message.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a vFolder for these recipients"
-msgstr "Направи виртуелни директоријум за ове примаоце"
+msgstr "Прави вДиректоријум за ове примаоце"
 
-#: ui/evolution-mail-message.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a vFolder for this mailing list"
-msgstr "Направи виртуелни директоријум за ову дописну листу"
+msgstr "Прави вДиректоријум за ову дописну листу"
 
-#: ui/evolution-mail-message.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for this sender"
-msgstr "Направи виртуелни директоријум за овог пошиљаоца"
+msgstr "Прави вДиректоријум за овог пошиљаоца"
 
-#: ui/evolution-mail-message.xml.h:20
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this subject"
-msgstr "Направи виртуелни директоријум за овај наслов"
+msgstr "Прави вДиректоријум за овај наслов"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Умањи величину текста"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Прикажи следећу важну поруку"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Прикажи следећу поруку"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Прикажи следећу непрочитану поруку"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Прикажи следећи непрочитан низ"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Прикажи претходну важну поруку"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Прикажи претходну поруку"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Прикажи претходну непрочитану поруку"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "Про_следи као..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter _Junk"
 msgstr "Филтер нај _ђубре"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Филтер на дописну _листу..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Филтер на по_шиљаоца..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Филтер на п_римаоце..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Филтер на _наслов..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрирај изабране поруке ради избацивања ђубрета"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Означи изабрану(е) поруку(е) за праћење"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Пра_ти..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Силом учитава слике у HTML порукама"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Прослеђује изабрану поруку у телу нове поруке"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Прослеђује изабрану поруку цитирану као одговор"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Прослеђује изабрану поруку некоме као прилог"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Увећај величину текста"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Учитај _слике"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mar_k as Read"
-msgstr "О_значи као прочитано"
-
-#: ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Означи као _важно"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Mark as U_nread"
-msgstr "Означи као _непрочитано"
-
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Означи као нева_жно"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Означава изабрану(е) поруку(е) као прочитано"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Означава изабрану(е) поруку(е) као важно"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Означава изабрану(е) поруку(е) као ђубре"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Означава изабрану(е) поруку(е) да нису ђубре"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Означава изабрану(е) поруку(е) као непрочитано"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Означава изабрану(е) поруку(е) као неважно"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Означава изабрану(е) поруку(е) за брисање"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Премести"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Премешта изабрану(е) поруку(е) у други директоријум"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Следећи _низ"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Није ђубре"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Отвара изабрану поруку у новом прозору"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer for editing"
 msgstr "Отвара изабрану поруку у састављачу за уређивање"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Изворна _величина"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Пошаљи од_говор"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Шаље одговор на поруку у јавни директоријум"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Преглед поруке пре штампе"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Штампај ову поруку"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преу_смерава (одбацује) изабрану поруку некоме"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Врати текст на изворну величину"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Пре_тражи поруку..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Мање"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Сачувај поруку као текстуалну датотеку"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Тражи текст у телу приказане поруке"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Подешава стране за ваш текући штампач"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Прикажи извор електронске поруке"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Прикажи цела _заглавља"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажи трепћући курзор у телу приказаних порука"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Прикажи поруку у нормалном стилу"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Прикажи поруку са свим заглављима е-поште"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Прикажи изворни код електронске поруке"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Величина те_кста"
 
 # Од-обриши?
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Поврати изабране поруке"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Attached"
 msgstr "_Приложено"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Направи филтер од поруке"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "Унутар"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Larger"
 msgstr "_Веће"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Message Display"
 msgstr "Приказ _поруке"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Normal Display"
 msgstr "Нормалан при_каз"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open Message"
 msgstr "_Отвори поруку"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:125 ../ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "Ала_ти"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Поврати"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "vFolder on Mailing _List..."
-msgstr "VДиректоријум на _дописну листу..."
+msgstr "вДиректоријум на _дописну листу..."
 
-#: ui/evolution-mail-message.xml.h:128
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "vFolder on Se_nder..."
-msgstr "VДиректоријум на _пошиљаоца..."
+msgstr "вДиректоријум на _пошиљаоца..."
 
-#: ui/evolution-mail-message.xml.h:129
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "vFolder on _Recipients..."
-msgstr "VДиректоријум на _примаоце..."
+msgstr "вДиректоријум на _примаоце..."
 
-#: ui/evolution-mail-message.xml.h:130
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "vFolder on _Subject..."
-msgstr "VДиректоријум на _наслов..."
+msgstr "вДиректоријум на _наслов..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Затвори"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Затвори овај прозор"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Главна линија алата"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
 msgid "_File"
 msgstr "Дато_тека"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Приложи"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Приложи датотеку"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Затвара тренутну датотеку"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Брише све осим потписа"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Шифрује ову поруку помоћу PGP-а"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Шифрује ову поруку помоћу S/MIME сертификата за шифровање"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Формат"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Отвара датотеку"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP шифровање"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP потпис"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME шифровање"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME потпис"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Сачувај као"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Сачувај к_ао..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Сачувај _припрему"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Сачувај у директоријум..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Сачувај тренутну датотеку"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Сачувај тренутну датотеку под другим именом"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Сачувај поруку у наведеном директоријуму"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Пошаљи поруку у HTML формату"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Пошаљи ову поруку"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Прикажи / сакриј прилоге"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Прик_ажи прилоге"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Прикажи прилоге"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Потпиши ову поруку помоћу PGP кључа"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потписује ову поруку S/MIME сертификатом"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Мења да ли је поље BCC приказано"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Мења да ли је поље CC приказано"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Мења да ли је поље Шаље приказано"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Мења да ли је поље Пошаљи приказано"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Мења да ли је поље Одговор приказано"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
 msgstr "Мења да ли је поље Прима приказано"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc заглавље"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc заглавље"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "Обри_ши све"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "О_д заглавље"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Убац_и"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
 msgstr "_Пошаљи поље"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Одго_вори поље"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Безбедност"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
 msgstr "_Прима поље"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "З_атвори"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Сачувај и затвори"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Сачувај и _затвори"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Сачувај текућу датотеку и затвори прозор"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Додај директоријум у списак пријављених директоријума"
 
-#: ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Директ_оријум"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Освежи списак"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Освежи списак директоријума"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Уклони директоријум из списка пријављених директоријума"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Пријави се"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Одјави се"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Копирај изабрано задужење"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Исеци изабрано задужење"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Обриши извршена задужења"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Обриши изабрана задужења"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Озна_чи као завршено"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Обележи изабрана задужења као завршена"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Налепи задужење из меморије"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Прегледа списак задужења за штампање"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Штампај списак задужења"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Приказује изабрано задужење"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Отвори задужење"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "О програму Еволуција..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Измени подешавања Еволуције"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Мења видљивост траке алата"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Отвара нов прозор за приказ овог директоријума"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
+"Приказује дугмад прозора коришћењем подешавања траке алата редне површине"
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons and text"
-msgstr ""
+msgstr "Приказује дугмад прозора са иконама и текстом"
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with icons only"
-msgstr ""
+msgstr "Приказује дугмад прозора само са иконама"
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:10
 msgid "Display window buttons with text only"
-msgstr ""
+msgstr "Приказује дугмад прозора само са текстом"
 
-#: ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "И_зађи"
 
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Пи_тања и одговори у вези Еволуције"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Излазак из програма"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Заборави _лозинке"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Заборавља запамћене лозинке како би поново били питани за њих"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:16
 msgid "Hide window buttons"
-msgstr ""
+msgstr "Сакрива дугмад прозора"
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:17
 msgid "Icons _and text"
-msgstr ""
+msgstr "Иконе _и текст"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Увези податке из других програма"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "Нов п_розор"
 
-#: ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Подешавања Пи_лота..."
 
-#: ui/evolution.xml.h:22
-#, fuzzy
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
-msgstr "Поставке поште"
+msgstr "Подеша_вања"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Слање / примање"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Шаље припремљене и прима нове предмете"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Подешавање Пилота"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Приказује податке о Еволуцији"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Шаље извештај о грешци"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Пошаљи извештај о _грешци"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Шаље извештај о грешци програмом Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Бира да ли ћемо радити ван мреже."
 
-#: ui/evolution.xml.h:31
-#, fuzzy
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "Тра_ка алата"
 
-#: ui/evolution.xml.h:32
-#, fuzzy
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
-msgstr "Трака алата је видљива"
+msgstr "Стил тра_ке алата"
 
-#: ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:33
 msgid "Window B_uttons"
-msgstr ""
+msgstr "Дуг_мад прозора"
 
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_О програму Еволуција..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
-msgstr ""
+msgstr "_Сакриј дугмад"
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
-msgstr ""
+msgstr "Само _иконе"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Увези..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ново"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Кратки подсетник"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Пошаљи / прими"
 
-#: ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
-msgstr "Модел текста"
+msgstr "Само _текст"
 
-#: ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "Про_зор"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Према _предузећу"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Карте адресара"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Телефонски именик"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "_Недељни преглед"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Дневни преглед"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Преглед у _списку"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Месечни преглед"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Преглед _радне недеље"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "Као директоријум _Послато"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Према с_татусу"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Према по_шиљаоцу"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Према _наслову"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Према ознаци _праћења"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "По_руке"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Са _роком"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "Са _статусом"
 
 # Универзално време, или УТ
 # Ваљда УВ?
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Временске зоне</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Избор</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Изаберите временску зону"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
-msgstr "Временска зона"
+msgstr "Оквир за временску зону"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17973,209 +17843,206 @@ msgstr ""
 "Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
 "Користите десни тастер миша за умањивање."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Текући преглед"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
 # week, 'M' for 'Monday', 'T' for Tuesday etc.
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "ПУСЧПСН"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
-msgstr "Претходно"
+msgstr "Дугме Претходно"
 
-#: widgets/misc/e-calendar.c:226
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
-msgstr "Учитавање календара"
+msgstr "Месечни календар"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Сада"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Време мора бити у формату: %s"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Процентуална вредност мора бити између 0 и 100, укључно"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Балтички"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Централно европски"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Кинески"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Ћирилични"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Грчки"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Хебрејски"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Јапански"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Корејски"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Турски"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Уникод"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Западноевропски"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Западноевропским, нови"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Традиционални"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Поједностављени"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Украјински"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Визуелни"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Непозната кодна страна: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Кодна страна"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Изаберите кодну страну за коришћење"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Друго..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:313
 msgid "Date and Time Entry"
 msgstr "Датум и време"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:332
 msgid "Text entry to input date"
-msgstr ""
+msgstr "Део текста за унос датума"
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:333
 msgid "Text Date Entry"
-msgstr ""
+msgstr "Унос датума у тексту"
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:350
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "Кликни на ово дугме за приказ календара"
 
-#: widgets/misc/e-dateedit.c:351
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:351
 msgid "Date Button"
-msgstr "Датум слања"
+msgstr "Дугме Датум"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:371
 msgid "Combo box to select time"
-msgstr ""
+msgstr "Оквир за избор времена"
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:372
 msgid "Time Combo Box"
-msgstr ""
+msgstr "Оквир за време"
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
+#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
+#: ../widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Грешка Еволуције"
 
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
+#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
+#: ../widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Упозорење Еволуције"
 
-#: widgets/misc/e-error.c:124
+#: ../widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Подаци Еволуције"
 
-#: widgets/misc/e-error.c:126
+#: ../widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Упит Еволуције"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:438
+#: ../widgets/misc/e-error.c:438
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Унутрашња грешка, потребна непозната грешка '%s'</span>"
 
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Разгранато"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Да ли је стабло разгранато или не"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Текст ознаке стабла"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Користи подвлачење"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -18183,307 +18050,305 @@ msgstr ""
 "Ако је постављено, подвлачење у тексту означава текст који ће се користити "
 "као пречица"
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Размак"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Размак између ознаке и садржаног елемента"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Елемент ознаке"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Елемент који се приказује уместо обичне ознаке стабла"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Величина стабла"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Величина стрелице стабла"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Размак показивача"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Размак око стрелице стабла"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Претраге"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Уређивач претраге"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Чува претрагу"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Сачувај претрагу..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Уреди сачуване претраге..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Напредно..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Изаберите слику"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
-msgstr ""
+msgstr "Карта света"
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr ""
+"Интеркативни алат за избор временске зоне помоћу миша. Тастатуром се избор "
+"временске зоне врши из доњег оквира."
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Усклади са:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Усклађивање личних записа:"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Усклади категорије:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: widgets/misc/e-search-bar.c:343
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
-msgstr "Уређивач претраге"
+msgstr "Претрага текста"
 
-#: widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "Прона_ђи"
 
-#: widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Пронађи сада"
 
-#: widgets/misc/e-search-bar.c:554 widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: widgets/misc/e-search-bar.c:645
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
-msgstr "Обим п_ретраге:"
+msgstr "Тип претраге"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ИБ ставке"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ИБ подставке"
 
-#: widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Текст"
 
-#: widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Пронађи _сада"
 
-#: widgets/misc/e-send-options.c:505
-#, fuzzy
+#: ../widgets/misc/e-send-options.c:506
 msgid "When de_leted:"
-msgstr "%d обрисано"
+msgstr "Када је обри_сано:"
 
-#: widgets/misc/e-send-options.glade.h:1
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
-msgstr "<b>Подешавања</b>"
+msgstr "<b>Подешавања испоруке</b>"
 
-#: widgets/misc/e-send-options.glade.h:2
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
-msgstr "<b>Понови</b>"
+msgstr "<b>Одговори</b>"
 
-#: widgets/misc/e-send-options.glade.h:3
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
-msgstr "<b>Идентификација</b>"
+msgstr "<b>Повратно обавештење</b>"
 
-#: widgets/misc/e-send-options.glade.h:4
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
-msgstr "<b>Претрага</b>"
+msgstr "<b>Праћење статуса</b>"
 
-#: widgets/misc/e-send-options.glade.h:5
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "Брише ову ставку"
+msgstr "А_утоматски бриши послат предмет"
 
-#: widgets/misc/e-send-options.glade.h:6
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
-msgstr "_Разврставање:"
+msgstr "_Разврставање"
 
-#: widgets/misc/e-send-options.glade.h:7
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "Добави најновије податке о задужењу"
+msgstr "На_прави послат објекат за праћење податка"
 
-#: widgets/misc/e-send-options.glade.h:8
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr "Одговори и надређено"
+msgstr "Испо_ручено и отворено"
 
-#: widgets/misc/e-send-options.glade.h:9
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
-msgstr "Опције филтера"
+msgstr "Опш_та подешавања"
 
-#: widgets/misc/e-send-options.glade.h:10
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Признанице"
+msgstr ""
+"Нема\n"
+"Прималац поште"
 
-#: widgets/misc/e-send-options.glade.h:12
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
 "None\n"
 "Mail Receipt\n"
-msgstr "Признанице"
+msgstr ""
+"Нема\n"
+"Прималац поште\n"
 
-#: widgets/misc/e-send-options.glade.h:15
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:15
 msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
-msgstr "Поверљиво"
+msgstr ""
+"Јавно\n"
+"Приватно\n"
+"Поверљиво\n"
 
-#: widgets/misc/e-send-options.glade.h:19
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "R_eply requested"
-msgstr "_Стил одговора:"
+msgstr "Захтеван о_дговор"
 
-#: widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid "Sta_tus  Tracking"
-msgstr ""
+msgstr "Праћење  ста_туса"
 
-#: widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:22
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
 msgstr ""
+"Недефинисано\n"
+"Високо\n"
+"Обично\n"
+"Ниско"
 
-#: widgets/misc/e-send-options.glade.h:26
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "W_ithin"
-msgstr "Ширина"
+msgstr "Ун_утар"
 
-#: widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When acce_pted: "
-msgstr ""
+msgstr "Када је при_хваћено: "
 
-#: widgets/misc/e-send-options.glade.h:28
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "When co_mpleted:"
-msgstr "_Датум завршетка:"
+msgstr "По заврш_етку:"
 
-#: widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "When decli_ned:    "
-msgstr ""
+msgstr "Када је одби_јено:    "
 
-#: widgets/misc/e-send-options.glade.h:30
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_After:"
-msgstr "после"
+msgstr "_После:"
 
-#: widgets/misc/e-send-options.glade.h:31
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_All information"
-msgstr "Информација о задужењу"
+msgstr "_Сви подаци"
 
-#: widgets/misc/e-send-options.glade.h:32
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
-msgstr "Остави поруке на серверу"
+msgstr "_Одложи испоруку поруке"
 
-#: widgets/misc/e-send-options.glade.h:33
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
-msgstr "Обрисано"
+msgstr "_Испоручено"
 
-#: widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration  date"
-msgstr ""
+msgstr "_Постави  рок"
 
-#: widgets/misc/e-send-options.glade.h:36
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
-msgstr "Без имена"
+msgstr "_До:"
 
-#: widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
-msgstr ""
+msgstr "_Када је згодно"
 
-#: widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:     "
-msgstr ""
+msgstr "_Када је отворено:     "
 
 #. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
 msgstr "Датотека постоји \"{0}\"."
 
 #. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Желите ли да је препишете?"
 
 #. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+#: ../widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
 msgstr "Није могуће чување датотеке \"{0}\"."
 
 #. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+#: ../widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
 msgstr "Није могуће отварање датотеке \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
-#: widgets/misc/e-url-entry.c:107
-#, fuzzy
+#: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
-msgstr "<протисните овде да изаберете директоријум>"
+msgstr "протисните овде да посетите аресу (url)"
+
+#~ msgid ""
+#~ "\n"
+#~ " Please read carefully the license agreement displayed\n"
+#~ " below and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Пажљиво прочитајте доле приказан уговор о лиценци\n"
+#~ " и означите кућицу за прихватате\n"
 
 #~ msgid "Failed to parse gpg userid hint."
 #~ msgstr "Није успело читање gpg userid подсетника."
@@ -22208,9 +22073,6 @@ msgstr "<протисните овде да изаберете директор�
 #~ msgid "Do you want to trust \"%s\" for the following purposes?"
 #~ msgstr "Желите ли да верујете „%s“ за наредне потребе?"
 
-#~ msgid "Cannot create a folder by this name."
-#~ msgstr "Није могуће прављење директоријума тог имена."
-
 #~ msgid "mailbox:%s (%s)"
 #~ msgstr "mailbox:%s (%s)"
 
@@ -23335,9 +23197,6 @@ msgstr "<протисните овде да изаберете директор�
 #~ msgid "Requested action not taken: insufficient system storage"
 #~ msgstr "Тражена акција није предузета: недовољно простора на систему"
 
-#~ msgid "Object could not be found\n"
-#~ msgstr "Објекат није могао бити пронађен\n"
-
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "додај-време очекује 2 аргумента"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 797cbebf2c..57216afc71 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.0\n"
+"Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 08:58+0100\n"
-"PO-Revision-Date: 2005-03-05 08:53+0100\n"
+"POT-Creation-Date: 2005-04-06 09:23+0200\n"
+"PO-Revision-Date: 2005-04-06 08:10+0200\n"
 "Last-Translator: Igor Nestorović <jung@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,144 +17,134 @@ msgstr ""
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:166
 msgid "evolution addressbook"
 msgstr "adresar evolucije"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:196
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:196
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:204
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:204
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: a11y/addressbook/ea-minicard-view.c:149
-#, fuzzy, c-format
+#: ../a11y/addressbook/ea-minicard-view.c:149
+#, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
-msgstr[0] "tekući direktorijum adresara"
-msgstr[1] "tekući direktorijum adresara"
-msgstr[2] "tekući direktorijum adresara"
+msgstr[0] "tekući direktorijum adresara ima %d kartu"
+msgstr[1] "tekući direktorijum adresara ima %d karte"
+msgstr[2] "tekući direktorijum adresara ima %d karti"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:876
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:879
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori"
 
-#: a11y/addressbook/ea-minicard.c:138
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard.c:138
 msgid "Contact List: "
-msgstr "Kontakt li_sta"
+msgstr "Kontakt li_sta: "
 
-#: a11y/addressbook/ea-minicard.c:139
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard.c:139
 msgid "Contact: "
-msgstr "Kontakti: "
+msgstr "Kontakt: "
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "minikarta evolucije"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
-msgstr ""
+msgstr "Ima alarme."
 
-#: a11y/calendar/ea-cal-view-event.c:238
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
-msgstr "_Bez ponavljanja"
+msgstr "Ima ponavljanja."
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
-msgstr ""
+msgstr "To je sastanak."
 
-#: a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-cal-view-event.c:247
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Kalendarski događaji"
+msgstr "Kalendarski događaj: pregled je %s."
 
-#: a11y/calendar/ea-cal-view-event.c:249
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
-msgstr "Kalendarski događaji"
+msgstr "Kalendarski događaj: nema pregled."
 
-#: a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
-msgstr "Kalendarski događaji"
+msgstr "događaj pregleda kalendara"
 
-#: a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
-msgstr "Ima fokus"
+msgstr "Uhvati fokus"
 
-#: a11y/calendar/ea-cal-view.c:306
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
-msgstr "Nov _zakazani sastanak"
+msgstr "Nov sastanak"
 
-#: a11y/calendar/ea-cal-view.c:307
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
-msgstr "Nov celodnevni _događaj"
+msgstr "Nov celodnevni događaj"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1376
 msgid "New Meeting"
 msgstr "Nov sastanak"
 
-#: a11y/calendar/ea-cal-view.c:309
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
-msgstr "Idi na _današnji dan"
+msgstr "Idi na današnji dan"
 
-#: a11y/calendar/ea-cal-view.c:310
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
-msgstr "Idi na _datum"
+msgstr "Idi na datum"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
-#, fuzzy
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
-msgstr "vreme u odnosu na trenutno vreme"
+msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
-#: a11y/calendar/ea-day-view.c:146 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ima %d događaj."
+msgstr[1] "Ima %d događaja."
+msgstr[2] "Ima %d događaja."
 
-#: a11y/calendar/ea-day-view.c:148 a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
-msgstr ""
+msgstr "Nema događaja."
 
-#: a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-day-view.c:152
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "Pregled radne nedelje"
+msgstr "Pregled radne nedelje: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-day-view.c:155
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "Dnevni pregled"
+msgstr "Dnevni pregled: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:186
-#, fuzzy
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
-msgstr "podaci o kalendaru"
+msgstr "pregled kalendara za radnu nedelju"
 
-#: a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "prikaz kalendara za jedna ili više dana"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -169,22 +159,30 @@ msgstr "%A, %d. %b %Y."
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:663
-#: calendar/gui/e-day-view-top-item.c:719 calendar/gui/e-day-view.c:1511
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:665
-#: calendar/gui/calendar-component.c:670 calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/calendar-component.c:670
+#: ../calendar/gui/calendar-component.c:672
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:684 calendar/gui/calendar-component.c:691
-#: calendar/gui/calendar-component.c:697 calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:697
+#: ../calendar/gui/calendar-component.c:699
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -197,105 +195,101 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:689
-#: calendar/gui/e-day-view-top-item.c:723 calendar/gui/e-day-view.c:1527
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:726
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "Gnom kalendar"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
-msgstr "Osnova za _pretragu:"
+msgstr "traka pretrage"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
-msgstr "Preglednik Evolucija kalendara"
+msgstr "traka pretrage evolucija kalendara"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
-msgstr ""
+msgstr "Dugme za preskakanje"
 
-#: a11y/calendar/ea-jump-button.c:158
-#, fuzzy
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
-msgstr "Pritisnite ovde da dodate učesnika"
+msgstr "Kliknite ovde, možete naći još događaja."
 
-#: a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:155
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "Mesečni pregled"
+msgstr "Mesečni pregled: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:159
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "Nedeljni pregled"
+msgstr "Nedeljni pregled: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:190
-#, fuzzy
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
-msgstr "podaci o kalendaru"
+msgstr "pregled kalendara za mesec"
 
-#: a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "prikaz kalendara za jedan ili više nedelja"
 
-#: a11y/widgets/ea-calendar-item.c:296 a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:304
-#, fuzzy, c-format
+#: ../a11y/widgets/ea-calendar-item.c:304
+#, c-format
 msgid "Calendar: from %s to %s"
-msgstr "Informacija o kalendaru"
+msgstr "Kalendar: od %s do %s"
 
-#: a11y/widgets/ea-calendar-item.c:339
-#, fuzzy
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
-msgstr "Preglednik Evolucija kalendara"
+msgstr "Predmet evolucija kalendara"
 
-#: a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
-msgstr ""
+msgstr "Dugme za kombinovanje"
 
-#: a11y/widgets/ea-combo-button.c:50
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
-msgstr "Koristi _podrazumevano"
+msgstr "Aktiviraj podrazumevano"
 
-#: a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
-msgstr ""
+msgstr "Iskačući meni"
 
 # malo aorista ;-)
 #. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
 msgstr "Ovaj adresar nije moguće otvoriti."
 
 #. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"Ovaj server adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili "
+"Server ovog adresara je ili nedostupan ili je njegovo ime pogrešno uneto ili "
 "je mreža nedostupna."
 
 #. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook-errors.xml.h:6
 msgid "Failed to authenticate with LDAP server."
 msgstr "Neuspešna prijava na LDAP server."
 
 #. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -306,12 +300,12 @@ msgstr ""
 "velika slova. uključena."
 
 #. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Ovaj server adresara ne sadrži predložene osnove za pretragu."
 
 #. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook-errors.xml.h:12
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -322,40 +316,38 @@ msgstr ""
 "pretragu."
 
 #. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook-errors.xml.h:14
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ovaj server ne podržava podatke LDAPv3 šeme podataka."
 
 #. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook-errors.xml.h:16
 msgid "Could not get schema information for LDAP server."
 msgstr "Neuspešno preuzimanje šeme podataka sa LDAP servera."
 
 #. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook-errors.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server nije odgovorio ispravnom šemom podataka."
 
 #. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook-errors.xml.h:20
 msgid "Could not remove addressbook."
 msgstr "Neuspešno uklanjanje adresara."
 
 #. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:22
 msgid "Delete address book '{0}'?"
-msgstr "Izaberite odredišni adresar."
+msgstr "Obrisati adresar '{0}'?"
 
 # malo aorista ;-)
 #. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:24
 msgid "This address book will be removed permanently."
-msgstr "Ovaj adresar nije moguće otvoriti."
+msgstr "Ovaj adresar biće trajno uklonjen."
 
 #. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
@@ -381,13 +373,13 @@ msgstr "Uređivač kategorija nije dostupan."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:75
-#: mail/mail-errors.xml.h:77 mail/mail-errors.xml.h:79
-#: mail/mail-errors.xml.h:81 mail/mail-errors.xml.h:83
-#: mail/mail-errors.xml.h:85 mail/mail-errors.xml.h:89
-#: mail/mail-errors.xml.h:93
+#: ../addressbook/addressbook-errors.xml.h:28
+#: ../addressbook/addressbook-errors.xml.h:36
+#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
+#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
+#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
+#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
+#: ../mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
@@ -396,49 +388,49 @@ msgstr "{0}"
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:97
+#: ../addressbook/addressbook-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Nemoguće otvaranje adresara"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Greška kod učitavanja adresara."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Pretraga nije moguća."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Želite li da sačuvate promene?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
+#: ../addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Izmenili ste ovaj kontakt. Želite li da sačuvate ove izmene?"
 
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Odbaci"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Kontakt nije moguće premestiti."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -447,144 +439,143 @@ msgstr ""
 "može ukloniti iz izvora. Želite li da napravite kopiju umesto toga?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
+#: ../addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Čuvanje kontak(a)ta nije moguće."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: ../addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Greška pri čuvanju kontakta u {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Adresar Evolucije je neočekivano završio."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Vaši kontakti za {0} neće biti dostupni dok se Evolucija ne pokrene ponovo."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
-msgstr "Direktorijum već postoji"
+msgstr "Adresa '{0}' već postoji"
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
 msgstr ""
-"Promenjena elektronska adresa ili ime ovog kontakta\n"
-"već postoji u ovom direktorijumu. Želite li svejedno da dodate?"
+"Kontakt sa ovom adresom već postoji.  Želite li ipak da dodate novu kartu sa "
+"istom adresom?"
 
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
+#: ../plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Dodaj"
 
 #. addressbook:server-version title
 #. calendar:server-version title
-#: addressbook/addressbook-errors.xml.h:64 calendar/calendar-errors.xml.h:142
-#, fuzzy
+#: ../addressbook/addressbook-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:146
 msgid "Server Version"
-msgstr "Verzija"
+msgstr "Verzija servera"
 
 #. addressbook:server-version primary
 #. calendar:server-version primary
-#: addressbook/addressbook-errors.xml.h:66 calendar/calendar-errors.xml.h:144
+#: ../addressbook/addressbook-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:148
 msgid "Your server needs to be updated"
-msgstr ""
+msgstr "Serveru je potrebno osvežavanje"
 
 #. addressbook:server-version secondary
-#: addressbook/addressbook-errors.xml.h:68
+#: ../addressbook/addressbook-errors.xml.h:68
 msgid "Some features may not work correctly with your current server version"
-msgstr ""
+msgstr "Na tekućoj verziji servera neke opcije neće ispravno raditi"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Neuspelo otvaranje adresara"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Neuspelo čitanje programskog bloka adresa pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Samodopunjavanje"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakti"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Sertifikati"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Podesite samodopunjavanje ovde"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:235 calendar/gui/migration.c:385
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolucija adresar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Iskačući prozor za adrese Evolucija adresara"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Prikazivač adresa Evolucija adresara"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Prikazivač karata Evolucija adresara"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Deo Evolucija adresara"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontrola upravljanja S/Mime sertifikatima Evolucije"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Kontrola podešavanja direktorijuma Evolucije"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Upravljajte S/MIME sertifikatima ovde"
 
 # On This Computer is always first and VFolders is always last
 #. create the local source group
 #. On This Computer is always first and vFolders is always last
-#: addressbook/gui/component/addressbook-component.c:133
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/calendar-component.c:208 calendar/gui/migration.c:459
-#: calendar/gui/migration.c:552 calendar/gui/tasks-component.c:188
-#: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
-#: mail/mail-component.c:290 mail/mail-vfolder.c:222
+#: ../addressbook/gui/component/addressbook-component.c:133
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:290 ../mail/mail-vfolder.c:222
 msgid "On This Computer"
 msgstr "Na ovom računaru"
 
@@ -596,137 +587,132 @@ msgstr "Na ovom računaru"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: addressbook/gui/component/addressbook-component.c:141
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/calendar-component.c:216 calendar/gui/migration.c:467
-#: calendar/gui/migration.c:560 calendar/gui/tasks-component.c:196
-#: filter/filter-label.c:123 mail/em-migrate.c:1043 mail/mail-config.c:78
-#: mail/mail-config.glade.h:101
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:103
 msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:149
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:197
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:198
 msgid "Create a new contact"
 msgstr "Napravi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:205
 msgid "Contact _List"
 msgstr "Kontakt li_sta"
 
-#: addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:206
 msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#: addressbook/gui/component/addressbook-config.c:1120
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:212
+#: ../addressbook/gui/component/addressbook-config.c:1120
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:213
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:214
 msgid "Create a new address book"
 msgstr "Napravi novi adresar"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:287
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Neuspešno dograđivanje podešavanja ili direktorijuma adresara."
 
-#: addressbook/gui/component/addressbook-config.c:315
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
-msgstr "Nalepi"
+msgstr "Baza"
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: addressbook/gui/component/addressbook-config.c:609
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
-msgstr "Kopiraj sadržaj direktorijuma lokalno za rad van mreže"
-
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372 mail/em-folder-properties.c:215
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+msgstr "Kopiraj sadržaj knjige lokalno za rad van mreže"
+
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.c:361
+#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:84
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Opšte"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: addressbook/gui/component/addressbook-config.c:909
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
-msgstr "<b>Podaci servera</b>"
+msgstr "Podaci servera"
 
-#: addressbook/gui/component/addressbook-config.c:911
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
-msgstr "SMTP prijava"
+msgstr "Prijava"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalji"
 
-#: addressbook/gui/component/addressbook-config.c:915
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
-msgstr "Tražim..."
+msgstr "Pretraga"
 
-#: addressbook/gui/component/addressbook-config.c:917
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
-msgstr "<b>Preuzimanje</b>"
+msgstr "Preuzimanje"
 
-#: addressbook/gui/component/addressbook-config.c:1118
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Podešavanja adresara"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Prenosim..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Prenosim `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Podešavanje samodopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -738,7 +724,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -748,7 +734,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -758,7 +744,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -768,214 +754,208 @@ msgstr ""
 "\n"
 "Budite·strpljivi·dok·Evolucija·prenosi·podatke sa Pilot·Sync uređaja..."
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:935
-#: calendar/gui/calendar-component.c:526 calendar/gui/tasks-component.c:430
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:527 calendar/gui/tasks-component.c:431
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Podešavanja..."
 
-#: addressbook/gui/component/addressbook-view.c:1130
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
-msgstr "Izvori nisu izabrani."
+msgstr "Birač izvora kontakta"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:98
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:193
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:194
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela prijava.\n"
 
-#: addressbook/gui/component/addressbook.c:200
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
-#, fuzzy, c-format
+#: ../addressbook/gui/component/addressbook.c:201
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:461
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "%sUnesite lozinku za %s (korisnik %s)"
+msgstr "Unesite lozinku za %s (korisnik %s)"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
-msgstr "Samodopunjavanje"
+msgstr "Dužina samodopunjavanja"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML za spisak adresa (url) za dopunjavanje"
+msgstr "EFolderList XML za spisak adresa (URI) za dopunjavanje"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML za spisak adresa (url) za dopunjavanje"
+msgstr "EFolderList XML za spisak adresa (URI) za dopunjavanje."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "Položaj uspravnog panela u mesečnom pregledu"
+msgstr ""
+"Položaj vertikalnog panela, između karte i spiska pregleda i panela za "
+"pregled, u pikselima."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
-msgstr "Prikaži panel \"Pregled\""
+msgstr "Prikaži panel pregleda"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"Broj znakova koji se moraju ukucati pre nego evolucija pokuša da samodopuni"
+"Broj znakova koji se moraju ukucati pre nego Evolucija pokuša da samodopuni."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "Adresa (URL) za poslednji korišten direktorijum u prozorčetu za izbor imena"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
-"Adresa (URL) za poslednji korišten direktorijum u prozorčetu za izbor imena"
+"Adresa (URI) za poslednji korišten direktorijum u prozorčetu za izbor imena."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Vertical pane position"
-msgstr "Geografski položaj"
+msgstr "Položaj vertikalnog panela"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
-msgstr "Da li se prikazuje površ sa direktorijumima"
-
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/cal-attachment.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-dialogs.glade.h:6
-#: mail/message-tags.glade.h:1 plugins/shared-folder/properties.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgstr "Da li se prikazuje panel pregleda."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/shared-folder/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Identifikacija</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Prikaz</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Preuzimanje</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Pretraga</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Podaci servera</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tip:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Dodaj adresar"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:302
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302
 msgid "Always"
 msgstr "Uvek"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Posebno ime"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "Elektronska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolucija će koristiti ovu elektronsku adresu za prijavu na server."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Nađi moguće osnove za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Pri_java:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:300
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Osnova za _pretragu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -983,7 +963,7 @@ msgstr ""
 "Izbor ove opcije znači da će se Evolucija povezati na LDAP server samo ako "
 "server podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -995,7 +975,7 @@ msgstr ""
 "poslu, onda nema potrebe da Evolucija koristi SSL/TLS pošto je veza već "
 "bezbedna."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -1004,15 +984,15 @@ msgstr ""
 "Odabir ove opcije znači da server ne podržava ni SSL ni TLS.  To znači da "
 "vaša beza neće biti sigurna, i da ćete biti ranjivi na sigurnosne napade. "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1021,7 +1001,7 @@ msgstr ""
 "Baza za pretragu je posebno ime (DN)  unosa odakle će vaša pretraga početi. "
 "Ako ovo ostavite prazno, pretraga će početi iz korena stabla direktorijuma."
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1033,13 +1013,13 @@ msgstr ""
 "pretragu. Obim pretrage \"one\" će uključiti samo unosejedan nivo ispod vaše "
 "baze."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ovo je puno ime vašeg ldap servera. Na primer, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1047,18 +1027,17 @@ msgstr ""
 "Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki broj "
 "usporićete vaš adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Ovo je metod koji će evolucija koristiti da vas prijavi. Zapazite da "
-"uključivanje ovoga na \"Email Address\" zahteva anonimni pristup na ldap "
+"Ovo je metod koji će Evolucija koristiti da vas prijavi.  Zapazite da "
+"uključivanje ovoga na \"Elektronska adresa\" zahteva anonimni pristup na ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1066,7 +1045,7 @@ msgstr ""
 "Ovo je ime servera koje će se pojaviti u listi direktorijuma Evolucije. To "
 "je samo za potrebe prikazivanja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1076,1393 +1055,1372 @@ msgstr ""
 "je spisak standardnih portova. Pitajte svog sistem administratora koji port "
 "da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Korišćenje posebnog imena (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Korisšćenje elektronske adrese"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Kadgod je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Dodaj u _adresar"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Nađi moguće baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Log in method:"
 msgstr "Metod _prijave:"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:160
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:163
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Rok:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Koristi bezbednu vezu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "karte"
 
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1885 plugins/calendar-http/calendar-http.c:263
-#: plugins/calendar-weather/calendar-weather.c:564
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1882
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-pošta</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Početak</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Brze poruke</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Posao</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Razno</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Ostalo</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web adrese</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Posao</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Uređivač kontakata"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Puno _ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
-msgstr "Strana"
+msgstr "Slika"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN glasnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Lični podaci"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
-msgstr "<b>Telefon</b>"
+msgstr "Telefon"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
-#: filter/filter-label.c:122 mail/em-migrate.c:1042 mail/mail-config.c:77
-#: mail/mail-config.glade.h:148
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:151
 msgid "Work"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
-msgstr "Godišnjica:"
+msgstr "_Godišnjica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
-msgstr "Pomoćnik:"
+msgstr "_Pomoćnik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
-msgstr "Rođendan:"
+msgstr "_Rođendan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1619
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1619
 msgid "_Calendar:"
-msgstr "Kalendar:"
+msgstr "_Kalendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
-msgstr "Mesto:"
+msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
-msgstr "Preduzeće:"
+msgstr "Pr_eduzeće:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
-msgstr "Država:"
+msgstr "_Država:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
-msgstr "Odeljenje:"
+msgstr "_Odeljenje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Smesti _pod:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
-msgstr "S_lobodan/zauzet:"
+msgstr "S_lobodno/zauzeto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
-msgstr "Lična stranica:"
+msgstr "_Lična strana:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
-msgstr "Upravnik:"
+msgstr "_Upravnik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
-msgstr "Beleške:"
+msgstr "_Beleške:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
-msgstr "Kancelarija:"
+msgstr "_Kancelarija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Poštanski broj:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
-msgstr "Zanimanje:"
+msgstr "_Zanimanje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
-msgstr "Supružnik:"
+msgstr "S_upružnik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Republika/pokrajina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titula:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
-msgstr "Video razgovor:"
+msgstr "_Video razgovor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
-msgstr "Želi da prima HTML poštu"
+msgstr "_Želi da prima HTML poštu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
-msgstr "Blog:"
+msgstr "B_log:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Gde:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
-msgstr "Zip/Poštanski broj:"
+msgstr "Zip/Poš_tanski broj:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Adresa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:310
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Izmenljivo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Sjedinjene Države"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Avganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Alžir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Američka Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Angila"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antartik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antiga i Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Jermenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Australija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Austrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Azejrbejdžan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahami"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Belorusija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Belgija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Bolivija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosna i Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Buve Ostrvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brazil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Britanska Teritorija Indijskog Okeana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Brunej"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bugarska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Zelenortska Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Kajmanska Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Centralno Afrička Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Čile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Kina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Božićna ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos (Kiling) Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Komori"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo, Demokratska Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Kuk Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Obala Slonovače"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Hrvatska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Kipar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Češka republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Danska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "DŽibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Dominikanska republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egipat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorijalna Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Foklandska ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Farska ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidži"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Francuska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Francuska Gvajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Francuska Polinezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Francuske Južne Teritorije"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Nemačka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Grčka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Gvadalupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Gvirnzi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Gvineja Bisao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Herd i Mekdonald Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Sveta Stolica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Iran"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Irak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Čovekovo ostrvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Izrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Italija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "DŽersi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Koreja, Demokratska Narodna Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Koreja, Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Latvija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Liban"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Libija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Lihtenštajn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Litvanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Makao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Makedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malavi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Maršalova ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mejot"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Republika Moldavija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Monserat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Mianmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Holandija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Holandski Antili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Novi Zeland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolk Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Ostrva Severna Mariana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norveška"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinska Teritorija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papua Nova Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paragvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filipini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitkrejn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Poljska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Katar"
 
 # Za ovu državu nisam čuo ni u snu, tako da sam ostavio u originalu.
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Rumunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Ruska Federacija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Sveti Kits i Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Sveta Lucija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Sveti Vinsent i Grenadini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome i Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudijska Arabija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Srbija i Crna Gora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Siera Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Solomonska ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somalija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Južna Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južna DŽordžija i Južna Sendvič Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Španija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Šri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "Sv. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Sv. Pjer i Mikelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard i Jan Majen Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Svazilend"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Švedska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Švajcarska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Sirija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "UR Tanzanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Tajland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timor-Lest"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad i Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Turska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turks i Kokos Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Ujedinjeni Arapski Emirati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Rubna Ostrva SAD"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vijetnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Britanska Devičanska Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Američka Devičanska Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Volis i Fotuna Ostrva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL brzi glasnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo glasnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Usluga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Mesto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Kuća"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
-msgstr "_Obavezne ljude"
+msgstr "_Obavezna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Promenjeno"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 msgid "No image"
 msgstr "Bez slike"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2470,27 +2428,27 @@ msgstr ""
 "Podaci o kontaktu su neispravni:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2498,7 +2456,7 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete ove kontakte?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2506,187 +2464,184 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete ovaj kontakt?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Puna adresa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP kod:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "G-din"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Ml."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "G-đica"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "G."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "G-đa"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "G-đica"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "St."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Ime:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Prezime:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Srednje:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Sufiks:"
 
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Dodaj nalog brzog glasnika"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "Ime n_aloga:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_Brzoglasnička usluga:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
-#: plugins/calendar-weather/calendar-weather.c:410
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Dodaj elektronsku adresu u spisak"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Uređivač kontakt liste"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Ubacite elektronske adrese iz adresara"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Članovi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Ukloni elektronsku adresu iz spiska"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sakrij adrese kada šalješ poštu na ovu listu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Ime _liste:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
-msgstr "Odaberi"
+msgstr "_Izaberi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:296
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Je nova lista"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
-msgstr "Članovi"
+msgstr "_Članovi"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
-msgstr "Ispiši članove"
+msgstr "Članovi konkakt liste"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Promenjen kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Sporan kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupliran kontakt"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2694,15 +2649,15 @@ msgstr ""
 "Promenjena elektronska adresa ili ime ovog kontakta\n"
 "već postoji u ovom direktorijumu. Želite li svejedno da dodate?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Novi kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Originalan kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2711,16 +2666,16 @@ msgstr ""
 "u ovom direktorijumu.  Želite li svejedno da dodate?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2728,273 +2683,274 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Upit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "Greška kod učitavanja pregleda adresara"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Model"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:319
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:320
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:541
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Sačuvaj kao VKartu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact..."
 msgstr "Nov kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:919
 msgid "New Contact List..."
 msgstr "Nova kontakt lista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosledi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2489
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Štampaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Copy to Address Book..."
 msgstr "Kopiraj u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "Move to Address Book..."
 msgstr "Premesti u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iseci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:525 calendar/gui/tasks-component.c:429
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Nalepi"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
 msgid "Print cards"
 msgstr "Štampaj karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Pomoćnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefon asistenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon na poslu 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Kategorije"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon preduzeća"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "E-pošta 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "E-pošta 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Prezime"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Smesti kao"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Kućni faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Kućni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Dnevnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Upravnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:379
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
 msgid "Note"
 msgstr "Napomena"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelarija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:326
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:327
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Uloga"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Supružnik"
 
@@ -3004,63 +2960,62 @@ msgstr "Supružnik"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Jedinica"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Web adresa"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Ima fokus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Ime polja"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Model teksta"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Širina kolone"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -3070,11 +3025,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Nema stavki za prikazivanje.\n"
+"Potražite kontakt\n"
 "\n"
-"Kliknite dvaput da napravite nov kontakt."
+"ili kliknite dvaput ovde za pravljenje novog kontakta."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3088,15 +3043,17 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "Pretraga za kontaktima..."
+msgstr ""
+"\n"
+"\n"
+"Pretraga za kontaktima."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3106,104 +3063,104 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Odabrano"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Ima kursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:143
+#: ../addressbook/gui/widgets/eab-contact-display.c:209
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:274
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Ispiši članove"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:337
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Položaj"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Video konferencije"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "lično"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Pozicija na poslu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Lična stranica"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Uspeh"
 
 # E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Osnovni proces je zauzet"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Arhiva van mreže"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Lični kontakt nije definisan"
 
@@ -3212,75 +3169,79 @@ msgstr "Lični kontakt nije definisan"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Zabranjen pristup"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Kontakt nije pronađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "ID kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:660
-#: calendar/gui/e-calendar-table.c:458 calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Poništeno"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Nije moguće otkazivanje"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Neuspela prijava"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Prijava obavezna"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 # E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Druga greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
+"Nismo u mogućnosti da otvorimo ovaj adresar. To ili znači da on nije označen "
+"za korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
+"ovaj adresar kada se povežete radi preutimanja sadržaja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -3288,7 +3249,7 @@ msgstr ""
 "Otvaranje ovog adresara nije uspelo.  Proverite da putanja postoji i da imate "
 "prava pristupa."
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3296,7 +3257,7 @@ msgstr ""
 "Otvaranje ovog adresara nije uspelo.  To znači da ste ili uneli pogrešnu "
 "adresu (URL), ili je LDAP server nedostupan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3306,7 +3267,7 @@ msgstr ""
 "koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
 "podrškom za LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3314,7 +3275,7 @@ msgstr ""
 "Otvaranje ovog adresara nije uspelo.  To znači da ste ili uneli pogrešnu "
 "adresu (URL), ili je server nedostupan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3326,7 +3287,7 @@ msgstr ""
 "Preciznije formulišite upit ili povećajte limit\n"
 "broja rezultata u postavkama adresara za server direktorijuma."
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3338,46 +3299,46 @@ msgstr ""
 "upit ili povećajte vremenski limit u postavkama adresara\n"
 "za server direktorijuma."
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspešno završen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Greška kod dodavanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Greška kod dodavanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Greška kod izmene liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Greška kod izmene kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Greška kod uklanjanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
+#, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3385,22 +3346,16 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"Otvaranje %d kontakta će otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate ovaj kontakt?Otvaranje %d kontakata će "
-"otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate sve ove kontakte?"
+"Otvaranje %d kontakta će otvoriti i %d nov prozor.\n"
+"Da li stvarno želite da pogledate ove kontakte?"
 msgstr[1] ""
-"Otvaranje %d kontakta će otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate ovaj kontakt?Otvaranje %d kontakata će "
-"otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate sve ove kontakte?"
+"Otvaranje %d kontakta će otvoriti i %d nova prozora.\n"
+"Da li stvarno želite da pogledate ove kontakte?"
 msgstr[2] ""
 "Otvaranje %d kontakta će otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate ovaj kontakt?Otvaranje %d kontakata će "
-"otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate sve ove kontakte?"
+"Da li stvarno želite da pogledate ove kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3409,44 +3364,44 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Prepiši"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Kopiraj kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Kopiraj kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Izaberite odredišni adresar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Brojne VKarte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VKarta za %s"
@@ -3458,382 +3413,378 @@ msgstr "VKarta za %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(prazno)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Osnovna E-pošta"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Odaberite akciju"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Napravi nov kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adresu postojećem kontaktu \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Pretražujem adresar..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Spoji elektronske adrese"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "i još jedan kontakt."
-msgstr[1] "i još %d kontakta."
-msgstr[2] "i još %d kontakata."
+msgstr[0] "Postoji još %d kontakt."
+msgstr[1] "Postoji još %d kontakta."
+msgstr[2] "Postoji još %d kontakata."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Prikaži celu VKartu"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Prikaži sažetu vizit VKartu"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Sačuvaj u adresar"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "Pregled GTK stabla"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP format razmene podataka (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Evolucija VKarta uvoznik"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKarta (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Štampaj kovertu"
 
-#: addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Štampaj kontakte"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Štampaj kontakt"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 p. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 p. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Prazni obrasci na kraju:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Telo"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Dno:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimenzije:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "F_ont..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Podnožje:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Zaglavlje/Podnožje"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Zaglavlja"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Zaglavlja za svako pismo"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Visina:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Odmah prati jedno drugo"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Uključi:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Položeno"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Levo:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Jezičci sa slovima sa strane"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Margine"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Broj kolona:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opcije"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orijentacija"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Strana"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Podešavanje strane:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Izvor papira:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Uspravno"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Izgled:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Štampaj koristeći sive tonove"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Obrnuto na parnim stranama"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Desno:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Odeljci:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Senčenje"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Veličina:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Počni na novoj strani"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Ime stila:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Vrh:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Tip:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Širina:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Font..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "Proba uređivača stila za štampanje kontakta"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Zadržana prava (C) 2000, Ximian, Inc."
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "Ovo isprobava element uređivača stila za štampanje kontakta"
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "Proba štampe kontakta"
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "Ovo isprobava kod za štampu kontakata"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Datoteka ne može biti otvorena"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "Spisak adresara nije dostupan"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "neuspelo otvaranje knjige"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "Ispiši lokalne datoteke adresara"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Prikaži karte kao vkarte ili csv datoteku"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "Izvezi u asinhronom režimu"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
-"Broj karti u jednoj izlaznoj datoteci u asinhronom režimu, podrazumevano je "
-"100."
+"Broj karti u jednoj izlaznoj datoteci u asinhronom režimu, podrazumevano 100."
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "BROJ"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška u argumentima naredbe, koristite opciju --help da vidite kako se "
 "koristi."
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vcard formate."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "U asinhronom režimu, izlaz mora biti datoteka."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "U normalnom režimu, nema potrebe za podešavanjem veličine."
 
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja predefinisanog adresara."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Ulazna datoteka"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ime datoteke nije dato."
 
 # calendar:prompt-cancel-task primary
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Želite li da pošaljete svim učesnicima obaveštenje o otkazivanju?"
 
 #. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar-errors.xml.h:4
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3841,31 +3792,31 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je sastanak otkazan."
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
+#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
+#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
+#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
+#: ../calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Ne šalji"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
+#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
+#: ../calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Pošalji obaveštenje"
 
 #. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar-errors.xml.h:8
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
 
 #. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "Svi podaci o ovom sastanku biće uklonjeni i neće se moći povratiti."
 
 #. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar-errors.xml.h:14
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -3874,7 +3825,7 @@ msgstr ""
 "znati da je zaduženje obrisano."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovo zaduženje?"
 
@@ -3883,18 +3834,18 @@ msgstr "Sigurno želite da obrišete ovo zaduženje?"
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
+#: ../calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Svi podaci o ovom zaduženju će biti obrisani i neće se moći povratiti."
 
 #. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Želite li da pošaljete obaveštenje o otkazivanju za ovaj unos u dnevnik?"
 
 #. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar-errors.xml.h:24
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -3903,12 +3854,12 @@ msgstr ""
 "znati da je ovaj dnevnik obrisan."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Sigurno želite da obrišete ovaj unos u dnevnik?"
 
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3916,14 +3867,14 @@ msgstr ""
 "Svi podaci o ovom unosu u dnevnik će biti obrisani i neće se moći povratiti."
 
 #. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:32
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Sigurno želite da obrišete sastanak nazvan '{0}'?"
 
 # calendar:prompt-delete-appointment secondary
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
@@ -3931,36 +3882,36 @@ msgstr ""
 "povratiti."
 
 #. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar-errors.xml.h:36
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
 
 #. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar-errors.xml.h:40
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Sigurno želite da obrišete '{0}' zaduženje?"
 
 #. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar-errors.xml.h:48
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Sigurno·želite·da·obrišete unos u dnevnik '{0}'?"
 
 # calendar:prompt-delete-journal secondary
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "Svi podaci u ovom dnevniku biće uklonjeni i neće se moći povratiti."
 
 # bug: plural-forms
 #. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar-errors.xml.h:56
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Sigurno želite da obrišete ovih {0} sastanaka?"
 
 #. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3968,23 +3919,23 @@ msgstr "Svi podaci o ovim sastancima biće uklonjeni i neće se moći povratiti.
 
 # bug: plural-forms
 #. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar-errors.xml.h:60
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Sigurno želite da obrišete ovih {0} zaduženja?"
 
 #. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Svi podaci o ovim zaduženjima biće uklonjeni i neće se moći povratiti."
 
 # bug: plural-forms
 #. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:64
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Sigurno želite da obrišete ovih {0} unosa u dnevnik?"
 
 #. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3992,68 +3943,68 @@ msgstr ""
 "Svi podaci u ovim unosima u dnevnik biće uklonjeni i neće se moći povratiti."
 
 #. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar-errors.xml.h:68
 msgid "Save Appointment"
 msgstr "Sačuvaj sastanak"
 
 #. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar-errors.xml.h:70
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Želite li da sačuvate izmene za ovaj sastanak?"
 
 #. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar-errors.xml.h:72
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Promenili ste ovaj sastanak, ali promene još nisu sačuvane."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Zanemari promene"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Sačuvaj promene"
 
 #. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
+#: ../calendar/calendar-errors.xml.h:76
 msgid "Save Task"
 msgstr "Sačuvaj zaduženje"
 
 #. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar-errors.xml.h:78
 msgid "Would you like to save your changes to this task?"
 msgstr "Želite li da sačuvate promene za ovo zaduženje?"
 
 #. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
+#: ../calendar/calendar-errors.xml.h:80
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Promenili ste ovo zaduženje, ali promene još nisu sačuvane."
 
 #. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar-errors.xml.h:84
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Želite li da pošaljete pozive na sastanak učesnicima?"
 
 # bug: what's RSVP?
 #. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar-errors.xml.h:86
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr "Pozivnice e-poštom biće poslate svim učesnicima da bi se pripremili."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
+#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Pošalji"
 
 #. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o sastanku učesnicima?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar-errors.xml.h:92
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4062,12 +4013,12 @@ msgstr ""
 "u toku."
 
 #. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar-errors.xml.h:96
 msgid "Would you like to send this task to participants?"
 msgstr "Želite li da pošaljete ovo zaduženje učesnicima?"
 
 #. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar-errors.xml.h:98
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4076,12 +4027,12 @@ msgstr ""
 "zaduženje."
 
 #. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar-errors.xml.h:102
 msgid "Would you like to send updated task information to participants?"
 msgstr "Želite li da pošaljete osvežene podatke o zaduženju učesnicima?"
 
 #. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar-errors.xml.h:104
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4090,305 +4041,303 @@ msgstr ""
 "zaduženja bude u toku."
 
 #. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar-errors.xml.h:108
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolucija zaduženja su neočekivano završila."
 
 #. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Vaša zaduženja neće biti dostupna dok se Evolucija ponovo ne pokrene."
 
 #. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar-errors.xml.h:112
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendar Evolucije je neočekivano završio."
 
 #. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Vaši kalendari neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#. calendar:editor-error primary
+#: ../calendar/calendar-errors.xml.h:116
 #, fuzzy
+msgid "Editor could not be loaded."
+msgstr "Objekat nije mogao biti pronađen\n"
+
+#. calendar:editor-error secondary
+#. mail:async-error-nodescribe secondary
+#: ../calendar/calendar-errors.xml.h:118 ../mail/mail-errors.xml.h:73
+msgid "{0}."
+msgstr "{0}."
+
+#. calendar:prompt-delete-calendar primary
+#: ../calendar/calendar-errors.xml.h:120
 msgid "Delete calendar '{0}'?"
-msgstr "Obrisati \"{0}\"?"
+msgstr "Obrisati kalendar \"{0}\"?"
 
 #. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar-errors.xml.h:122
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "Ovaj kalendar će biti trajno uklonjen."
 
 #. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:124
 msgid "Delete task list '{0}'?"
-msgstr "Obriši ovu listu"
+msgstr "Obrisati spisak zaduženja '{0}'?"
 
 #. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar-errors.xml.h:126
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "Ovaj spisak zaduženja će biti trajno uklonjen."
 
 #. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:128
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Sigurno želite da pošaljete poruku bez naslova?"
+msgstr "Sigurno želite da pošaljete sastanak bez pregleda?"
 
 #. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:130
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"Ubacivanjem smislenog naslova u vaše poruke daćete primaocima do znanja o čemu "
-"je reč u njoj."
+"Ubacivanjem smislenog pregleda u vaš sastanak daćete primaocima do znanja u "
+"vezi čega je sastanak."
 
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:131 ../calendar/calendar-errors.xml.h:136
+#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
+#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Pošalji"
 
 #. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:133
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "Sigurno želite da pošaljete poruku bez naslova?"
+msgstr "Sigurno želite da pošaljete zaduženje bez pregleda?"
 
 #. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:135
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Ubacivanjem smislenog naslova u vaše poruke daćete primaocima do znanja o čemu "
-"je reč u njoj."
+"Ubacivanjem smislenog pregleda u vaše zaduženje daćete primaocima do znanja šta "
+"je zaduženje."
 
 #. calendar:prompt-no-contents-offline-calendar primary
-#: calendar/calendar-errors.xml.h:134
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:138
 msgid "Error loading calendar"
-msgstr "Greška kod otvaranja kalendara"
+msgstr "Greška u učitavanju kalendara"
 
 #. calendar:prompt-no-contents-offline-calendar secondary
-#: calendar/calendar-errors.xml.h:136
+#: ../calendar/calendar-errors.xml.h:140
 msgid "The calendar is not marked for offline usage"
-msgstr ""
+msgstr "Ovaj kalendar nije označen za korišćenje van mreže"
 
 #. calendar:prompt-no-contents-offline-tasks primary
-#: calendar/calendar-errors.xml.h:138
-#, fuzzy
+#: ../calendar/calendar-errors.xml.h:142
 msgid "Error loading task list"
-msgstr "Greška kod dodavanja liste"
+msgstr "Greška u učitavanju spiska zaduženja"
 
 #. calendar:prompt-no-contents-offline-tasks secondary
-#: calendar/calendar-errors.xml.h:140
+#: ../calendar/calendar-errors.xml.h:144
 msgid "The task list is not marked for offline usage"
-msgstr ""
+msgstr "Ovaj spisak zadu-enja nije označen za korišćenje van mreže"
 
 #. calendar:server-version secondary
-#: calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version"
-msgstr ""
+#: ../calendar/calendar-errors.xml.h:150
+#, fuzzy
+msgid "Some features may not work correctly with your current server version "
+msgstr " Na tekućoj verziji servera neke opcije možda neće ispravno raditi "
 
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Neuspelo pokretanje evolucija-servera-podataka"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Neuspelo čitanje programskog bloka kalendara"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Predefinisan prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Neuspelo čitanje pilotovog ToDo programskog bloka"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zaduženja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "Kalendari"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Podesite vremensku zonu, kalendar i listu zaduženja ovde "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolucija kalendar i zaduženja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Kontrola podešavanja Evolucija kalendara"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Preglednik zakazanih poruka Evolucija kalendara"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Uređivač Evolucija kalendara/zaduženja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Deo Evolucija kalendara"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Deo Evolucija zaduženja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1219 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:508 calendar/gui/tasks-component.c:981
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:992
+#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Zaduženja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendari"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zaduženja"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servis za alarm obaveštenja Evolucija kalendara"
 
 # bug: plural-forms
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "minuta"
+msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:140 calendar/gui/print.c:2298
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Sastanak"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Appointment Title"
-msgstr "Sastanak"
+msgstr "Naslov sastanka"
 
 #. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:876
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../plugins/itip-formatter/itip-view.c:876
 msgid "End time:"
-msgstr "Vreme _završetka:"
+msgstr "Vreme završetka:"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:859
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Mesto:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "Snooze _time:"
-msgstr "Vreme _dremanja (minuti):"
+msgstr "Vreme _dremanja:"
 
 #. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:867
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "Start time:"
-msgstr "_Vreme početka:"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+msgstr "Vreme početka:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:156
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:38
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "Dre_maj"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "description of appointment"
-msgstr "početak sastanka"
+msgstr "opis sastanka"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 msgid "end-time"
-msgstr "Vreme _završetka:"
+msgstr "vreme-završetka"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
 msgid "location"
-msgstr "Mesto"
+msgstr "mesto"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
 msgid "start-time"
-msgstr "_Vreme početka:"
+msgstr "vreme-početka"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: ../calendar/gui/alarm-notify/alarm-queue.c:880
 msgid "Dismiss"
 msgstr "Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:878
+#: ../calendar/gui/alarm-notify/alarm-queue.c:881
 msgid "Dismiss All"
 msgstr "Odbaci sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:960
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:963
 msgid "No summary available."
-msgstr "Nema opisa."
+msgstr "Nema dostupnog opisa."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:969
-#: calendar/gui/alarm-notify/alarm-queue.c:971
+#: ../calendar/gui/alarm-notify/alarm-queue.c:972
+#: ../calendar/gui/alarm-notify/alarm-queue.c:974
 msgid "No description available."
 msgstr "Nema opisa."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-queue.c:982
 msgid "No location information available."
-msgstr "Nema opisa."
+msgstr "Nema dostupnog podatka o lokaciji."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:995
+#: ../calendar/gui/alarm-notify/alarm-queue.c:998
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4401,12 +4350,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava se u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1097
-#: calendar/gui/alarm-notify/alarm-queue.c:1121
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1101
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1125
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1101
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1105
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4418,7 +4367,7 @@ msgstr ""
 "podsetnik podešen da pošalje poruku. Evolucija će\n"
 "umesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1127
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1131
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4435,370 +4384,351 @@ msgstr ""
 "\n"
 "Sigurno želite da pokrenete ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1141
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1145
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Neuspelo pokrenetanje Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Neuspelo pokrenetanje servisa za alarm obaveštenja"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "pogrešno vreme"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
-msgstr "Pokreni program"
+msgstr "Programi za alarm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Ask for confirmation when deleting items"
-msgstr "_Traži potvrdu za brisanje podataka"
+msgstr "Traži potvrdu za brisanje predmeta"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Boja zaduženja za danas"
+msgstr "Boja pozadine zaduženja za danas, u formatu \"#rrggbb\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Boja zakasnelih zaduženja"
+msgstr "Boja pozadine zakasnelih zaduženja, u formatu \"#rrggbb\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreće alarm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Compress weekends in month view"
-msgstr "_Skupi nedelje u mesečni prikaz"
+msgstr "Skupi nedelje u mesečni prikaz"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Confirm expunge"
-msgstr "_Potvrdi kada prazniš direktorijum"
+msgstr "Potvrdi pražnjenje"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
+msgstr "Potrebno je označiti dane kojima počinju i završavaju se radni sati."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Default appointment reminder"
-msgstr "Obriši sastanak"
+msgstr "Podrazumevani podsetnik za sastanak"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Default reminder units"
-msgstr "Podrazumevana širina prozora"
+msgstr "Podrazumevane jedinice podsetnika"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default reminder value"
-msgstr "Podrazumevani kalendar za server"
+msgstr "Podrazumevana vrednost podsetnika"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Free/busy server urls"
-msgstr "Slobodno/zauzeto zahtev"
+msgstr "Adrese (url) servera slobodno/zauzeto"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Free/busy template url"
-msgstr "Slobodno/zauzeto odgovor"
+msgstr "Model adresa slobodno/zauzeto"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Hide completed tasks"
-msgstr "_Sakrij ispunjena zaduženja posle"
+msgstr "Sakrij ispunjena zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Hide task units"
-msgstr "Novi spisak zaduženja"
+msgstr "Sakrij jedinice zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide task value"
-msgstr ""
+msgstr "Sakrij vrednost zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Horizontal pane position"
-msgstr "Geografski položaj"
+msgstr "Horizontalni položaj panela"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
+"Sat kojim se završava radna nedelja, u dvadesetčetvoročasovnom formatu, od 0 "
+"do 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
+"Sat kojim počinje radna nedelja, u dvadesetčetvoročasovnom formatu, od 0 do 23."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Last alarm time"
-msgstr ""
+msgstr "Poslednje vreme za alarm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "List of server urls for free/busy publishing."
-msgstr "Spisak adresa (url) za objavljivanje slobodan/zauzet"
+msgstr "Spisak adresa (url) servera za objavljivanje slobodno/zauzeto."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Minute the workday ends on, 0 to 59"
-msgstr "Minut kojim se završava radni dan"
+msgstr "Minut kojim se završava radni dan, od 0 do 59"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minut kojim počinje radni dan"
+msgstr "Minut kojim počinje radni dan, od 0 do 59."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Month view horizontal pane position"
-msgstr "Položaj vodoravnog panela"
+msgstr "Položaj vodoravnog panela mesečnog prikaza"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Month view vertical pane position"
-msgstr "Položaj uspravnog panela u glavnom pregledu"
+msgstr "Položaj vertikalnog panela mesečnog prikaza"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Number of units for determining for a default reminder."
-msgstr "Broj jedinica za predefinisani podsetnik"
+msgstr "Broj jedinica za podrazumevani podsetnik."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Number of units for determining when to hide tasks."
-msgstr "Broj jedinica za određivanje kada sakriti zaduženja"
+msgstr "Broj jedinica za određivanje kada sakriti zaduženja."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Overdue tasks color"
-msgstr "_Neispunjena zaduženja:"
+msgstr "Boja neispunjenih zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
+"Pozicija horizontalnog panela, između kalendarovog navigatora za datum i "
+"spiska zaduženja kada nije postavljen mesečni prikaz, u pikselima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Pozicija horizontalnog panela, između prikaza i kalendarovog navigatora "
+"datuma i spiska zaduženja u mesečnom prikazu, u pikselima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid ""
 "Position of the vertical pane, between task list and the task preview pane, "
 "in pixels."
-msgstr "Položaj uspravnog panela u pregledu zaduženja"
+msgstr ""
+"Položaj vertikalnog panela, između spiska zaduženja i panela za pregled "
+"zaduženja, u pikselima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
+"Pozicija vertikalnog panela, između prikaza i kalendarovog navigatoradatuma "
+"i spiska zaduženja u mesečnom prikazu, u pikselima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
+"Pozicija vertikalnog panela, između prikaza i kalendarovog navigatora "
+"kalendara i spiska zaduženja kada nije postavljen mesečni prikaz, u pikselima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Programs that are allowed to be run by alarms."
-msgstr "Programi koji mogu da se pokrenu kao deo alarma"
+msgstr "Programi koji mogu biti pokrenuti alarmima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid "Show appointment end times in week and month views"
-msgstr "_Pokaži vremena završetka sastanaka u nedeljnim i mesečnim prikazima"
+msgstr "Prikazuje vremena završetka sastanaka u nedeljnim i mesečnim prikazima"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "Prikazuje alarme u obaveštajnoj zoni"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Show week numbers in date navigator"
-msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
+msgstr "Prikazuje brojeve nedelja u navigatoru za datume"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid "Tasks due today color"
-msgstr "Z_aduženja za danas:"
+msgstr "Boja zaduženja za danas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid "Tasks vertical pane position"
-msgstr "Geografski položaj"
+msgstr "Položaj vertikalnog panela zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
+"Podrazumevana vremenska zona koju kalendar koristi za datume i vremena, "
+"kaoneprevedeno mesto baze vremenske zone Olsen kao \"Amerika/Njujork\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
+"Model adrese (url) za korišćenje u povraćaju podataka slobodno/zauzeto, %u se "
+"zamenjuje korisničkim delom elektronske adrese a %d domenom."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
 "minutes."
-msgstr "Intervali prikazani u pregledima dana i radne nedelje"
+msgstr ""
+"Podele vremena</short> <short>Intervali prikazani u dnevnim i nedeljnim "
+"pregledima, u minutima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Time the last alarm ran, in time_t."
-msgstr "Vreme poslednjeg pokretanja alarma"
+msgstr "Vreme poslednjeg pokretanja alarma, u vremenu_t."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Twenty four hour time format"
-msgstr ""
+msgstr "Davadesetčetvoročasovni format vremena"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
+"Jedinice za podrazumevani podsetnik, \"minuti\", \"sati\" ili \"dani\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice za određivanje kada sakriti zaduženja"
+msgstr ""
+"Jedinice za određivanje kada sakriti zaduženja, \"minuti\", \"sati\", ili "
+"\"dani\"."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Week start"
-msgstr "Početak n_edelje:"
+msgstr "Početak nedelje"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Dan kojim počinje nedelja"
+msgstr "Dan kojim počinje nedelja, od nedelje (0) do subote (6)."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Da li da koristi obaveštajnu zonu za prikazivanje alarma"
+msgstr "Da li da koristi obaveštajnu zonu za prikazivanje alarma."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Da li da traži potvrdu brisanja sastanaka"
+msgstr "Da li da traži potvrdu brisanja sastanaka ili zaduženja."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Da li da traži potvrdu brisanja sastanaka"
+msgstr "Da li da traži potvrdu brisanja sastanaka i zaduženja."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
+"Da li da sabije vikende u mesečnom prikazu, koji subotu i nedelju stavlja u "
+"prostor radnog dana."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "_Pokaži vremena završetka sastanaka u nedeljnim i mesečnim prikazima"
+msgstr ""
+"Da li da prikaže vremena završetka sastanaka u nedeljnim i mesečnim prikazima."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Da li da sakrije urađena zaduženja"
+msgstr "Da li da sakrije obavljena zaduženja u pregledu zaduženja."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether to set a default reminder for appointments."
-msgstr "Da li da postavi predefinisani podsetnik za događaje"
+msgstr "Da li da postavi podrazumevani podsetnik za sastanke."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Da li da prikaže vreme u 24č obliku umesto am/pm"
+msgstr ""
+"Da li da prikaže vreme u dvadesetočasovnom obliku umesto korišćenja am/pm."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Da li da prikaže brojeve nedelja u izbiraču datuma"
+msgstr "Da li da prikaže brojeve nedelja u navigatoru datuma."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Work days"
-msgstr "Radni dani:"
+msgstr "Radni dani"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Workday end hour"
-msgstr "Čas kojim se završava radni dan"
+msgstr "Sat kojim se završava radni dan"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Workday end minute"
-msgstr "_Rad na mreži"
+msgstr "Minut kojim se završava radni dan"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Workday start hour"
-msgstr "Čas kojim počinje radni dan"
+msgstr "Sat kojim počinje radni dan"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Workday start minute"
-msgstr "Čas kojim počinje radni dan"
+msgstr "Minut kojim počinje radni dan"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Pregled sadrži"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Putanja sadrži"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Neraspodeljeno"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1942
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/dialogs/calendar-setup.c:362
+#: ../calendar/gui/gnome-cal.c:1950
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4807,817 +4737,822 @@ msgstr ""
 "Ova operacija će trajno obrisati sve događaje pre izabranog roka. Ukoliko "
 "nastavite, nećete moći da povratite ove događaje."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
-#: plugins/calendar-weather/calendar-weather.c:566
-#: widgets/misc/e-send-options.glade.h:39
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dana"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: calendar/gui/calendar-component.c:223 calendar/gui/migration.c:486
-#: calendar/gui/migration.c:579 calendar/gui/tasks-component.c:204
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Na internetu"
 
-#: calendar/gui/calendar-component.c:241 calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i godišnjice"
 
 #. Create the weather group
-#: calendar/gui/calendar-component.c:247
-#: plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:258
+#: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "abaEaMaE"
 
-#: calendar/gui/calendar-component.c:524
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Nov kalendar"
 
-#: calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:843
 msgid "Failed upgrading calendars."
 msgstr "Neuspešno dograđivanje kalendara."
 
-#: calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nije moguće otvariti kalendar '%s' za pravljenje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1155
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:1265
-#, fuzzy
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
-msgstr "Putanja kalendara"
+msgstr "Birač izvora kalendara"
 
-#: calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "Nov sastanak"
 
-#: calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "Nov sastanak"
 
-#: calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "Napravi novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "Novi celodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "Celo_dnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "Napravi novi celodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/calendar-component.c:1481
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Dnevni pregled"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Pregled radne nedelje"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Nedeljni pregled"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1264
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1264
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
-msgstr "<b>Alarm</b>\t"
+msgstr "<b>Alarm</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Podešavanja</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Ponovi</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Dodaj alarm"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Proizvoljna _poruka"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Proizvoljni zvuk alarma"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Iskačuće upozorenje"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "Pošalji:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pošalji elektronsku poruku"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Program:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "Po_novi alarm"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "posle"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "pre"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "kraj sastanka"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "pokaži još na svakih"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "sat(a)"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
-#: plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "sati"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "minut(a)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "početak sastanka"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Akcija/pokretač"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
+#: ../composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
+#: ../composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:922
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:922
+#: ../composer/e-msg-composer-attachment-bar.c:295 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "prilog"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:439
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:437
-#: plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
+#: ../calendar/gui/dialogs/meeting-page.c:784
+#: ../composer/e-msg-composer-attachment-bar.c:437
+#: ../plugins/shared-folder/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:438 mail/em-folder-tree.c:2818
-#: ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
+#: ../composer/e-msg-composer-attachment-bar.c:438
+#: ../mail/em-folder-tree.c:2820 ../ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "Po_stavke"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:440
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
+#: ../composer/e-msg-composer-attachment-bar.c:440
 msgid "_Add attachment..."
-msgstr "Dodaj prilog..."
+msgstr "_Dodaj prilog..."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:699
-#: composer/e-msg-composer-attachment-bar.c:703
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:699
+#: ../composer/e-msg-composer-attachment-bar.c:703
 msgid "Attachment Bar"
-msgstr "Prilog"
-
-#: calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: calendar/gui/dialogs/cal-attachment.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:95
-#: composer/e-msg-composer-select-file.c:115
+msgstr "Traka priloga"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:95
+#: ../composer/e-msg-composer-select-file.c:115
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje priloga"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:231
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:231
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
-#: calendar/gui/dialogs/cal-attachment.c:197
-#: calendar/gui/dialogs/cal-attachment.c:213
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:197
+#: ../calendar/gui/dialogs/cal-attachment.c:213
+#: ../composer/e-msg-composer-attachment.c:174
+#: ../composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nije moguće prilaganje datoteke %s: %s"
 
-#: calendar/gui/dialogs/cal-attachment.c:205
-#: composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:205
+#: ../composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nije moguće prilaganje datoteke %s: nije regularna datoteka"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:2
-#: composer/e-msg-composer-attachment.glade.h:2
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Podešavanja priloga"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:68
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:68
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:4
-#: composer/e-msg-composer-attachment.glade.h:4
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:5
-#: composer/e-msg-composer-attachment.glade.h:5
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME tip:"
 
 # has "activatable" set.
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:476
-#: mail/em-composer-prefs.c:888 plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Sigurno želite da uklonite ovu adresu (URL)?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Ukloni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ne uklanjaj"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:382
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Onemogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:323
-#: mail/em-account-prefs.c:351 mail/em-account-prefs.c:384
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Omogući"
 
 # bug: is zero needed?
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Uzbune</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>K_alendari za slobodno/zauzeto</b>"
+msgstr "<b>Podrazumevani server za slobodno/zauzeto</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Opšte</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
-msgstr "<b>Učestalost objavljivanja</b>"
+msgstr "<b>Objavljivanje</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Spisak zaduženja</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Vreme</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Radna nedelja</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
+"<i>%u i %d biće zamenjeni korisnikom i domenom iz elektronske adrese.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Podešavanja kalendara i zaduženja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Boja neizvršenih zaduženja posle roka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Boja zaduženja za danas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Dani"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: mail/mail-config.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:73
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
-msgstr "S_lobodan/zauzet:"
+msgstr "S_lobodno/zauzeto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Petak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Sati"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Publishing Table"
+msgstr "<b>Objavljivanje</b>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "N_ed"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Subota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsetnik"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
 msgstr "Z_aduženja za danas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr "U_to"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
-msgstr "Odeljenje:"
+msgstr "Model:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:1043
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
 msgstr "Vremenska zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "Format vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr "Početak n_edelje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
 msgstr "_12 očasovni (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
 msgstr "_24-očasovni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr "Dodaj _adresu (URL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Traži potvrdu za brisanje podataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
 msgstr "_Skupi nedelje u mesečni prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr "_Pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij ispunjena zaduženja posle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr "_Sub"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
 msgstr "_Pokaži vremena završetka sastanaka u nedeljnim i mesečnim prikazima"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr "Podela _vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr "_Uto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr "_Sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
 msgstr "pre svakog sastanka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
-msgstr ""
+msgstr "meni sa opcijama za biranje jedinica podsetnika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
-msgstr ""
+msgstr "meni sa opcijama za biranje jedinica vremena"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:284
 msgid "Copy calendar contents locally for offline operation"
-msgstr "Kopiraj sadržaj direktorijuma lokalno za rad van mreže"
+msgstr "Kopira sadržaj kalendara lokalno za rad van mreže"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Boja:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:373
 msgid "Tasks List"
 msgstr "Spisak zaduženja"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:440
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Task List Properties"
 msgstr "Osobine spiska zaduženja"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Dodaj kalendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Dodaj spisak zaduženja"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:104
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Dodaj kalendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Dodaj spisak zaduženja"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "O_sveži:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_Adresa (URL):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "nedelje"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ovo zaduženje je obrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Ovaj unos u dnevnik je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Načinili ste promene. Da ih zanemarim i zatvorim uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste načinili promene, da zatvorim uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Ovaj događaj je promenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ovo zaduženje je promenjeno."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Ovaj unos u dnevnik je promenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Načinili ste promene. Da ih zanemarim i osvežim uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste načinili promene, da osvežim uređivač?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " za "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Do "
 
-#: calendar/gui/dialogs/comp-editor.c:181 composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2676
 #, c-format
 msgid "Attached message - %s"
 msgstr "Priložena poruka - %s"
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:186
-#: calendar/gui/dialogs/comp-editor.c:349 composer/e-msg-composer.c:2681
-#: composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:186
+#: ../calendar/gui/dialogs/comp-editor.c:349 ../composer/e-msg-composer.c:2681
+#: ../composer/e-msg-composer.c:2844
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Priložena poruka"
+msgstr[0] "%d prikačena poruka"
 msgstr[1] "%d prikačene poruke"
 msgstr[2] "%d prikačenih poruka"
 
-#: calendar/gui/dialogs/comp-editor.c:412 calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1402 composer/e-msg-composer.c:2906
-#: mail/em-folder-tree.c:1046 mail/em-folder-view.c:966
-#: mail/message-list.c:1707 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:105 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/dialogs/comp-editor.c:412
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1406 ../composer/e-msg-composer.c:2906
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:980
+#: ../mail/message-list.c:1707 ../ui/evolution-addressbook.xml.h:31
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:105 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/dialogs/comp-editor.c:413 composer/e-msg-composer.c:2907
-#: mail/em-folder-tree.c:1047 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862 mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:413 ../composer/e-msg-composer.c:2907
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:876 ../mail/message-list.c:1708
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: calendar/gui/dialogs/comp-editor.c:415 composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1049 mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:415 ../composer/e-msg-composer.c:2909
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1710
 msgid "Cancel _Drag"
 msgstr "Otkaži _prevlačenje"
 
-#: calendar/gui/dialogs/comp-editor.c:682
+#: ../calendar/gui/dialogs/comp-editor.c:682
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:843 composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:843 ../composer/e-msg-composer.c:2310
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -5625,323 +5560,323 @@ msgstr[0] "<b>%d</b> datoteka prikačena"
 msgstr[1] "<b>%d</b> datoteke prikačene"
 msgstr[2] "<b>%d</b> datoteka prikačeno"
 
-#: calendar/gui/dialogs/comp-editor.c:900 composer/e-msg-composer.c:2339
+#: ../calendar/gui/dialogs/comp-editor.c:900 ../composer/e-msg-composer.c:2339
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:955 composer/e-msg-composer.c:2342
-#: composer/e-msg-composer.c:3471
+#: ../calendar/gui/dialogs/comp-editor.c:903
+#: ../calendar/gui/dialogs/comp-editor.c:955 ../composer/e-msg-composer.c:2342
+#: ../composer/e-msg-composer.c:3487
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
 
-#: calendar/gui/dialogs/comp-editor.c:979 composer/e-msg-composer.c:3493
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../composer/e-msg-composer.c:3509
 msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
+msgstr "Dugme za priloge: pritisni razmaknicu za prikaz trake za priloge"
 
-#: calendar/gui/dialogs/comp-editor.c:1526
-#: calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1540
+#: ../calendar/gui/dialogs/comp-editor.c:1583
 msgid "Edit Appointment"
 msgstr "Uredi sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:1532
-#: calendar/gui/dialogs/comp-editor.c:1575
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:1546
+#: ../calendar/gui/dialogs/comp-editor.c:1589
+#, c-format
 msgid "Meeting - %s"
-msgstr "Sastanak"
+msgstr "Sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1534
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1538
-#: calendar/gui/dialogs/comp-editor.c:1581
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:1552
+#: ../calendar/gui/dialogs/comp-editor.c:1595
+#, c-format
 msgid "Assigned Task - %s"
-msgstr "_Dobijeno zaduženje"
+msgstr "Dobijeno zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1540
-#: calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1597
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1543
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1600
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1554
-#: calendar/gui/dialogs/comp-editor.c:1596
+#: ../calendar/gui/dialogs/comp-editor.c:1568
+#: ../calendar/gui/dialogs/comp-editor.c:1610
 msgid "No summary"
 msgstr "Nema pregleda"
 
-#: calendar/gui/dialogs/comp-editor.c:2030
-#: calendar/gui/dialogs/comp-editor.c:2063
-#: calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2106
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Promene načinjene na ovom predmetu mogu biti zanemarene ako bude osvežen"
 
-#: calendar/gui/dialogs/comp-editor.c:2111
+#: ../calendar/gui/dialogs/comp-editor.c:2130
 msgid "Unable to use current version!"
 msgstr "Nije moguće korisšćenje tekuće verzije!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Nije moguće otvaranje izvora"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Nije moguće otvoranje odredišta"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Odredište se može samo čitati"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zaduženje nije moglo biti obrisano zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj nije mogao biti obrisan usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Zaduženje nije moglo biti obrisano usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Unos nije mogao biti obrisan usled greške"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "_Kontakti..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Delegiraj:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Povraćaj"
 
-#: calendar/gui/dialogs/event-editor.c:161
-#: calendar/gui/dialogs/event-editor.c:233
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:402
 msgid "Scheduling"
 msgstr "Zakazivanje"
 
-#: calendar/gui/dialogs/event-editor.c:168
-#: calendar/gui/dialogs/event-editor.c:236
-#: calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:173
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:405
 msgid "Invitations"
 msgstr "Pozivnice"
 
-#: calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:721
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:724
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: calendar/gui/dialogs/event-page.c:894 calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:557
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:900
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:923
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:930
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1676
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvaranje kalendara '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1881
+#: ../calendar/gui/dialogs/event-page.c:1882
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "%d dan pre sastanka"
+msgstr[0] "%d dan pre zakazanog sastanka"
 msgstr[1] "%d dana pre zakazanog sastanka"
 msgstr[2] "%d dana pre zakazanog sastanka"
 
-#: calendar/gui/dialogs/event-page.c:1889
+#: ../calendar/gui/dialogs/event-page.c:1890
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "%d čas pre sastanka"
+msgstr[0] "%d čas pre zakazanog sastanka"
 msgstr[1] "%d časa pre zakazanog sastanka"
 msgstr[2] "%d časova pre zakazanog sastanka"
 
-#: calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/event-page.c:1898
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minut pre sastanka"
+msgstr[0] "%d minut pre zakazanog sastanka"
 msgstr[1] "%d minuta pre zakazanog sastanka"
 msgstr[2] "%d minuta pre zakazanog sastanka"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "1 dan pre sastanka"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 čas pre sastanka"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minuta pre sastanka"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Osnove</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Date and Time</b>"
 msgstr "<b>Datum i vreme</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
-msgstr "<b>Podešavanja</b>"
+msgstr "<b>Podešavanja slanja</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "C_elodnevni događaj"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Ad_vanced  send options"
-msgstr ""
+msgstr "Na_predne  opcije slanja"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "_Prilagodi..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_ndar:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "_Razvrstavanje:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305 calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
-msgstr "aaPaIb"
+msgstr "Opis događaja"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Mesto:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254 calendar/gui/e-cal-model.c:303
-#: calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Lično"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301 calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "Pre_gled:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Ovaj sastanak ima proizvoljne alarme"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
@@ -5955,453 +5890,454 @@ msgstr "_Vreme početka:"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2117 filter/filter-rule.c:878
-#: mail/em-account-editor.c:685 mail/em-account-editor.c:1291
-#: mail/em-account-prefs.c:437 mail/em-folder-view.c:993
-#: plugins/calendar-weather/calendar-weather.c:371
-#: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1376
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:296
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2117
+#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1288 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1009
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
+#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ništa"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:435
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:441
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:456
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:781
 msgid "_Delegate To..."
 msgstr "_Delegiraj..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:308
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:309
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "_Učesnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Pritisnite ovde da dodate učesnika"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Zajedničko ime"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegirano od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegirano za"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Jezik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Član"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:333
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:334
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:146
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:340
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:341
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "<b>Att_endees</b>"
 msgstr "<b>Učesni_ci</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "C_hange Organizer"
 msgstr "_Promeni organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Kon_takti..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
-#, fuzzy
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
 msgid "Organizer"
-msgstr "Organizator:"
+msgstr "Organizator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Podešavanja kalendara</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Dodaj novi kalendar"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Grupa kalendara"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Putanja kalendara"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Ime kalendara"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Podešavanja spiska zaduženja</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Dodaj novi spisak zaduženja"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Ime spiska zaduženja"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Menjate povratni događaj, šta želite da izmenite?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Menjate povratno zaduženje, šta želite da izmenite?"
 
 # povratni > redovni
-#: calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Menjate povratni unos u dnevnik, šta želite da izmenite?"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Ovaj i buduće unose"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovaj sastanak sadrži povratne podatke koje Evolucija ne može da uredi."
 
-#: calendar/gui/dialogs/recurrence-page.c:812
+#: ../calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Datum povraćaja je neispravan"
 
-#: calendar/gui/dialogs/recurrence-page.c:923
+#: ../calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "prvoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "drugoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "trećoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "četvrtoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "poslednjoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Izuzeci</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Prikaz</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ponavljanje</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Svakih"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "Ovaj sastanak se po_navlja"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "uvek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesec(a)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nedelja(e)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: calendar/gui/dialogs/task-details-page.c:522
-#, fuzzy
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
-msgstr "Web stranica:"
+msgstr "Web strana"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#, fuzzy
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Razno\t</span>"
+msgstr "<span weight=\"bold\">Razno</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Stanje</span>"
 
 # timezone.
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:658
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361
 msgid "Completed"
 msgstr "Gotovo"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1006
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1007
 msgid "High"
 msgstr "Visoko"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-cal-model-tasks.c:731 calendar/gui/e-calendar-table.c:456
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "U toku"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:384 mail/message-list.c:1004
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1005
 msgid "Low"
 msgstr "Nisko"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:899
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1005
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../mail/message-list.c:1006
 msgid "Normal"
 msgstr "Obično"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Nije pokrenuto"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "P_rocenat završenog:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Nedefinisano"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Datum završetka:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Važnost:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Web stranica:"
 
-#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Zaduženje"
 
-#: calendar/gui/dialogs/task-editor.c:157
-#: calendar/gui/dialogs/task-editor.c:219
-#: calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:530
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:874
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zaduženja u '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ad_vanced send options"
-msgstr ""
+msgstr "Na_predne opcije slanja"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "Datum p_očetka:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-#, fuzzy
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
-msgstr "aaPaIb"
+msgstr "Opis zaduženja"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "Datum _za završetak:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>K_alendari za slobodno/zauzeto</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Učestalost objavljivanja</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Mesto objavljivanja</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
-msgstr "Putanja objavljivanja stanja slobodan/zauzet"
+msgstr "Podešavanja objavljivanja slobodno/zauzeto"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Dnevno"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Ručno"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Nedeljno"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6409,7 +6345,7 @@ msgstr[0] "%d dan"
 msgstr[1] "%d dana"
 msgstr[2] "%d dana"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -6417,7 +6353,7 @@ msgstr[0] "%d nedelja"
 msgstr[1] "%d nedelje"
 msgstr[2] "%d nedelja"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -6425,7 +6361,7 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -6433,7 +6369,7 @@ msgstr[0] "%d minut"
 msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -6441,130 +6377,134 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Izvršiće se nepoznata akcija"
 
-#: calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pre početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:477
+#: ../calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
-#: calendar/gui/e-alarm-list.c:482
+#: ../calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pre kraja sastanka"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2573
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2614
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Bez imena"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Pregled:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Datum završetka:"
 
 #. write status
 #. translators: exchange out of office status header
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:209
-#: plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:209
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Važnost:"
 
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Web stranica:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Datum završetka"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Datum početka"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Summary"
 msgstr "Pregled"
 
-#: calendar/gui/e-cal-model-calendar.c:179 calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
 msgid "Free"
 msgstr "Slobodno"
 
-#: calendar/gui/e-cal-model-calendar.c:182 calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/e-cal-model-tasks.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6574,260 +6514,268 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/e-cal-model-tasks.c:1017 calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1173 plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1398
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:139
+#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
+#: ../plugins/itip-formatter/itip-formatter.c:251
+#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:201 ../shell/e-component-registry.c:205
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Povratno"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:516
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
-msgstr "Osvežavanje zaduženja"
+msgstr "Tabela zaduženja"
 
-#: calendar/gui/e-calendar-table.c:694 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: calendar/gui/e-calendar-table.c:873 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Osveživanje objekata"
 
-#: calendar/gui/e-calendar-table.c:1014 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1066 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: calendar/gui/e-calendar-table.c:1156 calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1399 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
 
-#: calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "Otvori _Web stranu"
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1396
-#: mail/em-folder-view.c:976 mail/em-popup.c:494
-#: ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1400 ../mail/em-folder-view.c:990
+#: ../mail/em-popup.c:494 ../ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1376
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1380
+#: ../calendar/gui/e-calendar-view.c:1401 ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: calendar/gui/e-calendar-table.c:1163 calendar/gui/e-calendar-view.c:1401
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1405 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
-#: calendar/gui/e-calendar-table.c:1165 calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-view.c:1403 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:119 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1407 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Na_lepi"
 
-#: calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1414
-#: mail/em-folder-tree.c:2814 mail/em-folder-view.c:980
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1418 ../mail/em-folder-tree.c:2816
+#: ../mail/em-folder-view.c:994 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: calendar/gui/e-calendar-table.c:1328
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pritisni za novo zaduženje"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Gotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Završeno"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Datum za završetak"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Važnost"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Datum početka"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Razvrstavanje zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1187
 msgid "Moving items"
 msgstr "Premeštanje unosa"
 
-#: calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1189
 msgid "Copying items"
 msgstr "Kopiranje unosa"
 
-#: calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1374
 msgid "New _Appointment..."
 msgstr "Nov _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1375
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1377
 msgid "New Task"
 msgstr "Novo zaduženje"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1387
 msgid "Current View"
 msgstr "Trenutan pogled"
 
-#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1389 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
-#: calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1390
 msgid "_Select Date..."
 msgstr "_Izaberi datum..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1391 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatak slobodno/zauzeto"
 
-#: calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1411
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1412
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1413
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1414
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1419
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1420
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1421
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
@@ -6840,8 +6788,8 @@ msgstr "Obriši _sve pojave"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -6854,12 +6802,12 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6870,7 +6818,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
@@ -6886,28 +6834,28 @@ msgstr "%02i minutni razmaci"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715 calendar/gui/e-day-view.c:1494
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1494
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povraćaj)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6915,7 +6863,7 @@ msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6924,7 +6872,7 @@ msgstr[1] "Svake %d nedelje"
 msgstr[2] "Svakih %d nedelja"
 
 # ovo će teško biti 21, 31, 41, ...
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6932,22 +6880,22 @@ msgstr[0] "Svake nedelje u "
 msgstr[1] "Svake %d nedelje u "
 msgstr[2] "Svakih %d nedelja u "
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " i "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
 # slično kao za nedelje
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6956,7 +6904,7 @@ msgstr[1] "svaka %d meseca"
 msgstr[2] "svakih %d meseci"
 
 # slično kao za mesece i nedelje
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6964,7 +6912,7 @@ msgstr[0] "Svake godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "Svakih %d godina"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6972,42 +6920,42 @@ msgstr[0] "ukupno %d put"
 msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", završavajući se "
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Počinje"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Završava se"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Rok"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar podaci"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar greška"
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:329
-#: plugins/itip-formatter/itip-view.c:330
-#: plugins/itip-formatter/itip-view.c:397
-#: plugins/itip-formatter/itip-view.c:398
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7015,410 +6963,417 @@ msgstr ""
 "<br>  Proverite sledeću informaciju, i potom odaberite akciju iz donjeg "
 "menija."
 
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:421 plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:424
-#: plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453
-#: plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Sastanak je otkazan, međutim, ne može se naći u vašim kalndarima"
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "Zaduženje je otkazano, međutim, ne može se naći u vašim spiskovima zaduženja"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio(la) informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Informacija o sastanku"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi da doda postojećem sastanku"
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Promena sastanka"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnoviju informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Zahtev za promenama o sastanku"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio(la) na zahtev za sastanak."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo(la) sastanak."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Otkazivanje sastanka"
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao(la) nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio(la) informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži %s za obavljanje zaduženja."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b želi da doda postojećem zaduženju."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Osvežavanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Zahtev za promenama zaduženja"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio(la) na dodeljeno zaduženje."
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao(la) zaduženje."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Otkazivanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio(la) slobodno/zauzeto informaciju."
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Slobodno/zauzeto informacija"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži Vašu slobodno/zauzeto informaciju."
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Slobodno/zauzeto zahtev"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio(la) na slobodno/zauzeto zahtev."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Slobodno/zauzeto odgovor"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodno/zauzeto poruka"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema unose kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Osvežavanje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat je neispravan i ne može biti osvežen\n"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan učesnik.  Da ga dodam u prisutne?"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status učesnika nije osvežen zbog neispravnog statusa!\n"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Osvežen status učesnika\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:852
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:852
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status učesnika nije osvežen jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Izaberite akciju:"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Osveži"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodno/zauzeto informaciju"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Osveži status stranke"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:441
-#: mail/mail-send-recv.c:414 mail/mail-send-recv.c:466
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
+#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--za--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Poruka kalendara"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Datum:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Učitavanje kalendara"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Učitavanje kalendara..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Poruka servera:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "datum-završetka"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "datum-početka"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:60
+#: ../calendar/gui/e-meeting-list-view.c:124
 msgid "Required Participants"
 msgstr "Zahtevano prisustvovanje"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Izvori"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:135
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:136
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:137
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Izvor"
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:138
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Mesto"
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Potrebna akcija"
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "S rezervom"
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "U toku"
 
 # %B = full month name, %d = month day, %Y = full year.
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7433,9 +7388,9 @@ msgstr "%A, %B %d, %Y"
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:448
-#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7450,69 +7405,69 @@ msgstr "%a %m/%d/%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Nema informacije"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "Po_dešavanja"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Osveži slobodno/zauzeto"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automatski odaberi"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Sve ljude i resurse"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan resurs"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: calendar/gui/e-tasks.c:763 calendar/gui/gnome-cal.c:2372
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2382
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7521,189 +7476,187 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Učitavanje zaduženja"
 
-#: calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaranje zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Završavanje zaduženja..."
 
-#: calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Brisanje izabranih objekata..."
 
-#: calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: calendar/gui/e-timezone-entry.c:133
-#, fuzzy
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
-msgstr "Vremenska zona"
+msgstr "Dugme za vremensku zonu"
 
 # month name. You can change the order but don't
 # change the specifiers or add anything.
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:722
 msgid "Updating query"
 msgstr "Osvežavanje upita"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2057 widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2065 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: calendar/gui/gnome-cal.c:2058
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:2066
 msgid "Save Custom View"
-msgstr "Sačuvaj prilagođen pregled..."
+msgstr "Čuva prilagođen prikaz"
 
-#: calendar/gui/gnome-cal.c:2063 widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2071 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
-#: calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2231
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavanje sastanaka sa %s"
 
-#: calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2250
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavanje zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:2338
+#: ../calendar/gui/gnome-cal.c:2348
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
 
-#: calendar/gui/gnome-cal.c:3228
+#: ../calendar/gui/gnome-cal.c:3238
 msgid "Purging"
 msgstr "Brisanje"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Avgust"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Decembar"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Februar"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Jul"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Jun"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Novembar"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktobar"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Izaberite datum"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembar"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Izaberi današnji dan"
 
-#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318
-#: calendar/gui/itip-utils.c:350
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: calendar/gui/itip-utils.c:305
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Informacija o događaju"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Informacija o unosu u dnevnik"
 
-#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto informacija"
 
-#: calendar/gui/itip-utils.c:401
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Informacija o kalendaru"
 
-#: calendar/gui/itip-utils.c:437
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Osveženo"
 
-#: calendar/gui/itip-utils.c:445
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:449
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Kontra-predlog"
 
-#: calendar/gui/itip-utils.c:520
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto informacija (%s do %s)"
 
-#: calendar/gui/itip-utils.c:530
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: calendar/gui/itip-utils.c:672
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7715,7 +7668,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7728,250 +7681,260 @@ msgstr ""
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:745 calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nije moguć prenos starih podešavanja iz evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Nije moguć prenos kalendara `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nije moguć prenos zaduženja `%s'"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "Ne"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ut"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "Sr"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "Če"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Su"
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izabrani dan (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d. %Y."
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d. %b %Y."
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izabrana nedelja (%s t %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Izabran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Izabrana godina (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Summary: %s"
+msgstr "Pregled:"
+
+#: ../calendar/gui/print.c:2328
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "Mesto:"
+
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenat završenog: %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa (URL): %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontakti: "
 
-#: calendar/gui/print.c:2565 calendar/gui/print.c:2653
-#: calendar/gui/print.c:2779 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Prikaz štampe"
 
-#: calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Štampaj unos"
 
-#: calendar/gui/tasks-component.c:428
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr "Novi spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:504
+#: ../calendar/gui/tasks-component.c:515
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7979,7 +7942,7 @@ msgstr[0] "%d zaduženje"
 msgstr[1] "%d zaduženja"
 msgstr[2] "%d zaduženja"
 
-#: calendar/gui/tasks-component.c:506 mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:544
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7987,62 +7950,61 @@ msgstr[0] "%d izabrano"
 msgstr[1] "%d izabrana"
 msgstr[2] "%d izabranih"
 
-#: calendar/gui/tasks-component.c:553
+#: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Neuspešno dograđivanje zaduženja."
 
-#: calendar/gui/tasks-component.c:847
+#: ../calendar/gui/tasks-component.c:858
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvaranje spiska zaduženja '%s' za pravljenje događaja i sastanaka"
 
-#: calendar/gui/tasks-component.c:862
+#: ../calendar/gui/tasks-component.c:873
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za pravljenje zaduženja"
 
-#: calendar/gui/tasks-component.c:956
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:967
 msgid "Task Source Selector"
-msgstr "Izvori nisu izabrani."
+msgstr "Birač izvora zaduženja"
 
-#: calendar/gui/tasks-component.c:1139
+#: ../calendar/gui/tasks-component.c:1150
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1140
+#: ../calendar/gui/tasks-component.c:1151
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:1141
+#: ../calendar/gui/tasks-component.c:1152
 msgid "Create a new task"
 msgstr "Napravi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1147
+#: ../calendar/gui/tasks-component.c:1158
 msgid "New assigned task"
 msgstr "Novo dobijeno zaduženje"
 
-#: calendar/gui/tasks-component.c:1148
+#: ../calendar/gui/tasks-component.c:1159
 msgid "Assigne_d Task"
 msgstr "_Dobijeno zaduženje"
 
-#: calendar/gui/tasks-component.c:1149
+#: ../calendar/gui/tasks-component.c:1160
 msgid "Create a new assigned task"
 msgstr "Dodeli novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1155
+#: ../calendar/gui/tasks-component.c:1166
 msgid "New task list"
 msgstr "Novi spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:1156
+#: ../calendar/gui/tasks-component.c:1167
 msgid "Task l_ist"
 msgstr "_Spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:1157
+#: ../calendar/gui/tasks-component.c:1168
 msgid "Create a new task list"
 msgstr "Napravi novi spisak zaduženja"
 
-#: calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:370
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8054,52 +8016,52 @@ msgstr ""
 "\n"
 "Stvarno da obrišem ova zaduženja?"
 
-#: calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "NPUSČPS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolucija kalendar inteligentni uvoznik"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Evolucija iCalendar uvoznik"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Evolucija vCalendar uvoznik"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar datoteke (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Sastanci"
 
-#: calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Podsetnik!!"
 
-#: calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: calendar/importers/icalendar-importer.c:719
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -8114,1539 +8076,1540 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidžan"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Afrika/Akra"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Adis_Abeba"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžir"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjui"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Afrika/Bisao"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Afrika/Biantir"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazavil"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Budžumbura"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Afrika/Kazablanka"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Afrika/Seuta"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Afrika/Konakri"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salam"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Afrika/DŽibuti"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Afrika/Duala"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aun"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Afrika/Fritaun"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaboroni"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johanesburg"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Afrika/Katum"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinšasa"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Afrika/Libervil"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Afrika/Lomi"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbaši"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "AfrikaMogadiš"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovija"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndžamena"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamej"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nuakšot"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ugadugu"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Afrika/Vindek"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Amerika/Ankorejdž"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Amerika/Angila"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Amerika/Antigva"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Amerika/Aragvajana"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Amerika/Asankon"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Amerika/Bolze"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Kembridž_Bej"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Amerika/Kankun"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Amerika/Karakas"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Amerika/Katamarka"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Amerika/Kajen"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Amerika/Kajman"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Amerika/Čikago"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Amerika/Čihuahua"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Amerika/Kordoba"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Amerika/Kulaba"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Amerika/Kurakao"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Denmarkšon"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Amerika/Doson"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Doson_Krik"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Amerika/Erunepe"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glejs_Bej"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Amerika/Gotab"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Amerika/Gus_Bej"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grend_Turk"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Amerika/Gvadalup"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Amerika/Gvatemala"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Amerika/Gvajakil"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Amerika/Gvajana"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Amerika/Halifaks"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosilo"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indijana/Indijanapolis"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indijana/Noks"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indijana/Marengo"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indijana/Vivej"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Amerika/Indijanapolis"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Amerika/Ajnuvik"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Amerika/Ikvalit"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Amerika/DŽudžui"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Amerika/DŽuno"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentaki/Liusvil"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentaki/Montikelo"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Anđeles"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Amerika/Luisvil"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Amerika/Makio"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Amerika/Managva"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Amerika/Martinik"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Amerika/Macatian"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Amerika/Menomini"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Amerika/Meksiko_Siti"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "Amerika/Mikuelon"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Amerika/Monterej"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Amerika/Monserat"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Amerika/Nasau"
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/Njujork"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Amerika/Nomi"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Amerika/Noroha"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/Severna_Dakota/Senter"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Amerika/Feniks"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Porto_Prins"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_Of_Spejn"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Amerika/Portovelo"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Portoriko"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Amerika/Rejni_River"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Renkin_Inlet"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Amerika/Resifi"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branko"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Amerika/Rozario"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Amerika/Santjago"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sap_Paolo"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Amerika/Skorsbajsand"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Amerika/Šiprok"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Amerika/Sent_DŽon"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Amerika/Sent_Kits"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Amerika/Sent_Lusija"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Amerika/Sent_Tomas"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Amerika/Sent_Vinsent"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Amerika/Svift_Karent"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegusigalpa"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Amerika/Tule"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Tander_Bej"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Amerika/Tihuana"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Amerika/Vankuver"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Amerika/Vajthors"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Amerika/Vivipeg"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Amerika/Jakutat"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Amerika/Jelounajf"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Kejsi"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Dejvis"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/Dumontdurvil"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Moson"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/Mek_Mardo"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/Saut_Pol"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Sijova"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longjerbijen"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Azija/Ajmati"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Azija/Aman"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadir"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Azija/Akto"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aktobe"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Azija/Ašgabat"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrejn"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Azija/Bankok"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Azija/Bejrut"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Azija/Biškek"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Azija/Brunej"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Azija/Kalkuta"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Azija/Kobajsan"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Azija/Čongking"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Azija/Kolombo"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Azija/Damask"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Azija/Daka"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Azija/Dubai"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dušanbe"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hong_Kong"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Azija/Houd"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Azija/DŽakarta"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Azija/DŽajapura"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jerusalim"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kamčatka"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Azija/Karači"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Azija/Kašgar"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnojarsk"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Azija/Kučing"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuvajt"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Azija/Makao"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Azija/Makau"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Azija/Makasar"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Azija/Muskat"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Azija/Nikozija"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Azija/Oral"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Fom_Pen"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Azija/Peking"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Azija/Katar"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Azija/Kizilorda"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangun"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Azija/Rijad"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Azija/Sajgon"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Azija/Sahalin"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkard"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Azija/Šangaj"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Azija/Tajpej"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Azija/Taškent"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Azija/Timfu"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokio"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Udžung_Pandang"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulan_Bator"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumki"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Azija/Vijentan"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Azija/Jakutsk"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Jekaterinburg"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Azija/Jerevan"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanari"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kejp_Verde"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Feroe"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Majen"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madera"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reikjavik"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Saut_DŽordžija"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sent_Helena"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stenli"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australija/Adelaida"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australija/Brisbejn"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Broken_Hil"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australija/Darvin"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australija/Linderman"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Ove"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australija/Melburn"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australija/Pert"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australija/Sidnej"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Avropa/Andora"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Evropa/Atina"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Evropa/Beograd"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlin"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Evropa/Brisel"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukurešt"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Evropa/Budimpešta"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Evropa/Čisinau"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Avropa/Kopenhagen"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Evropa/Dablin"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibraltar"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Evropa/Kaljingrad"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lisabon"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Ljubljana"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Evropa/London"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Luksemburg"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nikozija"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Evropa/Pariz"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Evropa/Prag"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Evropa/Rim"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Evropa/Simferopol"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Evropa/Skoplje"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofija"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stokholm"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Evropa/Talin"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Uznogorod"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Evropa/Vaduz"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikan"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Evropa/Beč"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnus"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Evropa/Zagreb"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaropozje"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Evropa/Cirih"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indijski/Antananarivo"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indijski/Kagos"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indijski/Kristmas"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indijski/Kokos"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indijski/Komoro"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indijski/Kergelen"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indijski/Mahe"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indijski/Maldivi"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indijski/Mauricijus"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indijski/Majot"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indisjki/Rejunion"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Oklend"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Čatam"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacifik/Ister"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efate"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Endenburi"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacifik/Fakaofo"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fidži"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambler"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Gvadakanal"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacifik/DŽonson"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kozre"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kuadžalin"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Madžuro"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Markesas"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midvej"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacifik/Nie"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacifi/Numea"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitkern"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresbi"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Sajpan"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarava"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacifik/Vejk"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Volis"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Posting destination"
 msgstr "Odredište"
 
-#: composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:521
 msgid "Choose folders to post the message to."
 msgstr "Izaberite direktorijume za slanje poruke."
 
-#: composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:555
 msgid "Click here for the address book"
 msgstr "Pritisnite ovde za adresar."
 
@@ -9661,51 +9624,45 @@ msgstr "Pritisnite ovde za adresar."
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:584
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:585
 msgid "_Reply-To:"
-msgstr "Odgovor-za:"
+msgstr "_Odgovor:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:591
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:592
 msgid "Fr_om:"
-msgstr "Od:"
+msgstr "Š_alje:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:598
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:599
 msgid "S_ubject:"
-msgstr "Naslov:"
+msgstr "Na_slov:"
 
-#: composer/e-msg-composer-hdrs.c:608
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "_To:"
-msgstr "Za:"
+msgstr "_Prima:"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:610
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: composer/e-msg-composer-hdrs.c:612
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "_Cc:"
-msgstr "Kopija:"
+msgstr "_Kopija (Cc):"
 
-#: composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti kopiju (cc) poruke"
 
-#: composer/e-msg-composer-hdrs.c:616
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid "_Bcc:"
-msgstr "Nevidljiva kopija:"
+msgstr "_Nevidljiva kopija (Bcc):"
 
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9716,27 +9673,26 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:624
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Post To:"
-msgstr "Pošalji:"
+msgstr "S_lanje na:"
 
-#: composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Click here to select folders to post to"
 msgstr "Pritisnite ovde da izaberete direktorijume za slanje"
 
-#: composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:636
 msgid "Post To:"
 msgstr "Pošalji:"
 
-#: composer/e-msg-composer.c:730
+#: ../composer/e-msg-composer.c:730
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljen sertifikat za "
 "potpisivanje za ovaj nalog"
 
-#: composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:737
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9744,44 +9700,42 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljen sertifikat za "
 "šifrovanje za ovaj nalog"
 
-#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1292
 msgid "Could not open file"
 msgstr "Nije moguće otvaranje datoteke"
 
-#: composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1300
 msgid "Unable to retrieve message from editor"
 msgstr "Nije moguće dobiti poruku iz uređivača"
 
-#: composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1570
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1604
-#, fuzzy
+#: ../composer/e-msg-composer.c:1604
 msgid "Open File"
-msgstr "Otvori datoteku"
+msgstr "Otvara datoteku"
 
-#: composer/e-msg-composer.c:2001 mail/em-account-editor.c:588
-#: mail/em-account-editor.c:633 mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2001 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Autogenerisan"
 
-#: composer/e-msg-composer.c:2100
-#, fuzzy
+#: ../composer/e-msg-composer.c:2100
 msgid "Si_gnature:"
-msgstr "Potpis:"
+msgstr "Potp_is:"
 
-#: composer/e-msg-composer.c:2359 composer/e-msg-composer.c:3360
-#: composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2359 ../composer/e-msg-composer.c:3376
+#: ../composer/e-msg-composer.c:3377
 msgid "Compose a message"
 msgstr "Sastavi poruku"
 
-#: composer/e-msg-composer.c:4542
+#: ../composer/e-msg-composer.c:4570
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9789,22 +9743,22 @@ msgstr ""
 "<b>(Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno.)<b>"
 
 #. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Ne možete priložiti datoteku `{0}' ovoj poruci."
 
 #. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Datoteka `{0}' nije regularna i ne može biti poslata u poruci."
 
 #. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
 msgstr "Direktorijumi se ne mogu prilagati porukama."
 
 #. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer-errors.xml.h:10
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9813,7 +9767,7 @@ msgstr ""
 "pojedinačno, ili napravite arhivu direktorijuma i priložite je."
 
 #. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer-errors.xml.h:12
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Nije moguće dobiti poruke za prilaganje od {0}."
 
@@ -9828,25 +9782,25 @@ msgstr "Nije moguće dobiti poruke za prilaganje od {0}."
 #. mail:no-delete-folder secondary
 #. system:no-save-file secondary
 #. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:105
-#: mail/mail-errors.xml.h:117 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
+#: ../composer/mail-composer-errors.xml.h:14
+#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
+#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
+#: ../widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Zbog \"{1}\"."
 
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Pronađene nedovršene poruke"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Želite li da spasite nedovršene poruke?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9854,38 +9808,38 @@ msgstr ""
 "Evolucija je neočekivano završila tokom pisanja nove poruke. Spašavanje poruke "
 "će vam omogućiti da nastavite gde ste stali."
 
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Ne spašavaj"
 
-#: composer/mail-composer-errors.xml.h:22
+#: ../composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Spasi"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nije moguće čuvanje u samočuvajuću datoteku \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Greška u čuvanju samočuvajuće datoteke zbog \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
+#: ../composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmenjena poruka"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Sigurno želite da odbacite poruku, naslovljenu '{0}', koju sastavljate?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9895,56 +9849,54 @@ msgstr ""
 "odlučite da sačuvate poruku u direktorijumu Priprema. Ovo će vam omogućiti "
 "da nastavite poruku kasnije."
 
-#: composer/mail-composer-errors.xml.h:33
-#, fuzzy
+#: ../composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
-msgstr "Zanemari promene"
+msgstr "_Zanemari promene"
 
-#: composer/mail-composer-errors.xml.h:34
-#, fuzzy
+#: ../composer/mail-composer-errors.xml.h:34
 msgid "_Save Message"
-msgstr "Sačuvaj poruku"
+msgstr "Sač_uvaj poruku"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Nije moguće pravljenje poruke."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Zbog \"{0}\", može biti potrebno biranje drugačijih podešavanja pošte."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
+#: ../composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nije moguće čitanje datoteke potpisa \"{0}\"."
 
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
 # mail-composer:no-editor-control primary
 #. mail-composer:no-address-control primary
 #. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
+#: ../composer/mail-composer-errors.xml.h:48
+#: ../composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Nije moguće napraviti prozor za sastavljanje poruke."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: ../composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Nije moguće pokretanje kontrole biranja adresa."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9955,23 +9907,23 @@ msgstr ""
 "\n"
 "Proverite da li imate odgovarajuće verzije gtkhtml i libgtkhtml na sistemu."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:521
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:517
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Paket programa Evolucija"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "karta adresara"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "podaci o kalendaru"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9981,15 +9933,15 @@ msgstr ""
 "\n"
 "Želite li da promenite status u \"U kancelariji\"? "
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Poruka za van kancelarije:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9999,39 +9951,39 @@ msgstr ""
 "pošalje\n"
 "poštu dok ste van kancelarije.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "Trenutno sam u kancelariji"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Trenutno sam van kancelarije"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Ne, ne menjaj status"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Asistent van kacelarije"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Da, promeni status"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Primanje pošte</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Slanje pošte:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10043,37 +9995,37 @@ msgstr ""
 "poruku radi obaveštenja kada bude pročitana, i da odredite šta Evolucija da "
 "radi kada neko vama pošalje priznanicu.</small>"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
 msgstr "Uvek vrati priznanicu"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Pitaj me želim li da vratim priznanicu"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Nikada vraćaj priznanicu"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Priznanice"
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Zatraži povraćaj priznanice za sve poruke koje pošaljem"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Osim ako je poruka poslata dopisnom društvu, a ne lično meni"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr "Kada primite poruku sa priznanicom, šta Evolucija da radi?"
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10082,7 +10034,7 @@ msgstr ""
 "Prepisati je?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Prepisati datoteku?"
 
@@ -10093,7 +10045,7 @@ msgstr "Prepisati datoteku?"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -10104,73 +10056,73 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # in 12-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # in 24-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y. %H:%M:%S"
 
 # without seconds.
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y. %I:%M %p"
 
 # without seconds.
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y. %H:%M"
 
 # without minutes or seconds.
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y. %I %p"
 
 # without minutes or seconds.
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y. %H"
 
 # strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 # strftime format of a time in 24-hour format.
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -10183,8 +10135,8 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10195,22 +10147,21 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
-#: e-util/eggtrayicon.c:119
-#, fuzzy
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
-msgstr "Opis priloga."
+msgstr "Orijentacija zone."
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10218,7 +10169,7 @@ msgstr[0] "pre jedne sekunda"
 msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10226,7 +10177,7 @@ msgstr[0] "pre jednog minuta"
 msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10234,7 +10185,7 @@ msgstr[0] "pre jednog sata"
 msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10242,7 +10193,7 @@ msgstr[0] "juče"
 msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10250,7 +10201,7 @@ msgstr[0] "prošle nedelje"
 msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10258,7 +10209,7 @@ msgstr[0] "prošlog meseca"
 msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10266,165 +10217,165 @@ msgstr[0] "prošle godine"
 msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<pritisnite ovde da izaberete datum>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Izaberite ime za poređenje"
 
 #. filter:no-date primary
-#: filter/filter-errors.xml.h:2
+#: ../filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Nedostaje datum."
 
 #. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
+#: ../filter/filter-errors.xml.h:4
 msgid "You must choose a date."
 msgstr "Morate da izaberete datum."
 
 #. filter:no-file primary
-#: filter/filter-errors.xml.h:6
+#: ../filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # filter:bad-file secondary
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Morate dati ime datoteci."
 
 #. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
+#: ../filter/filter-errors.xml.h:10
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Datoteka \"{0}\" ne postoji ili nije regularna."
 
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
+#: ../filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Loš regularan izraz \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
+#: ../filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Nije moguće kompajliranje regularnog izraza \"{1}\"."
 
 # mail:no-name-vfolder primary
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:219
+#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:223
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
+#: ../filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
+#: ../filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Ime \"{0}\" je već upotrebljeno."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
+#: ../filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Izaberite drugo ime."
 
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Izaberi datoteku"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1041
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1044 mail/mail-config.c:79
-#: mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:143
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1045 mail/mail-config.c:80
-#: mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Kasnije"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:790
-#, fuzzy
+#: ../filter/filter-rule.c:790
 msgid "_Rule name:"
-msgstr "Ime pravila:"
+msgstr "_Ime pravila:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:818
 msgid "<b>If</b>"
 msgstr "<b>Ako</b>"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "ako su svi uslovi zadovoljeni"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "ako je bilo koji uslov zadovoljen"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Izvrši akcije"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "All related"
 msgstr "Sve povezano"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies"
 msgstr "Odgovori"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:880
 msgid "Include threads"
 msgstr "Uključi niti"
 
-#: filter/filter-rule.c:975 filter/filter.glade.h:3
+#: ../filter/filter-rule.c:975 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Dolazeće"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "Odlazeći"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Pr_avila filtera</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Uporedi sa"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "Prikaži filtere za poštu:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10432,7 +10383,7 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "00:00 navedenog datuma."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10440,7 +10391,7 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "vremenom kada se filtriranje desilo."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10448,114 +10399,116 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "trenutnim vremenom kada se filtriranje desilo."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "vreme u odnosu na trenutno vreme"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "pre"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:175
 msgid "seconds"
 msgstr "sekunde"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "trenutno vreme"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "vreme koje ste odredili"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "godine"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: filter/rule-editor.c:693
+#: ../filter/rule-editor.c:693
 msgid "Rule name"
 msgstr "Ime pravila"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Podešavanja sastavljača"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr "Podesite poštu, uključujući sigurnost i prikaz poruke, ovde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Podesite naloge za poštu ovde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolucija pošta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Kontrola podešavanja Evolucija naloga za poštu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Deo Evolucija pošte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Sastavljač Evolucija pošte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Kontrola podešavanja Evolucija sastavljača"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Kontrola postavki Evolucija pošte"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:469
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:557
-#: mail/mail-component.c:608
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:480
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:557
+#: ../mail/mail-component.c:608
 msgid "Mail"
 msgstr "Pošta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:95
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ugovor o licenci"
 
-#: mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10568,87 +10521,92 @@ msgstr ""
 "za %s\n"
 "i označite kućicu da bi ga prihvatili\n"
 
-#: mail/em-account-editor.c:464 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-account-editor.c:1664 mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1661 ../mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/em-account-editor.c:1700 mail/mail-config.glade.h:114
+#: ../mail/em-account-editor.c:1697 ../mail/mail-config.glade.h:116
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/em-account-editor.c:1877
+#: ../mail/em-account-editor.c:1874
 msgid "Automatically check for _new mail every"
 msgstr "_Automatski proveri za novu poštu svakih"
 
-#: mail/em-account-editor.c:2045 mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:2042 ../mail/mail-config.glade.h:126
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/em-account-editor.c:2089 mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2086 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: mail/em-account-editor.c:2148 mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:2145 ../mail/mail-config.glade.h:121
 msgid "Security"
 msgstr "Bezbednost"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2185 mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2256
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: mail/em-account-editor.c:2186 mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2183 ../mail/em-account-editor.c:2257
 msgid "Checking for New Mail"
 msgstr "Provera za nove poruke"
 
-#: mail/em-account-editor.c:2585 mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: mail/em-account-editor.c:2585 mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2581 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolucija naloga"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:428
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Predefinisano]"
 
-#: mail/em-account-prefs.c:482
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Ime naloga"
 
-#: mail/em-account-prefs.c:484
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:429
-#: mail/mail-config.c:935
+#: ../mail/em-account-prefs.c:489
+#, fuzzy
+msgid "Mail Accounts Table"
+msgstr "Poštanski nalozi"
+
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Dodaj skriptu za potpis"
 
-#: mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-composer-utils.c:911
+#: ../mail/em-composer-utils.c:849
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: mail/em-composer-utils.c:1521
+#: ../mail/em-composer-utils.c:1459
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
@@ -10657,7 +10615,7 @@ msgstr "nepoznati pošiljalac"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1568
+#: ../mail/em-composer-utils.c:1506
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10665,278 +10623,277 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month}. ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Preračunaj"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Dodeli boju"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Dodeli rezultat"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Prilozi"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Zvono"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "sadrži"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj u direktorijum"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Datum primanja"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Datum slanja"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "ne završava se sa"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "ne vraća"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "ne zvuči kao"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "ne počinje sa"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Priprema"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "završava se sa"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Postoji"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "postoji"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Izraz"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "je posle"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "je pre"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "je označen"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "je veći od"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "je manji od"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "nije"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "nije označen"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Provera đubreta"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:992
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1008
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketa"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Dopisno društvo"
 
-#: mail/em-filter-i18n.h:39
-#, fuzzy
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
-msgstr "Rezerviši sve"
+msgstr "Uporedi sve"
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Telo poruke"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Zaglavlje poruke"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Poruka je đubre"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Poruka nije đubre"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Premesti u direktorijum"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Poveži na program"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Čitaj"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Primaoci"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Regex odgovara"
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Odgovoreno"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "povraćaji"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "povraćaji veći od"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "povraćaji manji od"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Pokreni program"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultat"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Dodeli status"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Veličina (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "zvuči kao"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Izvorni nalog"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Određeno zaglavlje"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "počinje sa"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:7 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1532
+#: ../mail/em-format-quote.c:306 ../mail/em-format.c:856
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Naslov"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Nedodeljen status"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>Onda</b>"
 
-#: mail/em-folder-browser.c:133
-#, fuzzy
+#: ../mail/em-folder-browser.c:133
 msgid "Create _vFolder From Search..."
-msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
+msgstr "Napravi _vDirektorijum iz pretrage..."
 
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -10944,338 +10901,339 @@ msgstr[1] "Ukupno poruka:"
 msgstr[2] "Ukupno poruka:"
 
 # bug: no need for plural-forms
-#: mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepročitanih poruka:"
 msgstr[1] "Nepročitanih poruka:"
 msgstr[2] "Nepročitanih poruka:"
 
-#: mail/em-folder-properties.c:278 plugins/shared-folder/properties.glade.h:3
+#: ../mail/em-folder-properties.c:278
+#: ../plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Postavke direktorijuma"
 
-#: mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<protisnite ovde da izaberete direktorijum>"
 
-#: mail/em-folder-selector.c:166
+#: ../mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2527
-#: mail/mail-component.c:770 plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2528
+#: ../mail/mail-component.c:770 ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
 
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Napravi"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
-#: mail/mail-vfolder.c:899 mail/mail-vfolder.c:969
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:899 ../mail/mail-vfolder.c:969
 msgid "vFolders"
 msgstr "vDirektorijumi"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:207 mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "NEPOKLOPLjEN"
 
-#: mail/em-folder-tree-model.c:468 mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:142
 msgid "Drafts"
 msgstr "Priprema"
 
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471 mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:141
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: mail/em-folder-tree-model.c:474 mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:143
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: mail/em-folder-tree-model.c:476 mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:144
 msgid "Sent"
 msgstr "Poslato"
 
-#: mail/em-folder-tree-model.c:495 mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
 msgid "Loading..."
 msgstr "Učitavanje..."
 
-#: mail/em-folder-tree.c:688
-#, fuzzy
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
-msgstr "_Direktorijum za poštu"
+msgstr "Stablo direktorijuma za poštu"
 
-#: mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštanje direktorijuma %s"
 
-#: mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiranje direktorijuma %s"
 
-#: mail/em-folder-tree.c:930 mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1612
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštanje poruka u direktorijum %s"
 
-#: mail/em-folder-tree.c:932 mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1614
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiranje poruka u direktorijum %s"
 
-#: mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nije moguće ubaciti poruke u smeštaj na najvišem nivou"
 
-#: mail/em-folder-tree.c:1044 ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u direktorijum"
 
-#: mail/em-folder-tree.c:1045 ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:115
 msgid "_Move to Folder"
 msgstr "_Premesti u direktorijum"
 
-#: mail/em-folder-tree.c:1750 mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretraga direktorijuma u \"%s\""
 
-#: mail/em-folder-tree.c:2023
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:2024
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Kopiranje poruka u %s"
+msgstr "Kopiranje `%s' u `%s'"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862 mail/em-folder-view.c:877
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-tree.c:2312
+#: ../mail/em-folder-view.c:876 ../mail/em-folder-view.c:891
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2297 mail/em-folder-view.c:877
+#: ../mail/em-folder-tree.c:2298 ../mail/em-folder-view.c:891
 msgid "C_opy"
 msgstr "Ko_piraj"
 
-#: mail/em-folder-tree.c:2338 plugins/shared-folder/share-folder-common.c:138
+#: ../mail/em-folder-tree.c:2339
+#: ../plugins/shared-folder/share-folder-common.c:140
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravljenje direktorijuma `%s'"
 
-#: mail/em-folder-tree.c:2527 mail/mail-component.c:770
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
+#: ../mail/em-folder-tree.c:2528 ../mail/mail-component.c:770
+#: ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:353
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2720
+#: ../mail/em-folder-tree.c:2722
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum \"%s\" u:"
 
-#: mail/em-folder-tree.c:2722
+#: ../mail/em-folder-tree.c:2724
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2728
-#, fuzzy
+#: ../mail/em-folder-tree.c:2730
 msgid "Folder names cannot contain '/'"
-msgstr "Ime direktorijuma ne može da sadrži znak \"/\"."
+msgstr "Imena direktorijuma ne mogu da sadrže '/'"
 
-#: mail/em-folder-tree.c:2802 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2804 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "P_rikaz"
 
-#: mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2805
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2809
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2810
 msgid "_Move..."
 msgstr "_Premesti..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2814
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2817
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: mail/em-folder-view.c:970 mail/em-popup.c:499
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:984 ../mail/em-popup.c:499
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: mail/em-folder-view.c:971 ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:985 ../ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:972 mail/em-popup.c:501
-#: ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:986 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:975 ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:989 ../ui/evolution-mail-message.xml.h:109
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:977
+#: ../mail/em-folder-view.c:991
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:995
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:996
 msgid "Mo_ve to Folder..."
 msgstr "Preme_sti u direktorijum..."
 
-#: mail/em-folder-view.c:983 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:997 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:986
+#: ../mail/em-folder-view.c:1000 ../ui/evolution-mail-message.xml.h:50
+msgid "Mar_k as Read"
+msgstr "O_znači kao pročitano"
+
+#: ../mail/em-folder-view.c:1001 ../ui/evolution-mail-message.xml.h:52
+msgid "Mark as U_nread"
+msgstr "Označi kao _nepročitano"
+
+#: ../mail/em-folder-view.c:1002
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:1003
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:988 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1004 ../ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: mail/em-folder-view.c:989 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1005 ../ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: mail/em-folder-view.c:990
-#, fuzzy
+#: ../mail/em-folder-view.c:1006
 msgid "Mark for Follo_w Up..."
-msgstr "Pr_ati..."
+msgstr "Obeleži za _praćenje..."
 
-#: mail/em-folder-view.c:998
+#: ../mail/em-folder-view.c:1014
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:999
+#: ../mail/em-folder-view.c:1015
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:1002
+#: ../mail/em-folder-view.c:1018
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:1003
-#, fuzzy
+#: ../mail/em-folder-view.c:1019
 msgid "vFolder on _Subject"
-msgstr "VDirektorijum na _Naslov"
+msgstr "vDirektorijum na _naslov"
 
-#: mail/em-folder-view.c:1004
-#, fuzzy
+#: ../mail/em-folder-view.c:1020
 msgid "vFolder on Se_nder"
-msgstr "VDirektorijum na P_ošiljaoca"
+msgstr "vDirektorijum na p_ošiljaoca"
 
-#: mail/em-folder-view.c:1005
-#, fuzzy
+#: ../mail/em-folder-view.c:1021
 msgid "vFolder on _Recipients"
-msgstr "VDirektorijum na _Primaoce"
+msgstr "vDirektorijum na _primaoce"
 
-#: mail/em-folder-view.c:1006
-#, fuzzy
+#: ../mail/em-folder-view.c:1022
 msgid "vFolder on Mailing _List"
-msgstr "VDirektorijum na dopisnu _listu"
+msgstr "vDirektorijum na dopisnu _listu"
 
-#: mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1026
 msgid "Filter on Sub_ject"
 msgstr "Filter na naslo_v"
 
-#: mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1027
 msgid "Filter on Sen_der"
 msgstr "Filter na p_ošiljaoca"
 
-#: mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1028
 msgid "Filter on Re_cipients"
 msgstr "Filter na p_rimaoce"
 
-#: mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1029
 msgid "Filter on _Mailing List"
 msgstr "Filter na _dopisnu listu"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1844 mail/em-folder-view.c:1888
+#: ../mail/em-folder-view.c:1863 ../mail/em-folder-view.c:1907
 msgid "Default"
 msgstr "Predefinisano"
 
-#: mail/em-folder-view.c:1987
+#: ../mail/em-folder-view.c:2006
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2336
 msgid "_Copy Link Location"
 msgstr "_Kopiraj putanju veze"
 
-#: mail/em-folder-view.c:2297
-#, fuzzy
+#: ../mail/em-folder-view.c:2338
 msgid "Create _vFolder"
-msgstr "Napravi direktorijum"
+msgstr "Napravi _vDirektorijum"
 
-#: mail/em-folder-view.c:2298
-#, fuzzy
+#: ../mail/em-folder-view.c:2339
 msgid "_From this Address"
-msgstr "Kućna adresa"
+msgstr "_Sa ove adrese"
 
-#: mail/em-folder-view.c:2299
-#, fuzzy
+#: ../mail/em-folder-view.c:2340
 msgid "_To this Address"
-msgstr "Druga adresa"
+msgstr "_na ovu adresu"
 
-#: mail/em-folder-view.c:2568
+#: ../mail/em-folder-view.c:2609
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
-#: mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:680 mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:680 ../mail/em-format-html.c:579
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:680
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ova poruka nije potpisana. Nema garancija da je ova poruka autentična."
 
-#: mail/em-format-html-display.c:681 mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:681 ../mail/em-format-html.c:580
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:681
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11283,22 +11241,22 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno autentičan."
 
-#: mail/em-format-html-display.c:682 mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:682 ../mail/em-format-html.c:581
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:682
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravan potpis, nije moguća provera pošiljaoca"
 
-#: mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:683
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11306,11 +11264,11 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
 "biti proveren."
 
-#: mail/em-format-html-display.c:689 mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:689 ../mail/em-format-html.c:588
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:689
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11318,11 +11276,11 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti u prenosu preko "
 "Interneta."
 
-#: mail/em-format-html-display.c:690 mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:690 ../mail/em-format-html.c:589
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:690
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11331,11 +11289,11 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom.  Teško je, ali ne i nemoguće "
 "da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: mail/em-format-html-display.c:691 mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:590
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:691
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11343,11 +11301,11 @@ msgstr ""
 "Ova poruka je šifrovana.  Teško je moguće da neko sa strane vidi sadržaj ove "
 "poruke."
 
-#: mail/em-format-html-display.c:692 mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:591
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:692
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11356,188 +11314,190 @@ msgstr ""
 "Ova poruka je šifrovana, i to jakim algoritmom. Veoma je teško da neko sa "
 "strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: mail/em-format-html-display.c:793 smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:793 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Pri_kaži sertifikat"
 
-#: mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:808
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat se ne može prikazati"
 
-#: mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1037
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno u %B·%d,·%Y,·%l:%M·%p"
 
-#: mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1045
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1048
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %B·%d,·%Y,·%l:%M·%p"
 
-#: mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1095
 msgid "_View Inline"
 msgstr "Pri_kaži unutra"
 
-#: mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1096
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-display.c:1340
-#, fuzzy
+#: ../mail/em-format-html-display.c:1340
 msgid "Attachment Button"
-msgstr "Prilog"
+msgstr "Dugme za prilog"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d strana od %d"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Dobijanje `%s'"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:582
 msgid "Valid signature but cannot verify sender"
 msgstr "Ispravan potpis ali nije moguća provera pošiljaoca"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Loše složen spoljni deo."
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP adresu (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na mrežni podatak (%s)"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tip \"%s\")"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Oblikovanje poruke"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:848
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Kopija"
 
-#: mail/em-format-html.c:1424 mail/em-format-quote.c:193 mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
+#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Nevidljiva kopija"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1536 ../mail/em-format-quote.c:315
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1563
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1566
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1577 mail/em-format-quote.c:322 mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-format.c:857 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format-html.c:1600 mail/em-format.c:855 mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1599 ../mail/em-format.c:858
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Diskusione grupe"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1107
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1146 ../mail/em-format.c:1279
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguća obrada S/MIME poruke: nepoznata greška"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1269
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1417
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguća obrada MIME poruke. Prikaz izvora."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1436
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1444
 msgid "Error verifying signature"
 msgstr "Greška u proveri potpisa"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1444
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška u proveri potpisa"
 
-#: mail/em-junk-filter.c:111
+#: ../mail/em-junk-filter.c:111
 msgid "Spamassassin (built-in)"
 msgstr "Spam ubica (ugrađen)"
 
 # slično kao za mesece i nedelje
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Svaki put"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Jednom dnevno"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Jednom nedeljno"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Jednom mesečno"
 
-#: mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11549,48 +11509,48 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi direktorijume..."
 
-#: mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nije moguće pravljenje novog direktorijuma `%s': %s"
 
-#: mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nije moguće kopiranje direktorijuma `%s' u `%s': %s"
 
-#: mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nije moguće skeniranje za postojećim mailbox-ima u `%s': %s"
 
-#: mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nije moguće otvaranje starog POP čuvaj-na-serveru podatka `%s: %s"
 
-#: mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Nije moguće pravljenje POP3 čuvaj-na-serveru direktorijuma podataka `%s': %s"
 
-#: mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nije moguće kopiranje POP3 čuvaj-na-serveru podatka `%s': %s"
 
-#: mail/em-migrate.c:2561 mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nije uspelo pravljenje lokalne ostave pošte `%s': %s"
 
-#: mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nije moguće pravljenje lokalnih direktorijuma pošte  `%s': %s"
 
-#: mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11598,213 +11558,212 @@ msgstr ""
 "Nije moguće čitanje podešavanja prethodne instalacije Evolucije, `evolution/"
 "config.xmldb' ne postoji ili je oštećen."
 
-#: mail/em-popup.c:382
+#: ../mail/em-popup.c:382
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: mail/em-popup.c:401
+#: ../mail/em-popup.c:401
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: mail/em-popup.c:495
+#: ../mail/em-popup.c:495
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: mail/em-popup.c:497
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-popup.c:498 ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-popup.c:549
+#: ../mail/em-popup.c:549
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
-#: mail/em-popup.c:550
-#, fuzzy
+#: ../mail/em-popup.c:550
 msgid "_Send New Message To..."
-msgstr "Pošalji _poruku..."
+msgstr "_Pošalji poruku za..."
 
-#: mail/em-popup.c:551
+#: ../mail/em-popup.c:551
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:666
+#: ../mail/em-popup.c:666
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:611
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ovaj smeštaj ne podržava prijave, ili nisu omogućene."
 
-#: mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Prijavljeno"
 
-#: mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Direktorijum"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Izaberite server."
 
-#: mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Ne prikazuj ponovo ovu poruku."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "poruka"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1071
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
-#: mail/em-vfolder-editor.c:104
-#, fuzzy
+#: ../mail/em-vfolder-editor.c:104
 msgid "v_Folders"
-msgstr "vDirektorijumi"
+msgstr "v_Direktorijumi"
 
-#: mail/em-vfolder-rule.c:574
-#, fuzzy
+#: ../mail/em-vfolder-rule.c:574
 msgid "vFolder source"
-msgstr "VDirektorijum izvor"
+msgstr "vDirektorijum izvor"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Automatsko prepoznavanje smešaka"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Proveri da li je pristigla pošta đubre"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Predefinisana visina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Predefinisana širina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Predefinisani skup znakova za sastavljanje poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Predefinisani skup znakova za sastavljanje poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Predefinisani skup znakova za prikaz poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Predefinisani skup znakova za prikaz poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Predefinisani stil prosleđivanja"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Predefinisana visina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Predefinisana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Predefinisana visina prozora za prijavu"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Predefinisani stil odgovora"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Predefinisana širina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Predefinisana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Predefinisana širina prozora za prijavu"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtava oznake grešaka u kucanju uz reči dok kucate."
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Prazni direktorijume sa smećem na izlazu"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve direktorijume sa smećem pri zatvaranju Evolucije."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kurzora, tako da vidite kurzor dok čitate poruku."
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kurzora"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Visina panela spiska poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Visina panela spiska poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
+"Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pita ga da li "
+"zaista želi to da uradi."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -11814,23 +11773,23 @@ msgstr ""
 "mime tipovi iz ovog spiska koji su vezani Bonobo prikazivačem delova u "
 "Gnomovoj bazi mime tipova mogu biti korišćeni za prikaz sadržaja."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i odgovarajućih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Spisak prihvaćenih licenci"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Spisak naloga"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11838,11 +11797,11 @@ msgstr ""
 "Spisak naloga koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "koje imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Spisak proizvoljnih zaglavlja i da li su uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11850,19 +11809,19 @@ msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "oblika ime:boja gde boja koristi HTML heks kodiranje."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Spisak mime tipova radi provere za Bonobo prikazivačima"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Spisak imena protokola čija je licenca prihvaćena."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Učitava slike za HTML poruke preko http-a"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -11872,93 +11831,92 @@ msgstr ""
 "ne učitavaj slike sa mreže 1. - Učitavaj slike ukoliko je pošiljalac u "
 "adresaru 2 - Uvek učitavaj slike sa mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Beleži akcije filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži akcije filtera u navedenu datoteku dnevnika."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje akcija filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje akcija filtera."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava kao viđenu nakon navedenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava kao viđenu nakon navedenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Predefinisana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Predefinisana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (običan, sva zaglavlja, izvor)"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obaveštenje o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Vrsta obaveštenja o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Pita kada je tema prazna"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pita korisnika kada pokuša da isprazni direktorijum."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez naslova."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Pita pri pražnjenju"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
 
-#: mail/evolution-mail.schemas.in.in.h:60
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Pita korisnika kada pokuša da pošalje poruku bez primalaca."
+msgstr "Pita korisnika kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11966,95 +11924,95 @@ msgstr ""
 "Pita kada korisnik pokuša da pošalje HTML poštu primaocima koji možda ne žele "
 "da primaju HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pita korisnika kada pokuša da pošalje poruku bez primalaca."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pita kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaje smeške u tekstu i zamenjuje ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da li ima đubreta u dolazećoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji poštu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalje poštu kao HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (precrtane) u spisku poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u spisku poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži panel \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Prikazuje panel \"Pregled\"."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvučna datoteka za puštanje kada stigne nova pošta."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Navodi vrstu obaveštenja o novoj pošti koje korisnik želi da koristi."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Istovremena provera pravopisa"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Predefinisana visina prozora za prijavu"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Predefinisana širina prozora za prijavu"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Vreme pražnjenja smeća, u danima od početka epohe."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Font terminala za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Font promenljive širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12065,102 +12023,100 @@ msgstr ""
 "zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;"
 "header·enabled&gt; - omogućeno za prikazivanje zaglavlja u pregledu pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Lista poruke prema nizu razgovora."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Izlistaj poruke prema nizu razgovora"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Izlistaj poruke prema nizu razgovora na naslov"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Vreme za označavanje poruka kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Vreme za označavanje poruka kao viđene."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "JIB niz glavnog naloga."
 
-#: mail/evolution-mail.schemas.in.in.h:91
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: mail/evolution-mail.schemas.in.in.h:92
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Koristi servis i klijenta Ubice spama (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Koristi proizvoljne fontove"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi proizvoljne fontove za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Font promenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Opcija Prikaz/nevidljiva kopija (Bcc) je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Opcija Prikaz/nevidljiva kopija (Bcc) je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Opcija Prikaz/kopija (Cc) je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Opcija Prikaz/kopija (Cc) je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Opcija Prikaz/šalje je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Opcija Prikaz/šalje je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Opcija Prikaz/pošalji je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Opcija Prikaz/pošalji je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Opcija Prikaz/odgovori je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Opcija Prikaz/odgovori je izabrana."
 
 # Da li ovo treba ostaviti na engleskom, pošto su doslovna imena zaglavlja?
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12168,65 +12124,67 @@ msgstr ""
 "Da li pokušati prikaz niza rasprave po naslovu kada poruke ne sadrže "
 "zaglavlja Odgovor-na i Reference."
 
-#: mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr "port za pokretanje korisnikovog spamd-a"
 
-#: mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolucija Elm uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Evolucija Netscape pošta uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Evolucija Outlook Express 4 uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolucija Pine uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "Evolucija mbox uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MBoks (mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvozi staru Elm poštu"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvoženje..."
 
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Sačekajte"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Uvoženje Elm podataka"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -12234,43 +12192,43 @@ msgstr ""
 "Evolucija je pronašla Elm datoteke pošte\n"
 "Želite li da ih uvezete u Evoluciju?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Odredišni direktorijum:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Izaberite direktorijum za uvoženje"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvoženje `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvoženje mailbox-a"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretraga %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12296,7 +12254,7 @@ msgstr ""
 "prioriteta. Proverite uvežene filtere da se uverite\n"
 "da li sve radi kao što bi trebalo."
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12308,7 +12266,7 @@ msgstr ""
 "koju Evolucija ne podržava.\n"
 "Ovi filteri biće izostavljeni."
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12322,23 +12280,23 @@ msgstr ""
 "su promenjeni da proveravaju da li taj niz jeste\n"
 "ili nije sadržan u telu poruke."
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvozi stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Uvoženje Netscape podataka"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12346,15 +12304,15 @@ msgstr ""
 "Evolucija je pronašla Netscape datoteke pošte.\n"
 "Želite li da budu uvežene u Evoluciju?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolucija uvozi stare Pine podatke."
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podataka"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12362,35 +12320,35 @@ msgstr ""
 "Evolucija je pronašla Pine datoteke pošte.\n"
 "Želite li da ih uvezete u Evoluciju?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:238 mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: mail/mail-component.c:505
+#: ../mail/mail-component.c:505
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -12398,7 +12356,7 @@ msgstr[0] "%d obrisano"
 msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 
-#: mail/mail-component.c:507
+#: ../mail/mail-component.c:507
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -12406,7 +12364,7 @@ msgstr[0] "%d đubre"
 msgstr[1] "%d đubreta"
 msgstr[2] "%d đubreta"
 
-#: mail/mail-component.c:530
+#: ../mail/mail-component.c:530
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -12414,7 +12372,7 @@ msgstr[0] "%d u pripremi"
 msgstr[1] "%d nedovršene"
 msgstr[2] "%d nedovršenih"
 
-#: mail/mail-component.c:532
+#: ../mail/mail-component.c:532
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -12422,7 +12380,7 @@ msgstr[0] "%d poslato"
 msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 
-#: mail/mail-component.c:534
+#: ../mail/mail-component.c:534
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -12430,7 +12388,7 @@ msgstr[0] "%d neposlato"
 msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:538
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -12438,7 +12396,7 @@ msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 
-#: mail/mail-component.c:540
+#: ../mail/mail-component.c:540
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
@@ -12446,265 +12404,260 @@ msgstr[0] "%d nepročitano"
 msgstr[1] "%d nepročitane"
 msgstr[2] "%d nepročitanih"
 
-#: mail/mail-component.c:722
+#: ../mail/mail-component.c:722
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:723
+#: ../mail/mail-component.c:723
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:724
+#: ../mail/mail-component.c:724
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:730
+#: ../mail/mail-component.c:730
 msgid "New Mail Folder"
 msgstr "Novi direktorijum za poštu"
 
-#: mail/mail-component.c:731
+#: ../mail/mail-component.c:731
 msgid "Mail _Folder"
 msgstr "_Direktorijum za poštu"
 
-#: mail/mail-component.c:732
+#: ../mail/mail-component.c:732
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum za poštu"
 
-#: mail/mail-component.c:879
+#: ../mail/mail-component.c:879
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nije uspelo dograđivanje podešavanja pošte ili direktorijuma."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane tipove "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL nije podržan u ovoj verziji evolucije</b>"
+msgstr "<b>SSL nije podržan u ovoj verziji Evolucije</b>"
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Po_tpisi</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Jezici</b>"
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Ovo će učiniti filter pouzdanijim, ali sporijim</small>"
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Podaci o nalogu</span>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Upozorenja</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Način prijave</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Identifikacija</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sastavljanje poruka</span>"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanja</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Predefinisano ponašanje</span>"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Briši poštu</span>"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Prikazana _zaglavlja poruka</span>"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Podešavanja filtera</span>"
 
-#: mail/mail-config.glade.h:18 plugins/itip-formatter/itip-formatter.c:1667
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Opšte</span>"
 
-#: mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Oznake i boje</span>"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Učitavanje slika</span>"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Prikaz poruke</span>"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Fontovi poruke</span>"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Obaveštavanje o novoj pošti</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Opcioni podaci</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Podešavanja</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Prilično dobra privatnost (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Fontovi za štampu</span>"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Potrebni podaci</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Bezbedni MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Bezbednost</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Poslate i poruke u pripremi</span>"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanje servera</span>"
 
-#: mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "_Takođe šifruj na mene pri slanju šifrovane pošte"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek pošalji _kopiju (cc):"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _skrivenu kopiju (Bcc):"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj ključevima mog lanca pri šifrovanju"
 
-#: mail/mail-config.glade.h:42
-#, fuzzy
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Uv_ek šifruj na mene pri slanju šifrovane pošte"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Priloži originalnu poruku"
 
-#: mail/mail-config.glade.h:44 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Prilog"
 
-#: mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:45
 msgid "Automatically _insert smiley images"
 msgstr "Automat_ski ubaci slike sa osmesima"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
 msgstr "S_virni kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "_Proveri podržane tipove "
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:51
 msgid "Check _incoming mail for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu đubre"
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
+#: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
-msgstr "abaIbbaI"
+msgstr "Oči_sti"
 
-#: mail/mail-config.glade.h:55
-#, fuzzy
+#: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
-msgstr "abaIbbaI"
+msgstr "Očis_ti"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:57
 msgid "Colors"
 msgstr "Boje"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš direktorijum"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12720,125 +12673,135 @@ msgstr ""
 "\n"
 "Pritisnite \"Primeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Pre_definisano"
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevano _kodiranje znakova:"
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Digitalno potpiši odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:71 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:71 ../shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:72
 msgid "Drafts _Folder:"
 msgstr "D_irektorijum Priprema:"
 
-#: mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "Nalozi e-pošte"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:75
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni direktorijume sa _smećem na izlazu"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: mail/mail-config.glade.h:78
-#, fuzzy
+#: ../mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Izvrši komandu..."
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
 msgstr "U_tvrđena-širina:"
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Podešavanja fonta"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Sredi poruke u H_TML"
 
-#: mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:85
 msgid "HTML Mail"
 msgstr "HTML pošta"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:86
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:88
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
-#: mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Unutar"
 
-#: mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Languages Table"
+msgstr "Jezik"
+
+#: ../mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Headers Table"
+msgstr "Stablo direktorijuma za poštu"
+
+#: ../mail/mail-config.glade.h:98
 msgid "Mailbox location"
 msgstr "Mailbox lokacija"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:99
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: nećete biti upitani za lozinku dok se ne povežete prvi put"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _ključa:"
 
-#: mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
+"Unesite dole opisno ime za ovaj nalog.\n"
+"Ovo ime će biti korišćeno samo za potrebe prikaza."
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12846,7 +12809,7 @@ msgstr ""
 "Unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
 "pitajte administratora sistema ili ponuđača Internet usluge."
 
-#: mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12855,119 +12818,119 @@ msgstr ""
 "Unesite dole ime i elektronsku adresu. \"Opciona\" polja dole ne moraju biti "
 "popunjena, osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid "Please select among the following options"
 msgstr "Izaberite od sledećih opcija"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:111
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa navedenim Bcc primaocima"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:113
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:114
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:115
 msgid "Re_ply-To:"
 msgstr "Od_govori:"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:117
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: mail/mail-config.glade.h:116
-#, fuzzy
+#: ../mail/mail-config.glade.h:118
 msgid "S_elect..."
 msgstr "Izaberi..."
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:119
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:120
 msgid "Se_lect..."
-msgstr "Izaberi..."
+msgstr "Iza_beri..."
 
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Odaberi HTML font fiksirane veličine"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberi HTML font fiksirane veličine za štampu"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Odaberi HTML font varijabilne veličine"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberi HTML font varijabilne veličine za štampu"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:127
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Sent _Messages Folder:"
 msgstr "Direktorijum Poslatih _poruka:"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:129
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži identifikaciju"
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:130
 msgid "Server _Type: "
 msgstr "_Tip servera:"
 
-#: mail/mail-config.glade.h:129
-#, fuzzy
+#: ../mail/mail-config.glade.h:131
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signatures Table"
+msgstr "Potpisi"
+
+#: ../mail/mail-config.glade.h:135
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:136
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:137
 msgid "T_erminal Font:"
 msgstr "_Font terminala:"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:138
 msgid "T_ype: "
 msgstr "_Tip:"
 
-#: mail/mail-config.glade.h:136
-#, fuzzy
+#: ../mail/mail-config.glade.h:139
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Ova strana vam omogućava da podesite proveru pravopisa i jezik. Lista jezika "
-"ovde oslikava samo one jezike za koje imate instaliran rečnik."
+"Lista jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:140
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12977,7 +12940,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu. "
 
-#: mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12985,15 +12948,15 @@ msgstr ""
 "Ukucajte ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: \"Poslovni\" ili \"Lični\""
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:146
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13003,160 +12966,145 @@ msgstr ""
 "\n"
 "Pritisnite \"Napred\" za početak. "
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:152
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:153
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitavaj slike sa Interneta"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:154
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:152
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astancima (Outlook kompatibilnost)"
 
-#: mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:157
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:158
 msgid "_Full Name:"
 msgstr "_Puno ime:"
 
-#: mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:160
 msgid "_Load images if sender is in address book"
 msgstr "_Učitavaj slike ako je pošiljalac u adresaru"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:161
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj glavni nalog"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane nakon"
 
-#: mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:170
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
+#: ../mail/mail-config.glade.h:171
 msgid "_Use Secure Connection:"
 msgstr "_Koristi bezbednu vezu:"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:173
 msgid "color"
 msgstr "boja"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:174
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-" Pažljivo pročitajte dole prikazan ugovor o licenci\n"
-" i označite kućicu za prihvatate\n"
-
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>vDirektorijum izvori</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digitalni potpis</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Šifrovanje</span>"
 
-#: mail/mail-dialogs.glade.h:10
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
-msgstr "Osetljivo na veličinu slova"
+msgstr "_Osetljivo na veličinu slova"
 
 # timezone.
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
-msgstr "Gotovo"
+msgstr "Go_tovo"
 
-#: mail/mail-dialogs.glade.h:13
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
-msgstr "Nađi:"
+msgstr "N_ađi:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Pronađi u poruci"
 
-#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Prijave na direktorijume"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Ugovor o licenci"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "Ništa nije izabrano"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Bezbednosni podaci"
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13164,55 +13112,53 @@ msgstr ""
 "Poruke koje ste izabrali za praćenje su dole izlistane.\n"
 "Odaberite akciju za praćenje iz menija \"Oznaka\"."
 
-#: mail/mail-dialogs.glade.h:24
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
-msgstr "Prihvatam ugovor"
+msgstr "_Prihvatam licencu"
 
-#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Rok:"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "Pri_javi se"
 
-#: mail/mail-dialogs.glade.h:28
-#, fuzzy
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
-msgstr "Označite ovo da prihvatite ugovor o licenci"
+msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "samo navedeni direktorijumi"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "sa svim aktivnim mrežnim direktorijumima"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "sa svim lokalnim i aktivnim mrežnim direktorijumima"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "sa svim lokalnim direktorijumima"
 
 #. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
+#: ../mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
 msgstr "Neispravna identifikacija"
 
 #. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
+#: ../mail/mail-errors.xml.h:4
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13221,12 +13167,12 @@ msgstr ""
 "podržava identifikaciju."
 
 #. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
+#: ../mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prijava na server \"{0}\" kao \"{0}\" nije uspela."
 
 #. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
+#: ../mail/mail-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13235,12 +13181,12 @@ msgstr ""
 "lozinki veličina slova bitna; možda je caps lock uključen."
 
 #. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
+#: ../mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Sigurno želite da pošaljete poruku u HTML obliku?"
 
 #. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13252,12 +13198,12 @@ msgstr ""
 "Svakako poslati?"
 
 #. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Sigurno želite da pošaljete poruku bez naslova?"
 
 #. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+#: ../mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13268,12 +13214,12 @@ msgstr ""
 # mail:ask-send-only-bcc primary
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Sigurno želite da pošaljete poruku samo sa nevidljivim primaocima (BCC)?"
 
 #. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13289,7 +13235,7 @@ msgstr ""
 "Da bi izbegli ovo, dodajte barem jednog Prima: iliKopija (CC): primaoca."
 
 #. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-errors.xml.h:31
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13302,13 +13248,13 @@ msgstr ""
 "primaoca."
 
 #. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-errors.xml.h:34
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "Ova poruka se ne može poslati pošto niste naveli primaoce"
 
 #. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
+#: ../mail/mail-errors.xml.h:36
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13317,12 +13263,12 @@ msgstr ""
 "elektronske adrese pritiskom na dugme Prima: pored polja za unos."
 
 #. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
 msgstr "Koristiti podrazumevani direktorijum za pripremu?"
 
 #. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
+#: ../mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -13330,12 +13276,12 @@ msgstr ""
 "Nije moguće otvaranje direktorijuma za pripremu za ovaj nalog.  Koristiti "
 "sistemski direktorijum za pripremu?"
 
-#: mail/mail-errors.xml.h:41
+#: ../mail/mail-errors.xml.h:41
 msgid "Use _Default"
 msgstr "Koristi _podrazumevano"
 
 #. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
+#: ../mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -13346,49 +13292,47 @@ msgstr ""
 # mail:ask-empty-trash secondary
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ako nastavite, nećete moći da vratite ove poruke."
 
-#: mail/mail-errors.xml.h:46
+#: ../mail/mail-errors.xml.h:46
 msgid "_Expunge"
 msgstr "Iz_baci"
 
 #. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
+#: ../mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz svih direktorijuma?"
 
-#: mail/mail-errors.xml.h:51
+#: ../mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "Izbaci _smeće"
 
 #. mail:ask-open-many primary
-#: mail/mail-errors.xml.h:53
-#, fuzzy
+#: ../mail/mail-errors.xml.h:53
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Sigurno želite da izmenite svih %d poruka?"
+msgstr "Sigurno želite da otvorite {0} poruka odjednom?"
 
 #. mail:ask-open-many secondary
-#: mail/mail-errors.xml.h:55
+#: ../mail/mail-errors.xml.h:55
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "Otvaranje previše poruka odjednom može suviše da potraje."
 
-#: mail/mail-errors.xml.h:56
-#, fuzzy
+#: ../mail/mail-errors.xml.h:56
 msgid "_Open Messages"
-msgstr "_Otvori poruku"
+msgstr "_Otvori poruke"
 
 #. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:58
+#: ../mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:60
+#: ../mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13397,12 +13341,12 @@ msgstr ""
 "Evoluciju."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:62
+#: ../mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Poruka naslovnjena \"{0}\" nije isporučena."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -13415,37 +13359,32 @@ msgstr ""
 "ponovo je pošaljite."
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:67
+#: ../mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Greška prilikom {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:69
+#: ../mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:71
+#: ../mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Greška tokom operacije."
 
-#. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:73
-msgid "{0}."
-msgstr "{0}."
-
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:87
+#: ../mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Unesite lozinku."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:91
+#: ../mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Greška u učitavanju definicija filtera."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:95
+#: ../mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nije moguće čuvanje u direktorijum \"{0}\"."
 
@@ -13454,38 +13393,38 @@ msgstr "Nije moguće čuvanje u direktorijum \"{0}\"."
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
-#: mail/mail-errors.xml.h:111
+#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
+#: ../mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Nije moguće čuvanje u direktorijum \"{0}\"."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:101
+#: ../mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Nije moguće pravljenje direktorijuma za čuvanje, zbog \"{1}\""
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:103
+#: ../mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Nije moguće pravljenje privremenog direktorijum za čuvanje."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:109
+#: ../mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji, nije moguće prepisivanje."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:113
+#: ../mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:115
+#: ../mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Nije moguće brisanje direktorijuma \"{0}\"."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:119
+#: ../mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nije moguće brisanje sistemskog direktorijuma \"{0}\"."
 
@@ -13493,7 +13432,7 @@ msgstr "Nije moguće brisanje sistemskog direktorijuma \"{0}\"."
 # mail:no-rename-spethal-folder secondary
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:121 mail/mail-errors.xml.h:125
+#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13502,23 +13441,25 @@ msgstr ""
 "preimenovati, premestiti ili obrisati."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:123
+#: ../mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 "Nije moguće preimenovati ili premestiti sistemski direktorijum \"{0}\"."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:127
+#. mail:ask-delete-vfolder title
+#: ../mail/mail-errors.xml.h:127 ../mail/mail-errors.xml.h:133
 msgid "Delete \"{0}\"?"
 msgstr "Obrisati \"{0}\"?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:129
+#. mail:ask-delete-vfolder primary
+#: ../mail/mail-errors.xml.h:129 ../mail/mail-errors.xml.h:135
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Zaista obrisati direktorijum \"{0}\" i sve poddirektorijume?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:131
+#: ../mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13529,163 +13470,162 @@ msgstr ""
 # mail:no-rename-folder primary
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:133 mail/mail-errors.xml.h:137
+#: ../mail/mail-errors.xml.h:137 ../mail/mail-errors.xml.h:141
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nije moguće preimenovanje \"{0}\" u \"{1}\"."
 
 # mail:vfolder-notunique secondary
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:135 mail/mail-errors.xml.h:197
+#: ../mail/mail-errors.xml.h:139 ../mail/mail-errors.xml.h:201
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Direktorijum nazvan \"{1} već postoji. Upotrebite drugo ime."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:139
+#: ../mail/mail-errors.xml.h:143
 msgid "Because \"{2}\"."
 msgstr "Zbog \"{2}\"."
 
 # mail:no-move-folder-to-nostore primary
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:141 mail/mail-errors.xml.h:145
+#: ../mail/mail-errors.xml.h:145 ../mail/mail-errors.xml.h:149
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nije moguće premestiti direktorijum \"{0}\" u \"{1}\"."
 
 # mail:no-copy-folder-nostore secondary
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:143 mail/mail-errors.xml.h:151
+#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
 msgid "Cannot open source \"{2}\"."
 msgstr "Nije moguće otvaranje izvora \"{2}\"."
 
 # mail:no-copy-folder-to-nostore secondary
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:147 mail/mail-errors.xml.h:155
+#: ../mail/mail-errors.xml.h:151 ../mail/mail-errors.xml.h:159
 msgid "Cannot open target \"{2}\"."
 msgstr "Nije moguće otvaranje cilja \"{2}\"."
 
 # mail:no-copy-folder-to-nostore primary
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:149 mail/mail-errors.xml.h:153
+#: ../mail/mail-errors.xml.h:153 ../mail/mail-errors.xml.h:157
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nije moguće kopiranje direktorijuma \"{0}\" u \"{1}\"."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:157
+#: ../mail/mail-errors.xml.h:161
 msgid "Cannot create folder \"{0}\"."
 msgstr "Nije moguće pravljenje direktorijuma \"{0}\"."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:159
+#: ../mail/mail-errors.xml.h:163
 msgid "Cannot open source \"{1}\""
 msgstr "Nije moguće otvaranje izvora \"{1}\""
 
 # mail:account-notunique primary
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:161 mail/mail-errors.xml.h:165
+#: ../mail/mail-errors.xml.h:165 ../mail/mail-errors.xml.h:169
 msgid "Cannot save changes to account."
 msgstr "Nije moguće čuvanje izmena na nalogu."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:163
+#: ../mail/mail-errors.xml.h:167
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:167
+#: ../mail/mail-errors.xml.h:171
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete otvoriti dva naloga sa istim imenom."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:169
+#: ../mail/mail-errors.xml.h:173
 msgid "Delete account?"
 msgstr "Obrisati nalog?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail-errors.xml.h:175
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail-errors.xml.h:177
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci naloga biće trajno obrisani."
 
-#: mail/mail-errors.xml.h:174
+#: ../mail/mail-errors.xml.h:178
 msgid "Don't delete"
 msgstr "Ne briši"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:176
+#: ../mail/mail-errors.xml.h:180
 msgid "Could not save signature file."
 msgstr "Nije moguće čuvanje datoteke potpisa."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:178
+#: ../mail/mail-errors.xml.h:182
 msgid "Because \"{0}\"."
 msgstr "Zbog \"{0}\"."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:180
+#: ../mail/mail-errors.xml.h:184
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Nije moguće postaviti skriptu za potpis \"{0}\"."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:182
+#: ../mail/mail-errors.xml.h:186
 msgid "The script file must exist and be executable."
 msgstr "Datoteka skripte mora postojati i biti izvršna."
 
 # bug: s/changed/changes/?
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail-errors.xml.h:188
 msgid "Discard changed?"
 msgstr "Zanemariti promenjeno?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail-errors.xml.h:190
 msgid "Do you wish to save your changes?"
 msgstr "Želite li da sačuvate promene?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail-errors.xml.h:192
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
-#: mail/mail-errors.xml.h:189
+#: ../mail/mail-errors.xml.h:193
 msgid "_Discard changes"
 msgstr "_Zanemari promene"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:191
+#: ../mail/mail-errors.xml.h:195
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "Nije moguće izmeniti vDirektorijum \"{0}\" pošto ne postoji."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:193
-#, fuzzy
+#: ../mail/mail-errors.xml.h:197
 msgid ""
 "This folder may have been added implicitly, go to the vFolder editor to add "
 "it explicitly, if required."
 msgstr ""
-"Ovaj direktorijum je možda posredno dodat, idite u uređivač virtuelnih "
-"direktorijuma i dodajte ga izričito, ako želite."
+"Ovaj direktorijum je možda posredno dodat, idite u uređivač vDirektorijuma i "
+"dodajte ga izričito, ako želite."
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:195
+#: ../mail/mail-errors.xml.h:199
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "Nije moguće dodavanje vDirektorijuma \"{0}\"."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:199
+#: ../mail/mail-errors.xml.h:203
 msgid "vFolders automatically updated."
 msgstr "VDirektorijumi su automatski osveženi."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:201
+#: ../mail/mail-errors.xml.h:205
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -13700,12 +13640,12 @@ msgstr ""
 "I sada su osveženi."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:207
+#: ../mail/mail-errors.xml.h:211
 msgid "Mail filters automatically updated."
 msgstr "Filteri pošte su automatski osveženi."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:209
+#: ../mail/mail-errors.xml.h:213
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13720,27 +13660,27 @@ msgstr ""
 "I sada je(su) osveženo(a)."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:215
+#: ../mail/mail-errors.xml.h:219
 msgid "Missing folder."
 msgstr "Nedostaje direktorijum."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:217
+#: ../mail/mail-errors.xml.h:221
 msgid "You must specify a folder."
 msgstr "Morate navesti direktorijum."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:221
+#: ../mail/mail-errors.xml.h:225
 msgid "You must name this vFolder."
 msgstr "Morate imenovati ovaj vDirektorijum."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:223
+#: ../mail/mail-errors.xml.h:227
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:225
+#: ../mail/mail-errors.xml.h:229
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -13752,12 +13692,12 @@ msgstr ""
 "ili i jednih i drugih."
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:229
+#: ../mail/mail-errors.xml.h:233
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem u prenosu starog direktorijuma pošte \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:231
+#: ../mail/mail-errors.xml.h:235
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13769,81 +13709,82 @@ msgstr ""
 "Možete izabrati da ignorišete ovaj direktorijum, prepisati ga ili dopuniti "
 "njegov sadržaj, ili izaći.\n"
 
-#: mail/mail-errors.xml.h:235
+#: ../mail/mail-errors.xml.h:239
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: mail/mail-errors.xml.h:236 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail-errors.xml.h:240 ../widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: mail/mail-errors.xml.h:237
+#: ../mail/mail-errors.xml.h:241
 msgid "_Append"
 msgstr "_Dopuni"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:239
-#, fuzzy
+#: ../mail/mail-errors.xml.h:243
 msgid "Unable to read license file."
-msgstr ""
-"Ne mogu da tražim datoteku: %s\n"
-"%s"
+msgstr "Nije moguće čitanje datoteke licence."
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:241
+#: ../mail/mail-errors.xml.h:245
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider "
 "until\n"
 "      you can accept its license."
 msgstr ""
+"Nije moguće čitanje datoteke licence \"{0}\", zbog\n"
+"      problema sa instalacijom.  Nećete moći da koristite ovog pružaoca dok\n"
+"      ne prihvatite licencu."
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:245
+#: ../mail/mail-errors.xml.h:249
 msgid "Querying server"
-msgstr ""
+msgstr "Slanje upita serveru"
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:247
-#, fuzzy
+#: ../mail/mail-errors.xml.h:251
 msgid "Please wait."
-msgstr "Sačekajte"
+msgstr "Sačekajte."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:249
-#, fuzzy
+#: ../mail/mail-errors.xml.h:253
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Neophodno šifrovanje za traženi mehanizam prijave"
+msgstr "Slanje upita serveru za spisak podržanih mehanizama prijave."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:251
-#, fuzzy
+#: ../mail/mail-errors.xml.h:255
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
-msgstr "Neuspešno povezivanje sa LDAP serverom"
+msgstr ""
+"Neuspešno povezivanje na GroupWise\n"
+"server."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:254
+#: ../mail/mail-errors.xml.h:258
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
 msgstr ""
+"\n"
+"Proverite podešavanja naloga i pokušajte ponovo.\n"
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingovanje %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtriranje direktorijuma"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Uzimanje pošte"
 
-#: mail/mail-ops.c:542 mail/mail-ops.c:585
+#: ../mail/mail-ops.c:556 ../mail/mail-ops.c:598
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13853,106 +13794,106 @@ msgstr ""
 "Dopunjavanje u lokalni direktorijum Poslato."
 
 #. sending mail, filtering failed
-#: mail/mail-ops.c:564
+#: ../mail/mail-ops.c:577
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nije uspela primena odlazećih filtera: %s"
 
-#: mail/mail-ops.c:602
+#: ../mail/mail-ops.c:615
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nije uspelo dopunjavanje u lokalni direktorijum Poslato: %s"
 
-#: mail/mail-ops.c:702
+#: ../mail/mail-ops.c:727
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Slanje poruke %d od %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:727
+#: ../mail/mail-ops.c:752
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nije uspelo slanje %d od %d poruka"
 
-#: mail/mail-ops.c:729 mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:754 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: mail/mail-ops.c:731
+#: ../mail/mail-ops.c:756
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:828
+#: ../mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Čuvanje poruke u direktorijum"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštanje poruka u %s"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiranje poruka u %s"
 
-#: mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaranje direktorijuma %s"
 
-#: mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1279
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaranje ostave %s"
 
-#: mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1357
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjanje direktorijuma %s"
 
-#: mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1451
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštanje direktorijuma '%s'"
 
-#: mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1516
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Pražnjenje i smeštanje naloga '%s'"
 
-#: mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštanje naloga %s'"
 
-#: mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1572
 msgid "Refreshing folder"
 msgstr "Osvežavanje direktorijuma"
 
-#: mail/mail-ops.c:1583 mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1608 ../mail/mail-ops.c:1659
 msgid "Expunging folder"
 msgstr "Pražnjenje direktorijuma"
 
-#: mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1656
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacivanje smeća u '%s'"
 
-#: mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Uzimanje poruke %s"
 
-#: mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -13960,7 +13901,7 @@ msgstr[0] "Uzimanje %d poruke"
 msgstr[1] "Učitavam %d poruke"
 msgstr[2] "Učitavam %d poruka"
 
-#: mail/mail-ops.c:1873
+#: ../mail/mail-ops.c:1898
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -13968,7 +13909,7 @@ msgstr[0] "Čuvanje %d poruke"
 msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 
-#: mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1948
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13977,7 +13918,7 @@ msgstr ""
 "Nije moguće pravljenje izlazne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1976
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13986,11 +13927,11 @@ msgstr ""
 "Greška u čuvanju poruke u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2047
 msgid "Saving attachment"
 msgstr "Čuvanje priloga"
 
-#: mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2059
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13999,789 +13940,741 @@ msgstr ""
 "Nije moguće pravljenje izlazne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2069
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nije moguć upis podataka: %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidanje veze sa %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovno povezivanje na %s"
 
-#: mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2335
 msgid "Checking Service"
 msgstr "Provera servisa"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Poništavanje..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tip: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:327
 msgid "Cancel _All"
 msgstr "Poništi _sve"
 
-#: mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:416
 msgid "Updating..."
 msgstr "Osvežavanje..."
 
-#: mail/mail-send-recv.c:416 mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Čekanje..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Uredi potpis"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Unesi ime za ovaj potpis."
 
-#: mail/mail-signature-editor.c:415 plugins/shared-folder/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Ime:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Nije moguće pravljenje spool direktorijuma `%s': %s"
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Pokušava premeštanje pošte iz ne-mbox izvora `%s'"
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosleđena poruka - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:243
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:283
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Neispravan direktorijum %s"
 
-#: mail/mail-vfolder.c:90
-#, fuzzy, c-format
+#: ../mail/mail-vfolder.c:90
+#, c-format
 msgid "Setting up vFolder: %s"
-msgstr "Podešavanje vdirektorijuma: %s"
+msgstr "Podešavanje vDirektorijuma: %s"
 
-#: mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Osvežavanje vDirektorijuma za '%s: %s'"
 
-#: mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:246
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavanje vDirektorijuma za '%s'"
 
-#: mail/mail-vfolder.c:1008
-#, fuzzy
+#: ../mail/mail-vfolder.c:1008
 msgid "Edit vFolder"
-msgstr "Uredi VDirektorijum"
+msgstr "Uređuje vDirektorijum"
 
-#: mail/mail-vfolder.c:1092
-#, fuzzy
+#: ../mail/mail-vfolder.c:1092
 msgid "New vFolder"
-msgstr "_Novi direktorijum"
+msgstr "Novi vDirektorijum"
 
-#: mail/message-list.c:994
+#: ../mail/message-list.c:995
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:995
+#: ../mail/message-list.c:996
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:996
+#: ../mail/message-list.c:997
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:997
+#: ../mail/message-list.c:998
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:998
+#: ../mail/message-list.c:999
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:1003
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1004
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1008
 msgid "Higher"
 msgstr "Više"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1009
 msgid "Highest"
 msgstr "Najviše"
 
-#: mail/message-list.c:1336
+#: ../mail/message-list.c:1337
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1343 plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1344 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: mail/message-list.c:1352
+#: ../mail/message-list.c:1353
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %l:%M %p"
 
-#: mail/message-list.c:1364
+#: ../mail/message-list.c:1365
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1372
+#: ../mail/message-list.c:1373
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1374
+#: ../mail/message-list.c:1375
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2041
-#, fuzzy
+#: ../mail/message-list.c:2041
 msgid "Message List"
-msgstr "Po_ruke"
+msgstr "Spisak poruka"
 
-#: mail/message-list.c:3384
+#: ../mail/message-list.c:3386
 msgid "Generating message list"
 msgstr "Pravljenje spiska poruka"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Rok do"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Status oznake"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Sledi oznaku"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Orginalna lokacija"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Primljeno"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Veličina"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Poziv"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Ne prosledi"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Prosledi"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Pročitaj"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Telo sadrži"
 
-#: mail/searchtypes.xml.h:2
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
-#: mail/searchtypes.xml.h:3
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
-#: mail/searchtypes.xml.h:6
-#, fuzzy
+#: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
-msgstr "Naslov sadrži"
+msgstr "Naslov ili pošiljalac sadrže"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
-msgstr ""
+msgstr "Izaberite ime arhive Evolucije"
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr ""
+msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
-msgstr ""
+msgstr "Odaberite arhivu Evolucije za povraćaj"
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr ""
+msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: plugins/backup-restore/backup.c:109
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
-msgstr "Upit Evolucije"
+msgstr "Direktorijum za rezervu Evolucije"
 
-#: plugins/backup-restore/backup.c:111
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
-msgstr "Evolucija LDIF uvoznik"
+msgstr "Direktorijum za povraćaj Evolucije"
 
-#: plugins/backup-restore/backup.c:113
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
-msgstr "Paket programa Evolucija"
+msgstr "Proverava arhivu Evolucije"
 
 # shell:noshell-reason title
-#: plugins/backup-restore/backup.c:115
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
-msgstr "Nije moguće pokretanje Evolucije"
+msgstr "Ponovo pokreće Evoluciju"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
-msgstr "_Podešavanja..."
+msgstr "Podešavanja za rezervu..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr "Izmeni podešavanja Evolucije"
+msgstr "Pravi rezervu i oporavlja podatke i podešavanja Evolucije"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
-msgstr "Podešavanja pilota..."
+msgstr "Oporavlja podešavanja..."
 
-#: plugins/bbdb/bbdb.c:388
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:390
 msgid "Automatic Contacts"
-msgstr "Javni kontakti"
+msgstr "Automatski kontakti"
 
-#: plugins/bbdb/bbdb.c:397
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:399
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Identifikacija</span>"
+msgstr "<span weight=\"bold\">Automatski kontakti</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:412
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+msgstr "_Automatski napravi unose u adresar pri odgovaranju na poštu"
 
-#: plugins/bbdb/bbdb.c:428
-#, fuzzy
+#: ../plugins/bbdb/bbdb.c:430
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Fontovi poruke</span>"
+msgstr "<span weight=\"bold\">Kontakti brzih glasnika</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:443
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
-msgstr ""
+msgstr "Povremeno uskladi podatke o kontaktima i slike sa mog_brzog glasnika"
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:450
 msgid "Synchronize with _buddy list now"
-msgstr ""
+msgstr "Uskladi sa _spiskom drugara sada"
 
-#: plugins/calendar-weather/calendar-weather.c:54
-#: plugins/calendar-weather/calendar-weather.c:60
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
-msgstr "abaEaMaE"
+msgstr "Vreme: oblačno"
 
-#: plugins/calendar-weather/calendar-weather.c:61
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr "abaEaMaE"
+msgstr "Vreme: magla"
 
-#: plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "Vreme: mestimično oblačno"
 
-#: plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
-msgstr "abaEaMaE"
+msgstr "Vreme: kiša"
 
-#: plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
-msgstr "abaEaMaE"
+msgstr "Vreme: sneg"
 
-#: plugins/calendar-weather/calendar-weather.c:65
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
-msgstr "abaEaMaE"
+msgstr "Vreme: sunčano"
 
-#: plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "Vreme: Grmljavine"
 
-#: plugins/calendar-weather/calendar-weather.c:268
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:268
 msgid "Select a location"
-msgstr "Odaberite akciju"
+msgstr "Biranje lokacije"
 
-#: plugins/calendar-weather/calendar-weather.c:655
-#, fuzzy
+#: ../plugins/calendar-weather/calendar-weather.c:655
 msgid "_Units:"
-msgstr "Jedinica"
+msgstr "_Jedinice:"
 
-#: plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "Metrično (Celzijus, cm, itd.)"
 
-#: plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:663
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "Imperijalno (Farenhajt, inči, itd.)"
 
-#: plugins/default-source/default-source.c:82
-#, fuzzy
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark  as default folder"
-msgstr "Putanja do podrazumevanog direktorijuma pošte"
+msgstr "Označava  kao podrazumevani direktorijum"
 
-#: plugins/default-source/default-source.c:108
-#, fuzzy
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
-msgstr "Koristiti podrazumevani direktorijum za pripremu?"
+msgstr "Označava kao podrazumevani direktorijum"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:59
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:59
 msgid "Secure Password"
-msgstr "Unesite lozinku"
+msgstr "Bezbedna lozinka"
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:62
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:62
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr "Ova opcija će povezati na server korišćenjem Kerberos 5 prijave."
+msgstr ""
+"Ova opcija će povezati na Exchange server korišćenjem prijave bezbednom "
+"lozinkom (NTLM)."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:70
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:70
 msgid "Plaintext Password"
-msgstr "Unesite lozinku"
+msgstr "Tekstualna lozinka"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:72
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:72
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
+"Ova opcija će povezati na Exchange server korišćenjem prijave tekstualne "
+"lozinke."
 
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:193
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:193
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
-"<small>Dole odabrana poruka biće automatski poslata svakoj osobi koja vam "
-"pošalje\n"
-"poštu dok ste van kancelarije.</small>"
+"Dole izabrana poruka biće automatski poslata svakoj osobi \n"
+"koja vam pošalje poštu dok ste van kancelarije.</small>"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:221
-#: plugins/exchange-account-setup/exchange-account-setup.c:231
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:221
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:231
 msgid "I am out of the office"
-msgstr "Trenutno sam van kancelarije"
+msgstr "Van kancelarije sam"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:224
-#: plugins/exchange-account-setup/exchange-account-setup.c:228
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:224
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:228
 msgid "I am in the office"
-msgstr "Trenutno sam u kancelariji"
+msgstr "U kancelariji sam"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:257
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:257
 msgid "Out of office Message:"
-msgstr "<b>Poruka za van kancelarije:</b>"
+msgstr "Poruka za van kancelarije:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:302
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:302
 msgid "Exchange Settings"
-msgstr "Podešavanja vremena"
+msgstr "Exchange podešavanja"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:448
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:475
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
-msgstr ""
+msgstr "_OWA adresa (Url):"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:456
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:500
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
-msgstr "Neuspela prijava"
+msgstr "_Prijava"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:664
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:722
 msgid "Authentication Type"
-msgstr "_Tip identifikacije: "
+msgstr "Tip prijave"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:678
-#, fuzzy
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:736
 msgid "Ch_eck for Supported Types"
-msgstr "_Proveri podržane tipove "
+msgstr "_Proveri podržane tipove"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
-#, fuzzy, c-format
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "Odjavljujem pretplatu sa direktorijuma \"%s\""
+msgstr "Odjava sa direktorijuma \"%s\""
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Popis"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "Dodaj opcije slanja groupwise porukama"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: widgets/misc/e-send-options.glade.h:20
-#, fuzzy
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Send Options"
-msgstr "Opcije"
+msgstr "Opcije slanja"
 
-#: plugins/itip-formatter/itip-formatter.c:704
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:704
 msgid "Unable to parse item"
-msgstr "Nije moguće čitanje sadržaja poruke"
+msgstr "Nije moguća obrada predmeta"
 
-#: plugins/itip-formatter/itip-formatter.c:757
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:757
+#, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Nije moguće otvaranje kalendara '%s'."
+msgstr "Nije moguće slanje predmeta kalendaru '%s'.  %s"
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:768
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "Poslato kalendaru '%s' kao prihvaćeno·"
 
-#: plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:772
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "Poslato kalendaru '%s' kao rezervisano"
 
-#: plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:777
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "Poslato kalendaru '%s' kao odbijeno"
 
-#: plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
-msgstr ""
+msgstr "Poslato kalendaru '%s' kao poništeno"
 
-#: plugins/itip-formatter/itip-formatter.c:833
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:833
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Status učesnika nije osvežen zbog neispravnog statusa!\n"
+msgstr "Status učesnika nije osvežen zbog neispravnog statusa"
 
-#: plugins/itip-formatter/itip-formatter.c:844
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:844
+#, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Nije moguć prenos kalendara `%s'"
+msgstr "Nije moguće osvežavanje za učesnika %s"
 
-#: plugins/itip-formatter/itip-formatter.c:848
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:848
 msgid "Attendee status updated"
-msgstr "Osvežen status učesnika\n"
+msgstr "Osvežen status učesnika"
 
-#: plugins/itip-formatter/itip-formatter.c:973
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:973
 msgid "The calendar attached is not valid"
-msgstr "Navedena vrsta direktorijuma nije ispravna"
+msgstr "Priložen kalendar nije ispravan"
 
-#: plugins/itip-formatter/itip-formatter.c:974
+#: ../plugins/itip-formatter/itip-formatter.c:974
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
-msgstr ""
+msgstr "Poruka prijavljuje kalendar, ali kalendar nije ispravan iKalendar."
 
-#: plugins/itip-formatter/itip-formatter.c:1008
-#: plugins/itip-formatter/itip-formatter.c:1064
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1008
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
-msgstr "Pregled koji prikazuje kada počinje kalendar"
+msgstr "Predmet u kalendaru nije ispravan"
 
-#: plugins/itip-formatter/itip-formatter.c:1009
-#: plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
+"Poruka sadrži kalendar, ali on ne sadrži događaje, zaduženja ili slobodno/"
+"zauzeto podatke."
 
-#: plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "Kalendar u prilogu sadrži više predmeta"
 
-#: plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1035
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
+"Radi obrade svih ovih predmeta, potrebno je datoteku sačuvati a kalendar "
+"uvesti"
 
-#: plugins/itip-formatter/itip-formatter.c:1658
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
-msgstr "Kalendar i zaduženja"
+msgstr "Sastanci i zaduženja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "_Obriši poruku nakon akcije"
 
-#: plugins/itip-formatter/itip-formatter.c:1691
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Podešavanja</span>"
+msgstr "<span weight=\"bold\">Pretraga za preklapanjem</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
+msgstr "Bira kalendare za pretragu preklapanja u sastancima"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1735
+msgid "Conflict Search Table"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:175 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:180
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:180
 msgid "Today %H:%M"
-msgstr "Danas %l:%M %p"
+msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:184
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:184
 msgid "Today %H:%M:%S"
-msgstr "Danas %l:%M %p"
+msgstr "Danas %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:193
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %l:%M:%S %p"
-msgstr "Danas %l:%M %p"
+msgstr "Danas %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:203
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Tomorrow"
-msgstr "Komori"
+msgstr "Sutra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Tomorrow %H:%M"
-msgstr ""
+msgstr "Sutra %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:212
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "Sutra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %l:%M %p"
-msgstr "Danas %l:%M %p"
+msgstr "Sutra %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:221
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Danas %l:%M %p"
+msgstr "Sutra %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:240
 #, c-format
 msgid "%A"
-msgstr ""
+msgstr "%A"
 
 # strftime format of a time in 24-hour format,
 # without seconds.
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:245
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:245
 msgid "%A %H:%M"
-msgstr "%H:%M"
+msgstr "%A·%H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:249
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "%A·%H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A·%l:%M·%p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:258
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %l:%M:%S %p"
-msgstr "%I:%M:%S %p"
+msgstr "%A·%l:%M:%S·%p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:267
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A, %B %e"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:273
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e·%H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:277
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e·%H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A,·%B·%e·%l:%M·%p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:286
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A,·%B·%e·%l:%M:%S·%p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:292
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e, %Y"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e,·%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:297
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e. %B %Y."
+msgstr "%A,·%B·%e,·%Y·%H:%M"
 
 # strptime format of a weekday, a date and a time,
 # in 24-hour format.
@@ -14789,209 +14682,204 @@ msgstr "%A, %e. %B %Y."
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:301
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%A,·%B·%e,·%Y·%H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "do %B·%d,·%Y,·%l:%M·%p"
+msgstr "%A,·%B·%e,·%Y·%l:%M·%p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:310
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "do %B·%d,·%Y,·%l:%M·%p"
+msgstr "%A,·%B·%e,·%Y·%l:%M:%S·%p"
 
-#: plugins/itip-formatter/itip-view.c:335
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:335
+#, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> je objavio(la) informaciju o sastanku."
+msgstr "<b>%s</b> preko %s je objavio(la) sledeću informaciju o sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:337
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:337
+#, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> je objavio(la) informaciju o sastanku."
+msgstr "<b>%s</b> je objavio(la) sledeću informaciju o sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:342
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:342
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
+msgstr "<b>%s</b> zahteva prisustvo %s nasledećem sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:345
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:345
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
+msgstr "<b>%s</b> preko %s zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:347
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:347
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> zahteva Vaše prisustvo na sastanku."
+msgstr "<b>%s</b> zahteva Vaše prisustvo na sledećem sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:353
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:353
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> želi da doda postojećem sastanku"
+msgstr "<b>%s</b> preko %s želi da doda postojećem sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:355
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:355
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> želi da doda postojećem sastanku"
+msgstr "<b>%s</b> želi da doda postojećem sastanku:"
 
-#: plugins/itip-formatter/itip-view.c:358
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:358
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
+msgstr "<b>%s</b> želi da primi najnoviju informaciju o sledećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:361
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:361
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> je poslao(la) nerazumljivu poruku."
+msgstr "<b>%s</b> je poslao(la) sledeći odgovor za sastanak:"
 
-#: plugins/itip-formatter/itip-view.c:365
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:365
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> je otkazo(la) sastanak."
+msgstr "<b>%s</b> preko %s je otkazo(la) sledeći sastanak:"
 
-#: plugins/itip-formatter/itip-view.c:367
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> je otkazo(la) sastanak."
+msgstr "<b>%s</b> je otkazo(la) sledeći sastanak."
 
-#: plugins/itip-formatter/itip-view.c:370
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:370
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> je odgovorio(la) na zahtev za sastanak."
+msgstr "<b>%s</b> je predložio(la) sledeće promene sastanka."
 
-#: plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:374
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> je odgovorio(la) na zahtev za sastanak."
+msgstr "<b>%s</b> preko %s je odbio(la) sledeće promene sastanka:"
 
-#: plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> je odgovorio(la) na zahtev za sastanak."
+msgstr "<b>%s</b> je odbio(la) sledeće promene sastanka."
 
-#: plugins/itip-formatter/itip-view.c:403
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:403
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> je objavio(la) informaciju o zaduženju."
+msgstr "<b>%s</b> preko %s je objavio(la) informaciju o sledećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:405
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:405
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> je objavio(la) informaciju o zaduženju."
+msgstr "<b>%s</b> je objavio(la) informaciju o sledećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:410
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:410
+#, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
+msgstr "<b>%s</b> zahteva da %s preuzme sledeće zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:413
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:413
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> je otkazao(la) zaduženje."
+msgstr "<b>%s</b> preko %s Vam je dodelio(la) zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:415
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:415
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> je otkazao(la) zaduženje."
+msgstr "<b>%s</b> Vam je dodelio(la) zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:421
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:421
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b želi da doda postojećem zaduženju."
+msgstr "<b>%s</b preko %s želi da doda postojećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:423
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:423
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b želi da doda postojećem zaduženju."
+msgstr "<b>%s</b želi da doda postojećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:426
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:426
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
+msgstr "<b>%s</b> želi da primi najnoviju informaciju o sledećem zaduženju:"
 
-#: plugins/itip-formatter/itip-view.c:429
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:429
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> je poslao(la) nerazumljivu poruku."
+msgstr "<b>%s</b> je poslao(la) sledeći odgovor na dodeljeno zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:433
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:433
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> je otkazao(la) zaduženje."
+msgstr "<b>%s</b> preko %s je otkazao(la) sledeeće zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:435
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:435
+#, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b> je otkazao(la) zaduženje."
+msgstr "<b>%s</b> je otkazao(la) sledeće zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:438
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:438
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> je odgovorio(la) na dodeljeno zaduženje."
+msgstr "<b>%s</b> je predložio(la) sledeće promene zaduženja:"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b> preko %s je odbio sledeće zaduženje:"
 
-#: plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> je odgovorio(la) na dodeljeno zaduženje."
+msgstr "<b>%s</b> je odbio(la) sledeće dodeljeno zaduženje:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:892
-#: plugins/itip-formatter/itip-view.c:942
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
-msgstr "Naredba:"
+msgstr "Komentar:"
 
 #. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
 msgid "Action not available"
-msgstr "TLS nije dostupan"
+msgstr "Akcija nije dostupna"
 
 #. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
+msgstr "Ova poruka ne sadrži potrebne podatke u zaglavlju za ovu akciju."
 
 #. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
 msgid "Posting not allowed"
-msgstr "Server ne dozvoljava slanje članaka"
+msgstr "Slanje nije dozvoljeno"
 
 #. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
+"Slanje na ovu dopisnu listu nije dozvoljeno. Možda je ova lista samo za "
+"čitanje. Obratite se vlasniku liste za detalje."
 
 #. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
 msgid "Send e-mail message to mailing list?"
-msgstr "Pošalji _poruku na listu"
+msgstr "Poslati elektronsku_poruku na dopisnu listu?"
 
 #. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -14999,443 +14887,469 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
+"Elektronska poruka će biti poslata na adresu (URL) \"{0}\". Možete poruku da "
+"pošaljete automatski, ili je prvo pogledati i izmeniti.\n"
+"\n"
+"Trebalo bi da dobijete odgovor sa dopisne liste ubrzo nakon slanja poruke."
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
 msgid "_Send message"
-msgstr "Slanje poruke"
+msgstr "_Pošalji poruku"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
 msgid "_Edit message"
-msgstr "Slanje poruke"
+msgstr "_Uredi poruku"
 
 #. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
 msgid "Malformed header"
-msgstr "Neispravan potpis"
+msgstr "Neispravno zaglavlje"
 
 #. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
 msgstr ""
+"Zaglavlje {0} ove poruke nije ispravno sastavljeno i ne može biti obrađeno.\n"
+"\n"
+"Zaglavlje: {1}"
 
 #. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
 msgid "No e-mail action"
-msgstr "Beleži akcije filtera"
+msgstr "Nema akcije za e-poštu"
 
 #. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
+"Akciju nije moguće izvesti. To znači da zaglavlje za ovu akciju nije sadržalo "
+"obradivu akciju.\n"
+"\n"
+"Zaglavlje: {0}"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/new-mail-notify/new-mail-notify.c:66
-#, fuzzy
+#: ../plugins/new-mail-notify/new-mail-notify.c:66
 msgid "_Generates a D-BUS message when new mail arrives"
-msgstr "S_virni kada stigne nova pošta"
+msgstr "·Obavesti D-BUS porukom kada stigne nova pošta"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Uključuje i isključuje dodatke"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Manage Plugins..."
-msgstr "Poništavanje..."
+msgstr "Upravljanje dodacima..."
 
-#: plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
-msgstr "sat(a)"
+msgstr "Autor(i)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
-msgstr "I"
+msgstr "Ib"
 
-#: plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
-msgstr "_Putanja:"
+msgstr "Putanja"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "aaPaIb"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
-msgstr "Upravnik"
+msgstr "Upravljač dodacima"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "Napomena: neke izmene neće biti uključene pre ponovnog pokretanja"
 
-#: plugins/plugin-manager/plugin-manager.c:210
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
-msgstr "Brisanje"
+msgstr "Dodatak"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
-msgstr ""
+msgstr "Prikaži HTML ako postoji"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "Po mogućstvu PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "Isključivo prikazuj PLAIN"
 
-#: plugins/prefer-plain/prefer-plain.c:150
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
-msgstr "HTML pošta"
+msgstr "HTML mod"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-#, fuzzy
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
-msgstr "Sačuvaj prilog..."
+msgstr "Čuva priloge ..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-#, fuzzy
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
-msgstr "Sačuvaj prilog"
+msgstr "Čuva sve priloge"
 
-#: plugins/save-attachments/save-attachments.c:331
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
-msgstr "Izaberite vremensku zonu"
+msgstr "Bira ime za snimanje baze"
 
-#: plugins/save-attachments/save-attachments.c:351
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
-msgstr "MIME tip:"
+msgstr "MIME tip"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:168
 #, c-format
 msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr ""
+msgstr "%s%d/%s%d/%s%d·%s%d:%s%d:%s%d"
 
-#: plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 #, c-format
 msgid ""
 "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
 "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
 "sAttendees List%sLocation%sModified%s"
 msgstr ""
+"Jib%sPregled%sSpisak opisa%sSpisak kategorija%sSpisak komentara%sZavršeno%"
+"sNapravljeno%sKontakt lista%sPočetak%sZavršetak%sDo%sProcenat završenog%"
+"sVažnost%sAresa (Url)%sSpisak prisutnih%sLokacija%sIzmenjeno%s"
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "Napredne opcije za CSV format"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a header"
-msgstr ""
+msgstr "Prvo uključi zaglavlje"
 
-#: plugins/save-calendar/csv-format.c:535
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "Value delimiter:"
-msgstr "Lokalna dostava"
+msgstr "Razgraničnik vrednosti:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:542
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Razgraničnik zapisa:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "Spoji vrednosti sa:"
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "Zarezom odvojen format vrednosti (.csv)"
 
-#: plugins/save-calendar/ical-format.c:136
-#, fuzzy
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
-msgstr "iCalendar datoteke (.ics)"
+msgstr "iKalendar format (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:391
 msgid "RDF format (.rdf)"
-msgstr ""
+msgstr "RDF format (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:171
-#: plugins/save-calendar/save-calendar.c:181
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
-msgstr "Izaberite odredište"
+msgstr "Izaberite odredišnu datoteku"
 
-#: plugins/save-calendar/save-calendar.c:216
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
+"Navedena ekstenzija za ovaj tip datoteke (%s) izabrano ime datoteke ne "
+"koristi. Želite li da nastavite?"
 
-#: plugins/send-options/send-options.c:82
+#: ../plugins/send-options/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite lozinku za %s (korisnik %s)"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-#, fuzzy
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
 msgid "Invalid user"
-msgstr "Neispravna svrha"
+msgstr "Neispravan korisnik"
 
 #. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
 msgid ""
 "\n"
 "You cannot share folder with specified user \"{0}\" \n"
 msgstr ""
+"\n"
+"žne možete da delite direktorijum sa navedenim korisnikom \"{0}\" \n"
 
 #. org.gnome.evolution.mail_shared_folder:no-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-#, fuzzy
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
 msgid "Specify User"
-msgstr "Određeno zaglavlje"
+msgstr "Odredite korisnika"
 
 #. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
 msgid ""
 "\n"
 "\tYou have to specify a user name whom you want to add to the list \n"
 msgstr ""
+"\n"
+"\tMorate da navedete korisničko ime koje želite da dodate na spisak \n"
 
-#: plugins/shared-folder/properties.glade.h:2
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:2
 msgid "<b>Users :</b>"
-msgstr "<b>Uzbune</b>"
+msgstr "<b>Korisnici:</b>"
 
-#: plugins/shared-folder/properties.glade.h:4
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:4
 msgid "Message"
-msgstr "Po_ruke"
+msgstr "Poruka"
 
-#: plugins/shared-folder/properties.glade.h:6
+#: ../plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Obaveštavanje o deljenom direktorijumu"
 
-#: plugins/shared-folder/properties.glade.h:8
+#: ../plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "Učesnici će primiti sledeće obaveštenje.\n"
 
-#: plugins/shared-folder/properties.glade.h:11
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontakti..."
 
-#: plugins/shared-folder/properties.glade.h:12
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:12
 msgid "_Cutomize notification message"
-msgstr "Nije moguće pravljenje poruke."
+msgstr "_Prilagodi poruku za obaveštavanje"
 
-#: plugins/shared-folder/properties.glade.h:13
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
-msgstr "Nije pokrenuto"
+msgstr "_Nije deljeno"
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
-msgstr ""
+msgstr "_Deljeno sa ..."
 
-#: plugins/shared-folder/properties.glade.h:16
-#, fuzzy
+#: ../plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
-msgstr "Senčenje"
+msgstr "_Deljenje"
 
-#: plugins/shared-folder/share-folder-common.c:315
+#. e_error_run (NULL,  _("Cannot create GroupWise folders in offline mode."), NULL, NULL);
+#: ../plugins/shared-folder/share-folder-common.c:220
 #, fuzzy
+msgid "Cannot Create shared folder in offline mode."
+msgstr "Nije moguće pravljenje direktorijuma tog imena."
+
+#: ../plugins/shared-folder/share-folder-common.c:323
 msgid "Users"
-msgstr "_Korisnik:"
+msgstr "Korisnici"
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/shared-folder/share-folder-common.c:324
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Unesite korisnike i postavite ovlašćenja"
 
-#: plugins/shared-folder/share-folder-common.c:401
-#, fuzzy
+#: ../plugins/shared-folder/share-folder-common.c:411
 msgid "Sharing"
-msgstr "Senčenje"
+msgstr "Deljenje"
+
+#: ../plugins/startup-wizard/startup-wizard.c:255
+#: ../shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Pomoćnik Evolucija podešavanja"
+
+#: ../plugins/startup-wizard/startup-wizard.c:260
+#: ../shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Dobro došli"
+
+#: ../plugins/startup-wizard/startup-wizard.c:261
+#: ../shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Dobro došli u Evoluciju. Nekoliko narednih ekrana će omogućiti da se "
+"Evolucija poveže na naloge eletronske pošte i da uveze datoteke iz drugih "
+"programa.\n"
+"\n"
+"Pritisnite dugme \"Napred\" da nastavite. "
+
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
+msgid "Please select the information that you would like to import:"
+msgstr "Izaberite podatke koje želite da uvezete:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
+#, c-format
+msgid "From %s:"
+msgstr "Od %s:"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "Vrati se na poruke u nanizane po nas_lovu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolucija konzola"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Proba Evolucije"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Probni deo Evolucije"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "Gnom opis štampe tekućih podešavanja štampača"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
-msgstr "Verzija podešavanja Evolucije"
+msgstr "Verzija podešavanja"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
-msgstr "Podrazumevana širina prozora"
+msgstr "Podrazumevana širina pomoćne trake"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Podrazumevana visina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Podrazumevana širina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
-msgstr "Poslednja dostupna verzija podešavanja Evolucije"
+msgstr "Poslednja osvežena verzija podešavanja"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Spisak putanja direktorijuma koji se usklađuju na disku za rad van mreže"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
-msgstr "Podešavanja vremena"
+msgstr "Podešavanja štampača"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
-msgstr "Da li da preskoči prozorče sa upozorenjem o razvoju"
+msgstr "Preskače prozorče sa upozorenjem o razvoju"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11 shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:472
 msgid "Start in offline mode"
 msgstr "Počni rad van mreže"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level"
-msgstr ""
+msgstr "Verzija podešavanja Evolucije, uz nivo podešavanja glavno/sporedno/"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
-msgstr "Predefinisana visina prozora za poruku"
+msgstr "Podrazumevana visina prozora za poruku, u pikselima."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default width for the main window, in pixels."
-msgstr "Predefinisana širina prozora za poruku"
+msgstr "Podrazumevana širina glavnog prozora, u pikselima."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the sidebar, in pixels."
-msgstr "Podrazumevana širina panela direktorijuma"
+msgstr "Podrazumevana širina pomoćne trake, u pikselima."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level"
 msgstr ""
+"Poslednja osvežena verzija podešavanja Evolucije, uz nivo podešavanja glavno/"
+"sporedno/"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#, fuzzy
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
+"Stil dugmadi prozora. Može biti \"tekst\", \"ikone\", \"oboje\", \"traka "
+"alata\". Ako je postavljeno \"traka alata\",Gnomovo podešavanje trake alata "
+"utvrđuje stil dugmadi."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
 msgstr "Traka alata je vidljiva"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Ako je postavljeno, Evolucija će se pokrenuti u režimu za rad van mreže "
-"umesto u režimu za rad na mreži."
+msgstr "Da li će se Evolucija pokrenuti u režimu za rad van mreže."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Da li da traka alata bude vidljiva."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
-"Ako je postavljeno, prozorče sa upozorenjem u razvojnim verzijama Evolucije "
-"neće biti prikazano."
+"Da li će prozorče sa upozorenjem u razvojnim verzijama Evolucije biti "
+"prikazano."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
-msgstr "Da li da traka alata bude vidljiva."
+msgstr "Da li da dugmad prozora budu vidljiva."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Window button style"
-msgstr ""
+msgstr "Stil dugmadi prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Window buttons are visible"
-msgstr ""
+msgstr "Dugmad prozora su vidljiva"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktivne veze</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Aktivne veze"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr "Kliknite OK da prekinete vezu i radite van mreže"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Bezimeno)"
 
-#: shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite vrstu uvoznika:"
 
-#: shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15449,15 +15363,11 @@ msgstr ""
 "Možete izabrati \"Automatsko\" ukoliko ne znate, i Evolucija će pokušati da "
 "sama završi posao."
 
-#: shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
-#: shell/e-shell-importer.c:159 shell/e-shell-startup-wizard.c:750
-msgid "Please select the information that you would like to import:"
-msgstr "Izaberite podatke koje želite da uvezete:"
-
-#: shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -15469,7 +15379,7 @@ msgstr ""
 "koja bi se mogla uvesti. Ukoliko želite da pokušate\n"
 "ponovo, kliknite na dugme \"Nazad\".\n"
 
-#: shell/e-shell-importer.c:233 shell/e-shell-importer.c:267
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15478,30 +15388,30 @@ msgstr ""
 "Uvoženje %s\n"
 "Uvoženje predmeta %d."
 
-#: shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Izaberite uvoznika"
 
-#: shell/e-shell-importer.c:462 shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
 
-#: shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Uvoženje"
 
-#: shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Uvoženje %s.\n"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Greška kod učitavanja %s"
 
-#: shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15510,31 +15420,31 @@ msgstr ""
 "Uvoženje %s\n"
 "Uvoženje 1. predmeta."
 
-#: shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Automatsko"
 
-#: shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: shell/e-shell-importer.c:766 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15542,41 +15452,36 @@ msgstr ""
 "Sačekajte...\n"
 "Pretraga za postojećim podešavanjima"
 
-#: shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećanje inteligentnih uvoznika"
 
-#: shell/e-shell-importer.c:899 shell/e-shell-startup-wizard.c:700
-#, c-format
-msgid "From %s:"
-msgstr "Od %s:"
-
-#: shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Nema dostupnog uvoznika za datoteku %s"
 
-#: shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Nije moguće pokretanje uvoznika"
 
-#: shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "U_voz"
 
-#: shell/e-shell-offline-handler.c:589
+#: ../shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Zatvaranje veza..."
 
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
-#: shell/e-shell-startup-wizard.c:577
+#: ../shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Početak uvoza"
 
-#: shell/e-shell-startup-wizard.c:797
+#: ../shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15590,202 +15495,178 @@ msgstr ""
 "\n"
 "Želite li sada da zatvorite pomoćnika?"
 
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nije navedeno ime direktorijuma."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Ime direktorijuma ne može da sadrži Return znak."
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Ime direktorijuma ne može da sadrži znak \"/\"."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Ime direktorijuma ne može da sadrži znak \"#\"."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' su nepromenjiva imena direktorijuma."
 
-#: shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da ovaj sistem nema instalirane Gnom pilot alate.."
 
-#: shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
-#: shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nije instaliran."
 
-#: shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može biti pokrenut."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:501
+#: ../shell/e-shell-window-commands.c:501
 msgid "translator-credits"
-msgstr ""
+msgstr "zaslužni-prevodioci"
 
-#: shell/e-shell-window-commands.c:515
+#: ../shell/e-shell-window-commands.c:515
 msgid "Groupware Suite"
 msgstr "Groupware paket programa"
 
-#: shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:742
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: shell/e-shell-window-commands.c:755 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:755 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Ra_d van mreže"
 
-#: shell/e-shell-window-commands.c:768 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:768 ../ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Rad van mreže"
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolucija je trenutno na mreži.  Kliknite na ovo dugme za rad van mreže."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Evolucija je u procesu odlaska za rad van mreže."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolucija je trenutno van mreže.  Kliknite na ovo dugme za rad na mreži."
 
-#: shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:713
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: shell/e-shell.c:598
+#: ../shell/e-shell.c:598
 msgid "Uknown system error."
 msgstr "Nepoznata sistemska greška."
 
-#: shell/e-shell.c:800 shell/e-shell.c:801
+#: ../shell/e-shell.c:800 ../shell/e-shell.c:801
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1254 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1254 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1256
+#: ../shell/e-shell.c:1256
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: shell/e-shell.c:1258
+#: ../shell/e-shell.c:1258
 msgid "Cannot register on OAF"
 msgstr "Nije moguća registracija na OAF"
 
-#: shell/e-shell.c:1260
+#: ../shell/e-shell.c:1260
 msgid "Configuration Database not found"
 msgstr "Baza sa podešavanjima nije nađena"
 
-#: shell/e-shell.c:1262
+#: ../shell/e-shell.c:1262
 msgid "Generic error"
 msgstr "Opšta greška"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Pomoćnik Evolucija podešavanja"
-
-#: shell/evolution-startup-wizard.glade.h:3
+#: ../shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvoženje datoteka"
 
-#: shell/evolution-startup-wizard.glade.h:4
+#: ../shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Vremenska zona"
 
-#: shell/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Dobro došli"
-
-#: shell/evolution-startup-wizard.glade.h:6
-#, fuzzy
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Dobro došli u Evoluciju. Nekoliko narednih ekrana\n"
-"će vam omogućiti da se Evolucija poveže na naloge eletronske\n"
-"pošte i da uveze datoteke iz drugih programa.\n"
-"\n"
-"Pritisnite dugme \"Napred\" da nastavite. "
-
-#: shell/evolution-startup-wizard.glade.h:9
-#, fuzzy
+#: ../shell/evolution-startup-wizard.glade.h:9
 msgid ""
 "You have successfully entered all of the information needed to set up "
 "Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Uspešno ste uneli sve podatke neophodne za\n"
-"podešavanje Evolucije.\n"
+"Uspešno ste uneli sve podatke neophodne za podešavanje Evolucije.\n"
 "\n"
 "Pritisnite dugme \"Primeni\" da sačuvate podešavanja. "
 
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nova proba"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Proba"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Napravi novu probnu stavku"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite na \"Uvezi\" da započnete uvoz datoteke u Evoluciju. "
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Uvezi datoteku"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Uvezi putanju"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Vrsta uvoznika"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Izaberite uvoznike"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -15795,28 +15676,28 @@ msgstr ""
 "Ovaj pomoćnik će vas provesti kroz postupak\n"
 "uvoza spoljnih datoteka u Evoluciju."
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Uvoznici"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Uvezi"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može da uveze podatke iz sledećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:238
+#: ../shell/main.c:234
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15851,7 +15732,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaš doprinos!\n"
 
-#: shell/main.c:262
+#: ../shell/main.c:258
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15859,40 +15740,39 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: shell/main.c:269
+#: ../shell/main.c:265
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:474
+#: ../shell/main.c:470
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: shell/main.c:478
+#: ../shell/main.c:474
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: shell/main.c:481
-#, fuzzy
+#: ../shell/main.c:477
 msgid "Forcibly shut down all Evolution components"
-msgstr "Silom ugasi sve delove evolucije"
+msgstr "Silom gasi sve delove Evolucije"
 
-#: shell/main.c:485
+#: ../shell/main.c:481
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovan prenos podataka iz Evolucije 1.4"
 
-#: shell/main.c:488
+#: ../shell/main.c:484
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
-#: shell/main.c:491
+#: ../shell/main.c:487
 msgid "Disable the mono plugin environment."
-msgstr ""
+msgstr "Isključuje dodatak za mono okruženje."
 
-#: shell/main.c:494
+#: ../shell/main.c:490
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Isključuje učitavanje svih dodataka."
 
-#: shell/main.c:525
+#: ../shell/main.c:521
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15902,12 +15782,12 @@ msgstr ""
 "  Koristite %s --help za više podataka.\n"
 
 #. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
 msgstr "Nedovoljno mesta na disku za dograđivanje."
 
 #. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
+#: ../shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -15922,7 +15802,7 @@ msgstr ""
 "da nastavite."
 
 #. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
+#: ../shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
@@ -15931,7 +15811,7 @@ msgstr ""
 "{0}"
 
 #. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
 "\n"
@@ -15943,19 +15823,19 @@ msgstr ""
 "Ukoliko odlučite da nastavite, možda nećete moći da pristupite nekim starim "
 "podacima.\n"
 
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Nastavi"
 
 # shell:upgrade-remove-1-4 primary
 #. shell:upgrade-remove-1-4 title
 #. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr "Obrisati stare podatke iz verzije {0}?"
 
 #. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -15970,23 +15850,23 @@ msgstr ""
 "\"evolution\" biće trajno obrisan.  Ukoliko se odlučite  da zadržite ove "
 "podatke, moraćete ručno da uklonite ovaj sadržaj kada vam bude zgodno.\n"
 
-#: shell/shell-errors.xml.h:25
+#: ../shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Podseti me kasnije"
 
-#: shell/shell-errors.xml.h:26
+#: ../shell/shell-errors.xml.h:26
 msgid "_Keep Data"
 msgstr "_Zadrži podatke"
 
 # shell:upgrade-remove-1-4-confirm primary
 #. shell:upgrade-remove-1-4-confirm title
 #. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr "Zaista obrisati stare podatke?"
 
 #. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
 "permanently removed.\n"
@@ -16009,19 +15889,19 @@ msgstr ""
 # shell:noshell-reason title
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Nije moguće pokretanje Evolucije"
 
 # shell:noshell-reason primary
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Evolucija se ne može pokrenuti."
 
 #. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -16032,7 +15912,7 @@ msgstr ""
 "Kliknite na pomoć za detalje"
 
 #. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -16046,7 +15926,7 @@ msgstr ""
 "\n"
 "Kliknite na pomoć za detalje"
 
-#: smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -16057,7 +15937,7 @@ msgstr ""
 "\n"
 "Podesite poverenje:"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -16066,7 +15946,7 @@ msgstr ""
 "Pošto verujete izdavaocu ovog sertifikata, onda verujete i u autentičnost "
 "ovog sertifikata osim ako ovde ne naznačite drugačije"
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -16075,55 +15955,60 @@ msgstr ""
 "Pošto ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u "
 "autentičnost ovog sertifikata osim ako ovde ne naznačite drugačije"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:377 smime/gui/certificate-manager.c:385
-#: smime/gui/certificate-manager.c:597 smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
 msgid "Select a cert to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
-#: smime/gui/certificate-manager.c:265 smime/gui/certificate-manager.c:474
-#: smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
-#: smime/gui/certificate-manager.c:274 smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Namene"
 
-#: smime/gui/certificate-manager.c:283 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Ističe"
 
-#: smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "Elektronska adresa"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Pregledač sertifikata: %s"
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Unesite lozinku za `%s'"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Unesite novu lozinku za bazu sertifikata"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16132,7 +16017,7 @@ msgstr ""
 "Izdato:\n"
 "  Naslov: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16141,59 +16026,59 @@ msgstr ""
 "Izdao:\n"
 "  Naslov: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Izaberi sertifikat"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<nije deo sertifikata>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Polja sertifikata</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Hijerarhija sertifikata</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Vrednost polja</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Otisci</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Izdao</b> "
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Izdato</b> "
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>Ovaj sertifikat je proveren za naredne potrebe:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Ispravnost</b>"
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Izdavaoci"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Rezerviši"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Rezerviši sve"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -16201,364 +16086,369 @@ msgstr ""
 "Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, "
 "politiku i procedure (ako su dostupni)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Poverenje izdavaocu sertifikata"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Detalji sertifikata"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
+#, fuzzy
+msgid "Certificates Table"
+msgstr "Ime sertifikata"
+
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Zajedničko ime (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Sertifikati kontakta"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne veruj u autentičnost ovog sertifikata"
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "Samo glupi prozor"
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Uređivanje"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "Podešavanja poverenja u sertifikate e-pošte"
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat primaoca e-poruke"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "Sertifikat potpisnika e-poruke"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Ističe"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Izdat"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5 otisak"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organizacija (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Organizaciona jedinica (OU)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Sertifikat SSL klijenta"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Sertifikat SSL servera"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Veruj u autentičnost ovog sertifikata"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje e-adresa."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje programera."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje web stranica."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Prikaz"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Imate sertifikate ovih organizacija koji vas određuju:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Držite sertifikate koji određuju ove izdavaoce sertifikata:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Držite sertifikate koji određuju ove osobe:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Vaši sertifikati"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "_Uredi poverenje u CA"
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr "prozorče1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:642
 msgid "Certificate already exists"
 msgstr "Sertifikat već postoji"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Potpiši"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Verzija"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Verzija 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Verzija 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OJ"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrovanje"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključa sertifikata"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape tip sertifikata"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikator ključa izdavaoca sertifikata"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "JIB"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator predmeta (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identifikator algoritma"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom ključu subjekta"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog ključa subjekta"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Javni ključ subjekta"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Greška: nije moguća obrada proširenja"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL izdavač sertifikata"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Izdavač sertifikata e-pošte"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Zamućivanje ključa"
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Zamućivanje podataka"
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Saglasnost ključa"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Potpisnik sertifikata"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritično"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nekritično"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa sertifikata"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Izdavalac"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavača"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Uvežen sertifikat"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Prilog za dodavanje."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Tip sadržaja priloga."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Ime datoteke koje se prikazuje u poruci."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Opis priloga."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Označi da se prilog podrazumevano prikazuje unutar poruke."
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Podrazumevan naslov poruke."
 
@@ -16566,1405 +16456,1385 @@ msgstr "Podrazumevan naslov poruke."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nije moguće izvršavanje '%s': %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gašenje %s (%s)\n"
 
 # bug: plural-forms
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiraj kontakt(e) u drugi direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiraj odabrano"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopiraj u direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Iseci označeno"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Obriši odabrane kontakte"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Premesti kontakt(e) u drugi direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Premesti u direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Nalepi memorisano"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Pregleda kontakte pre štampe"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_gledaj pre štampe"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Štampa odabranih kontakata"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Sačuvaj odabrane kontakte kao VKartu."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Bira sve kontakte"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Šalje poruku izabranim kontaktima."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Šalje poruku kontaktu"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Šalje izabrane kontakte drugoj osobi."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Prikaži prozor za pregled kontakta"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Prekini"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Prekida učitavanje"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Pregledaj tekući kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-global.xml.h:14 ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-messagedisplay.xml.h:4 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Premesti u direktorijum..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:16
 msgid "_Preview Pane"
 msgstr "_Panel za pregled"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Izaberi sve"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Obriši sve pojave"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Obriši sastanak"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Obriši ovu pojavu"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Idi na"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Idi nazad"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Idi napred"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Spisak"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Sledeće"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Pregled kalendara pre štampe"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Štampaj ovaj kalendar"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatak slobodno/zauzeto za ovaj kalendar"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Izbaci stare sastanke"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Bira određeni datum"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Prikaži radnu nedelju"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Pregledaj tekući sastanak"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Nedelja"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiraj izabrani tekst u memoriju"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "I_seci"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Iseci izabrani tekst u memoriju"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Nalepi tekst iz memorije"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Izaberi sv_e"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Izaberi sav tekst"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Prilagodi Moju evoluciju"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Otkaži tekuću operaciju sa poštom"
 
-#: ui/evolution-mail-global.xml.h:3
+#: ../ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravi ili uredi pravila za filtriranje nove pošte"
 
-#: ui/evolution-mail-global.xml.h:5
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit vFolder definitions"
-msgstr "Napravi ili uredi definicije virtuelnih direktorijuma"
+msgstr "Pravi ili uređuje definicije vDirektorijuma"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
 msgstr "Otvori prozor za sastavljanje poruke"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno ukloni sve obrisane poruke iz svih direktorijuma"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "Pošalji no_vu poruku"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Pošalji poruku u javni direktorijum"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "P_rijavi se na direktorijume..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "Prikaži prozor za pregled poruke"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavi se ili odjavi na direktorijume na mrežnim serverima"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filteri..."
 
-#: ui/evolution-mail-global.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "vFolder _Editor..."
-msgstr "Uređivač virtuelnog _direktorijuma..."
+msgstr "_Uređivač vDirektorijuma..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Izmenite postavke ovog direktorijuma"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiraj izabranu(e) poruku(e) u memoriju"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Iseci izabranu(e) poruku(e) u memoriju"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Sa_krij izabrane poruke"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Sakrij o_brisane poruke"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Sakrij pro_čitane poruke"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Sakrij obrisane poruke umesto njihovog precrtavanja"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
 msgstr "Označi sve kao p_ročitano"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Označi sve vidljive poruke kao pročitane"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Nalepi poruku(e) iz memorije"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno ukloni sve obrisane poruke iz ovog direktorijuma"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Izaberi _niz"
 
 # bug:
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Izaberi sve i samo poruke koje trenutno nisu izabrane"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Izaberi sve poruke istog niza kao što je izabrana poruka"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "Pri_kaži skrivene poruke"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Prikaži poruke koje su privremeno skrivene"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Privremeno sakrij sve pročitane poruke"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Privremeno sakrij izabrane poruke"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Spisak poruka prema nizu razgovora"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "_Direktorijum"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Spisak poruka prema _nizu razgovora"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _pošiljaoca u adresar"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "Pri_meni filtere"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Primeni pravila filtriranja na izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
 msgstr "Način u_metanja"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Sastavi odgovor svim primaocima izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavi odgovor dopisnoj listi izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavi odgovor pošiljaocu izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopiraj izabrane poruke u drugi direktorijum"
 
-#: ui/evolution-mail-message.xml.h:12
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Create _vFolder From Message"
-msgstr "_Napravi filter od poruke"
+msgstr "Napravi _vDirektorijum od poruke"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravi pravilo za filtriranje poruka od ovog pošiljaoca"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravi pravilo za filtriranje poruka ovim primaocima"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Napravi pravilo za filtriranje poruka na ovu dopisnu listu"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravi pravilo za filtriranje poruka sa ovim naslovom"
 
-#: ui/evolution-mail-message.xml.h:17
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a vFolder for these recipients"
-msgstr "Napravi virtuelni direktorijum za ove primaoce"
+msgstr "Pravi vDirektorijum za ove primaoce"
 
-#: ui/evolution-mail-message.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a vFolder for this mailing list"
-msgstr "Napravi virtuelni direktorijum za ovu dopisnu listu"
+msgstr "Pravi vDirektorijum za ovu dopisnu listu"
 
-#: ui/evolution-mail-message.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for this sender"
-msgstr "Napravi virtuelni direktorijum za ovog pošiljaoca"
+msgstr "Pravi vDirektorijum za ovog pošiljaoca"
 
-#: ui/evolution-mail-message.xml.h:20
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this subject"
-msgstr "Napravi virtuelni direktorijum za ovaj naslov"
+msgstr "Pravi vDirektorijum za ovaj naslov"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Umanji veličinu teksta"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Prikaži sledeću važnu poruku"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Prikaži sledeću poruku"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Prikaži sledeću nepročitanu poruku"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Prikaži sledeći nepročitan niz"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Prikaži prethodnu važnu poruku"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Prikaži prethodnu poruku"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Prikaži prethodnu nepročitanu poruku"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "Pro_sledi kao..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter _Junk"
 msgstr "Filter naj _đubre"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter na dopisnu _listu..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter na po_šiljaoca..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter na p_rimaoce..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter na _naslov..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Filtriraj izabrane poruke radi izbacivanja đubreta"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označi izabranu(e) poruku(e) za praćenje"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Pra_ti..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Silom učitava slike u HTML porukama"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Prosleđuje izabranu poruku u telu nove poruke"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosleđuje izabranu poruku citiranu kao odgovor"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosleđuje izabranu poruku nekome kao prilog"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Uvećaj veličinu teksta"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Učitaj _slike"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mar_k as Read"
-msgstr "O_znači kao pročitano"
-
-#: ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Označi kao _važno"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Mark as U_nread"
-msgstr "Označi kao _nepročitano"
-
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kao neva_žno"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označava izabranu(e) poruku(e) kao pročitano"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Označava izabranu(e) poruku(e) kao važno"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Označava izabranu(e) poruku(e) kao đubre"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Označava izabranu(e) poruku(e) da nisu đubre"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označava izabranu(e) poruku(e) kao nepročitano"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označava izabranu(e) poruku(e) kao nevažno"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Označava izabranu(e) poruku(e) za brisanje"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Premesti"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Premešta izabranu(e) poruku(e) u drugi direktorijum"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Sledeći _niz"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Nije đubre"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Otvara izabranu poruku u novom prozoru"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer for editing"
 msgstr "Otvara izabranu poruku u sastavljaču za uređivanje"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Izvorna _veličina"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Pošalji od_govor"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Šalje odgovor na poruku u javni direktorijum"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Pregled poruke pre štampe"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Štampaj ovu poruku"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smerava (odbacuje) izabranu poruku nekome"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na izvornu veličinu"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Pre_traži poruku..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Manje"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Sačuvaj poruku kao tekstualnu datoteku"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Traži tekst u telu prikazane poruke"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Podešava strane za vaš tekući štampač"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Prikaži izvor elektronske poruke"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Prikaži cela _zaglavlja"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikaži trepćući kurzor u telu prikazanih poruka"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Prikaži poruku u normalnom stilu"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Prikaži poruku sa svim zaglavljima e-pošte"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Prikaži izvorni kod elektronske poruke"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Veličina te_ksta"
 
 # Od-obriši?
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Povrati izabrane poruke"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "Unutar"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Message Display"
 msgstr "Prikaz _poruke"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:125 ../ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "Ala_ti"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Povrati"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "vFolder on Mailing _List..."
-msgstr "VDirektorijum na _dopisnu listu..."
+msgstr "vDirektorijum na _dopisnu listu..."
 
-#: ui/evolution-mail-message.xml.h:128
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "vFolder on Se_nder..."
-msgstr "VDirektorijum na _pošiljaoca..."
+msgstr "vDirektorijum na _pošiljaoca..."
 
-#: ui/evolution-mail-message.xml.h:129
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "vFolder on _Recipients..."
-msgstr "VDirektorijum na _primaoce..."
+msgstr "vDirektorijum na _primaoce..."
 
-#: ui/evolution-mail-message.xml.h:130
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "vFolder on _Subject..."
-msgstr "VDirektorijum na _naslov..."
+msgstr "vDirektorijum na _naslov..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zatvori"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Glavna linija alata"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priloži datoteku"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Zatvara trenutnu datoteku"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Briše sve osim potpisa"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Šifruje ovu poruku pomoću PGP-a"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Šifruje ovu poruku pomoću S/MIME sertifikata za šifrovanje"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otvara datoteku"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP šifrovanje"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP potpis"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME šifrovanje"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME potpis"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Sačuvaj kao"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Sačuvaj k_ao..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Sačuvaj _pripremu"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Sačuvaj u direktorijum..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Sačuvaj trenutnu datoteku"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Sačuvaj trenutnu datoteku pod drugim imenom"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Sačuvaj poruku u navedenom direktorijumu"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Pošalji poruku u HTML formatu"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Pošalji ovu poruku"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Prikaži / sakrij priloge"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Prik_aži priloge"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Prikaži priloge"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Potpiši ovu poruku pomoću PGP ključa"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME sertifikatom"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Menja da li je polje BCC prikazano"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Menja da li je polje CC prikazano"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Menja da li je polje Šalje prikazano"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Menja da li je polje Pošalji prikazano"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Menja da li je polje Odgovor prikazano"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
 msgstr "Menja da li je polje Prima prikazano"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "Obri_ši sve"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "O_d zaglavlje"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Ubac_i"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
 msgstr "_Pošalji polje"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Odgo_vori polje"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Bezbednost"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
 msgstr "_Prima polje"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "Z_atvori"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Sačuvaj i _zatvori"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Sačuvaj tekuću datoteku i zatvori prozor"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj direktorijum u spisak prijavljenih direktorijuma"
 
-#: ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Direkt_orijum"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Osveži spisak"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Osveži spisak direktorijuma"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ukloni direktorijum iz spiska prijavljenih direktorijuma"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Prijavi se"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Odjavi se"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izabrano zaduženje"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Iseci izabrano zaduženje"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Obriši izvršena zaduženja"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Obriši izabrana zaduženja"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Ozna_či kao završeno"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Obeleži izabrana zaduženja kao završena"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Nalepi zaduženje iz memorije"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Pregleda spisak zaduženja za štampanje"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Štampaj spisak zaduženja"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Prikazuje izabrano zaduženje"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Otvori zaduženje"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "O programu Evolucija..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Izmeni podešavanja Evolucije"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Menja vidljivost trake alata"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Otvara nov prozor za prikaz ovog direktorijuma"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
+"Prikazuje dugmad prozora korišćenjem podešavanja trake alata redne površine"
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons and text"
-msgstr ""
+msgstr "Prikazuje dugmad prozora sa ikonama i tekstom"
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with icons only"
-msgstr ""
+msgstr "Prikazuje dugmad prozora samo sa ikonama"
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:10
 msgid "Display window buttons with text only"
-msgstr ""
+msgstr "Prikazuje dugmad prozora samo sa tekstom"
 
-#: ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "I_zađi"
 
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Pi_tanja i odgovori u vezi Evolucije"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Izlazak iz programa"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zaboravlja zapamćene lozinke kako bi ponovo bili pitani za njih"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:16
 msgid "Hide window buttons"
-msgstr ""
+msgstr "Sakriva dugmad prozora"
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:17
 msgid "Icons _and text"
-msgstr ""
+msgstr "Ikone _i tekst"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Uvezi podatke iz drugih programa"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "Nov p_rozor"
 
-#: ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Podešavanja Pi_lota..."
 
-#: ui/evolution.xml.h:22
-#, fuzzy
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
-msgstr "Postavke pošte"
+msgstr "Podeša_vanja"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Slanje / primanje"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Šalje pripremljene i prima nove predmete"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Podešavanje Pilota"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Šalje izveštaj o grešci"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Pošalji izveštaj o _grešci"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Šalje izveštaj o grešci programom Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Bira da li ćemo raditi van mreže."
 
-#: ui/evolution.xml.h:31
-#, fuzzy
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "Tra_ka alata"
 
-#: ui/evolution.xml.h:32
-#, fuzzy
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
-msgstr "Traka alata je vidljiva"
+msgstr "Stil tra_ke alata"
 
-#: ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:33
 msgid "Window B_uttons"
-msgstr ""
+msgstr "Dug_mad prozora"
 
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_O programu Evolucija..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
-msgstr ""
+msgstr "_Sakrij dugmad"
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
-msgstr ""
+msgstr "Samo _ikone"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Uvezi..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Kratki podsetnik"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Pošalji / primi"
 
-#: ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
-msgstr "Model teksta"
+msgstr "Samo _tekst"
 
-#: ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Prema _preduzeću"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Karte adresara"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Telefonski imenik"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "_Nedeljni pregled"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Dnevni pregled"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Pregled u _spisku"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Mesečni pregled"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Pregled _radne nedelje"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "Kao direktorijum _Poslato"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Prema s_tatusu"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Prema po_šiljaocu"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Prema _naslovu"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Prema oznaci _praćenja"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "Po_ruke"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Sa _rokom"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "Sa _statusom"
 
 # Univerzalno vreme, ili UT
 # Valjda UV?
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Vremenske zone</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Izbor</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Izaberite vremensku zonu"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
-msgstr "Vremenska zona"
+msgstr "Okvir za vremensku zonu"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17973,209 +17843,206 @@ msgstr ""
 "Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
 "Koristite desni taster miša za umanjivanje."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Tekući pregled"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
 # week, 'M' for 'Monday', 'T' for Tuesday etc.
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "PUSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
-msgstr "Prethodno"
+msgstr "Dugme Prethodno"
 
-#: widgets/misc/e-calendar.c:226
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
-msgstr "Učitavanje kalendara"
+msgstr "Mesečni kalendar"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Sada"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentualna vrednost mora biti između 0 i 100, uključno"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltički"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Centralno evropski"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Kineski"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Ćirilični"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Grčki"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Japanski"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Korejski"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Turski"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unikod"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Zapadnoevropski"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Zapadnoevropskim, novi"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradicionalni"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Pojednostavljeni"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Vizuelni"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nepoznata kodna strana: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Kodna strana"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Izaberite kodnu stranu za korišćenje"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Drugo..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:313
 msgid "Date and Time Entry"
 msgstr "Datum i vreme"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:332
 msgid "Text entry to input date"
-msgstr ""
+msgstr "Deo teksta za unos datuma"
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:333
 msgid "Text Date Entry"
-msgstr ""
+msgstr "Unos datuma u tekstu"
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:350
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "Klikni na ovo dugme za prikaz kalendara"
 
-#: widgets/misc/e-dateedit.c:351
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:351
 msgid "Date Button"
-msgstr "Datum slanja"
+msgstr "Dugme Datum"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:371
 msgid "Combo box to select time"
-msgstr ""
+msgstr "Okvir za izbor vremena"
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:372
 msgid "Time Combo Box"
-msgstr ""
+msgstr "Okvir za vreme"
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
+#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
+#: ../widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
+#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
+#: ../widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Upozorenje Evolucije"
 
-#: widgets/misc/e-error.c:124
+#: ../widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Podaci Evolucije"
 
-#: widgets/misc/e-error.c:126
+#: ../widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Upit Evolucije"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:438
+#: ../widgets/misc/e-error.c:438
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Unutrašnja greška, potrebna nepoznata greška '%s'</span>"
 
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Razgranato"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Da li je stablo razgranato ili ne"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Tekst oznake stabla"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Koristi podvlačenje"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -18183,307 +18050,305 @@ msgstr ""
 "Ako je postavljeno, podvlačenje u tekstu označava tekst koji će se koristiti "
 "kao prečica"
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Razmak"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Razmak između oznake i sadržanog elementa"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Element oznake"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Element koji se prikazuje umesto obične oznake stabla"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Veličina stabla"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Veličina strelice stabla"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Razmak pokazivača"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Razmak oko strelice stabla"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Pretrage"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Uređivač pretrage"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Čuva pretragu"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Napredno..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Izaberite sliku"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
-msgstr ""
+msgstr "Karta sveta"
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr ""
+"Interkativni alat za izbor vremenske zone pomoću miša. Tastaturom se izbor "
+"vremenske zone vrši iz donjeg okvira."
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Uskladi sa:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Usklađivanje ličnih zapisa:"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Uskladi kategorije:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: widgets/misc/e-search-bar.c:343
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
-msgstr "Uređivač pretrage"
+msgstr "Pretraga teksta"
 
-#: widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "Prona_đi"
 
-#: widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Pronađi sada"
 
-#: widgets/misc/e-search-bar.c:554 widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: widgets/misc/e-search-bar.c:645
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
-msgstr "Obim p_retrage:"
+msgstr "Tip pretrage"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "IB stavke"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "IB podstavke"
 
-#: widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Pronađi _sada"
 
-#: widgets/misc/e-send-options.c:505
-#, fuzzy
+#: ../widgets/misc/e-send-options.c:506
 msgid "When de_leted:"
-msgstr "%d obrisano"
+msgstr "Kada je obri_sano:"
 
-#: widgets/misc/e-send-options.glade.h:1
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
-msgstr "<b>Podešavanja</b>"
+msgstr "<b>Podešavanja isporuke</b>"
 
-#: widgets/misc/e-send-options.glade.h:2
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
-msgstr "<b>Ponovi</b>"
+msgstr "<b>Odgovori</b>"
 
-#: widgets/misc/e-send-options.glade.h:3
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
-msgstr "<b>Identifikacija</b>"
+msgstr "<b>Povratno obaveštenje</b>"
 
-#: widgets/misc/e-send-options.glade.h:4
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
-msgstr "<b>Pretraga</b>"
+msgstr "<b>Praćenje statusa</b>"
 
-#: widgets/misc/e-send-options.glade.h:5
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "Briše ovu stavku"
+msgstr "A_utomatski briši poslat predmet"
 
-#: widgets/misc/e-send-options.glade.h:6
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
-msgstr "_Razvrstavanje:"
+msgstr "_Razvrstavanje"
 
-#: widgets/misc/e-send-options.glade.h:7
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "Dobavi najnovije podatke o zaduženju"
+msgstr "Na_pravi poslat objekat za praćenje podatka"
 
-#: widgets/misc/e-send-options.glade.h:8
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
-msgstr "Odgovori i nadređeno"
+msgstr "Ispo_ručeno i otvoreno"
 
-#: widgets/misc/e-send-options.glade.h:9
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
-msgstr "Opcije filtera"
+msgstr "Opš_ta podešavanja"
 
-#: widgets/misc/e-send-options.glade.h:10
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Priznanice"
+msgstr ""
+"Nema\n"
+"Primalac pošte"
 
-#: widgets/misc/e-send-options.glade.h:12
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
 "None\n"
 "Mail Receipt\n"
-msgstr "Priznanice"
+msgstr ""
+"Nema\n"
+"Primalac pošte\n"
 
-#: widgets/misc/e-send-options.glade.h:15
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:15
 msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
-msgstr "Poverljivo"
+msgstr ""
+"Javno\n"
+"Privatno\n"
+"Poverljivo\n"
 
-#: widgets/misc/e-send-options.glade.h:19
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "R_eply requested"
-msgstr "_Stil odgovora:"
+msgstr "Zahtevan o_dgovor"
 
-#: widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid "Sta_tus  Tracking"
-msgstr ""
+msgstr "Praćenje  sta_tusa"
 
-#: widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:22
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
 msgstr ""
+"Nedefinisano\n"
+"Visoko\n"
+"Obično\n"
+"Nisko"
 
-#: widgets/misc/e-send-options.glade.h:26
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "W_ithin"
-msgstr "Širina"
+msgstr "Un_utar"
 
-#: widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When acce_pted: "
-msgstr ""
+msgstr "Kada je pri_hvaćeno: "
 
-#: widgets/misc/e-send-options.glade.h:28
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "When co_mpleted:"
-msgstr "_Datum završetka:"
+msgstr "Po završ_etku:"
 
-#: widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "When decli_ned:    "
-msgstr ""
+msgstr "Kada je odbi_jeno:    "
 
-#: widgets/misc/e-send-options.glade.h:30
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_After:"
-msgstr "posle"
+msgstr "_Posle:"
 
-#: widgets/misc/e-send-options.glade.h:31
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_All information"
-msgstr "Informacija o zaduženju"
+msgstr "_Svi podaci"
 
-#: widgets/misc/e-send-options.glade.h:32
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
-msgstr "Ostavi poruke na serveru"
+msgstr "_Odloži isporuku poruke"
 
-#: widgets/misc/e-send-options.glade.h:33
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
-msgstr "Obrisano"
+msgstr "_Isporučeno"
 
-#: widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration  date"
-msgstr ""
+msgstr "_Postavi  rok"
 
-#: widgets/misc/e-send-options.glade.h:36
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
-msgstr "Bez imena"
+msgstr "_Do:"
 
-#: widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
-msgstr ""
+msgstr "_Kada je zgodno"
 
-#: widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:     "
-msgstr ""
+msgstr "_Kada je otvoreno:     "
 
 #. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
 msgstr "Datoteka postoji \"{0}\"."
 
 #. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Želite li da je prepišete?"
 
 #. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+#: ../widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
 msgstr "Nije moguće čuvanje datoteke \"{0}\"."
 
 #. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+#: ../widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
 msgstr "Nije moguće otvaranje datoteke \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
-#: widgets/misc/e-url-entry.c:107
-#, fuzzy
+#: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
-msgstr "<protisnite ovde da izaberete direktorijum>"
+msgstr "protisnite ovde da posetite aresu (url)"
+
+#~ msgid ""
+#~ "\n"
+#~ " Please read carefully the license agreement displayed\n"
+#~ " below and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Pažljivo pročitajte dole prikazan ugovor o licenci\n"
+#~ " i označite kućicu za prihvatate\n"
 
 #~ msgid "Failed to parse gpg userid hint."
 #~ msgstr "Nije uspelo čitanje gpg userid podsetnika."
@@ -22208,9 +22073,6 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 #~ msgid "Do you want to trust \"%s\" for the following purposes?"
 #~ msgstr "Želite li da verujete „%s“ za naredne potrebe?"
 
-#~ msgid "Cannot create a folder by this name."
-#~ msgstr "Nije moguće pravljenje direktorijuma tog imena."
-
 #~ msgid "mailbox:%s (%s)"
 #~ msgstr "mailbox:%s (%s)"
 
@@ -23335,9 +23197,6 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 #~ msgid "Requested action not taken: insufficient system storage"
 #~ msgstr "Tražena akcija nije preduzeta: nedovoljno prostora na sistemu"
 
-#~ msgid "Object could not be found\n"
-#~ msgstr "Objekat nije mogao biti pronađen\n"
-
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "dodaj-vreme očekuje 2 argumenta"
author	Danilo Šegan <danilo@src.gnome.org>	2005-04-06 15:23:59 +0800
committer	Danilo Šegan <danilo@src.gnome.org>	2005-04-06 15:23:59 +0800
commit	cc78be472f491386522cbe860725f49d4a33a335 (patch)
tree	f559958be1d6afd93506ed39fe60766525786af2 /po
parent	b6fb54466f30b83d74cf118f2f9aa73b5ee61505 (diff)
download	gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.tar.gz gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.tar.zst gsoc2013-evolution-cc78be472f491386522cbe860725f49d4a33a335.zip