[gtranslator] Updated Serbian translation

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

commit d99d5312e9673067a4f29de57610e559995bd7be
Author: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>
Date:   Tue Aug 24 05:01:08 2010 +0200

    Updated Serbian translation

 po/sr.po       | 1849 +++++++++++++++++++++++++++-----------------------------
 po/sr latin po | 1849 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 1760 insertions(+), 1938 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 721fa5f..d9569b4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,21 +5,23 @@
 #
 # Prevous maintainers: Ð?еÑ?ко Ð?. СÑ?аноÑ?евиÑ? <veljko vms homelinux net>
 # Maintainer: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>, 2009.
+# Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gtranslator&component=general\n"
-"POT-Creation-Date: 2009-09-30 22:50+0000\n"
-"PO-Revision-Date: 2009-10-01 01:13+0000\n"
+"POT-Creation-Date: 2010-05-19 19:21+0000\n"
+"PO-Revision-Date: 2010-08-23 23:17+0200\n"
 "Last-Translator: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
-"Language-Team: Serbian <gnome prevod org>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: ../data/desktop/gtranslator.desktop.in.in.h:1
 msgid "Gtranslator PO Editor"
@@ -248,731 +250,362 @@ msgstr "Ð?знака"
 msgid "gtranslator highlight"
 msgstr "Ð?Ñ?Ñ?иÑ?аÑ?е Ñ?екÑ?Ñ?а"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:117
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:128
 msgid "Message not found"
 msgstr "Ð?оÑ?Ñ?ке ниÑ?Ñ? наÑ?ене"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:221
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:231
 msgid "Open file for alternate language"
 msgstr "Ð?Ñ?воÑ?и даÑ?оÑ?екÑ? за заменÑ? Ñ?езика"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:246
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:256
 msgid "File closed"
 msgstr "Ð?аÑ?оÑ?ека Ñ?е заÑ?воÑ?ена"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:314
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:316
+#| msgid "Open"
+msgctxt "alternate lang"
+msgid "_Open"
+msgstr "_Ð?Ñ?воÑ?и"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:322
+#| msgid "_Close All"
+msgctxt "alternate lang"
+msgid "_Close"
+msgstr "_Ð?аÑ?воÑ?и"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:328
+msgctxt "alternate lang"
+msgid "Co_py"
+msgstr "_Умножи"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:357
 msgid "There isn't any file loaded"
 msgstr "Ð?иÑ?е Ñ?Ñ?иÑ?ана ни Ñ?една даÑ?оÑ?ека"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:56
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:58
 msgid "_Alternate Language"
 msgstr "_Ð?амени Ñ?език"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:57
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:59
 msgid "Show the Alternate Language panel"
 msgstr "Ð?Ñ?иказÑ?Ñ?е панел за заменÑ? Ñ?езика"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:119
-#: ../plugins/alternate-language/alternate-language.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:118
+#: ../plugins/alternate-language/gtr-alternate-language.gtranslator-plugin.desktop.in.h:1
 msgid "Alternate Language"
 msgstr "Ð?амена Ñ?езика"
 
-#: ../plugins/alternate-language/alternate-language.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/alternate-language/gtr-alternate-language.gtranslator-plugin.desktop.in.h:2
 msgid "Load an alternate language."
 msgstr "УÑ?иÑ?ава Ñ?език за заменÑ?."
 
-#: ../plugins/charmap/charmap-plugin.c:283
-#: ../plugins/charmap/charmap.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/charmap/gtr-charmap-plugin.c:280
+#: ../plugins/charmap/gtr-charmap.gtranslator-plugin.desktop.in.h:1
 msgid "Character Map"
 msgstr "Ð?накови"
 
-#: ../plugins/charmap/charmap.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/charmap/gtr-charmap.gtranslator-plugin.desktop.in.h:2
 msgid "Insert special characters just by clicking on them."
 msgstr "УмеÑ?е поÑ?ебне знаке показиваÑ?ем миÑ?а"
 
-#: ../plugins/dictionary/dict-panel.c:183
+#: ../plugins/dictionary/gtr-dict-panel.c:179
 #, c-format
 msgid "No dictionary source available with name '%s'"
 msgstr "Ð?иÑ?е наÑ?ен Ñ?еÑ?ник Ñ?а називом â??%sâ??"
 
-#: ../plugins/dictionary/dict-panel.c:187
+#: ../plugins/dictionary/gtr-dict-panel.c:183
 msgid "Unable to find dictionary source"
 msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам извоÑ? Ñ?еÑ?ника"
 
-#: ../plugins/dictionary/dict-panel.c:204
+#: ../plugins/dictionary/gtr-dict-panel.c:198
 #, c-format
 msgid "No context available for source '%s'"
 msgstr "Ð?иÑ?е доÑ?Ñ?Ñ?пна поÑ?ава поÑ?Ñ?ке за â??%sâ??"
 
-#: ../plugins/dictionary/dict-panel.c:208
+#: ../plugins/dictionary/gtr-dict-panel.c:202
 msgid "Unable to create a context"
 msgstr "Ð?е могÑ? да добавим поÑ?авÑ? поÑ?Ñ?ке"
 
-#: ../plugins/dictionary/dict-panel.c:294
+#: ../plugins/dictionary/gtr-dict-panel.c:287
 #, c-format
 msgid "Dictionary source '%s' selected"
 msgstr "Ð?забÑ?ана Ñ?е â??%sâ?? за дневник"
 
-#: ../plugins/dictionary/dict-panel.c:314
+#: ../plugins/dictionary/gtr-dict-panel.c:306
 #, c-format
 msgid "Strategy '%s' selected"
 msgstr "Ð?забÑ?ана Ñ?е â??%sâ?? Ñ?Ñ?Ñ?аÑ?егиÑ?а"
 
-#: ../plugins/dictionary/dict-panel.c:333
+#: ../plugins/dictionary/gtr-dict-panel.c:324
 #, c-format
 msgid "Database '%s' selected"
 msgstr "Ð?забÑ?ана Ñ?е â??%sâ?? за базÑ? подаÑ?ака"
 
-#: ../plugins/dictionary/dict-panel.c:379
+#: ../plugins/dictionary/gtr-dict-panel.c:368
 #, c-format
 msgid "Word '%s' selected"
 msgstr "Ð?забÑ?ана Ñ?е Ñ?еÑ? â??%sâ??"
 
 #. speller
-#: ../plugins/dictionary/dict-panel.c:402
+#: ../plugins/dictionary/gtr-dict-panel.c:390
 msgid "Double-click on the word to look up"
 msgstr "Ð?ликниÑ?е двапÑ?Ñ? на Ñ?еÑ? за Ñ?Ñ?агаÑ?е"
 
 #. strat-chooser
-#: ../plugins/dictionary/dict-panel.c:407
+#: ../plugins/dictionary/gtr-dict-panel.c:395
 msgid "Double-click on the matching strategy to use"
 msgstr "Ð?ликниÑ?е двапÑ?Ñ? за Ñ?поÑ?Ñ?ебÑ? поклопÑ?ене Ñ?Ñ?Ñ?аÑ?егиÑ?е"
 
 #. source-chooser
-#: ../plugins/dictionary/dict-panel.c:413
+#: ../plugins/dictionary/gtr-dict-panel.c:401
 msgid "Double-click on the source to use"
 msgstr "Ð?ликниÑ?е двапÑ?Ñ? за Ñ?поÑ?Ñ?ебÑ? жеÑ?еног извоÑ?а"
 
 #. db-chooser
-#: ../plugins/dictionary/dict-panel.c:423
+#: ../plugins/dictionary/gtr-dict-panel.c:411
 msgid "Double-click on the database to use"
 msgstr "Ð?ликниÑ?е двапÑ?Ñ? за Ñ?поÑ?Ñ?ебÑ? жеÑ?ене базе подаÑ?ака"
 
 #.
 #. * Look up Button
 #.
-#: ../plugins/dictionary/dict-panel.c:487
+#: ../plugins/dictionary/gtr-dict-panel.c:473
 msgid "Look _up:"
 msgstr "ТÑ?а_гаÑ?е:"
 
-#: ../plugins/dictionary/dict-panel.c:559
+#: ../plugins/dictionary/gtr-dict-panel.c:543
 msgid "Similar words"
 msgstr "СлиÑ?не Ñ?еÑ?и"
 
-#: ../plugins/dictionary/dict-panel.c:574
+#: ../plugins/dictionary/gtr-dict-panel.c:558
 msgid "Available dictionaries"
 msgstr "Ð?оÑ?Ñ?Ñ?пни Ñ?еÑ?ниÑ?и"
 
-#: ../plugins/dictionary/dict-panel.c:590
+#: ../plugins/dictionary/gtr-dict-panel.c:574
 msgid "Available strategies"
 msgstr "Ð?оÑ?Ñ?Ñ?пне Ñ?Ñ?Ñ?аÑ?егиÑ?е"
 
-#: ../plugins/dictionary/dict-panel.c:600
+#: ../plugins/dictionary/gtr-dict-panel.c:584
 msgid "Dictionary sources"
 msgstr "Ð?звоÑ?и Ñ?еÑ?ника"
 
-#: ../plugins/dictionary/dict.gtranslator-plugin.desktop.in.h:1
-#: ../plugins/dictionary/dictionary-plugin.c:92
+#: ../plugins/dictionary/gtr-dict.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/dictionary/gtr-dictionary-plugin.c:92
 msgid "Dictionary"
 msgstr "РеÑ?ник"
 
-#: ../plugins/dictionary/dict.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/dictionary/gtr-dict.gtranslator-plugin.desktop.in.h:2
 msgid "Look up words in a dictionary."
 msgstr "ТÑ?ажи Ñ?еÑ?и Ñ? Ñ?еÑ?никÑ?"
 
-#: ../plugins/fullscreen/fullscreen-plugin.c:45
+#: ../plugins/fullscreen/gtr-fullscreen-plugin.c:44
 msgid "_Fullscreen"
 msgstr "_Цео екÑ?ан"
 
-#: ../plugins/fullscreen/fullscreen-plugin.c:46
+#: ../plugins/fullscreen/gtr-fullscreen-plugin.c:45
 msgid "Place window on fullscreen state"
 msgstr "Ð?Ñ?иказÑ?Ñ?е пÑ?озоÑ? пÑ?еко Ñ?елог екÑ?ана"
 
-#: ../plugins/fullscreen/fullscreen.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in.h:1
 msgid "Fullscreen"
 msgstr "Цео екÑ?ан"
 
-#: ../plugins/fullscreen/fullscreen.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in.h:2
 msgid "Place window in the fullscreen state."
 msgstr "Ð?Ñ?иказÑ?Ñ?е пÑ?озоÑ? пÑ?еко Ñ?елог екÑ?ана"
 
-#: ../plugins/insert-params/insert-params-plugin.c:75
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:74
 msgid "_Next Param"
 msgstr "_СледеÑ?и паÑ?амеÑ?аÑ?"
 
-#: ../plugins/insert-params/insert-params-plugin.c:76
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:75
 msgid "Insert the next param of the message"
 msgstr "УмеÑ?е Ñ?ледеÑ?и паÑ?амеÑ?аÑ? поÑ?Ñ?ке"
 
-#: ../plugins/insert-params/insert-params-plugin.c:78
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:77
 msgid "_Insert Params"
 msgstr "_УмеÑ?ни паÑ?амеÑ?Ñ?е"
 
-#: ../plugins/insert-params/insert-params.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/insert-params/gtr-insert-params.gtranslator-plugin.desktop.in.h:1
 msgid "Insert Params"
 msgstr "УмеÑ?ни паÑ?амеÑ?Ñ?е"
 
-#: ../plugins/insert-params/insert-params.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/insert-params/gtr-insert-params.gtranslator-plugin.desktop.in.h:2
 msgid "Parameters detection and easy insertion."
 msgstr "Ð?алажеÑ?е и лако Ñ?меÑ?аÑ?е паÑ?амеÑ?аÑ?а"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:68
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:67
 msgid "_Next Tag"
 msgstr "Сле_деÑ?а ознака"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:69
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:68
 msgid "Insert the next tag of the message"
 msgstr "УмеÑ?е наÑ?еднÑ? ознакÑ? поÑ?Ñ?ке"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:71
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:70
 msgid "_Insert Tags"
 msgstr "УмеÑ?ни о_знаке"
 
-#: ../plugins/insert-tags/insert-tags.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/insert-tags/gtr-insert-tags.gtranslator-plugin.desktop.in.h:1
 msgid "Insert Tags"
 msgstr "УмеÑ?ни ознаке"
 
-#: ../plugins/insert-tags/insert-tags.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/insert-tags/gtr-insert-tags.gtranslator-plugin.desktop.in.h:2
 msgid "Tags detection and easy insertion."
 msgstr "Ð?алази ознаке и Ñ?меÑ?е иÑ? на Ñ?едноÑ?Ñ?аван наÑ?ин."
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:1
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:1
-#: ../plugins/subversion/subversion.ui.h:2
-#: ../src/dialogs/preferences-dialog.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../plugins/open-tran/open-tran-dialog.ui.h:2
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:2
-msgid "     "
-msgstr "     "
-
-#: ../plugins/open-tran/open-tran-dialog.ui.h:3
-msgid "<b>Code language of the results:</b>"
-msgstr "<b>Ð?знака Ñ?езика за Ñ?езÑ?лÑ?аÑ?е (нпÑ?. sr):</b>"
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:1
+#| msgid "<b>Code language of the results:</b>"
+msgid "Code language of the results:"
+msgstr "Ð?знака Ñ?езика за Ñ?езÑ?лÑ?аÑ?е (нпÑ?. sr):"
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:4
-msgid "<b>Code language to query open-tran:</b>"
-msgstr "<b>Ð?од Ñ?езика за пÑ?еÑ?Ñ?агÑ? Ñ? open-tran.eu (нпÑ?. sr):</b>"
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:2
+#| msgid "<b>Code language to query open-tran:</b>"
+msgid "Code language to query open-tran:"
+msgstr "Ð?од Ñ?езика за пÑ?еÑ?Ñ?агÑ? Ñ? open-tran.eu (нпÑ?. sr):"
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:5
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:3
 msgid "Open Tran Settings"
 msgstr "Ð?одеÑ?аваÑ?е пÑ?еводилаÑ?ке мемоÑ?иÑ?е"
 
-#: ../plugins/open-tran/open-tran-panel.c:207
-#: ../plugins/open-tran/open-tran-panel.c:272
-msgid "ERROR: could not parse response\n"
-msgstr "Ð?Ñ?еÑ?ка: немогÑ? да обÑ?адим одговоÑ?\n"
-
-#: ../plugins/open-tran/open-tran-panel.c:254
+#: ../plugins/open-tran/gtr-open-tran-panel.c:248
 #, c-format
 msgid "ERROR: %d %s\n"
 msgstr "Ð?Ñ?еÑ?ка: %d %s\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:267
+#: ../plugins/open-tran/gtr-open-tran-panel.c:261
 #, c-format
 msgid "FAULT: %d %s\n"
 msgstr "Ð?Ñ?екÑ?Ñ?аÑ?: %d %s\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:283
+#: ../plugins/open-tran/gtr-open-tran-panel.c:266
+#: ../plugins/open-tran/gtr-open-tran-panel.c:276
+msgid "ERROR: could not parse response\n"
+msgstr "Ð?Ñ?еÑ?ка: немогÑ? да обÑ?адим одговоÑ?\n"
+
+#: ../plugins/open-tran/gtr-open-tran-panel.c:285
 #, c-format
 msgid "WRONG! Can't get result element %d\n"
 msgstr "Ð?еиÑ?пÑ?авно! Ð?е могÑ? да добиÑ?ем кÑ?аÑ?Ñ?и елеменÑ? %d\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:300 ../src/actions-search.c:195
+#: ../plugins/open-tran/gtr-open-tran-panel.c:300
+#: ../src/gtr-actions-search.c:191
 msgid "Phrase not found"
 msgstr "Ð?зÑ?аз ниÑ?е пÑ?онаÑ?ен"
 
-#: ../plugins/open-tran/open-tran-panel.c:320
+#: ../plugins/open-tran/gtr-open-tran-panel.c:319
 msgid "You have to provide a phrase to search"
 msgstr "Ð?оÑ?аÑ?е задаÑ?и Ñ?еÑ?и за пÑ?еÑ?Ñ?агÑ?"
 
-#: ../plugins/open-tran/open-tran-panel.c:329
+#: ../plugins/open-tran/gtr-open-tran-panel.c:328
 msgid "You have to provide a search language code"
 msgstr "Ð?оÑ?аÑ?е да поÑ?Ñ?авиÑ?е ознакÑ? Ñ?езика Ñ? подеÑ?аваÑ?има"
 
-#: ../plugins/open-tran/open-tran-panel.c:339
+#: ../plugins/open-tran/gtr-open-tran-panel.c:338
 msgid "You have to provide a language code for your language"
 msgstr "Ð?оÑ?аÑ?е да подеÑ?иÑ?е ознакÑ? ваÑ?ег Ñ?езика Ñ? подеÑ?аваÑ?има"
 
-#: ../plugins/open-tran/open-tran-panel.c:367
+#: ../plugins/open-tran/gtr-open-tran-panel.c:366
 msgid "Type"
 msgstr "Ð?Ñ?Ñ?Ñ?а"
 
-#: ../plugins/open-tran/open-tran-panel.c:378
+#: ../plugins/open-tran/gtr-open-tran-panel.c:377
 msgid "Open-Tran.eu"
 msgstr "Open-Tran.eu"
 
-#: ../plugins/open-tran/open-tran-panel.c:415
+#: ../plugins/open-tran/gtr-open-tran-panel.c:414
 msgid "Look for:"
 msgstr "ТÑ?ажи:"
 
-#: ../plugins/open-tran/open-tran-plugin.c:106
-#: ../plugins/open-tran/open-tran.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/open-tran/gtr-open-tran-plugin.c:104
+#: ../plugins/open-tran/gtr-open-tran.gtranslator-plugin.desktop.in.h:2
 msgid "Open Tran"
 msgstr "Ð?Ñ?еводилаÑ?ка мемоÑ?иÑ?а"
 
-#: ../plugins/open-tran/open-tran.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/open-tran/gtr-open-tran.gtranslator-plugin.desktop.in.h:1
 msgid "Look for phrases in Open tran memory translation database."
 msgstr "ТÑ?ажи задаÑ?Ñ? Ñ?еÑ? Ñ? Open-tran.eu пÑ?еводилаÑ?коÑ? мемоÑ?иÑ?и."
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:3
-msgid "<b>Line command:</b>"
-msgstr "<b>Ð?аÑ?едба линиÑ?е:</b>"
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:1
+#| msgid "<b>Line command:</b>"
+msgid "Line command:"
+msgstr "Ð?аÑ?едба линиÑ?е:"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:4
-msgid "<b>Program command:</b>"
-msgstr "<b>Ð?аÑ?едба пÑ?огÑ?ама:</b>"
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:2
+#| msgid "<b>Program command:</b>"
+msgid "Program command:"
+msgstr "Ð?аÑ?едба пÑ?огÑ?ама:"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:5
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:3
 msgid "Source View Settings"
 msgstr "Ð?одеÑ?аваÑ?е извоÑ?ног пÑ?егледа"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:6
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:4
 msgid "Use external editor"
 msgstr "Ð?оÑ?иÑ?Ñ?и Ñ?поÑ?ни пÑ?огÑ?ам за Ñ?Ñ?еÑ?иваÑ?е"
 
-#: ../plugins/source-code-view/source-code-view-plugin.c:111
+#: ../plugins/source-code-view/gtr-source-code-view-plugin.c:111
 #, c-format
-#| msgid "Please, install %s to be able to show the file"
-msgid "Please install %s to be able to show the file"
-msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е %s за пÑ?иказ ове даÑ?оÑ?еке"
+#| msgid "Please install %s to be able to show the file"
+msgid "Please install \"%s\" to be able to show the file"
+msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е â??%sâ?? за пÑ?иказ ове даÑ?оÑ?еке"
 
-#: ../plugins/source-code-view/source-code-view-plugin.c:446
-msgid "Paths:\n"
-msgstr "Ð?Ñ?Ñ?аÑ?е:\n"
+#: ../plugins/source-code-view/gtr-source-code-view-plugin.c:449
+#| msgid "Paths:\n"
+msgid "Paths:"
+msgstr "Ð?Ñ?Ñ?аÑ?е:"
 
-#: ../plugins/source-code-view/source-code-view.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/source-code-view/gtr-source-code-view.gtranslator-plugin.desktop.in.h:1
 msgid "Show the message in the source code."
 msgstr "Ð?Ñ?иказÑ?Ñ?е поÑ?Ñ?ке Ñ? извоÑ?ном кодÑ?."
 
-#: ../plugins/source-code-view/source-code-view.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/source-code-view/gtr-source-code-view.gtranslator-plugin.desktop.in.h:2
 msgid "Source Code View"
 msgstr "Ð?Ñ?иказ извоÑ?ног кода"
 
-#: ../plugins/source-code-view/viewer.c:74
+#: ../plugins/source-code-view/gtr-viewer.c:76
 msgid "Source Viewer"
 msgstr "Ð?звоÑ?ни пÑ?иказ"
 
-#: ../plugins/source-code-view/viewer.ui.h:1
-msgid "<b>Source code</b>"
-msgstr "<b>Ð?звоÑ?ни код</b>"
-
-#: ../plugins/subversion/checkout-dialog.c:77
-msgid "Subversion: Checkout complete."
-msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е Ñ?Ñ?клаÑ?иваÑ?е"
-
-#: ../plugins/subversion/checkout-dialog.c:124
-#| msgid "Please, add a directory path to make the checkout"
-msgid "Please add a directory path to make the checkout"
-msgstr "Ð?одаÑ?Ñ?е пÑ?Ñ?аÑ?Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ма Ñ?ади Ñ?Ñ?клаÑ?иваÑ?а"
-
-#: ../plugins/subversion/checkout-dialog.c:138
-#| msgid "Please, add a Subversion URL"
-msgid "Please add a Subversion URL"
-msgstr "Ð?одаÑ?Ñ?е адÑ?еÑ?Ñ? СÑ?бвеÑ?зиÑ?е"
-
-#: ../plugins/subversion/checkout-dialog.c:170 ../src/dialogs/assistant.c:689
-msgid "Checkout directory"
-msgstr "УÑ?клади диÑ?екÑ?оÑ?иÑ?Ñ?м"
-
-#: ../plugins/subversion/checkout-dialog.c:252
-msgid "Checkout repository"
-msgstr "УÑ?клади Ñ?изниÑ?Ñ?"
-
-#: ../plugins/subversion/commit-dialog.c:221
-msgid "Subversion: Commit complete."
-msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е Ñ?лаÑ?е."
-
-#.
-#. * Translators: Please change LANGUAGE for your language name in English.
-#. * This string is used to fill the ChangeLog entry
-#. * For example: "Updated Galician translation"
-#. * where LANGUAGE = Galician.
-#.
-#: ../plugins/subversion/commit-dialog.c:262
-msgctxt "ChangeLog entry"
-msgid "LANGUAGE"
-msgstr "Ð?Ð?Ð?Ð?Ð?"
-
-#: ../plugins/subversion/commit-dialog.c:286
-#, c-format
-#| msgid "The ChangeLog file '%s' does not exists"
-msgid "The ChangeLog file '%s' does not exist"
-msgstr "Ð?е поÑ?Ñ?оÑ?и ChangeLog даÑ?оÑ?ека â??%sâ??"
-
-#: ../plugins/subversion/commit-dialog.c:400
-msgid "Are you sure that you want to pass an empty log message?"
-msgstr "Ð?а ли Ñ?Ñ?е Ñ?игÑ?Ñ?но желиÑ?е да Ñ?баÑ?иÑ?е пÑ?азнÑ? поÑ?Ñ?кÑ? из дневника?"
-
-#: ../plugins/subversion/commit-dialog.c:422
-msgid "You have to select at least one file to send"
-msgstr "Ð?оÑ?аÑ?е изабÑ?аÑ?и баÑ? Ñ?еднÑ? даÑ?оÑ?екÑ? за Ñ?лаÑ?е"
-
-#: ../plugins/subversion/commit-dialog.c:562
-msgid "Commit Changes"
-msgstr "Ð?оÑ?аÑ?и измене"
-
-#: ../plugins/subversion/diff-dialog.c:80
-msgid "Subversion: Diff complete."
-msgstr "СÑ?бвеÑ?зиÑ?а: напÑ?авÑ?ене Ñ?Ñ? Ñ?азлике."
-
-#: ../plugins/subversion/diff-dialog.c:109
-#, c-format
-#| msgid "Please, install %s to be able to diff the file"
-msgid "Please install %s to be able to diff the file"
-msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е %s како би могли да наÑ?еÑ?е Ñ?азлике измеÑ?Ñ? даÑ?оÑ?ека"
-
-#: ../plugins/subversion/diff-dialog.c:390
-msgid "Diff file"
-msgstr "Ð?аÑ?оÑ?ека Ñ?а Ñ?азликама"
-
-#: ../plugins/subversion/diff-dialog.c:455
-msgid "Diff"
-msgstr "Разлике"
-
-#: ../plugins/subversion/subversion-plugin.c:82
-msgid "Subversion: File will be added on next commit."
-msgstr "СÑ?бвеÑ?зиÑ?а: даÑ?оÑ?ека Ñ?е биÑ?и додаÑ?а пÑ?и Ñ?ледеÑ?ем Ñ?лаÑ?Ñ?."
-
-#: ../plugins/subversion/subversion-plugin.c:129
-msgid "_Update"
-msgstr "_Ð?жÑ?Ñ?иÑ?аÑ?"
-
-#: ../plugins/subversion/subversion-plugin.c:130
-msgid "Sync your local copy with the Subversion tree"
-msgstr "Ð?жÑ?Ñ?иÑ?а ваÑ?Ñ? локалнÑ? копиÑ?Ñ? пÑ?ема Ñ?изниÑ?и СÑ?бвеÑ?зиÑ?е"
-
-#: ../plugins/subversion/subversion-plugin.c:133
-msgid "_Commit"
-msgstr "_Ð?оÑ?аÑ?и"
-
-#: ../plugins/subversion/subversion-plugin.c:134
-msgid "Commit your changes to the Subversion tree"
-msgstr "ШаÑ?е ваÑ?е измене Ñ? СÑ?бвеÑ?зиÑ?инÑ? Ñ?изниÑ?Ñ?"
+#: ../plugins/source-code-view/gtr-viewer.ui.h:1
+#| msgid "<b>Source code</b>"
+msgid "Source code"
+msgstr "Ð?звоÑ?ни кÈ?д"
 
-#: ../plugins/subversion/subversion-plugin.c:137
-msgid "_Add"
-msgstr "_Ð?одаÑ?"
-
-#: ../plugins/subversion/subversion-plugin.c:138
-msgid "Add a new file/directory to the Subversion tree"
-msgstr "Ð?одаÑ?е новÑ? даÑ?оÑ?екÑ?/диÑ?екÑ?оÑ?иÑ?Ñ?м Ñ? СÑ?бвеÑ?зиÑ?инÑ? Ñ?изниÑ?Ñ?"
-
-#: ../plugins/subversion/subversion-plugin.c:141
-msgid "_Diff"
-msgstr "_Ð?апÑ?ави Ñ?азлике"
-
-#: ../plugins/subversion/subversion-plugin.c:142
-msgid "Diff local PO file with repository PO file"
-msgstr "Ð?Ñ?пиÑ?Ñ?Ñ?е Ñ?азлике измеÑ?Ñ? ваÑ?е и PO даÑ?оÑ?еке Ñ? Ñ?изниÑ?и"
-
-#: ../plugins/subversion/subversion-plugin.c:145
-msgid "C_heckout"
-msgstr "_УÑ?клади"
-
-#: ../plugins/subversion/subversion-plugin.c:146
-msgid "Get a new repository copy"
-msgstr "Ð?Ñ?еÑ?зима новÑ? копиÑ?Ñ? Ñ?изниÑ?е"
-
-#: ../plugins/subversion/subversion-plugin.c:149
-msgid "S_ubversion"
-msgstr "_СÑ?бвеÑ?зиÑ?а"
-
-#: ../plugins/subversion/subversion.ui.h:1
-msgid "  "
-msgstr "  "
-
-#: ../plugins/subversion/subversion.ui.h:3
-msgid "        "
-msgstr "        "
-
-#: ../plugins/subversion/subversion.ui.h:4
-msgid "<b>Diff options:</b>"
-msgstr "<b>Ð?пÑ?иÑ?е за Ñ?азлике:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:5
-msgid "<b>Diff program:</b>"
-msgstr "<b>Ð?Ñ?огÑ?ам за Ñ?азлике:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:6
-msgid "<b>Directory to checkout:</b>"
-msgstr "<b>Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за Ñ?Ñ?клаÑ?иваÑ?е:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:7
-msgid "<b>Directory to update:</b>"
-msgstr "<b>Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за ажÑ?Ñ?иÑ?аÑ?е:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:8
-msgid "<b>Information:</b>"
-msgstr "<b>Ð?одаÑ?и:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:9
-msgid "<b>Log Message:</b>"
-msgstr "<b>Ð?оÑ?Ñ?ка за дневник:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:10
-msgid "<b>Password:</b>"
-msgstr "<b>Ð?озинка:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:11
-msgid "<b>Realm:</b>"
-msgstr "<b>Ð?омен:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:12
-msgid "<b>Select files to Commit:</b>"
-msgstr "<b>Ð?аÑ?оÑ?еке за Ñ?лаÑ?е:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:13
-msgid "<b>Subversion URL:</b>"
-msgstr "<b>Ð?дÑ?еÑ?а СÑ?бвеÑ?зиÑ?е:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:14
-msgid "<b>Username:</b>"
-msgstr "<b>Ð?оÑ?иÑ?ниÑ?ко име:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:15
-msgid "Add Log Message to ChangeLog file"
-msgstr "Ð?одаÑ? поÑ?Ñ?кÑ? Ñ? дневник (ChangeLog даÑ?оÑ?ека)"
-
-#: ../plugins/subversion/subversion.ui.h:16
-msgid "Line argument:"
-msgstr "Ð?Ñ?гÑ?менÑ? линиÑ?е:"
-
-#: ../plugins/subversion/subversion.ui.h:17
-msgid "Program name:"
-msgstr "Ð?ме пÑ?огÑ?ама:"
-
-#: ../plugins/subversion/subversion.ui.h:18
-msgid "Remember Password"
-msgstr "УпамÑ?и лозинкÑ?"
-
-#: ../plugins/subversion/subversion.ui.h:19
-msgid "Remember this decision"
-msgstr "УпамÑ?и овÑ? одлÑ?кÑ?"
-
-#: ../plugins/subversion/subversion.ui.h:20
-msgid "Repository authorization"
-msgstr "Ð?Ñ?иÑ?ава на Ñ?изниÑ?Ñ?"
-
-#: ../plugins/subversion/subversion.ui.h:21
-msgid "Retrieving status..."
-msgstr "Ð?Ñ?еÑ?зимам Ñ?Ñ?аÑ?е..."
-
-#: ../plugins/subversion/subversion.ui.h:22
-msgid "Save the diff file"
-msgstr "СаÑ?Ñ?ваÑ? даÑ?оÑ?екÑ? Ñ?а Ñ?азликама"
-
-#: ../plugins/subversion/subversion.ui.h:23
-msgid "Send Changes"
-msgstr "Ð?оÑ?аÑ?и измене"
-
-#: ../plugins/subversion/subversion.ui.h:24
-#: ../plugins/subversion/update-dialog.c:222
-msgid "Update repository"
-msgstr "Ð?жÑ?Ñ?иÑ?аÑ? Ñ?кладиÑ?Ñ?е"
-
-#: ../plugins/subversion/subversion.ui.h:25
-msgid "Use configured program to view the diff"
-msgstr "Ð?оÑ?иÑ?Ñ?и подеÑ?ени пÑ?огÑ?ам за пÑ?еглед Ñ?азлика"
-
-#: ../plugins/subversion/subversion.ui.h:26
-msgid "label"
-msgstr "наÑ?пиÑ?"
-
-#: ../plugins/subversion/subversion.gtranslator-plugin.desktop.in.h:1
-msgid "A Subversion client plugin based on libsvn."
-msgstr "Ð?одаÑ?ак за СÑ?бвеÑ?зиÑ?Ñ? коÑ?и Ñ?е оÑ?лаÑ?а на libsvn."
-
-#: ../plugins/subversion/subversion.gtranslator-plugin.desktop.in.h:2
-msgid "Subversion"
-msgstr "СÑ?бвеÑ?зиÑ?а"
-
-#: ../plugins/subversion/svn-command.c:176
-#: ../plugins/subversion/svn-command.c:258
-msgid "Authentication canceled"
-msgstr "Ð?Ñ?иÑ?ава Ñ?е оÑ?казана"
-
-#: ../plugins/subversion/svn-command.c:231
-msgid "Hostname:"
-msgstr "Ð?ме домаÑ?ина:"
-
-#: ../plugins/subversion/svn-command.c:232
-msgid "Fingerprint:"
-msgstr "Ð?Ñ?иÑ?ак пÑ?Ñ?Ñ?а:"
-
-#: ../plugins/subversion/svn-command.c:233
-msgid "Valid from:"
-msgstr "Ð?ажи од:"
-
-#: ../plugins/subversion/svn-command.c:234
-msgid "Valid until:"
-msgstr "Ð?ажи до:"
-
-#: ../plugins/subversion/svn-command.c:235
-msgid "Issuer DN:"
-msgstr "Ð?Ð? издаваÑ?а:"
-
-#: ../plugins/subversion/svn-command.c:236
-msgid "DER certificate:"
-msgstr "Ð?Ð?Ð  Ñ?еÑ?Ñ?иÑ?икаÑ?:"
-
-#: ../plugins/subversion/svn-command.c:385
-#: ../plugins/subversion/svn-command.c:400
-#, c-format
-msgid "Deleted: %s"
-msgstr "Ð?бÑ?иÑ?ан: %s"
-
-#: ../plugins/subversion/svn-command.c:388
-#: ../plugins/subversion/svn-command.c:406
-#, c-format
-msgid "Added: %s"
-msgstr "Ð?одаÑ?: %s"
-
-#: ../plugins/subversion/svn-command.c:391
-#, c-format
-msgid "Reverted: %s"
-msgstr "Ð?Ñ?аÑ?ен: %s"
-
-#: ../plugins/subversion/svn-command.c:394
-#, c-format
-msgid "Revert failed: %s"
-msgstr "Ð?иÑ?е Ñ?Ñ?пело вÑ?аÑ?аÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:397
-#, c-format
-msgid "Resolved: %s"
-msgstr "РазÑ?еÑ?ен: %s"
-
-#: ../plugins/subversion/svn-command.c:403
-#, c-format
-msgid "Updated: %s"
-msgstr "Ð?жÑ?Ñ?иÑ?ан: %s"
-
-#: ../plugins/subversion/svn-command.c:409
-#, c-format
-msgid "Externally Updated: %s"
-msgstr "Ð?жÑ?Ñ?иÑ?ано дÑ?Ñ?гим пÑ?огÑ?амом: %s"
-
-#: ../plugins/subversion/svn-command.c:413
-#, c-format
-msgid "Commit Modified: %s"
-msgstr "Ð?змеÑ?ено за Ñ?лаÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:417
-#, c-format
-msgid "Commit Added: %s"
-msgstr "Ð?одаÑ?о за Ñ?лаÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:420
-#, c-format
-msgid "Commit Deleted: %s"
-msgstr "Ð?бÑ?иÑ?ано за Ñ?лаÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:424
-#, c-format
-msgid "Commit Replaced: %s"
-msgstr "Ð?амеÑ?ено за Ñ?лаÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:428
-#, c-format
-msgid "Created File: %s"
-msgstr "Ð?апÑ?авÑ?ена даÑ?оÑ?ека: %s"
-
-#: ../plugins/subversion/svn-command.c:443
-#, c-format
-msgid "Modified: %s"
-msgstr "Ð?змеÑ?ено: %s"
-
-#: ../plugins/subversion/svn-command.c:446
-#, c-format
-msgid "Merged: %s"
-msgstr "СпоÑ?ено: %s"
-
-#: ../plugins/subversion/svn-command.c:449
-#, c-format
-msgid "Conflicted: %s"
-msgstr "СÑ?кобÑ?ени: %s"
-
-#: ../plugins/subversion/svn-command.c:452
-#, c-format
-msgid "Missing: %s"
-msgstr "Ð?едоÑ?Ñ?аÑ?е: %s"
-
-#: ../plugins/subversion/svn-command.c:455
-#, c-format
-msgid "Obstructed: %s"
-msgstr "СпÑ?еÑ?ено: %s"
-
-#: ../plugins/subversion/svn-update-command.c:104
-#, c-format
-msgid "Updated to revision %ld."
-msgstr "Ð?жÑ?Ñ?иÑ?ано на Ñ?евизиÑ?Ñ? бÑ?. %ld."
-
-#: ../plugins/subversion/update-dialog.c:75
-msgid "Subversion: Update complete."
-msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е ажÑ?Ñ?иÑ?аÑ?е"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:290
-msgid "Modified"
-msgstr "Ð?змеÑ?ена"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:294
-msgid "Added"
-msgstr "Ð?одаÑ?о"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:298
-msgid "Deleted"
-msgstr "Ð?бÑ?иÑ?ано"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:302
-msgid "Conflicted"
-msgstr "СÑ?кобÑ?аваÑ?е"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:306
-msgid "Missing"
-msgstr "Ð?едоÑ?Ñ?аÑ?Ñ?Ñ?а"
-
-#: ../src/actions-file.c:208
+#: ../src/gtr-actions-file.c:203
 msgid "Open file for translation"
 msgstr "Ð?Ñ?ваÑ?а даÑ?оÑ?екÑ? Ñ?ади пÑ?евода"
 
-#: ../src/actions-file.c:281 ../src/actions-file.c:402
+#: ../src/gtr-actions-file.c:275 ../src/gtr-actions-file.c:393
 msgid "File saved."
 msgstr "Ð?аÑ?оÑ?ека Ñ?е Ñ?аÑ?Ñ?вана"
 
-#: ../src/actions-file.c:331
+#: ../src/gtr-actions-file.c:324
 msgid "Save file as..."
 msgstr "СаÑ?Ñ?ваÑ? као..."
 
-#: ../src/actions-file.c:795
-#, c-format
-msgid "Failed to write profile data into profiles file '%s'"
-msgstr "Ð?е могÑ? да Ñ?пиÑ?ем подаÑ?ке Ñ? даÑ?оÑ?екÑ? Ñ?а пÑ?оÑ?илом â??%sâ??"
-
-#: ../src/actions-file.c:853
-#| msgid "File saved."
+#: ../src/gtr-actions-file.c:790
 msgid "Files saved."
 msgstr "Ð?аÑ?оÑ?ека Ñ?е Ñ?аÑ?Ñ?вана."
 
-#: ../src/actions-help.c:52
+#: ../src/gtr-actions-help.c:50
 msgid "Current Maintainers"
 msgstr "Ð?Ñ?огÑ?ам Ñ?Ñ?енÑ?Ñ?но одÑ?жаваÑ?Ñ?"
 
-#: ../src/actions-help.c:57
+#: ../src/gtr-actions-help.c:55
 msgid "Current Developers"
 msgstr "ТÑ?енÑ?Ñ?ни Ñ?азвоÑ?ни Ñ?им"
 
-#: ../src/actions-help.c:63
+#: ../src/gtr-actions-help.c:61
 msgid "Previous Developers"
 msgstr "Ð?Ñ?еÑ?Ñ?одни пÑ?огÑ?амеÑ?и"
 
-#: ../src/actions-help.c:71
+#: ../src/gtr-actions-help.c:69
 msgid "Contributors"
 msgstr "Ð?Ñ?огÑ?амÑ? Ñ?Ñ? допÑ?инели"
 
-#: ../src/actions-help.c:91
+#: ../src/gtr-actions-help.c:89
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -984,7 +617,7 @@ msgstr ""
 "СоÑ?Ñ?веÑ? (FSF); било веÑ?зиÑ?е 2 Ñ?е Ð?иÑ?енÑ?е, било (по ваÑ?ем наÑ?оÑ?еÑ?Ñ?) било коÑ?е "
 "новиÑ?е веÑ?зиÑ?е."
 
-#: ../src/actions-help.c:95
+#: ../src/gtr-actions-help.c:93
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -995,7 +628,7 @@ msgstr ""
 "Ð?Ð?Ð Ð?Ð?ЦÐ?Ð?Ð?; Ñ?ак и без подÑ?азÑ?меване гаÑ?анÑ?иÑ?е Ð?Ð?Ð Ð?СÐ?Ð?СТÐ? или Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?СТÐ? "
 "Ð?Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?.  Ð?идиÑ?е Ð?Ð?У Ð?пÑ?Ñ?Ñ? Ð?авнÑ? Ð?иÑ?енÑ?Ñ? за виÑ?е деÑ?аÑ?а."
 
-#: ../src/actions-help.c:99
+#: ../src/gtr-actions-help.c:97
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
@@ -1003,17 +636,17 @@ msgstr ""
 "ТÑ?ебали Ñ?Ñ?е да пÑ?имиÑ?е пÑ?имеÑ?ак Ð?Ð?У Ð?пÑ?Ñ?е Ð?авне Ð?иÑ?енÑ?е Ñ?з %s; ако ниÑ?Ñ?е, "
 "погледаÑ?Ñ?е <http://www.gnu.org/licenses/>."
 
-#: ../src/actions-help.c:111
+#: ../src/gtr-actions-help.c:119
 msgid ""
 "Translation file editing suite for localization of applications and "
 "libraries."
 msgstr "Ð?Ñ?огÑ?ам за Ñ?Ñ?еÑ?иваÑ?е даÑ?оÑ?ека Ñ?а пÑ?еводима пÑ?огÑ?ама и библиоÑ?ека."
 
-#: ../src/actions-help.c:114
+#: ../src/gtr-actions-help.c:122
 msgid "Copyright © 1999-2008 Free Software Foundation, Inc."
 msgstr "Сва пÑ?ава задÑ?жана, 1999-2008. Ð?адÑ?жбина Ñ?лободног Ñ?оÑ?Ñ?веÑ?а"
 
-#: ../src/actions-help.c:117
+#: ../src/gtr-actions-help.c:124
 msgid "About Gtranslator"
 msgstr "Ð? пÑ?огÑ?амÑ?"
 
@@ -1021,7 +654,7 @@ msgstr "Ð? пÑ?огÑ?амÑ?"
 #. * Note to translators: put here your name and email so it will show
 #. * up in the "about" box
 #.
-#: ../src/actions-help.c:122
+#: ../src/gtr-actions-help.c:129
 msgid "translator-credits"
 msgstr ""
 "Ð?еÑ?ко Ð?. СÑ?аноÑ?евиÑ? <veljko vms homelinux net>\n"
@@ -1029,40 +662,60 @@ msgstr ""
 "\n"
 "Prevod.org â?? пÑ?евод на Ñ?Ñ?пÑ?ки Ñ?език."
 
-#: ../src/actions-help.c:126
+#: ../src/gtr-actions-help.c:133
 msgid "Gtranslator Web Site"
 msgstr "Ð?нÑ?еÑ?неÑ? Ñ?Ñ?Ñ?аниÑ?а Ð?Ñ?еводиоÑ?а"
 
-#: ../src/actions-search.c:173
+#: ../src/gtr-actions-search.c:170
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] "Ð?Ñ?онаÑ?ао Ñ?ам и заменио %d поÑ?авÑ?"
 msgstr[1] "Ð?Ñ?онаÑ?ао Ñ?ам и заменио %d поÑ?аве"
 msgstr[2] "Ð?Ñ?онаÑ?ао Ñ?ам и заменио %d поÑ?ава"
+msgstr[3] "Ð?Ñ?онаÑ?ао Ñ?ам и заменио поÑ?авÑ?"
 
-#: ../src/actions-search.c:183
+#: ../src/gtr-actions-search.c:179
 msgid "Found and replaced one occurrence"
 msgstr "Ð?Ñ?онаÑ?ао Ñ?ам и заменио Ñ?еднÑ? поÑ?авÑ?"
 
-#: ../src/context.c:60
-msgid "Format:"
-msgstr "ФоÑ?маÑ?:"
+#: ../src/gtr-context.c:228
+#| msgid "None"
+msgid "Notes:"
+msgstr "Ð?елеÑ?ке:"
 
-#: ../src/context.c:62
-msgid "Context:"
-msgstr "Ð?оÑ?ава:"
+#: ../src/gtr-context.c:236
+#| msgid "Added"
+msgid "Add Note"
+msgstr "Ð?одаÑ? белеÑ?кÑ?"
+
+#: ../src/gtr-context.c:241
+#| msgid "_Edit"
+msgid "Edit"
+msgstr "Ð?змени"
 
-#: ../src/context.c:64
+#. Extracted comments
+#: ../src/gtr-context.c:284
 msgid "Extracted comments:"
 msgstr "Ð?звÑ?Ñ?ене напомене:"
 
-#: ../src/dialogs/assistant.c:140 ../src/dialogs/preferences-dialog.c:755
+#. Context
+#: ../src/gtr-context.c:288
+msgid "Context:"
+msgstr "Ð?оÑ?ава:"
+
+#. Format
+#: ../src/gtr-context.c:292
+msgid "Format:"
+msgstr "ФоÑ?маÑ?:"
+
+#: ../src/dialogs/gtr-assistant.c:128
+#: ../src/dialogs/gtr-preferences-dialog.c:936
 msgid "<span weight=\"bold\" size=\"large\">Strings added to database</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"large\">Ð?аÑ?акÑ?еÑ?и додаÑ?и Ñ? базÑ? подаÑ?ака</span>"
 
-#: ../src/dialogs/assistant.c:298
+#: ../src/dialogs/gtr-assistant.c:275
 #, c-format
 msgid ""
 "Profile name: %s\n"
@@ -1087,11 +740,11 @@ msgstr ""
 "Ð?ножине: %s\n"
 "Ð?Ñ?Ñ?аÑ?а до базе: %s"
 
-#: ../src/dialogs/assistant.c:325
+#: ../src/dialogs/gtr-assistant.c:302
 msgid "None"
 msgstr "Ð?иÑ?Ñ?а"
 
-#: ../src/dialogs/assistant.c:348
+#: ../src/dialogs/gtr-assistant.c:325
 msgid ""
 "This assistant will help you to create the main profile\n"
 "and generate your translation memory database."
@@ -1099,93 +752,98 @@ msgstr ""
 "Ð?Ñ?иÑ?Ñ?енÑ? Ñ?е вам помоÑ?и да напÑ?авиÑ?е главни пÑ?оÑ?ил\n"
 "и изгÑ?адиÑ?е базÑ? подаÑ?ака за пÑ?еводилаÑ?кÑ? мемоÑ?иÑ?Ñ?."
 
-#: ../src/dialogs/assistant.c:354
+#: ../src/dialogs/gtr-assistant.c:331
 msgid "Assistant"
 msgstr "Ð?Ñ?иÑ?Ñ?енÑ?"
 
-#: ../src/dialogs/assistant.c:446
+#: ../src/dialogs/gtr-assistant.c:423
 msgid "<b>Profile name:</b>"
 msgstr "<b>Ð?азив пÑ?оÑ?ила:</b>"
 
-#: ../src/dialogs/assistant.c:465
+#: ../src/dialogs/gtr-assistant.c:442
 msgid "<b>Translator name:</b>"
 msgstr "<b>Ð?ме пÑ?еводиоÑ?а:</b>"
 
-#: ../src/dialogs/assistant.c:484
+#: ../src/dialogs/gtr-assistant.c:461
 msgid "<b>Translator email:</b>"
 msgstr "<b>Ð?дÑ?еÑ?а е-поÑ?Ñ?е:</b>"
 
-#: ../src/dialogs/assistant.c:503
+#: ../src/dialogs/gtr-assistant.c:480
 msgid "<b>Language:</b>"
 msgstr "<b>Language:</b>"
 
-#: ../src/dialogs/assistant.c:522
+#: ../src/dialogs/gtr-assistant.c:499
 msgid "<b>Team email:</b>"
 msgstr "<b>Ð?-поÑ?Ñ?а Ñ?има:</b>"
 
-#: ../src/dialogs/assistant.c:534 ../src/dialogs/assistant.c:680
-#: ../src/dialogs/preferences-dialog.c:548
+#: ../src/dialogs/gtr-assistant.c:511 ../src/dialogs/gtr-assistant.c:657
+#: ../src/dialogs/gtr-preferences-dialog.c:730 ../src/gtr-window.c:1483
 msgid "Profile"
 msgstr "Ð?Ñ?оÑ?ил"
 
-#: ../src/dialogs/assistant.c:611
+#: ../src/dialogs/gtr-assistant.c:588
 msgid "<b>Language code:</b>"
 msgstr "<b>Ð?знака Ñ?езика:</b>"
 
-#: ../src/dialogs/assistant.c:630
+#: ../src/dialogs/gtr-assistant.c:607
 msgid "<b>Character set:</b>"
 msgstr "<b>СеÑ? знакова:</b>"
 
-#: ../src/dialogs/assistant.c:649
+#: ../src/dialogs/gtr-assistant.c:626
 msgid "<b>Transfer encoding:</b>"
 msgstr "<b>Ð?одиÑ?аÑ?е:</b>"
 
-#: ../src/dialogs/assistant.c:668
+#: ../src/dialogs/gtr-assistant.c:645
 msgid "<b>Plural forms:</b>"
 msgstr "<b>Ð?ножине:</b>"
 
-#: ../src/dialogs/assistant.c:727
+#: ../src/dialogs/gtr-assistant.c:666
+msgid "Checkout directory"
+msgstr "УÑ?клади диÑ?екÑ?оÑ?иÑ?Ñ?м"
+
+#: ../src/dialogs/gtr-assistant.c:704
 msgid "<b>Select the path to generate the database:</b>"
 msgstr "<b>Ð?забеÑ?иÑ?е пÑ?Ñ?аÑ?Ñ? за пÑ?авÑ?еÑ?е базе подаÑ?ака:</b>"
 
-#: ../src/dialogs/assistant.c:756
+#: ../src/dialogs/gtr-assistant.c:733
 msgid "<b>Look for a specific PO filename:</b>"
 msgstr "<b>Ð?аÑ?и Ñ?амо задаÑ?о име за PO даÑ?оÑ?еке:</b>"
 
-#: ../src/dialogs/assistant.c:765
+#: ../src/dialogs/gtr-assistant.c:742
 msgid "E.g.: gl.po"
 msgstr "Ð?а пÑ?имеÑ? sr.po"
 
-#: ../src/dialogs/assistant.c:769
+#: ../src/dialogs/gtr-assistant.c:746
 msgid "Generate Database"
 msgstr "Ð?згÑ?ади базÑ? подаÑ?ака"
 
-#: ../src/dialogs/assistant.c:795
+#: ../src/dialogs/gtr-assistant.c:772
 msgid "Confirmation"
 msgstr "Ð?оÑ?вÑ?да"
 
-#: ../src/dialogs/close-confirmation-dialog.c:128
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:127
 msgid "Close _without Saving"
 msgstr "Ð?аÑ?воÑ?и без _Ñ?Ñ?ваÑ?а"
 
-#: ../src/dialogs/close-confirmation-dialog.c:159
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:157
 msgid "Question"
 msgstr "Ð?иÑ?аÑ?е"
 
-#: ../src/dialogs/close-confirmation-dialog.c:380
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:372
 #, c-format
 msgid "Save the changes to document \"%s\" before closing?"
 msgstr "Ð?а Ñ?аÑ?Ñ?вам измене Ñ? докÑ?менÑ?Ñ? â??%sâ?? пÑ?е заÑ?ваÑ?аÑ?а?"
 
-#: ../src/dialogs/close-confirmation-dialog.c:543
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:535
 #, c-format
 msgid "Changes to %d document will be permanently lost."
 msgid_plural "Changes to %d documents will be permanently lost."
 msgstr[0] "Ð?змене Ñ?Ñ?иÑ?ене Ñ? %d докÑ?менÑ?Ñ? Ñ?е биÑ?и Ñ?Ñ?аÑ?но одбаÑ?ене."
 msgstr[1] "Ð?змене Ñ?Ñ?иÑ?ене Ñ? %d докÑ?менÑ?а Ñ?е биÑ?и Ñ?Ñ?аÑ?но одбаÑ?ене."
 msgstr[2] "Ð?змене Ñ?Ñ?иÑ?ене Ñ? %d докÑ?менаÑ?а Ñ?е биÑ?и Ñ?Ñ?аÑ?но одбаÑ?ене."
+msgstr[3] "Ð?змене Ñ?Ñ?иÑ?ене Ñ? докÑ?менÑ?Ñ? Ñ?е биÑ?и Ñ?Ñ?аÑ?но одбаÑ?ене."
 
-#: ../src/dialogs/close-confirmation-dialog.c:550
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:542
 #, c-format
 msgid "There is %d document with unsaved changes. Save changes before closing?"
 msgid_plural ""
@@ -1196,130 +854,120 @@ msgstr[1] ""
 "%d докÑ?менÑ?а имаÑ?Ñ? неÑ?аÑ?Ñ?ване измене. Ð?а ли да иÑ? Ñ?аÑ?Ñ?вам пÑ?е заÑ?ваÑ?аÑ?а?"
 msgstr[2] ""
 "%d докÑ?менаÑ?а имаÑ?Ñ? неÑ?аÑ?Ñ?ване измене. Ð?а ли да иÑ? Ñ?аÑ?Ñ?вам пÑ?е заÑ?ваÑ?аÑ?а?"
+msgstr[3] ""
+"Ð?окÑ?менÑ? има неÑ?аÑ?Ñ?ване измене. Ð?а ли да иÑ? Ñ?аÑ?Ñ?вам пÑ?е заÑ?ваÑ?аÑ?а?"
+
 
-#: ../src/dialogs/close-confirmation-dialog.c:571
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:563
 msgid "Docum_ents with unsaved changes:"
 msgstr "Ð?окÑ?менÑ?и Ñ?а неÑ?аÑ?Ñ?ваним изменама:"
 
-#: ../src/dialogs/close-confirmation-dialog.c:575
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:567
 msgid "S_elect the documents you want to save:"
 msgstr "Ð?забеÑ?иÑ?е _докÑ?менÑ?е коÑ?е желиÑ?е да Ñ?аÑ?Ñ?ваÑ?е:"
 
-#: ../src/dialogs/close-confirmation-dialog.c:595
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:587
 msgid "Saving has been disabled by the system administrator."
 msgstr "ЧÑ?ваÑ?е Ñ?е онемогÑ?Ñ?ено од Ñ?Ñ?Ñ?ане админиÑ?Ñ?Ñ?аÑ?оÑ?а Ñ?иÑ?Ñ?ема."
 
-#: ../src/dialogs/close-confirmation-dialog.c:597
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:589
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Уколико не Ñ?аÑ?Ñ?ваÑ?е, Ñ?ве ваÑ?е измене Ñ?е биÑ?и Ñ?Ñ?аÑ?но одбаÑ?ене."
 
-#: ../src/dialogs/comment-dialog.c:95
-msgid "Edit Comment"
-msgstr "Ð?змена напомене"
-
-#: ../src/dialogs/comment-dialog.ui.h:1
-#| msgid "<b>Write your comments below:</b>"
-msgid "<b>Write your comments bellow:</b>"
-msgstr "<b>УпиÑ?иÑ?е напомене иÑ?под:</b>"
-
-#: ../src/dialogs/file-dialogs.c:62
+#: ../src/dialogs/gtr-file-dialogs.c:62
 msgid "Gettext translation"
 msgstr "Ð?еÑ?Ñ?екÑ?Ñ? пÑ?евод"
 
-#: ../src/dialogs/file-dialogs.c:71
+#: ../src/dialogs/gtr-file-dialogs.c:71
 msgid "Gettext translation template"
 msgstr "Шаблон Ð?еÑ?Ñ?екÑ?Ñ? пÑ?евода"
 
-#: ../src/dialogs/file-dialogs.c:76
+#: ../src/dialogs/gtr-file-dialogs.c:76
 msgid "All files"
 msgstr "Све даÑ?оÑ?еке"
 
-#: ../src/dialogs/header-dialog.c:270
+#: ../src/dialogs/gtr-header-dialog.c:236
 msgid "Edit Header"
 msgstr "УÑ?еди заглавÑ?е"
 
-#: ../src/dialogs/header-dialog.ui.h:1
+#: ../src/dialogs/gtr-header-dialog.ui.h:1
 msgid "Char_set:"
 msgstr "Ð?наковни _Ñ?кÑ?п:"
 
-#: ../src/dialogs/header-dialog.ui.h:2
+#: ../src/dialogs/gtr-header-dialog.ui.h:2
 msgid "Comment"
 msgstr "Ð?апомена"
 
-#: ../src/dialogs/header-dialog.ui.h:3
+#: ../src/dialogs/gtr-header-dialog.ui.h:3
 msgid "Enc_oding:"
 msgstr "Ð?одиÑ?аÑ?е:"
 
-#: ../src/dialogs/header-dialog.ui.h:4
+#: ../src/dialogs/gtr-header-dialog.ui.h:4
 msgid "Language gro_up email:"
 msgstr "Ð?-поÑ?Ñ?а пÑ?еводилаÑ?ке _гÑ?Ñ?пе:"
 
-#: ../src/dialogs/header-dialog.ui.h:5
+#: ../src/dialogs/gtr-header-dialog.ui.h:5
 msgid "Po file _revision date:"
 msgstr "Ð?аÑ?Ñ?м _Ñ?евизиÑ?е даÑ?оÑ?еке Ñ?а пÑ?еводом:"
 
-#: ../src/dialogs/header-dialog.ui.h:6
+#: ../src/dialogs/gtr-header-dialog.ui.h:6
 msgid "Pot _file creation date:"
 msgstr "Ð?аÑ?Ñ?м _Ñ?Ñ?ваÑ?аÑ?а оÑ?новне даÑ?оÑ?еке Ñ?а пÑ?еводом:"
 
-#: ../src/dialogs/header-dialog.ui.h:7
+#: ../src/dialogs/gtr-header-dialog.ui.h:7
 msgid "Project"
 msgstr "Ð?Ñ?оÑ?екаÑ?"
 
-#: ../src/dialogs/header-dialog.ui.h:8
+#: ../src/dialogs/gtr-header-dialog.ui.h:8
 msgid "Project Id _version:"
 msgstr "_Ð?здаÑ?е пÑ?оÑ?екÑ?а:"
 
-#: ../src/dialogs/header-dialog.ui.h:9
-#| msgid "Report msgid _bugs to:"
+#: ../src/dialogs/gtr-header-dialog.ui.h:9
 msgid "Report message _bugs to:"
 msgstr "Ð?Ñ?иÑ?ави гÑ?еÑ?ке Ñ? пÑ?огÑ?амÑ? _на:"
 
-#: ../src/dialogs/header-dialog.ui.h:10
+#: ../src/dialogs/gtr-header-dialog.ui.h:10
 msgid "Translator and Language"
 msgstr "Ð?Ñ?еводилаÑ? и Ñ?език"
 
-#: ../src/dialogs/header-dialog.ui.h:11
+#: ../src/dialogs/gtr-header-dialog.ui.h:11
 msgid "Translator's _email:"
 msgstr "_Ð?-поÑ?Ñ?а пÑ?еводиоÑ?а:"
 
-#: ../src/dialogs/header-dialog.ui.h:12
+#: ../src/dialogs/gtr-header-dialog.ui.h:12
 msgid "Translator's _name:"
 msgstr "Ð?_ме пÑ?еводиоÑ?а:"
 
-#: ../src/dialogs/header-dialog.ui.h:13
+#: ../src/dialogs/gtr-header-dialog.ui.h:13
 msgid "Use my options to complete the following entries:"
 msgstr "Ð?оÑ?иÑ?Ñ?и моÑ?е опÑ?иÑ?е за довÑ?Ñ?аваÑ?е Ñ?ледеÑ?иÑ? Ñ?ноÑ?а:"
 
-#: ../src/dialogs/header-dialog.ui.h:14 ../src/dialogs/profile-dialog.ui.h:9
+#: ../src/dialogs/gtr-header-dialog.ui.h:14
+#: ../src/dialogs/gtr-profile-dialog.ui.h:9
 msgid "_Language:"
 msgstr "_Ð?език:"
 
-#: ../src/dialogs/jump-dialog.c:91
-#| msgid "Go to the last message"
+#: ../src/dialogs/gtr-jump-dialog.c:91
 msgid "Go to Message"
 msgstr "Ð?ди на поÑ?Ñ?кÑ?"
 
-#: ../src/dialogs/jump-dialog.ui.h:1
-msgid "<b>Enter message number:</b>"
-msgstr "<b>УнеÑ?иÑ?е бÑ?оÑ? поÑ?Ñ?ке:</b>"
-
-#: ../src/dialogs/preferences-dialog.c:554
-msgid "Active"
-msgstr "Ð?кÑ?иван"
+#: ../src/dialogs/gtr-jump-dialog.ui.h:1
+#| msgid "<b>Enter message number:</b>"
+msgid "Enter message number:"
+msgstr "УнеÑ?иÑ?е бÑ?оÑ? поÑ?Ñ?ке:"
 
-#: ../src/dialogs/preferences-dialog.c:1124
+#: ../src/dialogs/gtr-preferences-dialog.c:585
 msgid ""
 "<span weight=\"bold\" size=\"large\">Impossible to remove the active "
 "profile</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"large\">Ð?е могÑ? да Ñ?клоним акÑ?ивни пÑ?оÑ?ил</span>"
 
-#: ../src/dialogs/preferences-dialog.c:1129
+#: ../src/dialogs/gtr-preferences-dialog.c:589
 msgid "Another profile should be selected as active before"
 msgstr "Ð?оÑ?аÑ?е наÑ?пÑ?е акÑ?ивиÑ?аÑ?и неки дÑ?Ñ?ги пÑ?оÑ?ил"
 
-#: ../src/dialogs/preferences-dialog.c:1143
+#: ../src/dialogs/gtr-preferences-dialog.c:602
 msgid ""
 "<span weight=\"bold\" size=\"large\">Are you sure you want to delete this "
 "profile?</span>"
@@ -1327,326 +975,332 @@ msgstr ""
 "<span weight=\"bold\" size=\"large\">Ð?а ли желиÑ?е да обÑ?иÑ?еÑ?е оваÑ? пÑ?оÑ?ил?</"
 "span>"
 
-#: ../src/dialogs/preferences-dialog.c:1181
-#: ../src/dialogs/preferences-dialog.ui.h:16
+#: ../src/dialogs/gtr-preferences-dialog.c:736
+msgid "Active"
+msgstr "Ð?кÑ?иван"
+
+#: ../src/dialogs/gtr-preferences-dialog.c:1189
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:14
 msgid "Gtranslator Preferences"
 msgstr "Ð?оÑ?Ñ?авке Ð?номовог пÑ?еводиоÑ?а"
 
-#: ../src/dialogs/preferences-dialog.ui.h:2
-#| msgid "<b>Anchor style</b>"
-msgid "<b>Anchor style:</b>"
-msgstr "<b>Ð?зглед пÑ?икаÑ?еног:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:3
-msgid "<b>Autosave</b>"
-msgstr "<b>Ð?Ñ?Ñ?омаÑ?Ñ?ко Ñ?Ñ?ваÑ?е</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:4
-#| msgid "<b>Configuration</b>"
-msgid "<b>Configuration:</b>"
-msgstr "<b>Ð?одеÑ?аваÑ?е:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:5
-msgid "<b>Contents</b>"
-msgstr "<b>СадÑ?жаÑ?</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:6
-#| msgid "<b>Database</b>"
-msgid "<b>Database:</b>"
-msgstr "<b>Ð?аза подаÑ?ака:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:7
-msgid "<b>General</b>"
-msgstr "<b>Ð?пÑ?Ñ?е</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:8
-#| msgid "<b>Scheme color</b>"
-msgid "<b>Scheme color:</b>"
-msgstr "<b>Шема боÑ?а:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:9
-msgid "<b>Text Display</b>"
-msgstr "<b>Ð?Ñ?иказ Ñ?екÑ?Ñ?а</b>"
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:1
+msgid "    "
+msgstr "    "
 
-#: ../src/dialogs/preferences-dialog.ui.h:10
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:2
 msgid "Add to Database"
 msgstr "Ð?одаÑ? Ñ? базÑ? подаÑ?ака"
 
-#: ../src/dialogs/preferences-dialog.ui.h:11
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:3
+#| msgid "<b>Anchor style:</b>"
+msgid "Anchor style:"
+msgstr "Ð?зглед пÑ?икаÑ?еног:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:4
+#| msgid "Autosave files"
+msgid "Autosave"
+msgstr "Сам Ñ?аÑ?Ñ?ваÑ?"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:5
 msgid "Check _spelling"
 msgstr "_Ð?Ñ?овеÑ?и пиÑ?аÑ?е"
 
-#: ../src/dialogs/preferences-dialog.ui.h:12
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:6
+#| msgid "Confirmation"
+msgid "Configuration:"
+msgstr "Ð?одеÑ?аваÑ?е:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:7
+#| msgid "_Contents"
+msgid "Contents"
+msgstr "СадÑ?жаÑ?"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:8
 msgid "Create a _backup copy of files before saving"
 msgstr "Ð?апÑ?ави _Ñ?езеÑ?внÑ? копиÑ?Ñ? пÑ?е Ñ?Ñ?ваÑ?а"
 
-#: ../src/dialogs/preferences-dialog.ui.h:13
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:9
+#| msgid "<b>Database:</b>"
+msgid "Database:"
+msgstr "Ð?аза подаÑ?ака:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:10
 msgid "Editor"
 msgstr "УÑ?еÑ?иваÑ?е"
 
-#: ../src/dialogs/preferences-dialog.ui.h:14
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:11
 msgid "Editor _font:"
 msgstr "_ФонÑ? за Ñ?екÑ?Ñ?:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:15
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:12
 msgid "Files"
 msgstr "Ð?аÑ?оÑ?еке"
 
-#: ../src/dialogs/preferences-dialog.ui.h:17
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:13
+#| msgid "<b>General</b>"
+msgid "General"
+msgstr "Ð?пÑ?Ñ?е"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:15
 msgid "Interface"
 msgstr "СÑ?Ñ?еÑ?е"
 
-#: ../src/dialogs/preferences-dialog.ui.h:18
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:16
 msgid "Make _whitespace visible"
 msgstr "Ð?Ñ?икажи _Ñ?азмаке измеÑ?Ñ? Ñ?еÑ?и"
 
-#: ../src/dialogs/preferences-dialog.ui.h:19
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:17
 msgid "Max. # of missing words:"
 msgstr "Ð?аÑ?веÑ?и бÑ?оÑ? недоÑ?Ñ?аÑ?Ñ?Ñ?иÑ? Ñ?еÑ?и:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:20
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:18
 msgid "Max. difference in sentence length:"
 msgstr "Ð?аÑ?веÑ?а Ñ?азлика Ñ? дÑ?жини Ñ?еÑ?ениÑ?е:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:21
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:19
 msgid "Plugins"
 msgstr "Ð?одаÑ?и"
 
-#: ../src/dialogs/preferences-dialog.ui.h:22
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:20
 msgid "Profiles"
 msgstr "Ð?Ñ?оÑ?или"
 
-#: ../src/dialogs/preferences-dialog.ui.h:23
-msgid "Select directory contains PO files:"
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:21
+#| msgid "<b>Scheme color:</b>"
+msgid "Scheme color:"
+msgstr "Шема боÑ?а:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:22
+#| msgid "Select directory contains PO files:"
+msgid "Select the directory which contains PO files:"
 msgstr "Ð?забеÑ?иÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м Ñ?а PO даÑ?оÑ?екама:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:24 ../src/tab.c:662
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:23
+#| msgid "<b>Text Display</b>"
+msgid "Text Display"
+msgstr "Ð?Ñ?иказ Ñ?екÑ?Ñ?а"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:24
 msgid "Translation Memory"
 msgstr "Ð?Ñ?еводилаÑ?ка мемоÑ?иÑ?а"
 
-#: ../src/dialogs/preferences-dialog.ui.h:25
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:25
 msgid "Use _custom font"
 msgstr "_Ð?оÑ?иÑ?Ñ?и пÑ?оизвоÑ?ан Ñ?онÑ?"
 
-#: ../src/dialogs/preferences-dialog.ui.h:26
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:26
 msgid "Use only files with this name:"
 msgstr "Само даÑ?оÑ?еке Ñ?а овим именом:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:27
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:27
 msgid "_Autosave files every"
 msgstr "_Сам Ñ?аÑ?Ñ?ваÑ? даÑ?оÑ?еке након"
 
-#: ../src/dialogs/preferences-dialog.ui.h:28
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:28
 msgid "_Delete compiled GMO files"
 msgstr "Уклони _бинаÑ?не GMO даÑ?оÑ?еке"
 
-#: ../src/dialogs/preferences-dialog.ui.h:29
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:29
 msgid "_Highlight message syntax"
 msgstr "Ð?Ñ?_Ñ?акни Ñ?инÑ?акÑ?Ñ? поÑ?Ñ?ке"
 
-#: ../src/dialogs/preferences-dialog.ui.h:30
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:30
 msgid "_Remove fuzzy status if message is changed"
 msgstr "_Ð?знаÑ?и неÑ?аÑ?не поÑ?Ñ?ке као пÑ?еведене пÑ?и измени"
 
-#: ../src/dialogs/preferences-dialog.ui.h:31
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:31
 msgid "_Warn if PO file contains fuzzy translations"
 msgstr "_УпозоÑ?и Ñ?колико даÑ?оÑ?ека Ñ?а пÑ?еводом Ñ?адÑ?жи неÑ?аÑ?не поÑ?Ñ?ке"
 
-#: ../src/dialogs/preferences-dialog.ui.h:32
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:32
 msgid "_minutes"
 msgstr "_минÑ?Ñ?а"
 
-#: ../src/dialogs/profile-dialog.c:262
-msgid ""
-"<span weight=\"bold\" size=\"large\">The profile name already exists</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"large\">Ð?еÑ? поÑ?Ñ?оÑ?и пÑ?оÑ?ил Ñ?а овим именом</span>"
-
-#: ../src/dialogs/profile-dialog.c:375
-#| msgid "gtranslator Profile"
+#: ../src/dialogs/gtr-profile-dialog.c:85
 msgid "Gtranslator Profile"
 msgstr "Ð?Ñ?оÑ?ил Ð?номовог пÑ?еводиоÑ?а"
 
-#: ../src/dialogs/profile-dialog.c:420
-msgid "Example: nplurals=2; plural=(n != 1);"
-msgstr ""
-"Ð?Ñ?имеÑ?: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-
-#: ../src/dialogs/profile-dialog.ui.h:1
-msgid "<b>Language Settings</b>"
-msgstr "<b>Ð?одеÑ?аваÑ?е Ñ?езика</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:2
-msgid "<b>Profile Information</b>"
-msgstr "<b>Ð?одаÑ?и о пÑ?оÑ?илÑ?</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:3
-msgid "<b>Translator Information</b>"
-msgstr "<b>Ð?одаÑ?и о пÑ?еводиоÑ?Ñ?</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:4
+#: ../src/dialogs/gtr-profile-dialog.ui.h:1
 msgid "Character _set"
 msgstr "Ð?наковни _Ñ?кÑ?п:"
 
-#: ../src/dialogs/profile-dialog.ui.h:5
+#: ../src/dialogs/gtr-profile-dialog.ui.h:2
+#| msgid "<b>Language Settings</b>"
+msgid "Language Settings"
+msgstr "Ð?одеÑ?аваÑ?е Ñ?езика"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:3
 msgid "Language _code:"
 msgstr "_Ð?знака Ñ?езика:"
 
-#: ../src/dialogs/profile-dialog.ui.h:6
+#: ../src/dialogs/gtr-profile-dialog.ui.h:4
 msgid "N_ame:"
 msgstr "_Ð?ме:"
 
-#: ../src/dialogs/profile-dialog.ui.h:7
+#: ../src/dialogs/gtr-profile-dialog.ui.h:5
+#| msgid "<b>Profile Information</b>"
+msgid "Profile Information"
+msgstr "Ð?одаÑ?и о пÑ?оÑ?илÑ?"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:6
 msgid "Transfer en_coding:"
 msgstr "_Ð?оÑ?идаÑ?е:"
 
-#: ../src/dialogs/profile-dialog.ui.h:8
+#: ../src/dialogs/gtr-profile-dialog.ui.h:7
+#| msgid "<b>Translator Information</b>"
+msgid "Translator Information"
+msgstr "Ð?одаÑ?и о пÑ?еводиоÑ?Ñ?"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:8
 msgid "_Email:"
 msgstr "_Ð?-поÑ?Ñ?а:"
 
-#: ../src/dialogs/profile-dialog.ui.h:10
+#: ../src/dialogs/gtr-profile-dialog.ui.h:10
 msgid "_Name:"
 msgstr "_Ð?ме:"
 
-#: ../src/dialogs/profile-dialog.ui.h:11
+#: ../src/dialogs/gtr-profile-dialog.ui.h:11
 msgid "_Plural forms:"
 msgstr "Ð?блиÑ?и _множине:"
 
-#: ../src/dialogs/profile-dialog.ui.h:12
+#: ../src/dialogs/gtr-profile-dialog.ui.h:12
 msgid "_Team email:"
 msgstr "Ð?-_поÑ?Ñ?а Ñ?има:"
 
-#: ../src/dialogs/search-dialog.c:332 ../src/dialogs/search-dialog.ui.h:4
+#: ../src/dialogs/gtr-search-dialog.c:328
+#: ../src/dialogs/gtr-search-dialog.ui.h:3
 msgid "Replace"
 msgstr "Ð?амени"
 
-#: ../src/dialogs/search-dialog.c:356
+#: ../src/dialogs/gtr-search-dialog.c:352
 msgid "Find"
 msgstr "Ð?Ñ?онаÑ?и"
 
-#: ../src/dialogs/search-dialog.c:471
+#: ../src/dialogs/gtr-search-dialog.c:463
 msgid "Replace _All"
 msgstr "Ð?амени _Ñ?ве"
 
-#: ../src/dialogs/search-dialog.c:475
+#: ../src/dialogs/gtr-search-dialog.c:467
 msgid "_Replace"
 msgstr "Ð?_амени"
 
-#: ../src/dialogs/search-dialog.ui.h:1
-msgid "Include fuzzy strings"
-msgstr "УкÑ?Ñ?Ñ?и и неÑ?аÑ?не поÑ?Ñ?ке"
+#: ../src/dialogs/gtr-search-dialog.ui.h:1
+#| msgid "Include fuzzy strings"
+msgid "Include fu_zzy strings"
+msgstr "УкÑ?Ñ?Ñ?и и _неÑ?аÑ?не поÑ?Ñ?ке"
 
-#: ../src/dialogs/search-dialog.ui.h:2
+#: ../src/dialogs/gtr-search-dialog.ui.h:2
 msgid "Match _entire word only"
 msgstr "Ð?оклопи Ñ?амо _Ñ?еле Ñ?еÑ?и"
 
-#: ../src/dialogs/search-dialog.ui.h:3
-msgid "Original text"
-msgstr "У извоÑ?ном Ñ?екÑ?Ñ?Ñ?"
-
-#: ../src/dialogs/search-dialog.ui.h:5
+#: ../src/dialogs/gtr-search-dialog.ui.h:4
 msgid "Replace All"
 msgstr "Ð?амени Ñ?ве"
 
-#: ../src/dialogs/search-dialog.ui.h:6
+#: ../src/dialogs/gtr-search-dialog.ui.h:5
 msgid "Replace _with: "
 msgstr "Ð?амени _Ñ?а:"
 
-#: ../src/dialogs/search-dialog.ui.h:7
+#: ../src/dialogs/gtr-search-dialog.ui.h:6
 msgid "Search _backwards"
 msgstr "ТÑ?ажи Ñ?_назад"
 
-#: ../src/dialogs/search-dialog.ui.h:8
-msgid "Translated text"
-msgstr "У пÑ?еведеном Ñ?екÑ?Ñ?Ñ?"
-
-#: ../src/dialogs/search-dialog.ui.h:9
+#: ../src/dialogs/gtr-search-dialog.ui.h:7
 msgid "_Match case"
 msgstr "_Ð?оклопи велика и мала Ñ?лова"
 
-#: ../src/dialogs/search-dialog.ui.h:10
+#: ../src/dialogs/gtr-search-dialog.ui.h:8
+#| msgid "Original text"
+msgid "_Original text"
+msgstr "У _извоÑ?ном Ñ?екÑ?Ñ?Ñ?"
+
+#: ../src/dialogs/gtr-search-dialog.ui.h:9
 msgid "_Search for: "
 msgstr "_Ð?аÑ?и:"
 
-#: ../src/dialogs/search-dialog.ui.h:11
+#: ../src/dialogs/gtr-search-dialog.ui.h:10
+#| msgid "Translated text"
+msgid "_Translated text"
+msgstr "У пÑ?е_веденом Ñ?екÑ?Ñ?Ñ?"
+
+#: ../src/dialogs/gtr-search-dialog.ui.h:11
 msgid "_Wrap around"
 msgstr "Ð?_Ñ?еламаÑ?"
 
-#: ../src/main.c:54
+#: ../src/main.c:61
 msgid "[FILE...]"
 msgstr "[Ð?Ð?ТÐ?ТÐ?Ð?Ð?...]"
 
-#: ../src/main.c:80
+#: ../src/main.c:64
+msgid "Create a new toplevel window in an existing instance of Gtranslator"
+msgstr "Ð?бÑ?азÑ?Ñ?е нови главни пÑ?озоÑ? Ð?номовог пÑ?еводиоÑ?а"
+
+#: ../src/main.c:92
 #, c-format
 msgid "%s: malformed file name or URI.\n"
 msgstr "%s: лоÑ?е задаÑ?о име даÑ?оÑ?еке или адÑ?еÑ?а.\n"
 
-#: ../src/main.c:148
+#: ../src/main.c:240
 msgid "Gtranslator"
 msgstr "Ð?номов пÑ?еводилаÑ?"
 
 #. Setup command line options
-#: ../src/main.c:151
+#: ../src/main.c:244
 msgid "- Edit PO files"
 msgstr "â?? Ñ?Ñ?еÑ?Ñ?Ñ?е PO даÑ?оÑ?екÑ?"
 
-#: ../src/main.c:165
+#: ../src/main.c:256
 #, c-format
 msgid "Error during GConf initialization: %s."
 msgstr "Ð?Ñ?еÑ?ка пÑ?иликом покÑ?еÑ?аÑ?а Ð?Ð?онÑ?а: %s."
 
-#: ../src/main.c:187
+#: ../src/main.c:267
 #, c-format
-msgid "Error setting the default window icon: %s"
-msgstr "Ð?Ñ?еÑ?ка пÑ?иликом поÑ?Ñ?авÑ?аÑ?а подÑ?азÑ?меване икониÑ?е пÑ?озоÑ?а: %s"
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Ð?окÑ?ениÑ?е â??%s --helpâ?? за Ñ?пиÑ?ак Ñ?виÑ? опÑ?иÑ?а наÑ?едбе.\n"
 
-#: ../src/message-table.c:273
+#: ../src/gtr-message-table.c:265
 msgid "Status"
 msgstr "СÑ?аÑ?е"
 
-#: ../src/message-table.c:289
+#: ../src/gtr-message-table.c:281
 msgid "ID"
 msgstr "Ð?Ð?"
 
-#: ../src/message-table.c:308
+#: ../src/gtr-message-table.c:300
 msgid "Original Text"
 msgstr "Ð?звоÑ?ни Ñ?екÑ?Ñ?"
 
-#: ../src/message-table.c:327
+#: ../src/gtr-message-table.c:319
 msgid "Translated Text"
 msgstr "Ð?Ñ?еведени Ñ?екÑ?Ñ?"
 
-#: ../src/notebook.c:90
-#, c-format
-msgid "<b>Path:</b> %s"
-msgstr "<b>Ð?Ñ?Ñ?аÑ?а:</b> %s"
-
-#: ../src/notebook.c:143
-msgid "Close document"
-msgstr "Ð?аÑ?воÑ?и докÑ?менÑ?"
-
-#: ../src/po.c:403
+#: ../src/gtr-po.c:420
 #, c-format
 msgid "Failed opening file '%s': %s"
 msgstr "Ð?е могÑ? да оÑ?воÑ?им даÑ?оÑ?екÑ? â??%sâ??: %s"
 
-#: ../src/po.c:427
+#: ../src/gtr-po.c:444
 #, c-format
 msgid "The file is empty"
 msgstr "Ð?аÑ?оÑ?ека Ñ?е пÑ?азна"
 
-#: ../src/po.c:442
+#: ../src/gtr-po.c:459
 #, c-format
 msgid "Gettext returned a null message domain list."
 msgstr "Ð?еÑ?Ñ?екÑ?Ñ? Ñ?е вÑ?аÑ?ио пÑ?азнÑ? поÑ?Ñ?кÑ? Ñ?а Ñ?пиÑ?ком домена."
 
-#: ../src/po.c:598
+#: ../src/gtr-po.c:511
 #, c-format
 msgid "No messages obtained from parser."
 msgstr "Ð?иÑ?Ñ? добивене поÑ?Ñ?ке из пÑ?огÑ?ама за обÑ?адÑ?."
 
-#: ../src/po.c:900
+#: ../src/gtr-po.c:559
 #, c-format
 msgid ""
 "You are saving a file with a .pot extension.\n"
@@ -1658,93 +1312,95 @@ msgstr ""
 "пÑ?евоÑ?еÑ?а.\n"
 "Ð?аÑ?а даÑ?оÑ?ека би Ñ?Ñ?ебала биÑ?и названа â??%s.poâ??."
 
-#: ../src/po.c:913
+#: ../src/gtr-po.c:572
 #, c-format
 msgid "The file %s is read-only, and can not be overwritten"
 msgstr "Ð?аÑ?оÑ?ека â??%sâ?? Ñ?е може Ñ?амо Ñ?иÑ?аÑ?и, и не можеÑ?е Ñ?е пÑ?епиÑ?аÑ?и дÑ?Ñ?гом"
 
-#: ../src/po.c:946
+#: ../src/gtr-po.c:603
 #, c-format
 msgid "There was an error writing the PO file: %s"
 msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке пÑ?и Ñ?пиÑ?Ñ? PO даÑ?оÑ?еке: %s"
 
-#: ../src/plugin-system/plugin-manager.c:54
+#: ../src/plugin-system/gtr-plugin-manager.c:54
 msgid "Plugin"
 msgstr "Ð?одаÑ?ак"
 
-#: ../src/plugin-system/plugin-manager.c:55
+#: ../src/plugin-system/gtr-plugin-manager.c:55
 msgid "Enabled"
 msgstr "УкÑ?Ñ?Ñ?ен"
 
-#: ../src/plugin-system/plugin-manager.c:508
+#: ../src/plugin-system/gtr-plugin-manager.c:496
 msgid "_About"
 msgstr "_Ð? пÑ?огÑ?амÑ?"
 
-#: ../src/plugin-system/plugin-manager.c:514
+#: ../src/plugin-system/gtr-plugin-manager.c:502
 msgid "C_onfigure"
 msgstr "Ð?о_деÑ?и"
 
-#: ../src/plugin-system/plugin-manager.c:523
+#: ../src/plugin-system/gtr-plugin-manager.c:510
 msgid "A_ctivate"
 msgstr "_УкÑ?Ñ?Ñ?и"
 
-#: ../src/plugin-system/plugin-manager.c:534
+#: ../src/plugin-system/gtr-plugin-manager.c:520
 msgid "Ac_tivate All"
 msgstr "У_кÑ?Ñ?Ñ?и Ñ?ве"
 
-#: ../src/plugin-system/plugin-manager.c:538
+#: ../src/plugin-system/gtr-plugin-manager.c:524
 msgid "_Deactivate All"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?и Ñ?ве"
 
-#: ../src/plugin-system/plugin-manager.c:777
+#: ../src/plugin-system/gtr-plugin-manager.c:762
 msgid "Active plugins"
 msgstr "УкÑ?Ñ?Ñ?ени додаÑ?и"
 
-#: ../src/plugin-system/plugin-manager.c:806
+#: ../src/plugin-system/gtr-plugin-manager.c:791
 msgid "_About Plugin"
 msgstr "Ð? _додаÑ?кÑ?"
 
-#: ../src/plugin-system/plugin-manager.c:811
+#: ../src/plugin-system/gtr-plugin-manager.c:795
 msgid "C_onfigure Plugin"
 msgstr "_Ð?одеÑ?и додаÑ?ак"
 
-#: ../src/statusbar.c:118 ../src/statusbar.c:249
+#: ../src/gtr-statusbar.c:117 ../src/gtr-statusbar.c:246
 msgid "INS"
 msgstr "Ð?Ð?С"
 
-#: ../src/statusbar.c:119 ../src/statusbar.c:245
+#: ../src/gtr-statusbar.c:118 ../src/gtr-statusbar.c:242
 msgid "OVR"
 msgstr "Ð?Ð?Ð "
 
-#: ../src/tab.c:223
+#: ../src/gtr-tab.c:209
 msgid "There is an error in the message:"
 msgstr "Ð?оÑ?Ñ?оÑ?и гÑ?еÑ?ка Ñ? поÑ?Ñ?Ñ?и:"
 
-#: ../src/tab.c:398
-msgid "Open comment dialog"
-msgstr "Ð?Ñ?ваÑ?а пÑ?озоÑ?Ñ?е за напоменама"
-
-#: ../src/tab.c:576
+#: ../src/gtr-tab.c:527
 #, c-format
 msgid "Plural %d"
 msgstr "Ð?ножина %d"
 
-#: ../src/tab.c:621
-msgid "Message Table"
-msgstr "Ð?овÑ?Ñ? за поÑ?Ñ?ке"
-
-#: ../src/tab.c:653
-msgid "Context"
-msgstr "Ð?оÑ?ава"
-
-#: ../src/tab.c:692
+#: ../src/gtr-tab.c:589
 msgid "<b>Original Text:</b>"
 msgstr "<b>Ð?звоÑ?ни Ñ?екÑ?Ñ?:</b>"
 
-#: ../src/tab.c:753
+#: ../src/gtr-tab.c:648
 msgid "<b>Translate_d Text:</b>"
 msgstr "<b>Ð?Ñ?еведени _Ñ?екÑ?Ñ?:</b>"
 
+#: ../src/gtr-tab.c:698
+msgid "Context"
+msgstr "Ð?оÑ?ава"
+
+#. Translators: Path to the document opened
+#: ../src/gtr-tab.c:1132
+#| msgid "Paths:\n"
+msgid "Path:"
+msgstr "Ð?Ñ?Ñ?аÑ?а:"
+
+#: ../src/gtr-tab-label.c:275
+msgid "Close document"
+msgstr "Ð?аÑ?воÑ?и докÑ?менÑ?"
+
 #. Translaters: This string is for a toggle to display a toolbar.
 #. * The name of the toolbar is automatically computed from the widgets
 #. * on the toolbar, and is placed at the %s. Note the _ before the %s
@@ -1752,90 +1408,80 @@ msgstr "<b>Ð?Ñ?еведени _Ñ?екÑ?Ñ?:</b>"
 #. * produce duplicates, but don't worry about it. If your language
 #. * normally has a mnemonic at the start, please use the _. If not,
 #. * please remove.
-#: ../src/toolbareditor/egg-editable-toolbar.c:939
+#: ../src/toolbareditor/egg-editable-toolbar.c:934
 #, c-format
 msgid "Show â??_%sâ??"
 msgstr "Ð?Ñ?икажи â??_%sâ??"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1405
+#: ../src/toolbareditor/egg-editable-toolbar.c:1397
 msgid "_Move on Toolbar"
 msgstr "_Ð?Ñ?емеÑ?Ñ?и на палеÑ?Ñ? алаÑ?ки"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1406
+#: ../src/toolbareditor/egg-editable-toolbar.c:1398
 msgid "Move the selected item on the toolbar"
 msgstr "Ð?Ñ?емеÑ?Ñ?а ознаÑ?енÑ? Ñ?Ñ?авкÑ? на палеÑ?Ñ? Ñ?а алаÑ?кама"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1407
+#: ../src/toolbareditor/egg-editable-toolbar.c:1399
 msgid "_Remove from Toolbar"
 msgstr "_Уклони Ñ?а палеÑ?е алаÑ?ки"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1408
+#: ../src/toolbareditor/egg-editable-toolbar.c:1400
 msgid "Remove the selected item from the toolbar"
 msgstr "УклаÑ?а изабÑ?анÑ? Ñ?Ñ?авкÑ? из палеÑ?е Ñ?а алаÑ?кама"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1410
+#: ../src/toolbareditor/egg-editable-toolbar.c:1401
 msgid "_Delete Toolbar"
 msgstr "_Ð?бÑ?иÑ?и палеÑ?Ñ? алаÑ?ки"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1411
+#: ../src/toolbareditor/egg-editable-toolbar.c:1402
 msgid "Remove the selected toolbar"
 msgstr "УклаÑ?а изабÑ?анÑ? палеÑ?Ñ? Ñ?а алаÑ?кама"
 
-#: ../src/toolbareditor/egg-toolbar-editor.c:475
+#: ../src/toolbareditor/egg-toolbar-editor.c:485
 msgid "Separator"
 msgstr "РаздвоÑ?ник"
 
-#: ../src/translation-memory/berkeley/db-base.c:157
-msgid "Running recovery..."
-msgstr "Ð?Ñ?аÑ?ам подаÑ?ке..."
-
-#: ../src/translation-memory/berkeley/db-base.c:166
-#, c-format
-msgid "There was an error recovering the database: %s"
-msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке пÑ?илико вÑ?аÑ?аÑ?а базе подаÑ?ака: %s"
-
-#: ../src/translation-memory/berkeley/db-base.c:174
-#, c-format
-msgid "There was an error in database: %s"
-msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке Ñ? бази подаÑ?ака: %s"
-
-#: ../src/translation-memory/translation-memory-ui.c:212
+#: ../src/translation-memory/gtr-translation-memory-ui.c:227
 #, c-format
 msgid "Insert Option nº %d"
 msgstr "Ð?пÑ?иÑ?а Ñ?меÑ?аÑ?а nº %d"
 
-#: ../src/translation-memory/translation-memory-ui.c:290
+#: ../src/translation-memory/gtr-translation-memory-ui.c:381
+#| msgid "Gettext translation"
+msgid "_Use this translation"
+msgstr "_Ð?оÑ?иÑ?Ñ?и оваÑ? пÑ?евод"
+
+#: ../src/translation-memory/gtr-translation-memory-ui.c:386
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../src/translation-memory/gtr-translation-memory-ui.c:503
 msgid "Shortcut"
 msgstr "Ð?Ñ?еÑ?иÑ?а"
 
-#: ../src/translation-memory/translation-memory-ui.c:299
+#: ../src/translation-memory/gtr-translation-memory-ui.c:512
 msgid "Level"
 msgstr "Ð?иво"
 
-#: ../src/translation-memory/translation-memory-ui.c:308
+#: ../src/translation-memory/gtr-translation-memory-ui.c:521
 msgid "String"
 msgstr "Ð?иÑ?ка"
 
-#: ../src/utils.c:307
+#: ../src/gtr-utils.c:307
 msgid "Please check your installation."
 msgstr "Ð?Ñ?овеÑ?иÑ?е ваÑ?Ñ? инÑ?Ñ?алаÑ?иÑ?Ñ?."
 
-#: ../src/utils.c:368
+#: ../src/gtr-utils.c:368
 #, c-format
-#| msgid "Unable to find file %s."
 msgid "Unable to open ui file %s. Error: %s"
 msgstr "Ð?е могÑ? да оÑ?воÑ?им даÑ?оÑ?екÑ? Ñ?Ñ?Ñ?еÑ?а %s. Ð?Ñ?еÑ?ка: %s"
 
-#: ../src/utils.c:388
+#: ../src/gtr-utils.c:388
 #, c-format
-#| msgid "Unable to find the required widgets inside file %s."
 msgid "Unable to find the object '%s' inside file %s."
 msgstr "Ð?е могÑ? да пÑ?онаÑ?ем обÑ?екаÑ? â??%sâ?? Ñ?нÑ?Ñ?аÑ? даÑ?оÑ?еке %s."
 
-#: ../src/utils.c:812
-#| msgid ""
-#| "Unable to display help. Please make sure Gtranslator documentation "
-#| "package is installed."
+#: ../src/gtr-utils.c:812
 msgid ""
 "Unable to display help. Please make sure the Gtranslator documentation "
 "package is installed."
@@ -1843,12 +1489,12 @@ msgstr ""
 "Ð?е могÑ? да пÑ?икажем помоÑ?. Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е инÑ?Ñ?алиÑ?ан пакеÑ? за помоÑ? Ñ? "
 "Ð?номовом пÑ?еводиоÑ?Ñ?."
 
-#: ../src/view.c:79
+#: ../src/gtr-view.c:80
 #, c-format
 msgid "gtkspell error: %s\n"
 msgstr "gtkspell гÑ?еÑ?ка: %s\n"
 
-#: ../src/view.c:81
+#: ../src/gtr-view.c:82
 #, c-format
 msgid ""
 "GtkSpell was unable to initialize.\n"
@@ -1857,371 +1503,676 @@ msgstr ""
 "Ð?е могÑ? да покÑ?енем GtkSpell.\n"
 " %s"
 
-#: ../src/window.c:113
+#: ../src/gtr-window.c:123
 msgid "_File"
 msgstr "_Ð?аÑ?оÑ?ека"
 
-#: ../src/window.c:114
+#: ../src/gtr-window.c:124
 msgid "_Edit"
 msgstr "_УÑ?еÑ?иваÑ?е"
 
-#: ../src/window.c:115
+#: ../src/gtr-window.c:125
 msgid "_View"
 msgstr "Ð?_Ñ?еглед"
 
-#. { "Bookmarks", NULL, N_("_Bookmarks") },
-#. { "Actions", NULL, N_("_Actions") },
-#: ../src/window.c:118
+#: ../src/gtr-window.c:126
 msgid "_Search"
 msgstr "Ð?Ñ?_еÑ?Ñ?ага"
 
-#: ../src/window.c:119
+#: ../src/gtr-window.c:127
 msgid "_Go"
 msgstr "_Ð?ди"
 
-#: ../src/window.c:120
-#| msgid "Documents"
+#: ../src/gtr-window.c:128
 msgid "_Documents"
 msgstr "Ð?окÑ?_менÑ?и"
 
-#: ../src/window.c:121
+#: ../src/gtr-window.c:129
 msgid "_Help"
 msgstr "_Ð?омоÑ?"
 
-#: ../src/window.c:125
+#: ../src/gtr-window.c:133
 msgid "Open a PO file"
 msgstr "Ð?Ñ?воÑ?и даÑ?оÑ?екÑ? Ñ?а пÑ?еводом"
 
-#: ../src/window.c:127
+#: ../src/gtr-window.c:135
 msgid "_Recent Files"
 msgstr "_СкоÑ?аÑ?Ñ?е даÑ?оÑ?еке"
 
-#: ../src/window.c:130
+#: ../src/gtr-window.c:138
 msgid "Quit the program"
 msgstr "Ð?злази из пÑ?огÑ?ама"
 
 #. Edit menu
-#: ../src/window.c:134
+#: ../src/gtr-window.c:142
 msgid "T_oolbar"
 msgstr "_Ð?лаÑ?ниÑ?а"
 
-#: ../src/window.c:137
+#: ../src/gtr-window.c:145
 msgid "Edit gtranslator preferences"
 msgstr "УÑ?еÑ?Ñ?Ñ?е подеÑ?аваÑ?а Ð?номовог пÑ?еводиоÑ?а"
 
-#: ../src/window.c:139 ../src/window.c:186
+#: ../src/gtr-window.c:147 ../src/gtr-window.c:193
 msgid "_Header..."
 msgstr "Ð?аглавÑ?е..."
 
 #. Help menu
-#: ../src/window.c:143
+#: ../src/gtr-window.c:151
 msgid "_Contents"
 msgstr "_СадÑ?жаÑ?"
 
-#: ../src/window.c:155
+#: ../src/gtr-window.c:162
 msgid "Save the current file"
 msgstr "ЧÑ?ва Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../src/window.c:158
+#: ../src/gtr-window.c:165
 msgid "Save the current file with another name"
 msgstr "ЧÑ?ва Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ? под дÑ?Ñ?гим именом"
 
-#: ../src/window.c:164
+#: ../src/gtr-window.c:171
 msgid "Close the current file"
 msgstr "Ð?аÑ?ваÑ?а Ñ?Ñ?енÑ?Ñ?нÑ? даÑ?оÑ?екÑ?"
 
-#: ../src/window.c:169
+#: ../src/gtr-window.c:176
 msgid "Undo last operation"
 msgstr "Ð?ониÑ?Ñ?ава поÑ?ледÑ?Ñ? Ñ?адÑ?Ñ?"
 
-#: ../src/window.c:172
+#: ../src/gtr-window.c:179
 msgid "Redo last undone operation"
 msgstr "Ð?Ñ?аÑ?а поÑ?ледÑ?Ñ? пониÑ?Ñ?енÑ? Ñ?адÑ?Ñ?"
 
-#: ../src/window.c:175
+#: ../src/gtr-window.c:182
 msgid "Cut the selected text"
 msgstr "Ð?Ñ?еÑ?а изабÑ?ани Ñ?екÑ?Ñ? и пÑ?емеÑ?Ñ?а га Ñ? оÑ?Ñ?авÑ?"
 
-#: ../src/window.c:178
+#: ../src/gtr-window.c:185
 msgid "Copy the selected text"
 msgstr "Умножава изабÑ?ани Ñ?екÑ?Ñ? Ñ? оÑ?Ñ?авÑ?"
 
-#: ../src/window.c:181
+#: ../src/gtr-window.c:188
 msgid "Paste the contents of the clipboard"
 msgstr "УмеÑ?е Ñ?адÑ?жаÑ? из оÑ?Ñ?аве"
 
-#: ../src/window.c:184
+#: ../src/gtr-window.c:191
 msgid "Clear the selected translation"
 msgstr "Ð?Ñ?иÑ?е изабÑ?анÑ? поÑ?Ñ?кÑ? пÑ?евода"
 
-#: ../src/window.c:188
-msgid "C_omment..."
-msgstr "_Ð?апомена..."
-
-#: ../src/window.c:189
-msgid "Edit message comment"
-msgstr "УÑ?едиÑ?е напоменÑ? поÑ?Ñ?ке"
-
-#: ../src/window.c:191
+#: ../src/gtr-window.c:195
 msgid "Copy _Message to Translation"
 msgstr "Ð?Ñ?епи_Ñ?и поÑ?Ñ?кÑ? Ñ? пÑ?евод"
 
-#: ../src/window.c:193
+#: ../src/gtr-window.c:197
 msgid "Copy original message contents to the translation field"
 msgstr "Ð?опиÑ?а Ñ?адÑ?жаÑ? извоÑ?не поÑ?Ñ?ке Ñ? Ñ?ен пÑ?евод"
 
-#: ../src/window.c:195
+#: ../src/gtr-window.c:199
 msgid "Toggle _Fuzzy Status"
 msgstr "Ð?_Ñ?омени Ñ?Ñ?аÑ?е неÑ?аÑ?не поÑ?Ñ?ке"
 
-#: ../src/window.c:196
+#: ../src/gtr-window.c:200
 msgid "Toggle fuzzy status of a message"
 msgstr "Ð?Ñ?омени Ñ?Ñ?аÑ?Ñ?Ñ? неÑ?аÑ?не поÑ?Ñ?ке"
 
-#: ../src/window.c:198 ../src/window.c:206
+#: ../src/gtr-window.c:202
 msgid "_Translation Memory"
 msgstr "Ð?Ñ?еводилаÑ?ка _мемоÑ?иÑ?а"
 
 #. View menu
-#: ../src/window.c:203
+#: ../src/gtr-window.c:207
 msgid "_Context"
 msgstr "_Ð?оÑ?ава"
 
-#: ../src/window.c:204
+#: ../src/gtr-window.c:208
 msgid "Show the Context panel"
 msgstr "Ð?Ñ?иказÑ?Ñ?е повÑ?Ñ? Ñ?а меÑ?Ñ?ом где Ñ?е пÑ?евод Ñ?авÑ?а Ñ? пÑ?огÑ?амÑ?"
 
-#: ../src/window.c:207
-msgid "Show the Translation Memory panel"
-msgstr "Ð?Ñ?иказÑ?Ñ?е повÑ?Ñ? Ñ?а пÑ?еводилаÑ?ком мемоÑ?иÑ?ом"
-
-#. { "ViewSidePane", NULL, N_("Side _Pane"), "F9",
-#. N_("Show or hide the side pane in the current window"),
-#. NULL },
-#. Bookmarks menu
-#. { "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",
-#. N_("Add a bookmark to the current message"), NULL},
-#. { "BookmarksEdit", GTK_STOCK_EDIT, N_("_Edit Bookmarks"), "<control>B",
-#. N_("Edit stored bookmarks"), NULL},
-#. Action menu
-#. { "ActionsCompile", GTK_STOCK_CONVERT, N_("_Compile"), NULL,
-#. N_("Compile the current file to a MO file"), NULL },
-#. { "ActionsRefresh", GTK_STOCK_REFRESH, NULL, NULL,
-#. N_("  "), NULL },
-#. //G_CALLBACK(gtranslator_bookmark_adding_dialog) },
-#. { "ActionsAutotranslate", NULL, N_("Aut_otranslate..."), NULL,
-#. N_("Autotranslate the current file using a translation memory"), NULL},
-#. //G_CALLBACK(gtranslator_auto_translation_dialog) },
-#. { "ActionsRemoveTranslations", GTK_STOCK_REMOVE, N_("Remo_ve All Translations..."), NULL,
-#. N_("Remove all existing translations"), NULL},
-#. //G_CALLBACK(gtranslator_remove_all_translations_dialog) },
 #. Go menu
-#: ../src/window.c:233
-#| msgid "Previ_ous Untranslated"
+#: ../src/gtr-window.c:212
 msgid "_Previous Message"
 msgstr "Ð?Ñ?еÑ?Ñ?одна поÑ?_Ñ?ка"
 
-#: ../src/window.c:234
+#: ../src/gtr-window.c:213
 msgid "Move back one message"
 msgstr "Ð?де на пÑ?еÑ?Ñ?однÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:236
-#| msgid "_Next Tag"
+#: ../src/gtr-window.c:215
 msgid "_Next Message"
 msgstr "СледеÑ?а поÑ?Ñ?_ка"
 
-#: ../src/window.c:237
+#: ../src/gtr-window.c:216
 msgid "Move forward one message"
 msgstr "Ð?де на Ñ?ледеÑ?Ñ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:239
-#| msgid "_Go to..."
+#: ../src/gtr-window.c:218
 msgid "_Go to Message..."
 msgstr "_Ð?ди на поÑ?Ñ?кÑ?..."
 
-#: ../src/window.c:240
+#: ../src/gtr-window.c:219
 msgid "Jumps to a specific message"
 msgstr "Ð?ди до одÑ?еÑ?еног бÑ?оÑ?а поÑ?Ñ?ке"
 
-#: ../src/window.c:242
-#| msgid "_First"
+#: ../src/gtr-window.c:221
 msgid "_First Message"
 msgstr "Ð?Ñ?_ва поÑ?Ñ?ка"
 
-#: ../src/window.c:243
+#: ../src/gtr-window.c:222
 msgid "Go to the first message"
 msgstr "Ð?де на пÑ?вÑ? поÑ?Ñ?кÑ? Ñ? пÑ?еводÑ?"
 
-#: ../src/window.c:245
+#: ../src/gtr-window.c:224
 msgid "_Last Message"
 msgstr "Ð?оÑ?ле_дÑ?а поÑ?Ñ?ка"
 
-#: ../src/window.c:246
+#: ../src/gtr-window.c:225
 msgid "Go to the last message"
 msgstr "Ð?де на поÑ?ледÑ?Ñ? поÑ?Ñ?кÑ? Ñ? пÑ?еводÑ?"
 
-#: ../src/window.c:248
+#: ../src/gtr-window.c:227
 msgid "Next Fuz_zy"
 msgstr "СледеÑ?а _неÑ?аÑ?на"
 
-#: ../src/window.c:249
+#: ../src/gtr-window.c:228
 msgid "Go to the next fuzzy message"
 msgstr "Ð?де на Ñ?ледеÑ?Ñ? неÑ?аÑ?нÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:251
+#: ../src/gtr-window.c:230
 msgid "Previous Fuzz_y"
 msgstr "Ð?Ñ?еÑ?Ñ?одна н_еÑ?аÑ?на"
 
-#: ../src/window.c:252
+#: ../src/gtr-window.c:231
 msgid "Go to the previous fuzzy message"
 msgstr "Ð?де на пÑ?еÑ?Ñ?однÑ? неÑ?аÑ?нÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:254
+#: ../src/gtr-window.c:233
 msgid "Next _Untranslated"
 msgstr "С_ледеÑ?а непÑ?еведена"
 
-#: ../src/window.c:255
+#: ../src/gtr-window.c:234
 msgid "Go to the next untranslated message"
 msgstr "Ð?де на Ñ?ледеÑ?Ñ? непÑ?еведенÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:258
+#: ../src/gtr-window.c:237
 msgid "Previ_ous Untranslated"
 msgstr "Ð?_Ñ?еÑ?Ñ?одна непÑ?еведена"
 
-#: ../src/window.c:259
+#: ../src/gtr-window.c:238
 msgid "Go to the previous untranslated message"
 msgstr "Ð?де на пÑ?еÑ?Ñ?однÑ? непÑ?еведенÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:262
+#: ../src/gtr-window.c:241
 msgid "Next Fu_zzy or Untranslated"
 msgstr "_СледеÑ?а неÑ?аÑ?на или непÑ?еведена"
 
-#: ../src/window.c:264
+#: ../src/gtr-window.c:243
 msgid "Go to the next fuzzy or untranslated message"
 msgstr "Ð?де на Ñ?ледеÑ?Ñ? неÑ?аÑ?нÑ? или непÑ?еведенÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:267
+#: ../src/gtr-window.c:246
 msgid "Pre_vious Fuzzy or Untranslated"
 msgstr "_Ð?Ñ?еÑ?Ñ?одна неÑ?аÑ?на или непÑ?еведена"
 
-#: ../src/window.c:269
+#: ../src/gtr-window.c:248
 msgid "Go to the previous fuzzy or untranslated message"
 msgstr "Ð?де на пÑ?еÑ?Ñ?однÑ? неÑ?аÑ?нÑ? или непÑ?еведенÑ? поÑ?Ñ?кÑ?"
 
-#: ../src/window.c:274
+#: ../src/gtr-window.c:253
 msgid "Search for text"
 msgstr "ТÑ?ажи жеÑ?ени Ñ?екÑ?Ñ? Ñ? пÑ?еводÑ?"
 
-#: ../src/window.c:283
+#: ../src/gtr-window.c:256
 msgid "Search for and replace text"
 msgstr "ТÑ?ажи жеÑ?ени Ñ?екÑ?Ñ? Ñ? пÑ?еводÑ? и меÑ?а га"
 
 #. Documents menu
-#: ../src/window.c:287
-#| msgid "_Deactivate All"
+#: ../src/gtr-window.c:260
 msgid "_Save All"
 msgstr "_СаÑ?Ñ?ваÑ? Ñ?ве"
 
-#: ../src/window.c:288
-#| msgid "Save the current file"
+#: ../src/gtr-window.c:261
 msgid "Save all open files"
 msgstr "ЧÑ?ва Ñ?ве оÑ?воÑ?ене даÑ?оÑ?еке"
 
-#: ../src/window.c:290
+#: ../src/gtr-window.c:263
 msgid "_Close All"
 msgstr "_Ð?аÑ?воÑ?и Ñ?ве"
 
-#: ../src/window.c:291
-#| msgid "Close the current file"
+#: ../src/gtr-window.c:264
 msgid "Close all open files"
 msgstr "Ð?аÑ?ваÑ?а Ñ?ве оÑ?воÑ?ене даÑ?оÑ?еке"
 
-#: ../src/window.c:293
-#| msgid "Previous Developers"
+#: ../src/gtr-window.c:266
 msgid "_Previous Document"
 msgstr "_Ð?Ñ?еÑ?Ñ?одни докÑ?менÑ?"
 
-#: ../src/window.c:295
+#: ../src/gtr-window.c:268
 msgid "Activate previous document"
 msgstr "Ð?Ñ?иказÑ?Ñ?е пÑ?еÑ?Ñ?одни докÑ?менÑ?"
 
-#: ../src/window.c:297
-#| msgid "Documents"
+#: ../src/gtr-window.c:270
 msgid "_Next Document"
 msgstr "_Ð?аÑ?едни докÑ?менÑ?"
 
-#: ../src/window.c:299
+#: ../src/gtr-window.c:272
 msgid "Activate next document"
 msgstr "Ð?Ñ?иказÑ?Ñ?е наÑ?едни докÑ?менÑ?"
 
-#: ../src/window.c:764
+#: ../src/gtr-window.c:705
 msgid "Untranslated"
 msgstr "непÑ?еведена"
 
-#: ../src/window.c:767
+#: ../src/gtr-window.c:708
 msgid "Translated"
 msgstr "пÑ?еведена"
 
-#: ../src/window.c:770
+#: ../src/gtr-window.c:711
 msgid "Fuzzy"
 msgstr "неÑ?аÑ?на"
 
-#: ../src/window.c:777
+#: ../src/gtr-window.c:718
 #, c-format
 msgid "Current: %d"
 msgstr "Ð?оÑ?Ñ?ка бÑ?. %d"
 
-#: ../src/window.c:778
+#: ../src/gtr-window.c:719
 #, c-format
-#| msgid "Translated"
-msgid "Total: %d translated"
-msgstr "УкÑ?пно има: %d поÑ?Ñ?ка"
+msgid "Total: %d"
+msgstr "УкÑ?пно има: %d"
 
-#: ../src/window.c:779
+#: ../src/gtr-window.c:720
+#, c-format
+#| msgid "%d untranslated"
+msgid "%d translated"
+msgid_plural "%d translated"
+msgstr[0] "%d пÑ?еведена"
+msgstr[1] "%d пÑ?еведене"
+msgstr[2] "%d пÑ?еведениÑ?"
+msgstr[3] "%d пÑ?еведена"
+
+#: ../src/gtr-window.c:723
 #, c-format
-#| msgid "Fuzzy"
+#| msgid "%d fuzzy"
 msgid "%d fuzzy"
-msgstr "%d неÑ?аÑ?ниÑ?"
+msgid_plural "%d fuzzy"
+msgstr[0] "%d неÑ?аÑ?на"
+msgstr[1] "%d неÑ?аÑ?не"
+msgstr[2] "%d неÑ?аÑ?ниÑ?"
+msgstr[3] "%d неÑ?аÑ?на"
 
-#: ../src/window.c:780
+#: ../src/gtr-window.c:725
 #, c-format
-#| msgid "Untranslated"
+#| msgid "%d untranslated"
 msgid "%d untranslated"
-msgstr "%d непÑ?еведениÑ?"
+msgid_plural "%d untranslated"
+msgstr[0] "%d непÑ?еведена"
+msgstr[1] "%d непÑ?еведене"
+msgstr[2] "%d непÑ?еведениÑ?"
+msgstr[3] "%d непÑ?еведена"
 
 #. Translators: %s is a URI
-#: ../src/window.c:839
+#: ../src/gtr-window.c:779
 #, c-format
-#| msgid "A_ctivate"
 msgid "Activate '%s'"
 msgstr "Ð?Ñ?икажи â??%sâ??"
 
-#. FIXME: We are leaking a lot here
-#.
-#. * Translators: The title of the window when there is only one tab
-#.
-#: ../src/window.c:1016 ../src/window.c:1022
+#. Translators: this is the title of the window with a modified document
+#: ../src/gtr-window.c:953
 #, c-format
-msgid "gtranslator - %s"
-msgstr "Ð?номов пÑ?еводилаÑ? â?? %s"
+#| msgid "gtranslator"
+msgid "*%s - gtranslator"
+msgstr "*%s â?? Ð?номов пÑ?еводилаÑ?"
 
-#: ../src/window.c:1019
+#. Translators: this is the title of the window with a document opened
+#: ../src/gtr-window.c:956
 #, c-format
-msgid "gtranslator - *%s"
-msgstr "Ð?номов пÑ?еводилаÑ? â?? %s"
+#| msgid "gtranslator"
+msgid "%s - gtranslator"
+msgstr "%s â?? Ð?номов пÑ?еводилаÑ?"
 
-#: ../src/window.c:1027
+#: ../src/gtr-window.c:962
 msgid "gtranslator"
 msgstr "Ð?номов пÑ?еводилаÑ?"
 
-#: ../src/window.c:1389
+#: ../src/gtr-window.c:1336
 msgid "Toolbar Editor"
 msgstr "УÑ?едник палеÑ?е Ñ?а алаÑ?има"
 
-#: ../src/window.c:1700
+#: ../src/gtr-window.c:1462
+#| msgid "Profile"
+msgid "No profile"
+msgstr "Ð?ема пÑ?оÑ?ила"
+
+#: ../src/gtr-window.c:1485
+msgid "Profile for the active document"
+msgstr "Ð?Ñ?оÑ?ил за Ñ?Ñ?енÑ?Ñ?ни докÑ?менÑ?"
+
+#: ../src/gtr-window.c:1833
 msgid "Documents"
 msgstr "Ð?окÑ?менÑ?и"
 
+#~ msgid "     "
+#~ msgstr "     "
+
+#~ msgid "Subversion: Checkout complete."
+#~ msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е Ñ?Ñ?клаÑ?иваÑ?е"
+
+#~| msgid "Please, add a directory path to make the checkout"
+#~ msgid "Please add a directory path to make the checkout"
+#~ msgstr "Ð?одаÑ?Ñ?е пÑ?Ñ?аÑ?Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ма Ñ?ади Ñ?Ñ?клаÑ?иваÑ?а"
+
+#~| msgid "Please, add a Subversion URL"
+#~ msgid "Please add a Subversion URL"
+#~ msgstr "Ð?одаÑ?Ñ?е адÑ?еÑ?Ñ? СÑ?бвеÑ?зиÑ?е"
+
+#~ msgid "Checkout repository"
+#~ msgstr "УÑ?клади Ñ?изниÑ?Ñ?"
+
+#~ msgid "Subversion: Commit complete."
+#~ msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е Ñ?лаÑ?е."
+
+#~ msgctxt "ChangeLog entry"
+#~ msgid "LANGUAGE"
+#~ msgstr "Ð?Ð?Ð?Ð?Ð?"
+
+#~| msgid "The ChangeLog file '%s' does not exists"
+#~ msgid "The ChangeLog file '%s' does not exist"
+#~ msgstr "Ð?е поÑ?Ñ?оÑ?и ChangeLog даÑ?оÑ?ека â??%sâ??"
+
+#~ msgid "Are you sure that you want to pass an empty log message?"
+#~ msgstr "Ð?а ли Ñ?Ñ?е Ñ?игÑ?Ñ?но желиÑ?е да Ñ?баÑ?иÑ?е пÑ?азнÑ? поÑ?Ñ?кÑ? из дневника?"
+
+#~ msgid "You have to select at least one file to send"
+#~ msgstr "Ð?оÑ?аÑ?е изабÑ?аÑ?и баÑ? Ñ?еднÑ? даÑ?оÑ?екÑ? за Ñ?лаÑ?е"
+
+#~ msgid "Commit Changes"
+#~ msgstr "Ð?оÑ?аÑ?и измене"
+
+#~ msgid "Subversion: Diff complete."
+#~ msgstr "СÑ?бвеÑ?зиÑ?а: напÑ?авÑ?ене Ñ?Ñ? Ñ?азлике."
+
+#~| msgid "Please, install %s to be able to diff the file"
+#~ msgid "Please install %s to be able to diff the file"
+#~ msgstr "Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е %s како би могли да наÑ?еÑ?е Ñ?азлике измеÑ?Ñ? даÑ?оÑ?ека"
+
+#~ msgid "Diff file"
+#~ msgstr "Ð?аÑ?оÑ?ека Ñ?а Ñ?азликама"
+
+#~ msgid "Diff"
+#~ msgstr "Разлике"
+
+#~ msgid "Subversion: File will be added on next commit."
+#~ msgstr "СÑ?бвеÑ?зиÑ?а: даÑ?оÑ?ека Ñ?е биÑ?и додаÑ?а пÑ?и Ñ?ледеÑ?ем Ñ?лаÑ?Ñ?."
+
+#~ msgid "_Update"
+#~ msgstr "_Ð?жÑ?Ñ?иÑ?аÑ?"
+
+#~ msgid "Sync your local copy with the Subversion tree"
+#~ msgstr "Ð?жÑ?Ñ?иÑ?а ваÑ?Ñ? локалнÑ? копиÑ?Ñ? пÑ?ема Ñ?изниÑ?и СÑ?бвеÑ?зиÑ?е"
+
+#~ msgid "_Commit"
+#~ msgstr "_Ð?оÑ?аÑ?и"
+
+#~ msgid "Commit your changes to the Subversion tree"
+#~ msgstr "ШаÑ?е ваÑ?е измене Ñ? СÑ?бвеÑ?зиÑ?инÑ? Ñ?изниÑ?Ñ?"
+
+#~ msgid "_Add"
+#~ msgstr "_Ð?одаÑ?"
+
+#~ msgid "Add a new file/directory to the Subversion tree"
+#~ msgstr "Ð?одаÑ?е новÑ? даÑ?оÑ?екÑ?/диÑ?екÑ?оÑ?иÑ?Ñ?м Ñ? СÑ?бвеÑ?зиÑ?инÑ? Ñ?изниÑ?Ñ?"
+
+#~ msgid "_Diff"
+#~ msgstr "_Ð?апÑ?ави Ñ?азлике"
+
+#~ msgid "Diff local PO file with repository PO file"
+#~ msgstr "Ð?Ñ?пиÑ?Ñ?Ñ?е Ñ?азлике измеÑ?Ñ? ваÑ?е и PO даÑ?оÑ?еке Ñ? Ñ?изниÑ?и"
+
+#~ msgid "C_heckout"
+#~ msgstr "_УÑ?клади"
+
+#~ msgid "Get a new repository copy"
+#~ msgstr "Ð?Ñ?еÑ?зима новÑ? копиÑ?Ñ? Ñ?изниÑ?е"
+
+#~ msgid "S_ubversion"
+#~ msgstr "_СÑ?бвеÑ?зиÑ?а"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "        "
+#~ msgstr "        "
+
+#~ msgid "<b>Diff options:</b>"
+#~ msgstr "<b>Ð?пÑ?иÑ?е за Ñ?азлике:</b>"
+
+#~ msgid "<b>Diff program:</b>"
+#~ msgstr "<b>Ð?Ñ?огÑ?ам за Ñ?азлике:</b>"
+
+#~ msgid "<b>Directory to checkout:</b>"
+#~ msgstr "<b>Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за Ñ?Ñ?клаÑ?иваÑ?е:</b>"
+
+#~ msgid "<b>Directory to update:</b>"
+#~ msgstr "<b>Ð?иÑ?екÑ?оÑ?иÑ?Ñ?м за ажÑ?Ñ?иÑ?аÑ?е:</b>"
+
+#~ msgid "<b>Information:</b>"
+#~ msgstr "<b>Ð?одаÑ?и:</b>"
+
+#~ msgid "<b>Log Message:</b>"
+#~ msgstr "<b>Ð?оÑ?Ñ?ка за дневник:</b>"
+
+#~ msgid "<b>Password:</b>"
+#~ msgstr "<b>Ð?озинка:</b>"
+
+#~ msgid "<b>Realm:</b>"
+#~ msgstr "<b>Ð?омен:</b>"
+
+#~ msgid "<b>Select files to Commit:</b>"
+#~ msgstr "<b>Ð?аÑ?оÑ?еке за Ñ?лаÑ?е:</b>"
+
+#~ msgid "<b>Subversion URL:</b>"
+#~ msgstr "<b>Ð?дÑ?еÑ?а СÑ?бвеÑ?зиÑ?е:</b>"
+
+#~ msgid "<b>Username:</b>"
+#~ msgstr "<b>Ð?оÑ?иÑ?ниÑ?ко име:</b>"
+
+#~ msgid "Add Log Message to ChangeLog file"
+#~ msgstr "Ð?одаÑ? поÑ?Ñ?кÑ? Ñ? дневник (ChangeLog даÑ?оÑ?ека)"
+
+#~ msgid "Line argument:"
+#~ msgstr "Ð?Ñ?гÑ?менÑ? линиÑ?е:"
+
+#~ msgid "Program name:"
+#~ msgstr "Ð?ме пÑ?огÑ?ама:"
+
+#~ msgid "Remember Password"
+#~ msgstr "УпамÑ?и лозинкÑ?"
+
+#~ msgid "Remember this decision"
+#~ msgstr "УпамÑ?и овÑ? одлÑ?кÑ?"
+
+#~ msgid "Repository authorization"
+#~ msgstr "Ð?Ñ?иÑ?ава на Ñ?изниÑ?Ñ?"
+
+#~ msgid "Retrieving status..."
+#~ msgstr "Ð?Ñ?еÑ?зимам Ñ?Ñ?аÑ?е..."
+
+#~ msgid "Save the diff file"
+#~ msgstr "СаÑ?Ñ?ваÑ? даÑ?оÑ?екÑ? Ñ?а Ñ?азликама"
+
+#~ msgid "Send Changes"
+#~ msgstr "Ð?оÑ?аÑ?и измене"
+
+#~ msgid "Update repository"
+#~ msgstr "Ð?жÑ?Ñ?иÑ?аÑ? Ñ?кладиÑ?Ñ?е"
+
+#~ msgid "Use configured program to view the diff"
+#~ msgstr "Ð?оÑ?иÑ?Ñ?и подеÑ?ени пÑ?огÑ?ам за пÑ?еглед Ñ?азлика"
+
+#~ msgid "label"
+#~ msgstr "наÑ?пиÑ?"
+
+#~ msgid "A Subversion client plugin based on libsvn."
+#~ msgstr "Ð?одаÑ?ак за СÑ?бвеÑ?зиÑ?Ñ? коÑ?и Ñ?е оÑ?лаÑ?а на libsvn."
+
+#~ msgid "Subversion"
+#~ msgstr "СÑ?бвеÑ?зиÑ?а"
+
+#~ msgid "Authentication canceled"
+#~ msgstr "Ð?Ñ?иÑ?ава Ñ?е оÑ?казана"
+
+#~ msgid "Hostname:"
+#~ msgstr "Ð?ме домаÑ?ина:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Ð?Ñ?иÑ?ак пÑ?Ñ?Ñ?а:"
+
+#~ msgid "Valid from:"
+#~ msgstr "Ð?ажи од:"
+
+#~ msgid "Valid until:"
+#~ msgstr "Ð?ажи до:"
+
+#~ msgid "Issuer DN:"
+#~ msgstr "Ð?Ð? издаваÑ?а:"
+
+#~ msgid "DER certificate:"
+#~ msgstr "Ð?Ð?Ð  Ñ?еÑ?Ñ?иÑ?икаÑ?:"
+
+#~ msgid "Deleted: %s"
+#~ msgstr "Ð?бÑ?иÑ?ан: %s"
+
+#~ msgid "Added: %s"
+#~ msgstr "Ð?одаÑ?: %s"
+
+#~ msgid "Reverted: %s"
+#~ msgstr "Ð?Ñ?аÑ?ен: %s"
+
+#~ msgid "Revert failed: %s"
+#~ msgstr "Ð?иÑ?е Ñ?Ñ?пело вÑ?аÑ?аÑ?е: %s"
+
+#~ msgid "Resolved: %s"
+#~ msgstr "РазÑ?еÑ?ен: %s"
+
+#~ msgid "Updated: %s"
+#~ msgstr "Ð?жÑ?Ñ?иÑ?ан: %s"
+
+#~ msgid "Externally Updated: %s"
+#~ msgstr "Ð?жÑ?Ñ?иÑ?ано дÑ?Ñ?гим пÑ?огÑ?амом: %s"
+
+#~ msgid "Commit Modified: %s"
+#~ msgstr "Ð?змеÑ?ено за Ñ?лаÑ?е: %s"
+
+#~ msgid "Commit Added: %s"
+#~ msgstr "Ð?одаÑ?о за Ñ?лаÑ?е: %s"
+
+#~ msgid "Commit Deleted: %s"
+#~ msgstr "Ð?бÑ?иÑ?ано за Ñ?лаÑ?е: %s"
+
+#~ msgid "Commit Replaced: %s"
+#~ msgstr "Ð?амеÑ?ено за Ñ?лаÑ?е: %s"
+
+#~ msgid "Created File: %s"
+#~ msgstr "Ð?апÑ?авÑ?ена даÑ?оÑ?ека: %s"
+
+#~ msgid "Modified: %s"
+#~ msgstr "Ð?змеÑ?ено: %s"
+
+#~ msgid "Merged: %s"
+#~ msgstr "СпоÑ?ено: %s"
+
+#~ msgid "Conflicted: %s"
+#~ msgstr "СÑ?кобÑ?ени: %s"
+
+#~ msgid "Missing: %s"
+#~ msgstr "Ð?едоÑ?Ñ?аÑ?е: %s"
+
+#~ msgid "Obstructed: %s"
+#~ msgstr "СпÑ?еÑ?ено: %s"
+
+#~ msgid "Updated to revision %ld."
+#~ msgstr "Ð?жÑ?Ñ?иÑ?ано на Ñ?евизиÑ?Ñ? бÑ?. %ld."
+
+#~ msgid "Subversion: Update complete."
+#~ msgstr "СÑ?бвеÑ?зиÑ?а: завÑ?Ñ?ено Ñ?е ажÑ?Ñ?иÑ?аÑ?е"
+
+#~ msgid "Modified"
+#~ msgstr "Ð?змеÑ?ена"
+
+#~ msgid "Deleted"
+#~ msgstr "Ð?бÑ?иÑ?ано"
+
+#~ msgid "Conflicted"
+#~ msgstr "СÑ?кобÑ?аваÑ?е"
+
+#~ msgid "Missing"
+#~ msgstr "Ð?едоÑ?Ñ?аÑ?Ñ?Ñ?а"
+
+#~ msgid "Failed to write profile data into profiles file '%s'"
+#~ msgstr "Ð?е могÑ? да Ñ?пиÑ?ем подаÑ?ке Ñ? даÑ?оÑ?екÑ? Ñ?а пÑ?оÑ?илом â??%sâ??"
+
+#~ msgid "Edit Comment"
+#~ msgstr "Ð?змена напомене"
+
+#~| msgid "<b>Write your comments below:</b>"
+#~ msgid "<b>Write your comments bellow:</b>"
+#~ msgstr "<b>УпиÑ?иÑ?е напомене иÑ?под:</b>"
+
+#~ msgid "<b>Autosave</b>"
+#~ msgstr "<b>Ð?Ñ?Ñ?омаÑ?Ñ?ко Ñ?Ñ?ваÑ?е</b>"
+
+#~| msgid "<b>Configuration</b>"
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>Ð?одеÑ?аваÑ?е:</b>"
+
+#~ msgid "<b>Contents</b>"
+#~ msgstr "<b>СадÑ?жаÑ?</b>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"large\">The profile name already exists</"
+#~ "span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"large\">Ð?еÑ? поÑ?Ñ?оÑ?и пÑ?оÑ?ил Ñ?а овим именом</"
+#~ "span>"
+
+#~ msgid "Error setting the default window icon: %s"
+#~ msgstr "Ð?Ñ?еÑ?ка пÑ?иликом поÑ?Ñ?авÑ?аÑ?а подÑ?азÑ?меване икониÑ?е пÑ?озоÑ?а: %s"
+
+#~ msgid "<b>Path:</b> %s"
+#~ msgstr "<b>Ð?Ñ?Ñ?аÑ?а:</b> %s"
+
+#~ msgid "Open comment dialog"
+#~ msgstr "Ð?Ñ?ваÑ?а пÑ?озоÑ?Ñ?е за напоменама"
+
+#~ msgid "Message Table"
+#~ msgstr "Ð?овÑ?Ñ? за поÑ?Ñ?ке"
+
+#~ msgid "Running recovery..."
+#~ msgstr "Ð?Ñ?аÑ?ам подаÑ?ке..."
+
+#~ msgid "There was an error recovering the database: %s"
+#~ msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке пÑ?илико вÑ?аÑ?аÑ?а базе подаÑ?ака: %s"
+
+#~ msgid "There was an error in database: %s"
+#~ msgstr "Ð?оÑ?ло Ñ?е до гÑ?еÑ?ке Ñ? бази подаÑ?ака: %s"
+
+#~ msgid "C_omment..."
+#~ msgstr "_Ð?апомена..."
+
+#~ msgid "Edit message comment"
+#~ msgstr "УÑ?едиÑ?е напоменÑ? поÑ?Ñ?ке"
+
+#~ msgid "Show the Translation Memory panel"
+#~ msgstr "Ð?Ñ?иказÑ?Ñ?е повÑ?Ñ? Ñ?а пÑ?еводилаÑ?ком мемоÑ?иÑ?ом"
+
+#~| msgid "Translated"
+#~ msgid "Total: %d translated"
+#~ msgstr "УкÑ?пно има: %d поÑ?Ñ?ка"
+
+#~ msgid "gtranslator - %s"
+#~ msgstr "Ð?номов пÑ?еводилаÑ? â?? %s"
+
+#~ msgid "gtranslator - *%s"
+#~ msgstr "Ð?номов пÑ?еводилаÑ? â?? %s"
+
 #~ msgid "Select Folder"
 #~ msgstr "Ð?забеÑ?и Ñ?аÑ?Ñ?иклÑ?"
 
@@ -2268,9 +2219,6 @@ msgstr "Ð?окÑ?менÑ?и"
 #~ msgid "Status: %s"
 #~ msgstr "СÑ?аÑ?е: %s"
 
-#~ msgid "Total: %d"
-#~ msgstr "УкÑ?пно има: %d"
-
 #~ msgid "Fuzzy: %d"
 #~ msgstr "Ð?еÑ?аÑ?но: %d"
 
@@ -2501,24 +2449,6 @@ msgstr "Ð?окÑ?менÑ?и"
 #~ "Ð?иÑ?ам пÑ?онаÑ?ао\n"
 #~ "â??%sâ??"
 
-#~ msgid "%s [ %i Fuzzy left ]"
-#~ msgid_plural "%s [ %i Fuzzy left ]"
-#~ msgstr[0] "%s [ пÑ?еоÑ?Ñ?ала %i неÑ?аÑ?на ]"
-#~ msgstr[1] "%s [ пÑ?еоÑ?Ñ?але %i неÑ?аÑ?не ]"
-#~ msgstr[2] "%s [ пÑ?еоÑ?Ñ?ало %i неÑ?аÑ?ниÑ? ]"
-
-#~ msgid "%s [ No fuzzy left ]"
-#~ msgstr "%s [ нема неÑ?аÑ?ниÑ? ]"
-
-#~ msgid "Sticky (Message & translation are the same)"
-#~ msgstr "Ð?епÑ?иво (поÑ?Ñ?ка и пÑ?евод Ñ?Ñ? иÑ?Ñ?и)"
-
-#~ msgid "%s [ %i Untranslated left ]"
-#~ msgid_plural "%s [ %i Untranslated left ]"
-#~ msgstr[0] "%s [ пÑ?еоÑ?Ñ?ала %i непÑ?еведена ]"
-#~ msgstr[1] "%s [ пÑ?еоÑ?Ñ?але %i непÑ?еведене ]"
-#~ msgstr[2] "%s [ пÑ?еоÑ?Ñ?ало %i непÑ?еведениÑ? ]"
-
 #~ msgid "%s [ No untranslated left ]"
 #~ msgstr "%s [ Ð?ема виÑ?е непÑ?еведениÑ?]"
 
@@ -2870,9 +2800,6 @@ msgstr "Ð?окÑ?менÑ?и"
 #~ msgid "gtranslator's homepage on the web"
 #~ msgstr "Ð?омаÑ?а Ñ?Ñ?Ñ?ана Ð?Ð?Ñ?еводиoÑ?а на инÑ?еÑ?неÑ?Ñ?"
 
-#~ msgid "Open"
-#~ msgstr "Ð?Ñ?воÑ?и"
-
 #~ msgid "Save"
 #~ msgstr "СаÑ?Ñ?ваÑ?"
 
@@ -2948,22 +2875,6 @@ msgstr "Ð?окÑ?менÑ?и"
 #~ msgid "Could not open file `%s' for writing!"
 #~ msgstr "Ð?иÑ?ам Ñ?Ñ?пео да оÑ?воÑ?им даÑ?оÑ?екÑ? â??%sâ?? Ñ?ади Ñ?пиÑ?а!"
 
-#~ msgid ""
-#~ "File %s\n"
-#~ "contains %d fuzzy message"
-#~ msgid_plural ""
-#~ "File %s\n"
-#~ "contains %d fuzzy messages"
-#~ msgstr[0] ""
-#~ "Ð?аÑ?оÑ?ека %s\n"
-#~ "Ñ?адÑ?жи %d неÑ?аÑ?нÑ? поÑ?Ñ?кÑ?"
-#~ msgstr[1] ""
-#~ "Ð?аÑ?оÑ?ека %s\n"
-#~ "Ñ?адÑ?жи %d неÑ?аÑ?не поÑ?Ñ?ке"
-#~ msgstr[2] ""
-#~ "Ð?аÑ?оÑ?ека %s\n"
-#~ "Ñ?адÑ?жи %d неÑ?аÑ?ниÑ? поÑ?Ñ?ка"
-
 #~ msgid "Sorry, msgfmt isn't available on your system!"
 #~ msgstr "Ð?ажалоÑ?Ñ?, â??msgfmtâ?? ниÑ?е доÑ?Ñ?Ñ?пан на ваÑ?ем Ñ?иÑ?Ñ?емÑ?!"
 
diff --git a/po/sr latin po b/po/sr latin po
index 2b34042..3d36d0a 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,21 +5,23 @@
 #
 # Prevous maintainers: Veljko M. StanojeviÄ? <veljko vms homelinux net>
 # Maintainer: MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2009.
+# MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gtranslator&component=general\n"
-"POT-Creation-Date: 2009-09-30 22:50+0000\n"
-"PO-Revision-Date: 2009-10-01 01:13+0000\n"
+"POT-Creation-Date: 2010-05-19 19:21+0000\n"
+"PO-Revision-Date: 2010-08-23 23:17+0200\n"
 "Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
-"Language-Team: Serbian <gnome prevod org>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: ../data/desktop/gtranslator.desktop.in.in.h:1
 msgid "Gtranslator PO Editor"
@@ -248,731 +250,362 @@ msgstr "Oznaka"
 msgid "gtranslator highlight"
 msgstr "Isticanje teksta"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:117
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:128
 msgid "Message not found"
 msgstr "Poruke nisu naÄ?ene"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:221
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:231
 msgid "Open file for alternate language"
 msgstr "Otvori datoteku za zamenu jezika"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:246
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:256
 msgid "File closed"
 msgstr "Datoteka je zatvorena"
 
-#: ../plugins/alternate-language/alternate-language-panel.c:314
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:316
+#| msgid "Open"
+msgctxt "alternate lang"
+msgid "_Open"
+msgstr "_Otvori"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:322
+#| msgid "_Close All"
+msgctxt "alternate lang"
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:328
+msgctxt "alternate lang"
+msgid "Co_py"
+msgstr "_Umnoži"
+
+#: ../plugins/alternate-language/gtr-alternate-language-panel.c:357
 msgid "There isn't any file loaded"
 msgstr "Nije uÄ?itana ni jedna datoteka"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:56
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:58
 msgid "_Alternate Language"
 msgstr "_Zameni jezik"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:57
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:59
 msgid "Show the Alternate Language panel"
 msgstr "Prikazuje panel za zamenu jezika"
 
-#: ../plugins/alternate-language/alternate-language-plugin.c:119
-#: ../plugins/alternate-language/alternate-language.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/alternate-language/gtr-alternate-language-plugin.c:118
+#: ../plugins/alternate-language/gtr-alternate-language.gtranslator-plugin.desktop.in.h:1
 msgid "Alternate Language"
 msgstr "Zamena jezika"
 
-#: ../plugins/alternate-language/alternate-language.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/alternate-language/gtr-alternate-language.gtranslator-plugin.desktop.in.h:2
 msgid "Load an alternate language."
 msgstr "UÄ?itava jezik za zamenu."
 
-#: ../plugins/charmap/charmap-plugin.c:283
-#: ../plugins/charmap/charmap.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/charmap/gtr-charmap-plugin.c:280
+#: ../plugins/charmap/gtr-charmap.gtranslator-plugin.desktop.in.h:1
 msgid "Character Map"
 msgstr "Znakovi"
 
-#: ../plugins/charmap/charmap.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/charmap/gtr-charmap.gtranslator-plugin.desktop.in.h:2
 msgid "Insert special characters just by clicking on them."
 msgstr "UmeÄ?e posebne znake pokazivaÄ?em miÅ¡a"
 
-#: ../plugins/dictionary/dict-panel.c:183
+#: ../plugins/dictionary/gtr-dict-panel.c:179
 #, c-format
 msgid "No dictionary source available with name '%s'"
 msgstr "Nije naÄ?en reÄ?nik sa nazivom â??%sâ??"
 
-#: ../plugins/dictionary/dict-panel.c:187
+#: ../plugins/dictionary/gtr-dict-panel.c:183
 msgid "Unable to find dictionary source"
 msgstr "Ne mogu da uÄ?itam izvor reÄ?nika"
 
-#: ../plugins/dictionary/dict-panel.c:204
+#: ../plugins/dictionary/gtr-dict-panel.c:198
 #, c-format
 msgid "No context available for source '%s'"
 msgstr "Nije dostupna pojava poruke za â??%sâ??"
 
-#: ../plugins/dictionary/dict-panel.c:208
+#: ../plugins/dictionary/gtr-dict-panel.c:202
 msgid "Unable to create a context"
 msgstr "Ne mogu da dobavim pojavu poruke"
 
-#: ../plugins/dictionary/dict-panel.c:294
+#: ../plugins/dictionary/gtr-dict-panel.c:287
 #, c-format
 msgid "Dictionary source '%s' selected"
 msgstr "Izabrana je â??%sâ?? za dnevnik"
 
-#: ../plugins/dictionary/dict-panel.c:314
+#: ../plugins/dictionary/gtr-dict-panel.c:306
 #, c-format
 msgid "Strategy '%s' selected"
 msgstr "Izabrana je â??%sâ?? strategija"
 
-#: ../plugins/dictionary/dict-panel.c:333
+#: ../plugins/dictionary/gtr-dict-panel.c:324
 #, c-format
 msgid "Database '%s' selected"
 msgstr "Izabrana je â??%sâ?? za bazu podataka"
 
-#: ../plugins/dictionary/dict-panel.c:379
+#: ../plugins/dictionary/gtr-dict-panel.c:368
 #, c-format
 msgid "Word '%s' selected"
 msgstr "Izabrana je reÄ? â??%sâ??"
 
 #. speller
-#: ../plugins/dictionary/dict-panel.c:402
+#: ../plugins/dictionary/gtr-dict-panel.c:390
 msgid "Double-click on the word to look up"
 msgstr "Kliknite dvaput na reÄ? za traganje"
 
 #. strat-chooser
-#: ../plugins/dictionary/dict-panel.c:407
+#: ../plugins/dictionary/gtr-dict-panel.c:395
 msgid "Double-click on the matching strategy to use"
 msgstr "Kliknite dvaput za upotrebu poklopljene strategije"
 
 #. source-chooser
-#: ../plugins/dictionary/dict-panel.c:413
+#: ../plugins/dictionary/gtr-dict-panel.c:401
 msgid "Double-click on the source to use"
 msgstr "Kliknite dvaput za upotrebu željenog izvora"
 
 #. db-chooser
-#: ../plugins/dictionary/dict-panel.c:423
+#: ../plugins/dictionary/gtr-dict-panel.c:411
 msgid "Double-click on the database to use"
 msgstr "Kliknite dvaput za upotrebu željene baze podataka"
 
 #.
 #. * Look up Button
 #.
-#: ../plugins/dictionary/dict-panel.c:487
+#: ../plugins/dictionary/gtr-dict-panel.c:473
 msgid "Look _up:"
 msgstr "Tra_ganje:"
 
-#: ../plugins/dictionary/dict-panel.c:559
+#: ../plugins/dictionary/gtr-dict-panel.c:543
 msgid "Similar words"
 msgstr "SliÄ?ne reÄ?i"
 
-#: ../plugins/dictionary/dict-panel.c:574
+#: ../plugins/dictionary/gtr-dict-panel.c:558
 msgid "Available dictionaries"
 msgstr "Dostupni reÄ?nici"
 
-#: ../plugins/dictionary/dict-panel.c:590
+#: ../plugins/dictionary/gtr-dict-panel.c:574
 msgid "Available strategies"
 msgstr "Dostupne strategije"
 
-#: ../plugins/dictionary/dict-panel.c:600
+#: ../plugins/dictionary/gtr-dict-panel.c:584
 msgid "Dictionary sources"
 msgstr "Izvori reÄ?nika"
 
-#: ../plugins/dictionary/dict.gtranslator-plugin.desktop.in.h:1
-#: ../plugins/dictionary/dictionary-plugin.c:92
+#: ../plugins/dictionary/gtr-dict.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/dictionary/gtr-dictionary-plugin.c:92
 msgid "Dictionary"
 msgstr "ReÄ?nik"
 
-#: ../plugins/dictionary/dict.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/dictionary/gtr-dict.gtranslator-plugin.desktop.in.h:2
 msgid "Look up words in a dictionary."
 msgstr "Traži reÄ?i u reÄ?niku"
 
-#: ../plugins/fullscreen/fullscreen-plugin.c:45
+#: ../plugins/fullscreen/gtr-fullscreen-plugin.c:44
 msgid "_Fullscreen"
 msgstr "_Ceo ekran"
 
-#: ../plugins/fullscreen/fullscreen-plugin.c:46
+#: ../plugins/fullscreen/gtr-fullscreen-plugin.c:45
 msgid "Place window on fullscreen state"
 msgstr "Prikazuje prozor preko celog ekrana"
 
-#: ../plugins/fullscreen/fullscreen.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in.h:1
 msgid "Fullscreen"
 msgstr "Ceo ekran"
 
-#: ../plugins/fullscreen/fullscreen.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/fullscreen/gtr-fullscreen.gtranslator-plugin.desktop.in.h:2
 msgid "Place window in the fullscreen state."
 msgstr "Prikazuje prozor preko celog ekrana"
 
-#: ../plugins/insert-params/insert-params-plugin.c:75
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:74
 msgid "_Next Param"
 msgstr "_SledeÄ?i parametar"
 
-#: ../plugins/insert-params/insert-params-plugin.c:76
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:75
 msgid "Insert the next param of the message"
 msgstr "UmeÄ?e sledeÄ?i parametar poruke"
 
-#: ../plugins/insert-params/insert-params-plugin.c:78
+#: ../plugins/insert-params/gtr-insert-params-plugin.c:77
 msgid "_Insert Params"
 msgstr "_Umetni parametre"
 
-#: ../plugins/insert-params/insert-params.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/insert-params/gtr-insert-params.gtranslator-plugin.desktop.in.h:1
 msgid "Insert Params"
 msgstr "Umetni parametre"
 
-#: ../plugins/insert-params/insert-params.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/insert-params/gtr-insert-params.gtranslator-plugin.desktop.in.h:2
 msgid "Parameters detection and easy insertion."
 msgstr "Nalaženje i lako umetanje parametara"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:68
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:67
 msgid "_Next Tag"
 msgstr "Sle_deÄ?a oznaka"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:69
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:68
 msgid "Insert the next tag of the message"
 msgstr "UmeÄ?e narednu oznaku poruke"
 
-#: ../plugins/insert-tags/insert-tags-plugin.c:71
+#: ../plugins/insert-tags/gtr-insert-tags-plugin.c:70
 msgid "_Insert Tags"
 msgstr "Umetni o_znake"
 
-#: ../plugins/insert-tags/insert-tags.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/insert-tags/gtr-insert-tags.gtranslator-plugin.desktop.in.h:1
 msgid "Insert Tags"
 msgstr "Umetni oznake"
 
-#: ../plugins/insert-tags/insert-tags.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/insert-tags/gtr-insert-tags.gtranslator-plugin.desktop.in.h:2
 msgid "Tags detection and easy insertion."
 msgstr "Nalazi oznake i umeÄ?e ih na jednostavan naÄ?in."
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:1
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:1
-#: ../plugins/subversion/subversion.ui.h:2
-#: ../src/dialogs/preferences-dialog.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../plugins/open-tran/open-tran-dialog.ui.h:2
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:2
-msgid "     "
-msgstr "     "
-
-#: ../plugins/open-tran/open-tran-dialog.ui.h:3
-msgid "<b>Code language of the results:</b>"
-msgstr "<b>Oznaka jezika za rezultate (npr. sr):</b>"
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:1
+#| msgid "<b>Code language of the results:</b>"
+msgid "Code language of the results:"
+msgstr "Oznaka jezika za rezultate (npr. sr):"
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:4
-msgid "<b>Code language to query open-tran:</b>"
-msgstr "<b>Kod jezika za pretragu u open-tran.eu (npr. sr):</b>"
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:2
+#| msgid "<b>Code language to query open-tran:</b>"
+msgid "Code language to query open-tran:"
+msgstr "Kod jezika za pretragu u open-tran.eu (npr. sr):"
 
-#: ../plugins/open-tran/open-tran-dialog.ui.h:5
+#: ../plugins/open-tran/gtr-open-tran-dialog.ui.h:3
 msgid "Open Tran Settings"
 msgstr "PodeÅ¡avanje prevodilaÄ?ke memorije"
 
-#: ../plugins/open-tran/open-tran-panel.c:207
-#: ../plugins/open-tran/open-tran-panel.c:272
-msgid "ERROR: could not parse response\n"
-msgstr "Greška: nemogu da obradim odgovor\n"
-
-#: ../plugins/open-tran/open-tran-panel.c:254
+#: ../plugins/open-tran/gtr-open-tran-panel.c:248
 #, c-format
 msgid "ERROR: %d %s\n"
 msgstr "Greška: %d %s\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:267
+#: ../plugins/open-tran/gtr-open-tran-panel.c:261
 #, c-format
 msgid "FAULT: %d %s\n"
 msgstr "Prekršaj: %d %s\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:283
+#: ../plugins/open-tran/gtr-open-tran-panel.c:266
+#: ../plugins/open-tran/gtr-open-tran-panel.c:276
+msgid "ERROR: could not parse response\n"
+msgstr "Greška: nemogu da obradim odgovor\n"
+
+#: ../plugins/open-tran/gtr-open-tran-panel.c:285
 #, c-format
 msgid "WRONG! Can't get result element %d\n"
 msgstr "Neispravno! Ne mogu da dobijem krajnji element %d\n"
 
-#: ../plugins/open-tran/open-tran-panel.c:300 ../src/actions-search.c:195
+#: ../plugins/open-tran/gtr-open-tran-panel.c:300
+#: ../src/gtr-actions-search.c:191
 msgid "Phrase not found"
 msgstr "Izraz nije pronaÄ?en"
 
-#: ../plugins/open-tran/open-tran-panel.c:320
+#: ../plugins/open-tran/gtr-open-tran-panel.c:319
 msgid "You have to provide a phrase to search"
 msgstr "Morate zadati reÄ?i za pretragu"
 
-#: ../plugins/open-tran/open-tran-panel.c:329
+#: ../plugins/open-tran/gtr-open-tran-panel.c:328
 msgid "You have to provide a search language code"
 msgstr "Morate da postavite oznaku jezika u podešavanjima"
 
-#: ../plugins/open-tran/open-tran-panel.c:339
+#: ../plugins/open-tran/gtr-open-tran-panel.c:338
 msgid "You have to provide a language code for your language"
 msgstr "Morate da podesite oznaku vašeg jezika u podešavanjima"
 
-#: ../plugins/open-tran/open-tran-panel.c:367
+#: ../plugins/open-tran/gtr-open-tran-panel.c:366
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../plugins/open-tran/open-tran-panel.c:378
+#: ../plugins/open-tran/gtr-open-tran-panel.c:377
 msgid "Open-Tran.eu"
 msgstr "Open-Tran.eu"
 
-#: ../plugins/open-tran/open-tran-panel.c:415
+#: ../plugins/open-tran/gtr-open-tran-panel.c:414
 msgid "Look for:"
 msgstr "Traži:"
 
-#: ../plugins/open-tran/open-tran-plugin.c:106
-#: ../plugins/open-tran/open-tran.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/open-tran/gtr-open-tran-plugin.c:104
+#: ../plugins/open-tran/gtr-open-tran.gtranslator-plugin.desktop.in.h:2
 msgid "Open Tran"
 msgstr "PrevodilaÄ?ka memorija"
 
-#: ../plugins/open-tran/open-tran.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/open-tran/gtr-open-tran.gtranslator-plugin.desktop.in.h:1
 msgid "Look for phrases in Open tran memory translation database."
 msgstr "Traži zadatu reÄ? u Open-tran.eu prevodilaÄ?koj memoriji."
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:3
-msgid "<b>Line command:</b>"
-msgstr "<b>Naredba linije:</b>"
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:1
+#| msgid "<b>Line command:</b>"
+msgid "Line command:"
+msgstr "Naredba linije:"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:4
-msgid "<b>Program command:</b>"
-msgstr "<b>Naredba programa:</b>"
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:2
+#| msgid "<b>Program command:</b>"
+msgid "Program command:"
+msgstr "Naredba programa:"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:5
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:3
 msgid "Source View Settings"
 msgstr "Podešavanje izvornog pregleda"
 
-#: ../plugins/source-code-view/source-code-view-dialog.ui.h:6
+#: ../plugins/source-code-view/gtr-source-code-view-dialog.ui.h:4
 msgid "Use external editor"
 msgstr "Koristi spoljni program za ureÄ?ivanje"
 
-#: ../plugins/source-code-view/source-code-view-plugin.c:111
+#: ../plugins/source-code-view/gtr-source-code-view-plugin.c:111
 #, c-format
-#| msgid "Please, install %s to be able to show the file"
-msgid "Please install %s to be able to show the file"
-msgstr "Instalirajte %s za prikaz ove datoteke"
+#| msgid "Please install %s to be able to show the file"
+msgid "Please install \"%s\" to be able to show the file"
+msgstr "Instalirajte â??%sâ?? za prikaz ove datoteke"
 
-#: ../plugins/source-code-view/source-code-view-plugin.c:446
-msgid "Paths:\n"
-msgstr "Putanje:\n"
+#: ../plugins/source-code-view/gtr-source-code-view-plugin.c:449
+#| msgid "Paths:\n"
+msgid "Paths:"
+msgstr "Putanje:"
 
-#: ../plugins/source-code-view/source-code-view.gtranslator-plugin.desktop.in.h:1
+#: ../plugins/source-code-view/gtr-source-code-view.gtranslator-plugin.desktop.in.h:1
 msgid "Show the message in the source code."
 msgstr "Prikazuje poruke u izvornom kodu."
 
-#: ../plugins/source-code-view/source-code-view.gtranslator-plugin.desktop.in.h:2
+#: ../plugins/source-code-view/gtr-source-code-view.gtranslator-plugin.desktop.in.h:2
 msgid "Source Code View"
 msgstr "Prikaz izvornog koda"
 
-#: ../plugins/source-code-view/viewer.c:74
+#: ../plugins/source-code-view/gtr-viewer.c:76
 msgid "Source Viewer"
 msgstr "Izvorni prikaz"
 
-#: ../plugins/source-code-view/viewer.ui.h:1
-msgid "<b>Source code</b>"
-msgstr "<b>Izvorni kod</b>"
-
-#: ../plugins/subversion/checkout-dialog.c:77
-msgid "Subversion: Checkout complete."
-msgstr "Subverzija: zavrÅ¡eno je usklaÄ?ivanje"
-
-#: ../plugins/subversion/checkout-dialog.c:124
-#| msgid "Please, add a directory path to make the checkout"
-msgid "Please add a directory path to make the checkout"
-msgstr "Dodajte putanju direktorijuma radi usklaÄ?ivanja"
-
-#: ../plugins/subversion/checkout-dialog.c:138
-#| msgid "Please, add a Subversion URL"
-msgid "Please add a Subversion URL"
-msgstr "Dodajte adresu Subverzije"
-
-#: ../plugins/subversion/checkout-dialog.c:170 ../src/dialogs/assistant.c:689
-msgid "Checkout directory"
-msgstr "Uskladi direktorijum"
-
-#: ../plugins/subversion/checkout-dialog.c:252
-msgid "Checkout repository"
-msgstr "Uskladi riznicu"
-
-#: ../plugins/subversion/commit-dialog.c:221
-msgid "Subversion: Commit complete."
-msgstr "Subverzija: završeno je slanje."
-
-#.
-#. * Translators: Please change LANGUAGE for your language name in English.
-#. * This string is used to fill the ChangeLog entry
-#. * For example: "Updated Galician translation"
-#. * where LANGUAGE = Galician.
-#.
-#: ../plugins/subversion/commit-dialog.c:262
-msgctxt "ChangeLog entry"
-msgid "LANGUAGE"
-msgstr "JEZIK"
-
-#: ../plugins/subversion/commit-dialog.c:286
-#, c-format
-#| msgid "The ChangeLog file '%s' does not exists"
-msgid "The ChangeLog file '%s' does not exist"
-msgstr "Ne postoji ChangeLog datoteka â??%sâ??"
-
-#: ../plugins/subversion/commit-dialog.c:400
-msgid "Are you sure that you want to pass an empty log message?"
-msgstr "Da li ste sigurno želite da ubacite praznu poruku iz dnevnika?"
-
-#: ../plugins/subversion/commit-dialog.c:422
-msgid "You have to select at least one file to send"
-msgstr "Morate izabrati bar jednu datoteku za slanje"
-
-#: ../plugins/subversion/commit-dialog.c:562
-msgid "Commit Changes"
-msgstr "Pošalji izmene"
-
-#: ../plugins/subversion/diff-dialog.c:80
-msgid "Subversion: Diff complete."
-msgstr "Subverzija: napravljene su razlike."
-
-#: ../plugins/subversion/diff-dialog.c:109
-#, c-format
-#| msgid "Please, install %s to be able to diff the file"
-msgid "Please install %s to be able to diff the file"
-msgstr "Instalirajte %s kako bi mogli da naÄ?ete razlike izmeÄ?u datoteka"
-
-#: ../plugins/subversion/diff-dialog.c:390
-msgid "Diff file"
-msgstr "Datoteka sa razlikama"
-
-#: ../plugins/subversion/diff-dialog.c:455
-msgid "Diff"
-msgstr "Razlike"
-
-#: ../plugins/subversion/subversion-plugin.c:82
-msgid "Subversion: File will be added on next commit."
-msgstr "Subverzija: datoteka Ä?e biti dodata pri sledeÄ?em slanju."
-
-#: ../plugins/subversion/subversion-plugin.c:129
-msgid "_Update"
-msgstr "_Ažuriraj"
-
-#: ../plugins/subversion/subversion-plugin.c:130
-msgid "Sync your local copy with the Subversion tree"
-msgstr "Ažurira vašu lokalnu kopiju prema riznici Subverzije"
-
-#: ../plugins/subversion/subversion-plugin.c:133
-msgid "_Commit"
-msgstr "_Pošalji"
-
-#: ../plugins/subversion/subversion-plugin.c:134
-msgid "Commit your changes to the Subversion tree"
-msgstr "Šalje vaše izmene u Subverzijinu riznicu"
+#: ../plugins/source-code-view/gtr-viewer.ui.h:1
+#| msgid "<b>Source code</b>"
+msgid "Source code"
+msgstr "Izvorni kÈ?d"
 
-#: ../plugins/subversion/subversion-plugin.c:137
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../plugins/subversion/subversion-plugin.c:138
-msgid "Add a new file/directory to the Subversion tree"
-msgstr "Dodaje novu datoteku/direktorijum u Subverzijinu riznicu"
-
-#: ../plugins/subversion/subversion-plugin.c:141
-msgid "_Diff"
-msgstr "_Napravi razlike"
-
-#: ../plugins/subversion/subversion-plugin.c:142
-msgid "Diff local PO file with repository PO file"
-msgstr "Ispisuje razlike izmeÄ?u vaÅ¡e i PO datoteke u riznici"
-
-#: ../plugins/subversion/subversion-plugin.c:145
-msgid "C_heckout"
-msgstr "_Uskladi"
-
-#: ../plugins/subversion/subversion-plugin.c:146
-msgid "Get a new repository copy"
-msgstr "Preuzima novu kopiju riznice"
-
-#: ../plugins/subversion/subversion-plugin.c:149
-msgid "S_ubversion"
-msgstr "_Subverzija"
-
-#: ../plugins/subversion/subversion.ui.h:1
-msgid "  "
-msgstr "  "
-
-#: ../plugins/subversion/subversion.ui.h:3
-msgid "        "
-msgstr "        "
-
-#: ../plugins/subversion/subversion.ui.h:4
-msgid "<b>Diff options:</b>"
-msgstr "<b>Opcije za razlike:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:5
-msgid "<b>Diff program:</b>"
-msgstr "<b>Program za razlike:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:6
-msgid "<b>Directory to checkout:</b>"
-msgstr "<b>Direktorijum za usklaÄ?ivanje:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:7
-msgid "<b>Directory to update:</b>"
-msgstr "<b>Direktorijum za ažuriranje:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:8
-msgid "<b>Information:</b>"
-msgstr "<b>Podaci:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:9
-msgid "<b>Log Message:</b>"
-msgstr "<b>Poruka za dnevnik:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:10
-msgid "<b>Password:</b>"
-msgstr "<b>Lozinka:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:11
-msgid "<b>Realm:</b>"
-msgstr "<b>Domen:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:12
-msgid "<b>Select files to Commit:</b>"
-msgstr "<b>Datoteke za slanje:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:13
-msgid "<b>Subversion URL:</b>"
-msgstr "<b>Adresa Subverzije:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:14
-msgid "<b>Username:</b>"
-msgstr "<b>KorisniÄ?ko ime:</b>"
-
-#: ../plugins/subversion/subversion.ui.h:15
-msgid "Add Log Message to ChangeLog file"
-msgstr "Dodaj poruku u dnevnik (ChangeLog datoteka)"
-
-#: ../plugins/subversion/subversion.ui.h:16
-msgid "Line argument:"
-msgstr "Argument linije:"
-
-#: ../plugins/subversion/subversion.ui.h:17
-msgid "Program name:"
-msgstr "Ime programa:"
-
-#: ../plugins/subversion/subversion.ui.h:18
-msgid "Remember Password"
-msgstr "Upamti lozinku"
-
-#: ../plugins/subversion/subversion.ui.h:19
-msgid "Remember this decision"
-msgstr "Upamti ovu odluku"
-
-#: ../plugins/subversion/subversion.ui.h:20
-msgid "Repository authorization"
-msgstr "Prijava na riznicu"
-
-#: ../plugins/subversion/subversion.ui.h:21
-msgid "Retrieving status..."
-msgstr "Preuzimam stanje..."
-
-#: ../plugins/subversion/subversion.ui.h:22
-msgid "Save the diff file"
-msgstr "SaÄ?uvaj datoteku sa razlikama"
-
-#: ../plugins/subversion/subversion.ui.h:23
-msgid "Send Changes"
-msgstr "Pošalji izmene"
-
-#: ../plugins/subversion/subversion.ui.h:24
-#: ../plugins/subversion/update-dialog.c:222
-msgid "Update repository"
-msgstr "Ažuriraj skladište"
-
-#: ../plugins/subversion/subversion.ui.h:25
-msgid "Use configured program to view the diff"
-msgstr "Koristi podešeni program za pregled razlika"
-
-#: ../plugins/subversion/subversion.ui.h:26
-msgid "label"
-msgstr "natpis"
-
-#: ../plugins/subversion/subversion.gtranslator-plugin.desktop.in.h:1
-msgid "A Subversion client plugin based on libsvn."
-msgstr "Dodatak za Subverziju koji se oslanja na libsvn."
-
-#: ../plugins/subversion/subversion.gtranslator-plugin.desktop.in.h:2
-msgid "Subversion"
-msgstr "Subverzija"
-
-#: ../plugins/subversion/svn-command.c:176
-#: ../plugins/subversion/svn-command.c:258
-msgid "Authentication canceled"
-msgstr "Prijava je otkazana"
-
-#: ../plugins/subversion/svn-command.c:231
-msgid "Hostname:"
-msgstr "Ime domaÄ?ina:"
-
-#: ../plugins/subversion/svn-command.c:232
-msgid "Fingerprint:"
-msgstr "Otisak prsta:"
-
-#: ../plugins/subversion/svn-command.c:233
-msgid "Valid from:"
-msgstr "Važi od:"
-
-#: ../plugins/subversion/svn-command.c:234
-msgid "Valid until:"
-msgstr "Važi do:"
-
-#: ../plugins/subversion/svn-command.c:235
-msgid "Issuer DN:"
-msgstr "DN izdavaÄ?a:"
-
-#: ../plugins/subversion/svn-command.c:236
-msgid "DER certificate:"
-msgstr "DER sertifikat:"
-
-#: ../plugins/subversion/svn-command.c:385
-#: ../plugins/subversion/svn-command.c:400
-#, c-format
-msgid "Deleted: %s"
-msgstr "Obrisan: %s"
-
-#: ../plugins/subversion/svn-command.c:388
-#: ../plugins/subversion/svn-command.c:406
-#, c-format
-msgid "Added: %s"
-msgstr "Dodat: %s"
-
-#: ../plugins/subversion/svn-command.c:391
-#, c-format
-msgid "Reverted: %s"
-msgstr "VraÄ?en: %s"
-
-#: ../plugins/subversion/svn-command.c:394
-#, c-format
-msgid "Revert failed: %s"
-msgstr "Nije uspelo vraÄ?anje: %s"
-
-#: ../plugins/subversion/svn-command.c:397
-#, c-format
-msgid "Resolved: %s"
-msgstr "Razrešen: %s"
-
-#: ../plugins/subversion/svn-command.c:403
-#, c-format
-msgid "Updated: %s"
-msgstr "Ažuriran: %s"
-
-#: ../plugins/subversion/svn-command.c:409
-#, c-format
-msgid "Externally Updated: %s"
-msgstr "Ažurirano drugim programom: %s"
-
-#: ../plugins/subversion/svn-command.c:413
-#, c-format
-msgid "Commit Modified: %s"
-msgstr "Izmenjeno za slanje: %s"
-
-#: ../plugins/subversion/svn-command.c:417
-#, c-format
-msgid "Commit Added: %s"
-msgstr "Dodato za slanje: %s"
-
-#: ../plugins/subversion/svn-command.c:420
-#, c-format
-msgid "Commit Deleted: %s"
-msgstr "Obrisano za slanje: %s"
-
-#: ../plugins/subversion/svn-command.c:424
-#, c-format
-msgid "Commit Replaced: %s"
-msgstr "Zamenjeno za slanje: %s"
-
-#: ../plugins/subversion/svn-command.c:428
-#, c-format
-msgid "Created File: %s"
-msgstr "Napravljena datoteka: %s"
-
-#: ../plugins/subversion/svn-command.c:443
-#, c-format
-msgid "Modified: %s"
-msgstr "Izmenjeno: %s"
-
-#: ../plugins/subversion/svn-command.c:446
-#, c-format
-msgid "Merged: %s"
-msgstr "Spojeno: %s"
-
-#: ../plugins/subversion/svn-command.c:449
-#, c-format
-msgid "Conflicted: %s"
-msgstr "Sukobljeni: %s"
-
-#: ../plugins/subversion/svn-command.c:452
-#, c-format
-msgid "Missing: %s"
-msgstr "Nedostaje: %s"
-
-#: ../plugins/subversion/svn-command.c:455
-#, c-format
-msgid "Obstructed: %s"
-msgstr "SpreÄ?eno: %s"
-
-#: ../plugins/subversion/svn-update-command.c:104
-#, c-format
-msgid "Updated to revision %ld."
-msgstr "Ažurirano na reviziju br. %ld."
-
-#: ../plugins/subversion/update-dialog.c:75
-msgid "Subversion: Update complete."
-msgstr "Subverzija: završeno je ažuriranje"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:290
-msgid "Modified"
-msgstr "Izmenjena"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:294
-msgid "Added"
-msgstr "Dodato"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:298
-msgid "Deleted"
-msgstr "Obrisano"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:302
-msgid "Conflicted"
-msgstr "Sukobljavanje"
-
-#: ../plugins/subversion/vcs-status-tree-view.c:306
-msgid "Missing"
-msgstr "NedostajuÄ?a"
-
-#: ../src/actions-file.c:208
+#: ../src/gtr-actions-file.c:203
 msgid "Open file for translation"
 msgstr "Otvara datoteku radi prevoda"
 
-#: ../src/actions-file.c:281 ../src/actions-file.c:402
+#: ../src/gtr-actions-file.c:275 ../src/gtr-actions-file.c:393
 msgid "File saved."
 msgstr "Datoteka je saÄ?uvana"
 
-#: ../src/actions-file.c:331
+#: ../src/gtr-actions-file.c:324
 msgid "Save file as..."
 msgstr "SaÄ?uvaj kao..."
 
-#: ../src/actions-file.c:795
-#, c-format
-msgid "Failed to write profile data into profiles file '%s'"
-msgstr "Ne mogu da upiÅ¡em podatke u datoteku sa profilom â??%sâ??"
-
-#: ../src/actions-file.c:853
-#| msgid "File saved."
+#: ../src/gtr-actions-file.c:790
 msgid "Files saved."
 msgstr "Datoteka je saÄ?uvana."
 
-#: ../src/actions-help.c:52
+#: ../src/gtr-actions-help.c:50
 msgid "Current Maintainers"
 msgstr "Program trenutno održavaju"
 
-#: ../src/actions-help.c:57
+#: ../src/gtr-actions-help.c:55
 msgid "Current Developers"
 msgstr "Trenutni razvojni tim"
 
-#: ../src/actions-help.c:63
+#: ../src/gtr-actions-help.c:61
 msgid "Previous Developers"
 msgstr "Prethodni programeri"
 
-#: ../src/actions-help.c:71
+#: ../src/gtr-actions-help.c:69
 msgid "Contributors"
 msgstr "Programu su doprineli"
 
-#: ../src/actions-help.c:91
+#: ../src/gtr-actions-help.c:89
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -984,7 +617,7 @@ msgstr ""
 "Softver (FSF); bilo verzije 2 te Licence, bilo (po vaÅ¡em nahoÄ?enju) bilo koje "
 "novije verzije."
 
-#: ../src/actions-help.c:95
+#: ../src/gtr-actions-help.c:93
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -995,7 +628,7 @@ msgstr ""
 "GARANCIJA; Ä?ak i bez podrazumevane garancije KORISNOSTI ili PRILAGOÄ?ENOSTI "
 "ODREÄ?ENOJ NAMENI.  Vidite GNU OpÅ¡tu Javnu Licencu za viÅ¡e detalja."
 
-#: ../src/actions-help.c:99
+#: ../src/gtr-actions-help.c:97
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program.  If not, see <http://www.gnu.org/licenses/>."
@@ -1003,17 +636,17 @@ msgstr ""
 "Trebali ste da primite primerak GNU Opšte Javne Licence uz %s; ako niste, "
 "pogledajte <http://www.gnu.org/licenses/>."
 
-#: ../src/actions-help.c:111
+#: ../src/gtr-actions-help.c:119
 msgid ""
 "Translation file editing suite for localization of applications and "
 "libraries."
 msgstr "Program za ureÄ?ivanje datoteka sa prevodima programa i biblioteka."
 
-#: ../src/actions-help.c:114
+#: ../src/gtr-actions-help.c:122
 msgid "Copyright © 1999-2008 Free Software Foundation, Inc."
 msgstr "Sva prava zadržana, 1999-2008. Zadužbina slobodnog softvera"
 
-#: ../src/actions-help.c:117
+#: ../src/gtr-actions-help.c:124
 msgid "About Gtranslator"
 msgstr "O programu"
 
@@ -1021,7 +654,7 @@ msgstr "O programu"
 #. * Note to translators: put here your name and email so it will show
 #. * up in the "about" box
 #.
-#: ../src/actions-help.c:122
+#: ../src/gtr-actions-help.c:129
 msgid "translator-credits"
 msgstr ""
 "Veljko M. StanojeviÄ? <veljko vms homelinux net>\n"
@@ -1029,40 +662,60 @@ msgstr ""
 "\n"
 "Prevod.org â?? prevod na srpski jezik."
 
-#: ../src/actions-help.c:126
+#: ../src/gtr-actions-help.c:133
 msgid "Gtranslator Web Site"
 msgstr "Internet stranica Prevodioca"
 
-#: ../src/actions-search.c:173
+#: ../src/gtr-actions-search.c:170
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] "Pronašao sam i zamenio %d pojavu"
 msgstr[1] "Pronašao sam i zamenio %d pojave"
 msgstr[2] "Pronašao sam i zamenio %d pojava"
+msgstr[3] "Pronašao sam i zamenio pojavu"
 
-#: ../src/actions-search.c:183
+#: ../src/gtr-actions-search.c:179
 msgid "Found and replaced one occurrence"
 msgstr "Pronašao sam i zamenio jednu pojavu"
 
-#: ../src/context.c:60
-msgid "Format:"
-msgstr "Format:"
+#: ../src/gtr-context.c:228
+#| msgid "None"
+msgid "Notes:"
+msgstr "Beleške:"
 
-#: ../src/context.c:62
-msgid "Context:"
-msgstr "Pojava:"
+#: ../src/gtr-context.c:236
+#| msgid "Added"
+msgid "Add Note"
+msgstr "Dodaj belešku"
+
+#: ../src/gtr-context.c:241
+#| msgid "_Edit"
+msgid "Edit"
+msgstr "Izmeni"
 
-#: ../src/context.c:64
+#. Extracted comments
+#: ../src/gtr-context.c:284
 msgid "Extracted comments:"
 msgstr "IzvuÄ?ene napomene:"
 
-#: ../src/dialogs/assistant.c:140 ../src/dialogs/preferences-dialog.c:755
+#. Context
+#: ../src/gtr-context.c:288
+msgid "Context:"
+msgstr "Pojava:"
+
+#. Format
+#: ../src/gtr-context.c:292
+msgid "Format:"
+msgstr "Format:"
+
+#: ../src/dialogs/gtr-assistant.c:128
+#: ../src/dialogs/gtr-preferences-dialog.c:936
 msgid "<span weight=\"bold\" size=\"large\">Strings added to database</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"large\">Karakteri dodati u bazu podataka</span>"
 
-#: ../src/dialogs/assistant.c:298
+#: ../src/dialogs/gtr-assistant.c:275
 #, c-format
 msgid ""
 "Profile name: %s\n"
@@ -1087,11 +740,11 @@ msgstr ""
 "Množine: %s\n"
 "Putanja do baze: %s"
 
-#: ../src/dialogs/assistant.c:325
+#: ../src/dialogs/gtr-assistant.c:302
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/dialogs/assistant.c:348
+#: ../src/dialogs/gtr-assistant.c:325
 msgid ""
 "This assistant will help you to create the main profile\n"
 "and generate your translation memory database."
@@ -1099,93 +752,98 @@ msgstr ""
 "Asistent Ä?e vam pomoÄ?i da napravite glavni profil\n"
 "i izgradite bazu podataka za prevodilaÄ?ku memoriju."
 
-#: ../src/dialogs/assistant.c:354
+#: ../src/dialogs/gtr-assistant.c:331
 msgid "Assistant"
 msgstr "Asistent"
 
-#: ../src/dialogs/assistant.c:446
+#: ../src/dialogs/gtr-assistant.c:423
 msgid "<b>Profile name:</b>"
 msgstr "<b>Naziv profila:</b>"
 
-#: ../src/dialogs/assistant.c:465
+#: ../src/dialogs/gtr-assistant.c:442
 msgid "<b>Translator name:</b>"
 msgstr "<b>Ime prevodioca:</b>"
 
-#: ../src/dialogs/assistant.c:484
+#: ../src/dialogs/gtr-assistant.c:461
 msgid "<b>Translator email:</b>"
 msgstr "<b>Adresa e-pošte:</b>"
 
-#: ../src/dialogs/assistant.c:503
+#: ../src/dialogs/gtr-assistant.c:480
 msgid "<b>Language:</b>"
 msgstr "<b>Language:</b>"
 
-#: ../src/dialogs/assistant.c:522
+#: ../src/dialogs/gtr-assistant.c:499
 msgid "<b>Team email:</b>"
 msgstr "<b>E-pošta tima:</b>"
 
-#: ../src/dialogs/assistant.c:534 ../src/dialogs/assistant.c:680
-#: ../src/dialogs/preferences-dialog.c:548
+#: ../src/dialogs/gtr-assistant.c:511 ../src/dialogs/gtr-assistant.c:657
+#: ../src/dialogs/gtr-preferences-dialog.c:730 ../src/gtr-window.c:1483
 msgid "Profile"
 msgstr "Profil"
 
-#: ../src/dialogs/assistant.c:611
+#: ../src/dialogs/gtr-assistant.c:588
 msgid "<b>Language code:</b>"
 msgstr "<b>Oznaka jezika:</b>"
 
-#: ../src/dialogs/assistant.c:630
+#: ../src/dialogs/gtr-assistant.c:607
 msgid "<b>Character set:</b>"
 msgstr "<b>Set znakova:</b>"
 
-#: ../src/dialogs/assistant.c:649
+#: ../src/dialogs/gtr-assistant.c:626
 msgid "<b>Transfer encoding:</b>"
 msgstr "<b>Kodiranje:</b>"
 
-#: ../src/dialogs/assistant.c:668
+#: ../src/dialogs/gtr-assistant.c:645
 msgid "<b>Plural forms:</b>"
 msgstr "<b>Množine:</b>"
 
-#: ../src/dialogs/assistant.c:727
+#: ../src/dialogs/gtr-assistant.c:666
+msgid "Checkout directory"
+msgstr "Uskladi direktorijum"
+
+#: ../src/dialogs/gtr-assistant.c:704
 msgid "<b>Select the path to generate the database:</b>"
 msgstr "<b>Izaberite putanju za pravljenje baze podataka:</b>"
 
-#: ../src/dialogs/assistant.c:756
+#: ../src/dialogs/gtr-assistant.c:733
 msgid "<b>Look for a specific PO filename:</b>"
 msgstr "<b>NaÄ?i samo zadato ime za PO datoteke:</b>"
 
-#: ../src/dialogs/assistant.c:765
+#: ../src/dialogs/gtr-assistant.c:742
 msgid "E.g.: gl.po"
 msgstr "Na primer sr.po"
 
-#: ../src/dialogs/assistant.c:769
+#: ../src/dialogs/gtr-assistant.c:746
 msgid "Generate Database"
 msgstr "Izgradi bazu podataka"
 
-#: ../src/dialogs/assistant.c:795
+#: ../src/dialogs/gtr-assistant.c:772
 msgid "Confirmation"
 msgstr "Potvrda"
 
-#: ../src/dialogs/close-confirmation-dialog.c:128
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:127
 msgid "Close _without Saving"
 msgstr "Zatvori bez _Ä?uvanja"
 
-#: ../src/dialogs/close-confirmation-dialog.c:159
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:157
 msgid "Question"
 msgstr "Pitanje"
 
-#: ../src/dialogs/close-confirmation-dialog.c:380
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:372
 #, c-format
 msgid "Save the changes to document \"%s\" before closing?"
 msgstr "Da saÄ?uvam izmene u dokumentu â??%sâ?? pre zatvaranja?"
 
-#: ../src/dialogs/close-confirmation-dialog.c:543
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:535
 #, c-format
 msgid "Changes to %d document will be permanently lost."
 msgid_plural "Changes to %d documents will be permanently lost."
 msgstr[0] "Izmene uÄ?injene u %d dokumentu Ä?e biti trajno odbaÄ?ene."
 msgstr[1] "Izmene uÄ?injene u %d dokumenta Ä?e biti trajno odbaÄ?ene."
 msgstr[2] "Izmene uÄ?injene u %d dokumenata Ä?e biti trajno odbaÄ?ene."
+msgstr[3] "Izmene uÄ?injene u dokumentu Ä?e biti trajno odbaÄ?ene."
 
-#: ../src/dialogs/close-confirmation-dialog.c:550
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:542
 #, c-format
 msgid "There is %d document with unsaved changes. Save changes before closing?"
 msgid_plural ""
@@ -1196,130 +854,120 @@ msgstr[1] ""
 "%d dokumenta imaju nesaÄ?uvane izmene. Da li da ih saÄ?uvam pre zatvaranja?"
 msgstr[2] ""
 "%d dokumenata imaju nesaÄ?uvane izmene. Da li da ih saÄ?uvam pre zatvaranja?"
+msgstr[3] ""
+"Dokument ima nesaÄ?uvane izmene. Da li da ih saÄ?uvam pre zatvaranja?"
+
 
-#: ../src/dialogs/close-confirmation-dialog.c:571
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:563
 msgid "Docum_ents with unsaved changes:"
 msgstr "Dokumenti sa nesaÄ?uvanim izmenama:"
 
-#: ../src/dialogs/close-confirmation-dialog.c:575
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:567
 msgid "S_elect the documents you want to save:"
 msgstr "Izaberite _dokumente koje želite da saÄ?uvate:"
 
-#: ../src/dialogs/close-confirmation-dialog.c:595
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:587
 msgid "Saving has been disabled by the system administrator."
 msgstr "Ä?uvanje je onemoguÄ?eno od strane administratora sistema."
 
-#: ../src/dialogs/close-confirmation-dialog.c:597
+#: ../src/dialogs/gtr-close-confirmation-dialog.c:589
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Ukoliko ne saÄ?uvate, sve vaÅ¡e izmene Ä?e biti trajno odbaÄ?ene."
 
-#: ../src/dialogs/comment-dialog.c:95
-msgid "Edit Comment"
-msgstr "Izmena napomene"
-
-#: ../src/dialogs/comment-dialog.ui.h:1
-#| msgid "<b>Write your comments below:</b>"
-msgid "<b>Write your comments bellow:</b>"
-msgstr "<b>Upišite napomene ispod:</b>"
-
-#: ../src/dialogs/file-dialogs.c:62
+#: ../src/dialogs/gtr-file-dialogs.c:62
 msgid "Gettext translation"
 msgstr "Gettekst prevod"
 
-#: ../src/dialogs/file-dialogs.c:71
+#: ../src/dialogs/gtr-file-dialogs.c:71
 msgid "Gettext translation template"
 msgstr "Å ablon Gettekst prevoda"
 
-#: ../src/dialogs/file-dialogs.c:76
+#: ../src/dialogs/gtr-file-dialogs.c:76
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs/header-dialog.c:270
+#: ../src/dialogs/gtr-header-dialog.c:236
 msgid "Edit Header"
 msgstr "Uredi zaglavlje"
 
-#: ../src/dialogs/header-dialog.ui.h:1
+#: ../src/dialogs/gtr-header-dialog.ui.h:1
 msgid "Char_set:"
 msgstr "Znakovni _skup:"
 
-#: ../src/dialogs/header-dialog.ui.h:2
+#: ../src/dialogs/gtr-header-dialog.ui.h:2
 msgid "Comment"
 msgstr "Napomena"
 
-#: ../src/dialogs/header-dialog.ui.h:3
+#: ../src/dialogs/gtr-header-dialog.ui.h:3
 msgid "Enc_oding:"
 msgstr "Kodiranje:"
 
-#: ../src/dialogs/header-dialog.ui.h:4
+#: ../src/dialogs/gtr-header-dialog.ui.h:4
 msgid "Language gro_up email:"
 msgstr "E-poÅ¡ta prevodilaÄ?ke _grupe:"
 
-#: ../src/dialogs/header-dialog.ui.h:5
+#: ../src/dialogs/gtr-header-dialog.ui.h:5
 msgid "Po file _revision date:"
 msgstr "Datum _revizije datoteke sa prevodom:"
 
-#: ../src/dialogs/header-dialog.ui.h:6
+#: ../src/dialogs/gtr-header-dialog.ui.h:6
 msgid "Pot _file creation date:"
 msgstr "Datum _stvaranja osnovne datoteke sa prevodom:"
 
-#: ../src/dialogs/header-dialog.ui.h:7
+#: ../src/dialogs/gtr-header-dialog.ui.h:7
 msgid "Project"
 msgstr "Projekat"
 
-#: ../src/dialogs/header-dialog.ui.h:8
+#: ../src/dialogs/gtr-header-dialog.ui.h:8
 msgid "Project Id _version:"
 msgstr "_Izdanje projekta:"
 
-#: ../src/dialogs/header-dialog.ui.h:9
-#| msgid "Report msgid _bugs to:"
+#: ../src/dialogs/gtr-header-dialog.ui.h:9
 msgid "Report message _bugs to:"
 msgstr "Prijavi greške u programu _na:"
 
-#: ../src/dialogs/header-dialog.ui.h:10
+#: ../src/dialogs/gtr-header-dialog.ui.h:10
 msgid "Translator and Language"
 msgstr "Prevodilac i jezik"
 
-#: ../src/dialogs/header-dialog.ui.h:11
+#: ../src/dialogs/gtr-header-dialog.ui.h:11
 msgid "Translator's _email:"
 msgstr "_E-pošta prevodioca:"
 
-#: ../src/dialogs/header-dialog.ui.h:12
+#: ../src/dialogs/gtr-header-dialog.ui.h:12
 msgid "Translator's _name:"
 msgstr "I_me prevodioca:"
 
-#: ../src/dialogs/header-dialog.ui.h:13
+#: ../src/dialogs/gtr-header-dialog.ui.h:13
 msgid "Use my options to complete the following entries:"
 msgstr "Koristi moje opcije za dovrÅ¡avanje sledeÄ?ih unosa:"
 
-#: ../src/dialogs/header-dialog.ui.h:14 ../src/dialogs/profile-dialog.ui.h:9
+#: ../src/dialogs/gtr-header-dialog.ui.h:14
+#: ../src/dialogs/gtr-profile-dialog.ui.h:9
 msgid "_Language:"
 msgstr "_Jezik:"
 
-#: ../src/dialogs/jump-dialog.c:91
-#| msgid "Go to the last message"
+#: ../src/dialogs/gtr-jump-dialog.c:91
 msgid "Go to Message"
 msgstr "Idi na poruku"
 
-#: ../src/dialogs/jump-dialog.ui.h:1
-msgid "<b>Enter message number:</b>"
-msgstr "<b>Unesite broj poruke:</b>"
-
-#: ../src/dialogs/preferences-dialog.c:554
-msgid "Active"
-msgstr "Aktivan"
+#: ../src/dialogs/gtr-jump-dialog.ui.h:1
+#| msgid "<b>Enter message number:</b>"
+msgid "Enter message number:"
+msgstr "Unesite broj poruke:"
 
-#: ../src/dialogs/preferences-dialog.c:1124
+#: ../src/dialogs/gtr-preferences-dialog.c:585
 msgid ""
 "<span weight=\"bold\" size=\"large\">Impossible to remove the active "
 "profile</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"large\">Ne mogu da uklonim aktivni profil</span>"
 
-#: ../src/dialogs/preferences-dialog.c:1129
+#: ../src/dialogs/gtr-preferences-dialog.c:589
 msgid "Another profile should be selected as active before"
 msgstr "Morate najpre aktivirati neki drugi profil"
 
-#: ../src/dialogs/preferences-dialog.c:1143
+#: ../src/dialogs/gtr-preferences-dialog.c:602
 msgid ""
 "<span weight=\"bold\" size=\"large\">Are you sure you want to delete this "
 "profile?</span>"
@@ -1327,326 +975,332 @@ msgstr ""
 "<span weight=\"bold\" size=\"large\">Da li želite da obrišete ovaj profil?</"
 "span>"
 
-#: ../src/dialogs/preferences-dialog.c:1181
-#: ../src/dialogs/preferences-dialog.ui.h:16
+#: ../src/dialogs/gtr-preferences-dialog.c:736
+msgid "Active"
+msgstr "Aktivan"
+
+#: ../src/dialogs/gtr-preferences-dialog.c:1189
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:14
 msgid "Gtranslator Preferences"
 msgstr "Postavke Gnomovog prevodioca"
 
-#: ../src/dialogs/preferences-dialog.ui.h:2
-#| msgid "<b>Anchor style</b>"
-msgid "<b>Anchor style:</b>"
-msgstr "<b>Izgled prikaÄ?enog:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:3
-msgid "<b>Autosave</b>"
-msgstr "<b>Automatsko Ä?uvanje</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:4
-#| msgid "<b>Configuration</b>"
-msgid "<b>Configuration:</b>"
-msgstr "<b>Podešavanje:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:5
-msgid "<b>Contents</b>"
-msgstr "<b>Sadržaj</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:6
-#| msgid "<b>Database</b>"
-msgid "<b>Database:</b>"
-msgstr "<b>Baza podataka:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:7
-msgid "<b>General</b>"
-msgstr "<b>Opšte</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:8
-#| msgid "<b>Scheme color</b>"
-msgid "<b>Scheme color:</b>"
-msgstr "<b>Å ema boja:</b>"
-
-#: ../src/dialogs/preferences-dialog.ui.h:9
-msgid "<b>Text Display</b>"
-msgstr "<b>Prikaz teksta</b>"
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:1
+msgid "    "
+msgstr "    "
 
-#: ../src/dialogs/preferences-dialog.ui.h:10
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:2
 msgid "Add to Database"
 msgstr "Dodaj u bazu podataka"
 
-#: ../src/dialogs/preferences-dialog.ui.h:11
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:3
+#| msgid "<b>Anchor style:</b>"
+msgid "Anchor style:"
+msgstr "Izgled prikaÄ?enog:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:4
+#| msgid "Autosave files"
+msgid "Autosave"
+msgstr "Sam saÄ?uvaj"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:5
 msgid "Check _spelling"
 msgstr "_Proveri pisanje"
 
-#: ../src/dialogs/preferences-dialog.ui.h:12
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:6
+#| msgid "Confirmation"
+msgid "Configuration:"
+msgstr "Podešavanje:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:7
+#| msgid "_Contents"
+msgid "Contents"
+msgstr "Sadržaj"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:8
 msgid "Create a _backup copy of files before saving"
 msgstr "Napravi _rezervnu kopiju pre Ä?uvanja"
 
-#: ../src/dialogs/preferences-dialog.ui.h:13
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:9
+#| msgid "<b>Database:</b>"
+msgid "Database:"
+msgstr "Baza podataka:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:10
 msgid "Editor"
 msgstr "UreÄ?ivanje"
 
-#: ../src/dialogs/preferences-dialog.ui.h:14
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:11
 msgid "Editor _font:"
 msgstr "_Font za tekst:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:15
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:12
 msgid "Files"
 msgstr "Datoteke"
 
-#: ../src/dialogs/preferences-dialog.ui.h:17
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:13
+#| msgid "<b>General</b>"
+msgid "General"
+msgstr "Opšte"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:15
 msgid "Interface"
 msgstr "SuÄ?elje"
 
-#: ../src/dialogs/preferences-dialog.ui.h:18
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:16
 msgid "Make _whitespace visible"
 msgstr "Prikaži _razmake izmeÄ?u reÄ?i"
 
-#: ../src/dialogs/preferences-dialog.ui.h:19
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:17
 msgid "Max. # of missing words:"
 msgstr "NajveÄ?i broj nedostajuÄ?ih reÄ?i:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:20
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:18
 msgid "Max. difference in sentence length:"
 msgstr "NajveÄ?a razlika u dužini reÄ?enice:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:21
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:19
 msgid "Plugins"
 msgstr "Dodaci"
 
-#: ../src/dialogs/preferences-dialog.ui.h:22
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:20
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../src/dialogs/preferences-dialog.ui.h:23
-msgid "Select directory contains PO files:"
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:21
+#| msgid "<b>Scheme color:</b>"
+msgid "Scheme color:"
+msgstr "Å ema boja:"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:22
+#| msgid "Select directory contains PO files:"
+msgid "Select the directory which contains PO files:"
 msgstr "Izaberite direktorijum sa PO datotekama:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:24 ../src/tab.c:662
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:23
+#| msgid "<b>Text Display</b>"
+msgid "Text Display"
+msgstr "Prikaz teksta"
+
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:24
 msgid "Translation Memory"
 msgstr "PrevodilaÄ?ka memorija"
 
-#: ../src/dialogs/preferences-dialog.ui.h:25
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:25
 msgid "Use _custom font"
 msgstr "_Koristi proizvoljan font"
 
-#: ../src/dialogs/preferences-dialog.ui.h:26
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:26
 msgid "Use only files with this name:"
 msgstr "Samo datoteke sa ovim imenom:"
 
-#: ../src/dialogs/preferences-dialog.ui.h:27
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:27
 msgid "_Autosave files every"
 msgstr "_Sam saÄ?uvaj datoteke nakon"
 
-#: ../src/dialogs/preferences-dialog.ui.h:28
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:28
 msgid "_Delete compiled GMO files"
 msgstr "Ukloni _binarne GMO datoteke"
 
-#: ../src/dialogs/preferences-dialog.ui.h:29
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:29
 msgid "_Highlight message syntax"
 msgstr "Is_takni sintaksu poruke"
 
-#: ../src/dialogs/preferences-dialog.ui.h:30
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:30
 msgid "_Remove fuzzy status if message is changed"
 msgstr "_OznaÄ?i nejasne poruke kao prevedene pri izmeni"
 
-#: ../src/dialogs/preferences-dialog.ui.h:31
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:31
 msgid "_Warn if PO file contains fuzzy translations"
 msgstr "_Upozori ukoliko datoteka sa prevodom sadrži nejasne poruke"
 
-#: ../src/dialogs/preferences-dialog.ui.h:32
+#: ../src/dialogs/gtr-preferences-dialog.ui.h:32
 msgid "_minutes"
 msgstr "_minuta"
 
-#: ../src/dialogs/profile-dialog.c:262
-msgid ""
-"<span weight=\"bold\" size=\"large\">The profile name already exists</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"large\">VeÄ? postoji profil sa ovim imenom</span>"
-
-#: ../src/dialogs/profile-dialog.c:375
-#| msgid "gtranslator Profile"
+#: ../src/dialogs/gtr-profile-dialog.c:85
 msgid "Gtranslator Profile"
 msgstr "Profil Gnomovog prevodioca"
 
-#: ../src/dialogs/profile-dialog.c:420
-msgid "Example: nplurals=2; plural=(n != 1);"
-msgstr ""
-"Primer: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-
-#: ../src/dialogs/profile-dialog.ui.h:1
-msgid "<b>Language Settings</b>"
-msgstr "<b>Podešavanje jezika</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:2
-msgid "<b>Profile Information</b>"
-msgstr "<b>Podaci o profilu</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:3
-msgid "<b>Translator Information</b>"
-msgstr "<b>Podaci o prevodiocu</b>"
-
-#: ../src/dialogs/profile-dialog.ui.h:4
+#: ../src/dialogs/gtr-profile-dialog.ui.h:1
 msgid "Character _set"
 msgstr "Znakovni _skup:"
 
-#: ../src/dialogs/profile-dialog.ui.h:5
+#: ../src/dialogs/gtr-profile-dialog.ui.h:2
+#| msgid "<b>Language Settings</b>"
+msgid "Language Settings"
+msgstr "Podešavanje jezika"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:3
 msgid "Language _code:"
 msgstr "_Oznaka jezika:"
 
-#: ../src/dialogs/profile-dialog.ui.h:6
+#: ../src/dialogs/gtr-profile-dialog.ui.h:4
 msgid "N_ame:"
 msgstr "_Ime:"
 
-#: ../src/dialogs/profile-dialog.ui.h:7
+#: ../src/dialogs/gtr-profile-dialog.ui.h:5
+#| msgid "<b>Profile Information</b>"
+msgid "Profile Information"
+msgstr "Podaci o profilu"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:6
 msgid "Transfer en_coding:"
 msgstr "_Koridanje:"
 
-#: ../src/dialogs/profile-dialog.ui.h:8
+#: ../src/dialogs/gtr-profile-dialog.ui.h:7
+#| msgid "<b>Translator Information</b>"
+msgid "Translator Information"
+msgstr "Podaci o prevodiocu"
+
+#: ../src/dialogs/gtr-profile-dialog.ui.h:8
 msgid "_Email:"
 msgstr "_E-pošta:"
 
-#: ../src/dialogs/profile-dialog.ui.h:10
+#: ../src/dialogs/gtr-profile-dialog.ui.h:10
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../src/dialogs/profile-dialog.ui.h:11
+#: ../src/dialogs/gtr-profile-dialog.ui.h:11
 msgid "_Plural forms:"
 msgstr "Oblici _množine:"
 
-#: ../src/dialogs/profile-dialog.ui.h:12
+#: ../src/dialogs/gtr-profile-dialog.ui.h:12
 msgid "_Team email:"
 msgstr "E-_pošta tima:"
 
-#: ../src/dialogs/search-dialog.c:332 ../src/dialogs/search-dialog.ui.h:4
+#: ../src/dialogs/gtr-search-dialog.c:328
+#: ../src/dialogs/gtr-search-dialog.ui.h:3
 msgid "Replace"
 msgstr "Zameni"
 
-#: ../src/dialogs/search-dialog.c:356
+#: ../src/dialogs/gtr-search-dialog.c:352
 msgid "Find"
 msgstr "PronaÄ?i"
 
-#: ../src/dialogs/search-dialog.c:471
+#: ../src/dialogs/gtr-search-dialog.c:463
 msgid "Replace _All"
 msgstr "Zameni _sve"
 
-#: ../src/dialogs/search-dialog.c:475
+#: ../src/dialogs/gtr-search-dialog.c:467
 msgid "_Replace"
 msgstr "Z_ameni"
 
-#: ../src/dialogs/search-dialog.ui.h:1
-msgid "Include fuzzy strings"
-msgstr "UkljuÄ?i i nejasne poruke"
+#: ../src/dialogs/gtr-search-dialog.ui.h:1
+#| msgid "Include fuzzy strings"
+msgid "Include fu_zzy strings"
+msgstr "UkljuÄ?i i _nejasne poruke"
 
-#: ../src/dialogs/search-dialog.ui.h:2
+#: ../src/dialogs/gtr-search-dialog.ui.h:2
 msgid "Match _entire word only"
 msgstr "Poklopi samo _cele reÄ?i"
 
-#: ../src/dialogs/search-dialog.ui.h:3
-msgid "Original text"
-msgstr "U izvornom tekstu"
-
-#: ../src/dialogs/search-dialog.ui.h:5
+#: ../src/dialogs/gtr-search-dialog.ui.h:4
 msgid "Replace All"
 msgstr "Zameni sve"
 
-#: ../src/dialogs/search-dialog.ui.h:6
+#: ../src/dialogs/gtr-search-dialog.ui.h:5
 msgid "Replace _with: "
 msgstr "Zameni _sa:"
 
-#: ../src/dialogs/search-dialog.ui.h:7
+#: ../src/dialogs/gtr-search-dialog.ui.h:6
 msgid "Search _backwards"
 msgstr "Traži u_nazad"
 
-#: ../src/dialogs/search-dialog.ui.h:8
-msgid "Translated text"
-msgstr "U prevedenom tekstu"
-
-#: ../src/dialogs/search-dialog.ui.h:9
+#: ../src/dialogs/gtr-search-dialog.ui.h:7
 msgid "_Match case"
 msgstr "_Poklopi velika i mala slova"
 
-#: ../src/dialogs/search-dialog.ui.h:10
+#: ../src/dialogs/gtr-search-dialog.ui.h:8
+#| msgid "Original text"
+msgid "_Original text"
+msgstr "U _izvornom tekstu"
+
+#: ../src/dialogs/gtr-search-dialog.ui.h:9
 msgid "_Search for: "
 msgstr "_NaÄ?i:"
 
-#: ../src/dialogs/search-dialog.ui.h:11
+#: ../src/dialogs/gtr-search-dialog.ui.h:10
+#| msgid "Translated text"
+msgid "_Translated text"
+msgstr "U pre_vedenom tekstu"
+
+#: ../src/dialogs/gtr-search-dialog.ui.h:11
 msgid "_Wrap around"
 msgstr "P_relamaj"
 
-#: ../src/main.c:54
+#: ../src/main.c:61
 msgid "[FILE...]"
 msgstr "[DATOTEKA...]"
 
-#: ../src/main.c:80
+#: ../src/main.c:64
+msgid "Create a new toplevel window in an existing instance of Gtranslator"
+msgstr "Obrazuje novi glavni prozor Gnomovog prevodioca"
+
+#: ../src/main.c:92
 #, c-format
 msgid "%s: malformed file name or URI.\n"
 msgstr "%s: loše zadato ime datoteke ili adresa.\n"
 
-#: ../src/main.c:148
+#: ../src/main.c:240
 msgid "Gtranslator"
 msgstr "Gnomov prevodilac"
 
 #. Setup command line options
-#: ../src/main.c:151
+#: ../src/main.c:244
 msgid "- Edit PO files"
 msgstr "â?? ureÄ?uje PO datoteku"
 
-#: ../src/main.c:165
+#: ../src/main.c:256
 #, c-format
 msgid "Error during GConf initialization: %s."
 msgstr "Greška prilikom pokretanja GKonfa: %s."
 
-#: ../src/main.c:187
+#: ../src/main.c:267
 #, c-format
-msgid "Error setting the default window icon: %s"
-msgstr "Greška prilikom postavljanja podrazumevane ikonice prozora: %s"
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Pokrenite â??%s --helpâ?? za spisak svih opcija naredbe.\n"
 
-#: ../src/message-table.c:273
+#: ../src/gtr-message-table.c:265
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/message-table.c:289
+#: ../src/gtr-message-table.c:281
 msgid "ID"
 msgstr "IB"
 
-#: ../src/message-table.c:308
+#: ../src/gtr-message-table.c:300
 msgid "Original Text"
 msgstr "Izvorni tekst"
 
-#: ../src/message-table.c:327
+#: ../src/gtr-message-table.c:319
 msgid "Translated Text"
 msgstr "Prevedeni tekst"
 
-#: ../src/notebook.c:90
-#, c-format
-msgid "<b>Path:</b> %s"
-msgstr "<b>Putanja:</b> %s"
-
-#: ../src/notebook.c:143
-msgid "Close document"
-msgstr "Zatvori dokument"
-
-#: ../src/po.c:403
+#: ../src/gtr-po.c:420
 #, c-format
 msgid "Failed opening file '%s': %s"
 msgstr "Ne mogu da otvorim datoteku â??%sâ??: %s"
 
-#: ../src/po.c:427
+#: ../src/gtr-po.c:444
 #, c-format
 msgid "The file is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/po.c:442
+#: ../src/gtr-po.c:459
 #, c-format
 msgid "Gettext returned a null message domain list."
 msgstr "Gettekst je vratio praznu poruku sa spiskom domena."
 
-#: ../src/po.c:598
+#: ../src/gtr-po.c:511
 #, c-format
 msgid "No messages obtained from parser."
 msgstr "Nisu dobivene poruke iz programa za obradu."
 
-#: ../src/po.c:900
+#: ../src/gtr-po.c:559
 #, c-format
 msgid ""
 "You are saving a file with a .pot extension.\n"
@@ -1658,93 +1312,95 @@ msgstr ""
 "prevoÄ?enja.\n"
 "VaÅ¡a datoteka bi trebala biti nazvana â??%s.poâ??."
 
-#: ../src/po.c:913
+#: ../src/gtr-po.c:572
 #, c-format
 msgid "The file %s is read-only, and can not be overwritten"
 msgstr "Datoteka â??%sâ?? se može samo Ä?itati, i ne možete je prepisati drugom"
 
-#: ../src/po.c:946
+#: ../src/gtr-po.c:603
 #, c-format
 msgid "There was an error writing the PO file: %s"
 msgstr "Došlo je do greške pri upisu PO datoteke: %s"
 
-#: ../src/plugin-system/plugin-manager.c:54
+#: ../src/plugin-system/gtr-plugin-manager.c:54
 msgid "Plugin"
 msgstr "Dodatak"
 
-#: ../src/plugin-system/plugin-manager.c:55
+#: ../src/plugin-system/gtr-plugin-manager.c:55
 msgid "Enabled"
 msgstr "UkljuÄ?en"
 
-#: ../src/plugin-system/plugin-manager.c:508
+#: ../src/plugin-system/gtr-plugin-manager.c:496
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/plugin-system/plugin-manager.c:514
+#: ../src/plugin-system/gtr-plugin-manager.c:502
 msgid "C_onfigure"
 msgstr "Po_desi"
 
-#: ../src/plugin-system/plugin-manager.c:523
+#: ../src/plugin-system/gtr-plugin-manager.c:510
 msgid "A_ctivate"
 msgstr "_UkljuÄ?i"
 
-#: ../src/plugin-system/plugin-manager.c:534
+#: ../src/plugin-system/gtr-plugin-manager.c:520
 msgid "Ac_tivate All"
 msgstr "U_kljuÄ?i sve"
 
-#: ../src/plugin-system/plugin-manager.c:538
+#: ../src/plugin-system/gtr-plugin-manager.c:524
 msgid "_Deactivate All"
 msgstr "_IskljuÄ?i sve"
 
-#: ../src/plugin-system/plugin-manager.c:777
+#: ../src/plugin-system/gtr-plugin-manager.c:762
 msgid "Active plugins"
 msgstr "UkljuÄ?eni dodaci"
 
-#: ../src/plugin-system/plugin-manager.c:806
+#: ../src/plugin-system/gtr-plugin-manager.c:791
 msgid "_About Plugin"
 msgstr "O _dodatku"
 
-#: ../src/plugin-system/plugin-manager.c:811
+#: ../src/plugin-system/gtr-plugin-manager.c:795
 msgid "C_onfigure Plugin"
 msgstr "_Podesi dodatak"
 
-#: ../src/statusbar.c:118 ../src/statusbar.c:249
+#: ../src/gtr-statusbar.c:117 ../src/gtr-statusbar.c:246
 msgid "INS"
 msgstr "INS"
 
-#: ../src/statusbar.c:119 ../src/statusbar.c:245
+#: ../src/gtr-statusbar.c:118 ../src/gtr-statusbar.c:242
 msgid "OVR"
 msgstr "OVR"
 
-#: ../src/tab.c:223
+#: ../src/gtr-tab.c:209
 msgid "There is an error in the message:"
 msgstr "Postoji greška u poruci:"
 
-#: ../src/tab.c:398
-msgid "Open comment dialog"
-msgstr "Otvara prozorÄ?e za napomenama"
-
-#: ../src/tab.c:576
+#: ../src/gtr-tab.c:527
 #, c-format
 msgid "Plural %d"
 msgstr "Množina %d"
 
-#: ../src/tab.c:621
-msgid "Message Table"
-msgstr "Površ za poruke"
-
-#: ../src/tab.c:653
-msgid "Context"
-msgstr "Pojava"
-
-#: ../src/tab.c:692
+#: ../src/gtr-tab.c:589
 msgid "<b>Original Text:</b>"
 msgstr "<b>Izvorni tekst:</b>"
 
-#: ../src/tab.c:753
+#: ../src/gtr-tab.c:648
 msgid "<b>Translate_d Text:</b>"
 msgstr "<b>Prevedeni _tekst:</b>"
 
+#: ../src/gtr-tab.c:698
+msgid "Context"
+msgstr "Pojava"
+
+#. Translators: Path to the document opened
+#: ../src/gtr-tab.c:1132
+#| msgid "Paths:\n"
+msgid "Path:"
+msgstr "Putanja:"
+
+#: ../src/gtr-tab-label.c:275
+msgid "Close document"
+msgstr "Zatvori dokument"
+
 #. Translaters: This string is for a toggle to display a toolbar.
 #. * The name of the toolbar is automatically computed from the widgets
 #. * on the toolbar, and is placed at the %s. Note the _ before the %s
@@ -1752,90 +1408,80 @@ msgstr "<b>Prevedeni _tekst:</b>"
 #. * produce duplicates, but don't worry about it. If your language
 #. * normally has a mnemonic at the start, please use the _. If not,
 #. * please remove.
-#: ../src/toolbareditor/egg-editable-toolbar.c:939
+#: ../src/toolbareditor/egg-editable-toolbar.c:934
 #, c-format
 msgid "Show â??_%sâ??"
 msgstr "Prikaži â??_%sâ??"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1405
+#: ../src/toolbareditor/egg-editable-toolbar.c:1397
 msgid "_Move on Toolbar"
 msgstr "_Premesti na paletu alatki"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1406
+#: ../src/toolbareditor/egg-editable-toolbar.c:1398
 msgid "Move the selected item on the toolbar"
 msgstr "PremeÅ¡ta oznaÄ?enu stavku na paletu sa alatkama"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1407
+#: ../src/toolbareditor/egg-editable-toolbar.c:1399
 msgid "_Remove from Toolbar"
 msgstr "_Ukloni sa palete alatki"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1408
+#: ../src/toolbareditor/egg-editable-toolbar.c:1400
 msgid "Remove the selected item from the toolbar"
 msgstr "Uklanja izabranu stavku iz palete sa alatkama"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1410
+#: ../src/toolbareditor/egg-editable-toolbar.c:1401
 msgid "_Delete Toolbar"
 msgstr "_Obriši paletu alatki"
 
-#: ../src/toolbareditor/egg-editable-toolbar.c:1411
+#: ../src/toolbareditor/egg-editable-toolbar.c:1402
 msgid "Remove the selected toolbar"
 msgstr "Uklanja izabranu paletu sa alatkama"
 
-#: ../src/toolbareditor/egg-toolbar-editor.c:475
+#: ../src/toolbareditor/egg-toolbar-editor.c:485
 msgid "Separator"
 msgstr "Razdvojnik"
 
-#: ../src/translation-memory/berkeley/db-base.c:157
-msgid "Running recovery..."
-msgstr "VraÄ?am podatke..."
-
-#: ../src/translation-memory/berkeley/db-base.c:166
-#, c-format
-msgid "There was an error recovering the database: %s"
-msgstr "DoÅ¡lo je do greÅ¡ke priliko vraÄ?anja baze podataka: %s"
-
-#: ../src/translation-memory/berkeley/db-base.c:174
-#, c-format
-msgid "There was an error in database: %s"
-msgstr "Došlo je do greške u bazi podataka: %s"
-
-#: ../src/translation-memory/translation-memory-ui.c:212
+#: ../src/translation-memory/gtr-translation-memory-ui.c:227
 #, c-format
 msgid "Insert Option nº %d"
 msgstr "Opcija umetanja nº %d"
 
-#: ../src/translation-memory/translation-memory-ui.c:290
+#: ../src/translation-memory/gtr-translation-memory-ui.c:381
+#| msgid "Gettext translation"
+msgid "_Use this translation"
+msgstr "_Koristi ovaj prevod"
+
+#: ../src/translation-memory/gtr-translation-memory-ui.c:386
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../src/translation-memory/gtr-translation-memory-ui.c:503
 msgid "Shortcut"
 msgstr "PreÄ?ica"
 
-#: ../src/translation-memory/translation-memory-ui.c:299
+#: ../src/translation-memory/gtr-translation-memory-ui.c:512
 msgid "Level"
 msgstr "Nivo"
 
-#: ../src/translation-memory/translation-memory-ui.c:308
+#: ../src/translation-memory/gtr-translation-memory-ui.c:521
 msgid "String"
 msgstr "Niska"
 
-#: ../src/utils.c:307
+#: ../src/gtr-utils.c:307
 msgid "Please check your installation."
 msgstr "Proverite vašu instalaciju."
 
-#: ../src/utils.c:368
+#: ../src/gtr-utils.c:368
 #, c-format
-#| msgid "Unable to find file %s."
 msgid "Unable to open ui file %s. Error: %s"
 msgstr "Ne mogu da otvorim datoteku suÄ?elja %s. GreÅ¡ka: %s"
 
-#: ../src/utils.c:388
+#: ../src/gtr-utils.c:388
 #, c-format
-#| msgid "Unable to find the required widgets inside file %s."
 msgid "Unable to find the object '%s' inside file %s."
 msgstr "Ne mogu da pronaÄ?em objekat â??%sâ?? unutar datoteke %s."
 
-#: ../src/utils.c:812
-#| msgid ""
-#| "Unable to display help. Please make sure Gtranslator documentation "
-#| "package is installed."
+#: ../src/gtr-utils.c:812
 msgid ""
 "Unable to display help. Please make sure the Gtranslator documentation "
 "package is installed."
@@ -1843,12 +1489,12 @@ msgstr ""
 "Ne mogu da prikažem pomoÄ?. Proverite da li je instaliran paket za pomoÄ? u "
 "Gnomovom prevodiocu."
 
-#: ../src/view.c:79
+#: ../src/gtr-view.c:80
 #, c-format
 msgid "gtkspell error: %s\n"
 msgstr "gtkspell greška: %s\n"
 
-#: ../src/view.c:81
+#: ../src/gtr-view.c:82
 #, c-format
 msgid ""
 "GtkSpell was unable to initialize.\n"
@@ -1857,371 +1503,676 @@ msgstr ""
 "Ne mogu da pokrenem GtkSpell.\n"
 " %s"
 
-#: ../src/window.c:113
+#: ../src/gtr-window.c:123
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/window.c:114
+#: ../src/gtr-window.c:124
 msgid "_Edit"
 msgstr "_UreÄ?ivanje"
 
-#: ../src/window.c:115
+#: ../src/gtr-window.c:125
 msgid "_View"
 msgstr "P_regled"
 
-#. { "Bookmarks", NULL, N_("_Bookmarks") },
-#. { "Actions", NULL, N_("_Actions") },
-#: ../src/window.c:118
+#: ../src/gtr-window.c:126
 msgid "_Search"
 msgstr "Pr_etraga"
 
-#: ../src/window.c:119
+#: ../src/gtr-window.c:127
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../src/window.c:120
-#| msgid "Documents"
+#: ../src/gtr-window.c:128
 msgid "_Documents"
 msgstr "Doku_menti"
 
-#: ../src/window.c:121
+#: ../src/gtr-window.c:129
 msgid "_Help"
 msgstr "_PomoÄ?"
 
-#: ../src/window.c:125
+#: ../src/gtr-window.c:133
 msgid "Open a PO file"
 msgstr "Otvori datoteku sa prevodom"
 
-#: ../src/window.c:127
+#: ../src/gtr-window.c:135
 msgid "_Recent Files"
 msgstr "_Skorašnje datoteke"
 
-#: ../src/window.c:130
+#: ../src/gtr-window.c:138
 msgid "Quit the program"
 msgstr "Izlazi iz programa"
 
 #. Edit menu
-#: ../src/window.c:134
+#: ../src/gtr-window.c:142
 msgid "T_oolbar"
 msgstr "_Alatnica"
 
-#: ../src/window.c:137
+#: ../src/gtr-window.c:145
 msgid "Edit gtranslator preferences"
 msgstr "UreÄ?uje podeÅ¡avanja Gnomovog prevodioca"
 
-#: ../src/window.c:139 ../src/window.c:186
+#: ../src/gtr-window.c:147 ../src/gtr-window.c:193
 msgid "_Header..."
 msgstr "Zaglavlje..."
 
 #. Help menu
-#: ../src/window.c:143
+#: ../src/gtr-window.c:151
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/window.c:155
+#: ../src/gtr-window.c:162
 msgid "Save the current file"
 msgstr "Ä?uva trenutnu datoteku"
 
-#: ../src/window.c:158
+#: ../src/gtr-window.c:165
 msgid "Save the current file with another name"
 msgstr "Ä?uva trenutnu datoteku pod drugim imenom"
 
-#: ../src/window.c:164
+#: ../src/gtr-window.c:171
 msgid "Close the current file"
 msgstr "Zatvara trenutnu datoteku"
 
-#: ../src/window.c:169
+#: ../src/gtr-window.c:176
 msgid "Undo last operation"
 msgstr "Poništava poslednju radnju"
 
-#: ../src/window.c:172
+#: ../src/gtr-window.c:179
 msgid "Redo last undone operation"
 msgstr "VraÄ?a poslednju poniÅ¡tenu radnju"
 
-#: ../src/window.c:175
+#: ../src/gtr-window.c:182
 msgid "Cut the selected text"
 msgstr "Iseca izabrani tekst i premešta ga u ostavu"
 
-#: ../src/window.c:178
+#: ../src/gtr-window.c:185
 msgid "Copy the selected text"
 msgstr "Umnožava izabrani tekst u ostavu"
 
-#: ../src/window.c:181
+#: ../src/gtr-window.c:188
 msgid "Paste the contents of the clipboard"
 msgstr "UmeÄ?e sadržaj iz ostave"
 
-#: ../src/window.c:184
+#: ../src/gtr-window.c:191
 msgid "Clear the selected translation"
 msgstr "Briše izabranu poruku prevoda"
 
-#: ../src/window.c:188
-msgid "C_omment..."
-msgstr "_Napomena..."
-
-#: ../src/window.c:189
-msgid "Edit message comment"
-msgstr "Uredite napomenu poruke"
-
-#: ../src/window.c:191
+#: ../src/gtr-window.c:195
 msgid "Copy _Message to Translation"
 msgstr "Prepi_Å¡i poruku u prevod"
 
-#: ../src/window.c:193
+#: ../src/gtr-window.c:197
 msgid "Copy original message contents to the translation field"
 msgstr "Kopira sadržaj izvorne poruke u njen prevod"
 
-#: ../src/window.c:195
+#: ../src/gtr-window.c:199
 msgid "Toggle _Fuzzy Status"
 msgstr "P_romeni stanje nejasne poruke"
 
-#: ../src/window.c:196
+#: ../src/gtr-window.c:200
 msgid "Toggle fuzzy status of a message"
 msgstr "Promeni status nejasne poruke"
 
-#: ../src/window.c:198 ../src/window.c:206
+#: ../src/gtr-window.c:202
 msgid "_Translation Memory"
 msgstr "PrevodilaÄ?ka _memorija"
 
 #. View menu
-#: ../src/window.c:203
+#: ../src/gtr-window.c:207
 msgid "_Context"
 msgstr "_Pojava"
 
-#: ../src/window.c:204
+#: ../src/gtr-window.c:208
 msgid "Show the Context panel"
 msgstr "Prikazuje površ sa mestom gde se prevod javlja u programu"
 
-#: ../src/window.c:207
-msgid "Show the Translation Memory panel"
-msgstr "Prikazuje povrÅ¡ sa prevodilaÄ?kom memorijom"
-
-#. { "ViewSidePane", NULL, N_("Side _Pane"), "F9",
-#. N_("Show or hide the side pane in the current window"),
-#. NULL },
-#. Bookmarks menu
-#. { "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",
-#. N_("Add a bookmark to the current message"), NULL},
-#. { "BookmarksEdit", GTK_STOCK_EDIT, N_("_Edit Bookmarks"), "<control>B",
-#. N_("Edit stored bookmarks"), NULL},
-#. Action menu
-#. { "ActionsCompile", GTK_STOCK_CONVERT, N_("_Compile"), NULL,
-#. N_("Compile the current file to a MO file"), NULL },
-#. { "ActionsRefresh", GTK_STOCK_REFRESH, NULL, NULL,
-#. N_("  "), NULL },
-#. //G_CALLBACK(gtranslator_bookmark_adding_dialog) },
-#. { "ActionsAutotranslate", NULL, N_("Aut_otranslate..."), NULL,
-#. N_("Autotranslate the current file using a translation memory"), NULL},
-#. //G_CALLBACK(gtranslator_auto_translation_dialog) },
-#. { "ActionsRemoveTranslations", GTK_STOCK_REMOVE, N_("Remo_ve All Translations..."), NULL,
-#. N_("Remove all existing translations"), NULL},
-#. //G_CALLBACK(gtranslator_remove_all_translations_dialog) },
 #. Go menu
-#: ../src/window.c:233
-#| msgid "Previ_ous Untranslated"
+#: ../src/gtr-window.c:212
 msgid "_Previous Message"
 msgstr "Prethodna por_uka"
 
-#: ../src/window.c:234
+#: ../src/gtr-window.c:213
 msgid "Move back one message"
 msgstr "Ide na prethodnu poruku"
 
-#: ../src/window.c:236
-#| msgid "_Next Tag"
+#: ../src/gtr-window.c:215
 msgid "_Next Message"
 msgstr "SledeÄ?a poru_ka"
 
-#: ../src/window.c:237
+#: ../src/gtr-window.c:216
 msgid "Move forward one message"
 msgstr "Ide na sledeÄ?u poruku"
 
-#: ../src/window.c:239
-#| msgid "_Go to..."
+#: ../src/gtr-window.c:218
 msgid "_Go to Message..."
 msgstr "_Idi na poruku..."
 
-#: ../src/window.c:240
+#: ../src/gtr-window.c:219
 msgid "Jumps to a specific message"
 msgstr "Idi do odreÄ?enog broja poruke"
 
-#: ../src/window.c:242
-#| msgid "_First"
+#: ../src/gtr-window.c:221
 msgid "_First Message"
 msgstr "Pr_va poruka"
 
-#: ../src/window.c:243
+#: ../src/gtr-window.c:222
 msgid "Go to the first message"
 msgstr "Ide na prvu poruku u prevodu"
 
-#: ../src/window.c:245
+#: ../src/gtr-window.c:224
 msgid "_Last Message"
 msgstr "Posle_dnja poruka"
 
-#: ../src/window.c:246
+#: ../src/gtr-window.c:225
 msgid "Go to the last message"
 msgstr "Ide na poslednju poruku u prevodu"
 
-#: ../src/window.c:248
+#: ../src/gtr-window.c:227
 msgid "Next Fuz_zy"
 msgstr "SledeÄ?a _nejasna"
 
-#: ../src/window.c:249
+#: ../src/gtr-window.c:228
 msgid "Go to the next fuzzy message"
 msgstr "Ide na sledeÄ?u nejasnu poruku"
 
-#: ../src/window.c:251
+#: ../src/gtr-window.c:230
 msgid "Previous Fuzz_y"
 msgstr "Prethodna n_ejasna"
 
-#: ../src/window.c:252
+#: ../src/gtr-window.c:231
 msgid "Go to the previous fuzzy message"
 msgstr "Ide na prethodnu nejasnu poruku"
 
-#: ../src/window.c:254
+#: ../src/gtr-window.c:233
 msgid "Next _Untranslated"
 msgstr "S_ledeÄ?a neprevedena"
 
-#: ../src/window.c:255
+#: ../src/gtr-window.c:234
 msgid "Go to the next untranslated message"
 msgstr "Ide na sledeÄ?u neprevedenu poruku"
 
-#: ../src/window.c:258
+#: ../src/gtr-window.c:237
 msgid "Previ_ous Untranslated"
 msgstr "P_rethodna neprevedena"
 
-#: ../src/window.c:259
+#: ../src/gtr-window.c:238
 msgid "Go to the previous untranslated message"
 msgstr "Ide na prethodnu neprevedenu poruku"
 
-#: ../src/window.c:262
+#: ../src/gtr-window.c:241
 msgid "Next Fu_zzy or Untranslated"
 msgstr "_SledeÄ?a nejasna ili neprevedena"
 
-#: ../src/window.c:264
+#: ../src/gtr-window.c:243
 msgid "Go to the next fuzzy or untranslated message"
 msgstr "Ide na sledeÄ?u nejasnu ili neprevedenu poruku"
 
-#: ../src/window.c:267
+#: ../src/gtr-window.c:246
 msgid "Pre_vious Fuzzy or Untranslated"
 msgstr "_Prethodna nejasna ili neprevedena"
 
-#: ../src/window.c:269
+#: ../src/gtr-window.c:248
 msgid "Go to the previous fuzzy or untranslated message"
 msgstr "Ide na prethodnu nejasnu ili neprevedenu poruku"
 
-#: ../src/window.c:274
+#: ../src/gtr-window.c:253
 msgid "Search for text"
 msgstr "Traži željeni tekst u prevodu"
 
-#: ../src/window.c:283
+#: ../src/gtr-window.c:256
 msgid "Search for and replace text"
 msgstr "Traži željeni tekst u prevodu i menja ga"
 
 #. Documents menu
-#: ../src/window.c:287
-#| msgid "_Deactivate All"
+#: ../src/gtr-window.c:260
 msgid "_Save All"
 msgstr "_SaÄ?uvaj sve"
 
-#: ../src/window.c:288
-#| msgid "Save the current file"
+#: ../src/gtr-window.c:261
 msgid "Save all open files"
 msgstr "Ä?uva sve otvorene datoteke"
 
-#: ../src/window.c:290
+#: ../src/gtr-window.c:263
 msgid "_Close All"
 msgstr "_Zatvori sve"
 
-#: ../src/window.c:291
-#| msgid "Close the current file"
+#: ../src/gtr-window.c:264
 msgid "Close all open files"
 msgstr "Zatvara sve otvorene datoteke"
 
-#: ../src/window.c:293
-#| msgid "Previous Developers"
+#: ../src/gtr-window.c:266
 msgid "_Previous Document"
 msgstr "_Prethodni dokument"
 
-#: ../src/window.c:295
+#: ../src/gtr-window.c:268
 msgid "Activate previous document"
 msgstr "Prikazuje prethodni dokument"
 
-#: ../src/window.c:297
-#| msgid "Documents"
+#: ../src/gtr-window.c:270
 msgid "_Next Document"
 msgstr "_Naredni dokument"
 
-#: ../src/window.c:299
+#: ../src/gtr-window.c:272
 msgid "Activate next document"
 msgstr "Prikazuje naredni dokument"
 
-#: ../src/window.c:764
+#: ../src/gtr-window.c:705
 msgid "Untranslated"
 msgstr "neprevedena"
 
-#: ../src/window.c:767
+#: ../src/gtr-window.c:708
 msgid "Translated"
 msgstr "prevedena"
 
-#: ../src/window.c:770
+#: ../src/gtr-window.c:711
 msgid "Fuzzy"
 msgstr "nejasna"
 
-#: ../src/window.c:777
+#: ../src/gtr-window.c:718
 #, c-format
 msgid "Current: %d"
 msgstr "Poruka br. %d"
 
-#: ../src/window.c:778
+#: ../src/gtr-window.c:719
 #, c-format
-#| msgid "Translated"
-msgid "Total: %d translated"
-msgstr "Ukupno ima: %d poruka"
+msgid "Total: %d"
+msgstr "Ukupno ima: %d"
 
-#: ../src/window.c:779
+#: ../src/gtr-window.c:720
+#, c-format
+#| msgid "%d untranslated"
+msgid "%d translated"
+msgid_plural "%d translated"
+msgstr[0] "%d prevedena"
+msgstr[1] "%d prevedene"
+msgstr[2] "%d prevedenih"
+msgstr[3] "%d prevedena"
+
+#: ../src/gtr-window.c:723
 #, c-format
-#| msgid "Fuzzy"
+#| msgid "%d fuzzy"
 msgid "%d fuzzy"
-msgstr "%d nejasnih"
+msgid_plural "%d fuzzy"
+msgstr[0] "%d nejasna"
+msgstr[1] "%d nejasne"
+msgstr[2] "%d nejasnih"
+msgstr[3] "%d nejasna"
 
-#: ../src/window.c:780
+#: ../src/gtr-window.c:725
 #, c-format
-#| msgid "Untranslated"
+#| msgid "%d untranslated"
 msgid "%d untranslated"
-msgstr "%d neprevedenih"
+msgid_plural "%d untranslated"
+msgstr[0] "%d neprevedena"
+msgstr[1] "%d neprevedene"
+msgstr[2] "%d neprevedenih"
+msgstr[3] "%d neprevedena"
 
 #. Translators: %s is a URI
-#: ../src/window.c:839
+#: ../src/gtr-window.c:779
 #, c-format
-#| msgid "A_ctivate"
 msgid "Activate '%s'"
 msgstr "Prikaži â??%sâ??"
 
-#. FIXME: We are leaking a lot here
-#.
-#. * Translators: The title of the window when there is only one tab
-#.
-#: ../src/window.c:1016 ../src/window.c:1022
+#. Translators: this is the title of the window with a modified document
+#: ../src/gtr-window.c:953
 #, c-format
-msgid "gtranslator - %s"
-msgstr "Gnomov prevodilac â?? %s"
+#| msgid "gtranslator"
+msgid "*%s - gtranslator"
+msgstr "*%s â?? Gnomov prevodilac"
 
-#: ../src/window.c:1019
+#. Translators: this is the title of the window with a document opened
+#: ../src/gtr-window.c:956
 #, c-format
-msgid "gtranslator - *%s"
-msgstr "Gnomov prevodilac â?? %s"
+#| msgid "gtranslator"
+msgid "%s - gtranslator"
+msgstr "%s â?? Gnomov prevodilac"
 
-#: ../src/window.c:1027
+#: ../src/gtr-window.c:962
 msgid "gtranslator"
 msgstr "Gnomov prevodilac"
 
-#: ../src/window.c:1389
+#: ../src/gtr-window.c:1336
 msgid "Toolbar Editor"
 msgstr "Urednik palete sa alatima"
 
-#: ../src/window.c:1700
+#: ../src/gtr-window.c:1462
+#| msgid "Profile"
+msgid "No profile"
+msgstr "Nema profila"
+
+#: ../src/gtr-window.c:1485
+msgid "Profile for the active document"
+msgstr "Profil za trenutni dokument"
+
+#: ../src/gtr-window.c:1833
 msgid "Documents"
 msgstr "Dokumenti"
 
+#~ msgid "     "
+#~ msgstr "     "
+
+#~ msgid "Subversion: Checkout complete."
+#~ msgstr "Subverzija: zavrÅ¡eno je usklaÄ?ivanje"
+
+#~| msgid "Please, add a directory path to make the checkout"
+#~ msgid "Please add a directory path to make the checkout"
+#~ msgstr "Dodajte putanju direktorijuma radi usklaÄ?ivanja"
+
+#~| msgid "Please, add a Subversion URL"
+#~ msgid "Please add a Subversion URL"
+#~ msgstr "Dodajte adresu Subverzije"
+
+#~ msgid "Checkout repository"
+#~ msgstr "Uskladi riznicu"
+
+#~ msgid "Subversion: Commit complete."
+#~ msgstr "Subverzija: završeno je slanje."
+
+#~ msgctxt "ChangeLog entry"
+#~ msgid "LANGUAGE"
+#~ msgstr "JEZIK"
+
+#~| msgid "The ChangeLog file '%s' does not exists"
+#~ msgid "The ChangeLog file '%s' does not exist"
+#~ msgstr "Ne postoji ChangeLog datoteka â??%sâ??"
+
+#~ msgid "Are you sure that you want to pass an empty log message?"
+#~ msgstr "Da li ste sigurno želite da ubacite praznu poruku iz dnevnika?"
+
+#~ msgid "You have to select at least one file to send"
+#~ msgstr "Morate izabrati bar jednu datoteku za slanje"
+
+#~ msgid "Commit Changes"
+#~ msgstr "Pošalji izmene"
+
+#~ msgid "Subversion: Diff complete."
+#~ msgstr "Subverzija: napravljene su razlike."
+
+#~| msgid "Please, install %s to be able to diff the file"
+#~ msgid "Please install %s to be able to diff the file"
+#~ msgstr "Instalirajte %s kako bi mogli da naÄ?ete razlike izmeÄ?u datoteka"
+
+#~ msgid "Diff file"
+#~ msgstr "Datoteka sa razlikama"
+
+#~ msgid "Diff"
+#~ msgstr "Razlike"
+
+#~ msgid "Subversion: File will be added on next commit."
+#~ msgstr "Subverzija: datoteka Ä?e biti dodata pri sledeÄ?em slanju."
+
+#~ msgid "_Update"
+#~ msgstr "_Ažuriraj"
+
+#~ msgid "Sync your local copy with the Subversion tree"
+#~ msgstr "Ažurira vašu lokalnu kopiju prema riznici Subverzije"
+
+#~ msgid "_Commit"
+#~ msgstr "_Pošalji"
+
+#~ msgid "Commit your changes to the Subversion tree"
+#~ msgstr "Šalje vaše izmene u Subverzijinu riznicu"
+
+#~ msgid "_Add"
+#~ msgstr "_Dodaj"
+
+#~ msgid "Add a new file/directory to the Subversion tree"
+#~ msgstr "Dodaje novu datoteku/direktorijum u Subverzijinu riznicu"
+
+#~ msgid "_Diff"
+#~ msgstr "_Napravi razlike"
+
+#~ msgid "Diff local PO file with repository PO file"
+#~ msgstr "Ispisuje razlike izmeÄ?u vaÅ¡e i PO datoteke u riznici"
+
+#~ msgid "C_heckout"
+#~ msgstr "_Uskladi"
+
+#~ msgid "Get a new repository copy"
+#~ msgstr "Preuzima novu kopiju riznice"
+
+#~ msgid "S_ubversion"
+#~ msgstr "_Subverzija"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "        "
+#~ msgstr "        "
+
+#~ msgid "<b>Diff options:</b>"
+#~ msgstr "<b>Opcije za razlike:</b>"
+
+#~ msgid "<b>Diff program:</b>"
+#~ msgstr "<b>Program za razlike:</b>"
+
+#~ msgid "<b>Directory to checkout:</b>"
+#~ msgstr "<b>Direktorijum za usklaÄ?ivanje:</b>"
+
+#~ msgid "<b>Directory to update:</b>"
+#~ msgstr "<b>Direktorijum za ažuriranje:</b>"
+
+#~ msgid "<b>Information:</b>"
+#~ msgstr "<b>Podaci:</b>"
+
+#~ msgid "<b>Log Message:</b>"
+#~ msgstr "<b>Poruka za dnevnik:</b>"
+
+#~ msgid "<b>Password:</b>"
+#~ msgstr "<b>Lozinka:</b>"
+
+#~ msgid "<b>Realm:</b>"
+#~ msgstr "<b>Domen:</b>"
+
+#~ msgid "<b>Select files to Commit:</b>"
+#~ msgstr "<b>Datoteke za slanje:</b>"
+
+#~ msgid "<b>Subversion URL:</b>"
+#~ msgstr "<b>Adresa Subverzije:</b>"
+
+#~ msgid "<b>Username:</b>"
+#~ msgstr "<b>KorisniÄ?ko ime:</b>"
+
+#~ msgid "Add Log Message to ChangeLog file"
+#~ msgstr "Dodaj poruku u dnevnik (ChangeLog datoteka)"
+
+#~ msgid "Line argument:"
+#~ msgstr "Argument linije:"
+
+#~ msgid "Program name:"
+#~ msgstr "Ime programa:"
+
+#~ msgid "Remember Password"
+#~ msgstr "Upamti lozinku"
+
+#~ msgid "Remember this decision"
+#~ msgstr "Upamti ovu odluku"
+
+#~ msgid "Repository authorization"
+#~ msgstr "Prijava na riznicu"
+
+#~ msgid "Retrieving status..."
+#~ msgstr "Preuzimam stanje..."
+
+#~ msgid "Save the diff file"
+#~ msgstr "SaÄ?uvaj datoteku sa razlikama"
+
+#~ msgid "Send Changes"
+#~ msgstr "Pošalji izmene"
+
+#~ msgid "Update repository"
+#~ msgstr "Ažuriraj skladište"
+
+#~ msgid "Use configured program to view the diff"
+#~ msgstr "Koristi podešeni program za pregled razlika"
+
+#~ msgid "label"
+#~ msgstr "natpis"
+
+#~ msgid "A Subversion client plugin based on libsvn."
+#~ msgstr "Dodatak za Subverziju koji se oslanja na libsvn."
+
+#~ msgid "Subversion"
+#~ msgstr "Subverzija"
+
+#~ msgid "Authentication canceled"
+#~ msgstr "Prijava je otkazana"
+
+#~ msgid "Hostname:"
+#~ msgstr "Ime domaÄ?ina:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "Otisak prsta:"
+
+#~ msgid "Valid from:"
+#~ msgstr "Važi od:"
+
+#~ msgid "Valid until:"
+#~ msgstr "Važi do:"
+
+#~ msgid "Issuer DN:"
+#~ msgstr "DN izdavaÄ?a:"
+
+#~ msgid "DER certificate:"
+#~ msgstr "DER sertifikat:"
+
+#~ msgid "Deleted: %s"
+#~ msgstr "Obrisan: %s"
+
+#~ msgid "Added: %s"
+#~ msgstr "Dodat: %s"
+
+#~ msgid "Reverted: %s"
+#~ msgstr "VraÄ?en: %s"
+
+#~ msgid "Revert failed: %s"
+#~ msgstr "Nije uspelo vraÄ?anje: %s"
+
+#~ msgid "Resolved: %s"
+#~ msgstr "Razrešen: %s"
+
+#~ msgid "Updated: %s"
+#~ msgstr "Ažuriran: %s"
+
+#~ msgid "Externally Updated: %s"
+#~ msgstr "Ažurirano drugim programom: %s"
+
+#~ msgid "Commit Modified: %s"
+#~ msgstr "Izmenjeno za slanje: %s"
+
+#~ msgid "Commit Added: %s"
+#~ msgstr "Dodato za slanje: %s"
+
+#~ msgid "Commit Deleted: %s"
+#~ msgstr "Obrisano za slanje: %s"
+
+#~ msgid "Commit Replaced: %s"
+#~ msgstr "Zamenjeno za slanje: %s"
+
+#~ msgid "Created File: %s"
+#~ msgstr "Napravljena datoteka: %s"
+
+#~ msgid "Modified: %s"
+#~ msgstr "Izmenjeno: %s"
+
+#~ msgid "Merged: %s"
+#~ msgstr "Spojeno: %s"
+
+#~ msgid "Conflicted: %s"
+#~ msgstr "Sukobljeni: %s"
+
+#~ msgid "Missing: %s"
+#~ msgstr "Nedostaje: %s"
+
+#~ msgid "Obstructed: %s"
+#~ msgstr "SpreÄ?eno: %s"
+
+#~ msgid "Updated to revision %ld."
+#~ msgstr "Ažurirano na reviziju br. %ld."
+
+#~ msgid "Subversion: Update complete."
+#~ msgstr "Subverzija: završeno je ažuriranje"
+
+#~ msgid "Modified"
+#~ msgstr "Izmenjena"
+
+#~ msgid "Deleted"
+#~ msgstr "Obrisano"
+
+#~ msgid "Conflicted"
+#~ msgstr "Sukobljavanje"
+
+#~ msgid "Missing"
+#~ msgstr "NedostajuÄ?a"
+
+#~ msgid "Failed to write profile data into profiles file '%s'"
+#~ msgstr "Ne mogu da upiÅ¡em podatke u datoteku sa profilom â??%sâ??"
+
+#~ msgid "Edit Comment"
+#~ msgstr "Izmena napomene"
+
+#~| msgid "<b>Write your comments below:</b>"
+#~ msgid "<b>Write your comments bellow:</b>"
+#~ msgstr "<b>Upišite napomene ispod:</b>"
+
+#~ msgid "<b>Autosave</b>"
+#~ msgstr "<b>Automatsko Ä?uvanje</b>"
+
+#~| msgid "<b>Configuration</b>"
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>Podešavanje:</b>"
+
+#~ msgid "<b>Contents</b>"
+#~ msgstr "<b>Sadržaj</b>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"large\">The profile name already exists</"
+#~ "span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"large\">VeÄ? postoji profil sa ovim imenom</"
+#~ "span>"
+
+#~ msgid "Error setting the default window icon: %s"
+#~ msgstr "Greška prilikom postavljanja podrazumevane ikonice prozora: %s"
+
+#~ msgid "<b>Path:</b> %s"
+#~ msgstr "<b>Putanja:</b> %s"
+
+#~ msgid "Open comment dialog"
+#~ msgstr "Otvara prozorÄ?e za napomenama"
+
+#~ msgid "Message Table"
+#~ msgstr "Površ za poruke"
+
+#~ msgid "Running recovery..."
+#~ msgstr "VraÄ?am podatke..."
+
+#~ msgid "There was an error recovering the database: %s"
+#~ msgstr "DoÅ¡lo je do greÅ¡ke priliko vraÄ?anja baze podataka: %s"
+
+#~ msgid "There was an error in database: %s"
+#~ msgstr "Došlo je do greške u bazi podataka: %s"
+
+#~ msgid "C_omment..."
+#~ msgstr "_Napomena..."
+
+#~ msgid "Edit message comment"
+#~ msgstr "Uredite napomenu poruke"
+
+#~ msgid "Show the Translation Memory panel"
+#~ msgstr "Prikazuje povrÅ¡ sa prevodilaÄ?kom memorijom"
+
+#~| msgid "Translated"
+#~ msgid "Total: %d translated"
+#~ msgstr "Ukupno ima: %d poruka"
+
+#~ msgid "gtranslator - %s"
+#~ msgstr "Gnomov prevodilac â?? %s"
+
+#~ msgid "gtranslator - *%s"
+#~ msgstr "Gnomov prevodilac â?? %s"
+
 #~ msgid "Select Folder"
 #~ msgstr "Izaberi fasciklu"
 
@@ -2268,9 +2219,6 @@ msgstr "Dokumenti"
 #~ msgid "Status: %s"
 #~ msgstr "Stanje: %s"
 
-#~ msgid "Total: %d"
-#~ msgstr "Ukupno ima: %d"
-
 #~ msgid "Fuzzy: %d"
 #~ msgstr "Nejasno: %d"
 
@@ -2501,24 +2449,6 @@ msgstr "Dokumenti"
 #~ "Nisam pronašao\n"
 #~ "â??%sâ??"
 
-#~ msgid "%s [ %i Fuzzy left ]"
-#~ msgid_plural "%s [ %i Fuzzy left ]"
-#~ msgstr[0] "%s [ preostala %i nejasna ]"
-#~ msgstr[1] "%s [ preostale %i nejasne ]"
-#~ msgstr[2] "%s [ preostalo %i nejasnih ]"
-
-#~ msgid "%s [ No fuzzy left ]"
-#~ msgstr "%s [ nema nejasnih ]"
-
-#~ msgid "Sticky (Message & translation are the same)"
-#~ msgstr "Lepljivo (poruka i prevod su isti)"
-
-#~ msgid "%s [ %i Untranslated left ]"
-#~ msgid_plural "%s [ %i Untranslated left ]"
-#~ msgstr[0] "%s [ preostala %i neprevedena ]"
-#~ msgstr[1] "%s [ preostale %i neprevedene ]"
-#~ msgstr[2] "%s [ preostalo %i neprevedenih ]"
-
 #~ msgid "%s [ No untranslated left ]"
 #~ msgstr "%s [ Nema više neprevedenih]"
 
@@ -2870,9 +2800,6 @@ msgstr "Dokumenti"
 #~ msgid "gtranslator's homepage on the web"
 #~ msgstr "DomaÄ?a strana GPrevodioca na internetu"
 
-#~ msgid "Open"
-#~ msgstr "Otvori"
-
 #~ msgid "Save"
 #~ msgstr "SaÄ?uvaj"
 
@@ -2948,22 +2875,6 @@ msgstr "Dokumenti"
 #~ msgid "Could not open file `%s' for writing!"
 #~ msgstr "Nisam uspeo da otvorim datoteku â??%sâ?? radi upisa!"
 
-#~ msgid ""
-#~ "File %s\n"
-#~ "contains %d fuzzy message"
-#~ msgid_plural ""
-#~ "File %s\n"
-#~ "contains %d fuzzy messages"
-#~ msgstr[0] ""
-#~ "Datoteka %s\n"
-#~ "sadrži %d nejasnu poruku"
-#~ msgstr[1] ""
-#~ "Datoteka %s\n"
-#~ "sadrži %d nejasne poruke"
-#~ msgstr[2] ""
-#~ "Datoteka %s\n"
-#~ "sadrži %d nejasnih poruka"
-
 #~ msgid "Sorry, msgfmt isn't available on your system!"
 #~ msgstr "Nažalost, â??msgfmtâ?? nije dostupan na vaÅ¡em sistemu!"