Update po files

locale/cs/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:33+0200\n"
 "PO-Revision-Date: 2012-03-23 15:14+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -274,25 +274,16 @@ msgstr ""
 msgid "Send"
 msgstr "Odeslat"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Zdroj"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Překlad"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Ve slovníku nebyly nalezeny žádná související slova."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Vaše překlady"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Překlad"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -313,7 +304,7 @@ msgstr "Přeložit"
 msgid "Projects"
 msgstr "Projekty"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Projekt"
 
@@ -362,10 +353,6 @@ msgstr "jazyky"
 msgid "Language"
 msgstr "Jazyk"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "Nebyly nalezeny žádné další řetězce."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Prosím opravte chyby ve formuláři."
@@ -416,10 +403,6 @@ msgstr "Emailová konference pro překladatele:"
 msgid "Instructions for translators:"
 msgstr "Návod pro překladatele:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Nebyly nalezeny žádné podobné řetězce."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Překlady"
@@ -472,6 +455,11 @@ msgstr "Poslední"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Vyhledávám \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Zdroj"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Kontext"
@@ -634,6 +622,27 @@ msgstr "Stav Git repozitáře"
 msgid "Status"
 msgstr "Stav"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Ve slovníku nebyly nalezeny žádná související slova."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Registrace uživatele"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "Nebyly nalezeny žádné další řetězce."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Nebyly nalezeny žádné podobné řetězce."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -848,105 +857,105 @@ msgstr "Množné číslo"
 msgid "Plural form %d"
 msgstr "Množný tvar %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Nepřeloženo"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Přeložený řetězec je stejný jako zdroj"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Počáteční nový řádek"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Překlad a zdroj oba nezačínají novým řádkem"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Koncový nový řádek"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr "Překlad a zdroj oba nekončí novým řádkem"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Koncová mezera"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Překlad a zdroj oba nekončí mezerou"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Koncová tečka"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr "Překlad a zdroj oba nekončí tečkou"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Koncová dvojtečka"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr "Překlad a zdroj oba nekončí dvojtečkou nebo kolem ní chybí mezery"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Koncový otazník"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr "Překlad a zdroj oba nekončí otazníkem nebo kolem něj chybí mezery"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Koncový vykřičník"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr "Překlad a zdroj oba nekončí vykřičníkem nebo kolem něj chybí mezery"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Formát Pythonu"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Formátovací řetězec v překladu neodpovídá zdroji"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "Formát PHP"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "Formát C"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Chybí plurál"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Některé množné tvary nejsou přeložené"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Nekonzistentní"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr "Řetězec má více rozdílných překladů v tomto projektu"
 
@@ -1002,24 +1011,24 @@ msgstr "Vyhledávat ve přeložených řetězcích"
 msgid "Search in context strings"
 msgstr "Vyhledávat ve řetězcích kontextu"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Chybný formátovací řetězec (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Zobrazené jméno"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Jméno použité v URL"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "URL Git repozitáře"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1028,83 +1037,87 @@ msgstr ""
 "Odkaz na prohlížení Gitu, použijte %(file)s a %(line)s místo jména souboru a "
 "řádky"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Větev Gitu k překladu"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "Maska souborů k překladu, použijte * místo kódu jazyka"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Všechny řetězce"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Nepřeložených řetězců (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Nejasných řetězců (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Řetězců s návrhy (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "Pro ukládání překladů musíte být přihlášen!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "Pro ukládání překladů nemáte oprávnění!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Na vašem překladu selhaly některé kontroly!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Řetězec, který jste chtěl přeložit, již není dostupný!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "Pro práci s návrhy musíte být přihlášen!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "Pro přijmutí návrhu nemáte oprávnění!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "Pro odstranění návrhu nemáte oprávnění!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Chybný návrh!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Jste na konci překládání."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Obsah souboru byl úspěšně přidán do překladu."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "V nahraném souboru nebyly žádné nové řetězce."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Selhalo sloučení obsahu souborů: %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Stránka nenalezena"
 

locale/cs/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-21 15:14+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-14 02:33+0200\n"
 "Last-Translator: Jo Michael <me@mynetx.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -285,25 +285,16 @@ msgstr ""
 msgid "Send"
 msgstr "Senden"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Quelle"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Übersetzung"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr ""
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Ihre Übersetzungen"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Übersetzung"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -324,7 +315,7 @@ msgstr "Übersetzen"
 msgid "Projects"
 msgstr "Projekte"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Projekt"
 
@@ -372,10 +363,6 @@ msgstr "Sprachen"
 msgid "Language"
 msgstr "Sprache"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr ""
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Bitte Fehler im Formular beheben."
@@ -427,10 +414,6 @@ msgstr "Mailingliste für Übersetzer:"
 msgid "Instructions for translators:"
 msgstr "Anweisungen für Übersetzer:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr ""
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Übersetzungen"
@@ -483,6 +466,11 @@ msgstr "Letzte"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Suchen nach \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Quelle"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Kontext"
@@ -648,6 +636,27 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr ""
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Benutzer-Registrierung"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr ""
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr ""
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -862,64 +871,64 @@ msgstr "Mehrzahl"
 msgid "Plural form %d"
 msgstr "Plural-Form %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Nicht übersetzt"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Ursprungs- und übersetzte Zeichenkette sind identisch"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Zeilenumbruch am Anfang"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 #, fuzzy
 msgid "Source and translated do not both start with a newline"
 msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Anfang"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Zeilenumbruch am Ende"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 #, fuzzy
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 #, fuzzy
 msgid "Source and translated do not both end with a space"
 msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 #, fuzzy
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 #, fuzzy
 msgid "Trailing colon"
 msgstr "Übersetzung"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 #, fuzzy
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
@@ -928,12 +937,12 @@ msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 #, fuzzy
 msgid "Trailing question"
 msgstr "Übersetzung"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 #, fuzzy
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
@@ -942,12 +951,12 @@ msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 #, fuzzy
 msgid "Trailing exclamation"
 msgstr "Übersetzung"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 #, fuzzy
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
@@ -956,35 +965,35 @@ msgstr ""
 "Ursprungs- und übersetzte Zeichenkette haben nicht beide einen Zeilenumbruch "
 "am Ende"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr ""
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr ""
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr ""
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -1040,107 +1049,111 @@ msgstr ""
 msgid "Search in context strings"
 msgstr ""
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr ""
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr ""
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
 "placeholders"
 msgstr ""
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr ""
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr ""
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr ""
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr ""
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr ""
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr ""
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr ""
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr ""
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr ""
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr ""
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr ""
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr ""
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr ""
 

locale/de/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-12 01:07+0200\n"
 "Last-Translator: Jo Michael <me@mynetx.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/el/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-23 12:51+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -277,25 +277,16 @@ msgstr ""
 msgid "Send"
 msgstr "Αποστολή"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Προέλευση"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Μετάφραση"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Δεν βρέθηκαν σχετικά κείμενα στο λεξικό."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Οι μεταφράσεις σας"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Μετάφραση"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -316,7 +307,7 @@ msgstr "Μετάφραση"
 msgid "Projects"
 msgstr "Έργα"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Έργο"
 
@@ -364,10 +355,6 @@ msgstr "γλώσσες"
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "Δεν βρέθηκαν παρόμοια κείμενα."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Διορθώστε σφάλματα στη φόρμα."
@@ -420,10 +407,6 @@ msgstr "Λίστα αλληλογραφίας για μεταφραστές:"
 msgid "Instructions for translators:"
 msgstr "Οδηγίες για μεταφραστές:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Δεν βρέθηκαν παρόμοια κείμενα."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Μεταφράσεις"
@@ -476,6 +459,11 @@ msgstr "Τελευταίο"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Αναζήτηση για «%(search_query)s»."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Προέλευση"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Συνοδευτικά"
@@ -640,6 +628,27 @@ msgstr "Κατάσταση αποθετηρίων"
 msgid "Status"
 msgstr "Κατάσταση"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Δεν βρέθηκαν σχετικά κείμενα στο λεξικό."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Εγγραφή χρήστη"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "Δεν βρέθηκαν παρόμοια κείμενα."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Δεν βρέθηκαν παρόμοια κείμενα."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -855,57 +864,57 @@ msgstr "Πληθυντικός"
 msgid "Plural form %d"
 msgstr "Μορφή πληθυντικού %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Αμετάφραστο"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Το κείμενο προέλευσης και το μεταφρασμένο είναι ίδια"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Εκκίνηση νέας γραμμής"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν ξεκινούν και τα δύο με νέα "
 "γραμμή"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Ακολουθεί νέα γραμμή"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελείωνουν και τα δύο με νέα "
 "γραμμή"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Ακολουθεί κενό"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελειώνουν και τα δύο με κενό"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Ακολουθεί τελεία"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελειώνουν και τα δύο με τελεία"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Ακολουθεί άνω κάτω τελεία"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
@@ -913,11 +922,11 @@ msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελειώνουν και τα δύο με άνω "
 "κάτω τελεία ή δεν είναι χωρισμένη σωστά με κενά"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Ακολουθεί ερωτηματικό"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
@@ -925,11 +934,11 @@ msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελειώνουν και τα δύο με "
 "ερωτηματικό ή δεν είναι χωρισμένο σωστά με κενά"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Ακολουθεί θαυμαστικό"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
@@ -937,35 +946,35 @@ msgstr ""
 "Το κείμενο προέλευσης και το μεταφρασμένο δεν τελειώνουν και τα δύο με "
 "θαυμαστικό ή δεν είναι χωρισμένο σωστά με κενά"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Μορφή Python"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Η μορφή του κειμένου δεν ταιριάζει με την προέλευση"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "Μορφή PHP"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "Μορφή C"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Απόντες πληθυντικοί"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Ορισμένοι πληθυντικοί δεν μεταφράστηκαν"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Ασυνεπές"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr "Το μήνυμα έχει περισσότερες διαφορετικές μεταφράσεις σε αυτό το έργο"
 
@@ -1021,24 +1030,24 @@ msgstr "Αναζήτηση στα κείμενα προορισμού"
 msgid "Search in context strings"
 msgstr "Αναζήτηση στα συνοδευτικά κείμενα"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Κακή μορφή κειμένου (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Όνομα για εμφάνιση"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Όνομα για χρήση σε URLs"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "URL του αποθετηρίου Git"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1047,83 +1056,87 @@ msgstr ""
 "Σύνδεσμος για φυλλομετρητή αποθετηρίου, χρησιμοποιήστε τα %(file)s και "
 "%(line)s ως όνομα αρχείου και γραμμή"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Κλάδος Git για μετάφραση"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "Μάσκα αρχείων για μετάφραση, χρήση * αντί για κωδικό γλώσσας"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Όλα τα κείμενα"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Αμετάφραστα κείμενα (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Ασαφή κείμενα (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Κείμενα με προτάσεις (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "Πρέπει να συνδεθείτε για να μπορείτε να αποθηκεύσετε μεταφράσεις!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "Δεν έχετε δικαιώματα για να αποθήκευση μεταφράσεων!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Ορισμένοι έλεγχοι απέτυχαν στη μετάφρασή σας!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Το μήνυμα που θέλατε να μεταφράσετε δεν είναι πλέον διαθέσιμο!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "Πρέπει να συνδεθείτε για να μπορείτε να διαχειριστείτε τις προτάσεις!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "Δεν έχει δικαίωμα να αποδεχτείτε προτάσεις!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "Δεν έχετε δικαίωμα να διαγράψετε προτάσεις!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Μη έγκυρη πρόταση!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Ολοκληρώσατε τη μετάφραση."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Το περιεχόμενο του αρχείου ενώθηκε επιτυχώς στη μετάφραση."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "Δεν υπήρχαν νέα κείμενα στο απεσταλμένο αρχείο."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Το περιεχόμενο του αρχείου απέτυχε να ενωθεί: %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Η Σελίδα Δεν Βρέθηκε"
 

locale/el/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-23 11:03+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:33+0200\n"
 "PO-Revision-Date: 2012-03-23 16:05+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -277,25 +277,16 @@ msgstr ""
 msgid "Send"
 msgstr "Enviar"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Original"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Traducción"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "No se encontraron cadenas similares en el diccionario."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Sus traducciones"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Traducción"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -316,7 +307,7 @@ msgstr "Traducir"
 msgid "Projects"
 msgstr "Proyectos"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Proyecto"
 
@@ -365,10 +356,6 @@ msgstr "idiomas"
 msgid "Language"
 msgstr "Idioma"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "No se encontraron otras cadenas."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Por favor, corrija los errores en el formulario."
@@ -421,10 +408,6 @@ msgstr "Lista de correo para traductores:"
 msgid "Instructions for translators:"
 msgstr "Instrucciones para traductores:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "No se encontraron cadenas similares."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Traducciones"
@@ -477,6 +460,11 @@ msgstr "Último"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Buscando «%(search_query)s»."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Original"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Contexto"
@@ -640,6 +628,27 @@ msgstr "Estado de los repositorios"
 msgid "Status"
 msgstr "Estado"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "No se encontraron cadenas similares en el diccionario."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Registro de usuario"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "No se encontraron otras cadenas."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "No se encontraron cadenas similares."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -846,51 +855,51 @@ msgstr "Plural"
 msgid "Plural form %d"
 msgstr "Forma plural %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Sin traducir"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Las cadenas de origen y destino son iguales"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Salto de línea al incio"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Ni el original ni la traducción comienzan con una linea nueva"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Salto de línea al final"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr "Ni el origen ni la traducción finalizan con una linea nueva"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Salto de línea al final"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Ni el original ni la traducción terminan con un espacio"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Punto final"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr "Ni el original ni la traducción terminan con un punto"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Dos puntos al final"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
@@ -898,11 +907,11 @@ msgstr ""
 "Ni el original ni la traducción terminan con dos puntos o se encuentra "
 "incorrectamente espaciado"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Signo de interrogación al final"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
@@ -910,11 +919,11 @@ msgstr ""
 "Ni el original ni la traducción terminan con signo de interrogación si no "
 "está correctamente espaciado"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Signo de exclamación al final"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
@@ -922,35 +931,35 @@ msgstr ""
 "Ni el original ni la traducción terminan con un signo de exclamación si no "
 "está correctamente espaciado"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Formato Python"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Formato de cadena no coincide con cadena de origen"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "Formato PHP"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "Formato C"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Faltan plurales"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Algunos plurales no están traducidos"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Inconsistente"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr "El mensaje tiene más traducciones diferentes en este proyecto"
 
@@ -1006,24 +1015,24 @@ msgstr "Buscar en cadenas destino"
 msgid "Search in context strings"
 msgstr "Buscar en cadenas de contexto"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Cadena de formato inválido (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Nombre a mostrar"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Nombre a utilizar en URLs"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "URL de repositorio GIT"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1032,85 +1041,89 @@ msgstr ""
 "Enlace al navegador del repositorio, utilice %(file)s y %(line)s como "
 "reemplazos para nombres de archivo y de línea"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Rama Git a traducir"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 "Máscara para archivos a traducir, utilice * en lugar del código de idioma"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Todas las cadenas"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Cadenas sin traducir (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Cadenas parciales (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Cadenas con sugerencias (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "¡Necesita inciar sesión para poder guardar traducciones!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "¡No posee suficientes permisos para guardar traducciones!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "¡Fallaron algunos chequeos en su traducción!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "¡El mensaje que deseaba traducir ya no está disponible!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "¡Necesita iniciar sesión para manejar sugerencias!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "¡No tiene suficientes permisos para aceptar sugerencias!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "¡No tiene suficientes permisos para eliminar sugerencias!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "¡Sugerencia inválida!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Ha llegado al final de la traducción."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr ""
 "El contenido del archivo fue fusionado con la traducción de forma exitosa."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "No hay nuevas cadenas en el archivo subido."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Falló la fusión de contenido del archivo: %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Página no encontrada"
 

locale/es/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-23 14:06+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-24 15:45+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -277,25 +277,16 @@ msgstr ""
 msgid "Send"
 msgstr "Envoyer"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Source"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Traduction"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Pas de chaîne similaire trouvée dans le dictionnaire."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Vos traductions"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Traduction"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -316,7 +307,7 @@ msgstr "Traduire"
 msgid "Projects"
 msgstr "Projets"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Projet"
 
@@ -365,10 +356,6 @@ msgstr "langues"
 msgid "Language"
 msgstr "Langue"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "Pas d'autres messages trouvés."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Veuillez corriger les erreurs dans le formulaire."
@@ -420,10 +407,6 @@ msgstr "Liste de discussion pour les traducteurs : "
 msgid "Instructions for translators:"
 msgstr "Directives pour les traducteurs : "
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Pas de chaîne similaire trouvée."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Traductions"
@@ -476,6 +459,11 @@ msgstr "Dernier"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "À la recherche de \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Source"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Contexte"
@@ -639,6 +627,27 @@ msgstr "État des dépôts"
 msgid "Status"
 msgstr "État"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Pas de chaîne similaire trouvée dans le dictionnaire."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Enregistrement utilisateur"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "Pas d'autres messages trouvés."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Pas de chaîne similaire trouvée."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -850,54 +859,54 @@ msgstr "Pluriel"
 msgid "Plural form %d"
 msgstr "Forme plurielle %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Non traduit"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "La chaîne source est identique à la chaîne traduite"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Nouvelle ligne au début"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Les messages source et traduit ne débutent pas par un saut de ligne"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Saut de ligne à la fin"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 "Les messages source et traduit ne se terminent pas par un saut de ligne"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Espace à la fin"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Les messages source et traduit ne se terminent pas par une espace"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Caractère de fin de phrase"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 "Les messages source et traduit ne se terminent pas par un caractère de fin "
 "de phrase"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Deux-points en fin de phrase"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
@@ -905,11 +914,11 @@ msgstr ""
 "Les messages source et traduit ne se terminent pas par un deux-points, ou "
 "celui-ci n'a pas entouré correctement d'espaces"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Point d'interrogation final"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
@@ -917,11 +926,11 @@ msgstr ""
 "Les messages source et traduit ne se terminent pas par un point "
 "d'interrogation, ou celui-ci n'est pas correctement entouré d'espaces"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Point d'exclamation final"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
@@ -929,35 +938,35 @@ msgstr ""
 "Les messages source et traduit ne se terminent pas par un point "
 "d'exclamation, ou celui-ci n'est pas correctement entouré d'espaces"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Format Python"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Le caractère de format ne correspond pas à celui de la source"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "Format PHP"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "Format C"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Pluriels manquants"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Certaines des formes plurielles n'ont pas été traduites"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Incohérent"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -1013,24 +1022,24 @@ msgstr "Chercher dans les chaînes cible"
 msgid "Search in context strings"
 msgstr "Chercher dans les chaînes de contexte"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Format de chaîne incorrect (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Nom à afficher"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Nom utilisé dans les URLs"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "URL du dépôt Git"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1039,84 +1048,88 @@ msgstr ""
 "Lien vers la navigation du dépôt, utilisez %(file)s et %(line)s comme "
 "paramètres fictifs pour le nom de fichier et la ligne"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Branche Git à traduire"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "Masque des fichiers à traduire, utilisez * au lieu du code de langue"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Toutes les chaînes"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Chaînes non traduites (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Chaînes floues (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Chaînes avec suggestions (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr ""
 "Vous devez vous connecter afin de pouvoir sauvegarder les traductions !"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "Vous n'avez pas le droit de sauvegarder les traductions !"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Certaines vérifications de votre traduction ont échoué !"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Le message que vous vouliez traduire n'est plus disponible !"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "Vous devez vous connecter afin de pouvoir gérer les suggestions !"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "Vous n'avez pas le droit d'accepter les suggestions !"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "Vous n'avez pas le droit de supprimer les suggestions !"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Suggestion invalide !"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Vous avez terminé la traduction."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Le contenu du fichier a été fusionné avec succès à la traduction."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "Le fichier téléversé ne comportait pas de nouvelles chaînes."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Échec de fusion du fichier : %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Page introuvable"
 

locale/fr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-21 17:19+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/nl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:33+0200\n"
 "PO-Revision-Date: 2012-03-21 18:23+0200\n"
 "Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -279,25 +279,16 @@ msgstr ""
 msgid "Send"
 msgstr "Verzenden"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Bron"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Vertaling"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Geen gelijkaardige tekenreeksen gevonden in woordenboek."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Uw vertalingen"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Vertaling"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -318,7 +309,7 @@ msgstr "Vertaal"
 msgid "Projects"
 msgstr "Projecten"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Project"
 
@@ -366,11 +357,6 @@ msgstr "talen"
 msgid "Language"
 msgstr "Taal"
 
-#: html/other.html:19
-#, fuzzy
-msgid "No other strings found."
-msgstr "Geen gelijkaardige tekenreeksen gevonden."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Gelieve de fouten in het formulier te verbeteren."
@@ -422,10 +408,6 @@ msgstr "Mailinglist voor vertalers :"
 msgid "Instructions for translators:"
 msgstr "Rochtlijnen voor vertalers :"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Geen gelijkaardige tekenreeksen gevonden."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Vertalingen"
@@ -478,6 +460,11 @@ msgstr "Laatste"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Er wordt gezocht op \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Bron"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Context"
@@ -644,6 +631,28 @@ msgstr "Status van de repositories"
 msgid "Status"
 msgstr "Status"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Geen gelijkaardige tekenreeksen gevonden in woordenboek."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Gebruikersregistratie"
+
+#: html/js/other.html:24
+#, fuzzy
+msgid "No other strings found."
+msgstr "Geen gelijkaardige tekenreeksen gevonden."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Geen gelijkaardige tekenreeksen gevonden."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -852,51 +861,51 @@ msgstr "Meervoud"
 msgid "Plural form %d"
 msgstr "Meervoud vorm %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Niet vertaald"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Bron en vertaalde tekenreeks zijn dezelfde"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Begint met een nieuwe regel"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Bron en vertaalde tekst starten niet allebei met een nieuwe regel"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Nieuwe regel op het einde"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr "Bron en vertaalde tekst eindigen niet allebei met een nieuwe regel"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Spatie op het einde"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Bron en vertaalde tekst eindigen niet allebei met een spatie"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Punt op het einde"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr "Bron en vertaalde tekst eindigen niet allebei met een punt"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Dubbelpunt op het einde"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
@@ -904,11 +913,11 @@ msgstr ""
 "Bron en vertaalde tekst eindigen niet allebei met een dubbelpunt of het "
 "dubbelpunt is niet correct omgeven door spaties"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Vraagteken op het einde"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
@@ -916,11 +925,11 @@ msgstr ""
 "Bron en vertaalde tekst eindigen niet allebei met een vraagteken of het "
 "vraagteken is niet correct omgeven met spaties"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Uitroepingsteken op het einde"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
@@ -928,35 +937,35 @@ msgstr ""
 "Bron en vertaalde tekst eindigen niet allebei met een uitroepingsteken of "
 "het uitroepingsteken is niet correct omgeven met spaties"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Python formaat"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Het patroon komt niet overeen met de bron"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "PHP formaat"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "C formaat"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Ontbrekende meervouden"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Sommige meervoudsvormen zijn niet vertaald"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -1014,24 +1023,24 @@ msgstr "Zoeken in doeltekenreeksen"
 msgid "Search in context strings"
 msgstr "Zoeken in contexttekenreeksen"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Verkeerd patroon (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Weer te geven naam"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Naam gebruikt in URL's"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "URL van Git repository"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1040,84 +1049,88 @@ msgstr ""
 "Link naar repository browser, gebruik %(file)s en %(line)s als bestandsnaam "
 "en regel parameters"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Git tak om te vertalen"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 "Filter van bestanden om te vertalen, gebruik * in plaats van de taalcode"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Alle tekenreeksen"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Niet vertaalde tekenreeksen (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Vage tekenreeksen (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Tekenreeksen met suggesties (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "U moet aanmelden om vertalingen te kunnen opslaan!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "U heeft niet de juiste rechten om vertalingen op te slaan!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Sommige controles zijn mislukt bij uw vertaling!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Het bericht dat u wilde vertalen is niet langer beschikbaar!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "U moet aanmelden om suggesties te kunnen beheren!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "U heeft niet de juiste rechten om suggesties te aanvaarden!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "U heeft niet de juiste rechten om suggesties te verwijderen!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Ongeldige suggestie!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "U heeft de vertaling afgewerkt."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Bestandsinhoud werd succesvol samengevoegd met de vertaling."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "Het upgeloade bestand bevat geen nieuwe tekenreeksen."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Samenvoegen van bestandsinhoud is mislukt : %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Pagina niet gevonden"
 

locale/nl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-21 18:14+0200\n"
 "Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/pl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-22 19:00+0200\n"
 "Last-Translator: Bartosz Feński <fenio@debian.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -275,25 +275,16 @@ msgstr ""
 msgid "Send"
 msgstr "Wyślij"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Źródło"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Tłumaczenie"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Nie znaleziono powiązanych napisów."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Twoje tłumaczenia"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Tłumaczenie"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -314,7 +305,7 @@ msgstr "Tłumacz"
 msgid "Projects"
 msgstr "Projekty"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Projekt"
 
@@ -363,11 +354,6 @@ msgstr "języki"
 msgid "Language"
 msgstr "Język"
 
-#: html/other.html:19
-#, fuzzy
-msgid "No other strings found."
-msgstr "Nie znaleziono podobnych napisów."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Proszę poprawić błędy w formularzu."
@@ -417,10 +403,6 @@ msgstr "Lista dyskusyjna dla tłumaczy:"
 msgid "Instructions for translators:"
 msgstr "Instrukcje dla tłumaczy:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Nie znaleziono podobnych napisów."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Tłumaczenia"
@@ -473,6 +455,11 @@ msgstr "Ostatni"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Szukaj \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Źródło"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Kontekst"
@@ -637,6 +624,28 @@ msgstr "Stan repozytoriów"
 msgid "Status"
 msgstr "Stan"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Nie znaleziono powiązanych napisów."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Rejestracja użytkownika"
+
+#: html/js/other.html:24
+#, fuzzy
+msgid "No other strings found."
+msgstr "Nie znaleziono podobnych napisów."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Nie znaleziono podobnych napisów."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -850,107 +859,107 @@ msgstr "Liczba mnoga"
 msgid "Plural form %d"
 msgstr "Liczba mnoga dla %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Nie przetłumaczony"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Napisy źródłowy i tłumaczenie są takie same"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Zaczyna się od nowej linii"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Napis źródłowy i tłumaczenie nie zaczynają się od nowej linii"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Kończący znak nowej linii"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr "Napis źródłowy i tłumaczenie nie kończą się znakiem nowej linii"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Końcowa spacja"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Źródło i tłumaczenie nie kończą się spacją"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Końcowa kropka"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr "Nieprzetłumaczone napisy (%d)"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "Końcowy dwukropek"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr "Nieprzetłumaczone napisy (%d)"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Końcowy pytajnik"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr ""
 "Źródło i tłumaczenie nie są zakończone pytajnikiem lub są nadmiarowe spacje"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Końcowy wykrzyknik"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr ""
 "Źródło i tłumaczenie nie kończą się wykrzyknikiem lub są nadmiarowe spacje"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Format Python"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Format napisu nie zgadza się ze źródłem"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "Format PHP"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "Format C"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Brakująca liczba mnoga"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Niektóre napisy w liczbie mnogiej nie są przetłumaczone"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Niespójność"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 #, fuzzy
 msgid "Message has more different translations in this project"
 msgstr "W projekcie występują różne tłumaczenia tego samego napisu"
@@ -1007,24 +1016,24 @@ msgstr "Szukaj w tłumaczeniach"
 msgid "Search in context strings"
 msgstr "Szukaj w napisach kontekstowych"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Błędny format napisu (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Nazwa do wyświetlenia"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "Nazwa używana w adresach URL"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "Url repozytorium Git"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1033,83 +1042,87 @@ msgstr ""
 "Link do przeglądarki repozytorium, użyj %(file)s oraz %(line)s jako nazwy "
 "pliku i symboli zastępczych linii"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Gałąź Gita do tłumaczenia"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "Maska plików do tłumaczenia, użyj * zamiast kodu języka"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Wszystkie napisy"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Nieprzetłumaczone napisy (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Niepewne napisy (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Napisy z sugestiami (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "Musisz się zalogować, by zapisać tłumaczenia!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "Nie masz uprawnień do zapisu tłumaczeń!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Niektóre testy tłumaczenia nie powiodły się!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Wiadomość którą chciałbyś przetłumaczyć nie jest już dostępna!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "Musisz się zalogować, by zarządzać sugestiami!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "Nie masz uprawnień do akceptacji sugestii!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "Nie masz uprawnień do usuwania sugestii!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Nieprawidłowa sugestia!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Został osiągnięty koniec tłumaczenia."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Zawartość pliku pomyślnie połączona w tłumaczeniu."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "Nie było nowych napisów w przesłanym pliku."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Scalanie zawartości pliku nie powiodło się: %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Nie znaleziono strony"
 

locale/pl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-22 18:57+0200\n"
 "Last-Translator: Bartosz Feński <fenio@debian.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/pt/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -268,25 +268,16 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
+#: html/index.html:8
+msgid "Your translations"
 msgstr ""
 
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
 msgid "Translation"
 msgstr ""
 
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr ""
-
-#: html/index.html:8
-msgid "Your translations"
-msgstr ""
-
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -307,7 +298,7 @@ msgstr ""
 msgid "Projects"
 msgstr ""
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr ""
 
@@ -354,10 +345,6 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr ""
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr ""
@@ -407,10 +394,6 @@ msgstr ""
 msgid "Instructions for translators:"
 msgstr ""
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr ""
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr ""
@@ -461,6 +444,11 @@ msgstr ""
 msgid "Searching for \"%(search_query)s\"."
 msgstr ""
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr ""
+
 #: html/translate.html:54
 msgid "Context"
 msgstr ""
@@ -615,6 +603,26 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr ""
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+msgid "Use this translation"
+msgstr ""
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr ""
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr ""
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -783,105 +791,105 @@ msgstr ""
 msgid "Plural form %d"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr ""
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr ""
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr ""
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -935,106 +943,110 @@ msgstr ""
 msgid "Search in context strings"
 msgstr ""
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr ""
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr ""
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
 "placeholders"
 msgstr ""
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr ""
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr ""
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr ""
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr ""
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr ""
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr ""
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr ""
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr ""
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr ""
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr ""
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr ""
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr ""
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr ""

locale/pt/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/pt_BR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-25 04:18+0200\n"
 "Last-Translator: Claudio F Filho <filhocf@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,8 +144,8 @@ msgstr "Os dois campos de senha não combinam."
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Mantenha a tecla \"Control\" (ou \"Command\" no Mac) pressionado para selecionar "
-"mais de  um."
+"Mantenha a tecla \"Control\" (ou \"Command\" no Mac) pressionado para "
+"selecionar mais de  um."
 
 #: accounts/i18n.py:19
 msgid "Translate using Apertium"
@@ -197,7 +197,8 @@ msgstr "Idiomas secundários"
 
 #: accounts/models.py:50
 msgid "Your profile has been migrated, you might want to adjust preferences."
-msgstr "Seu perfil foi migrado, provavelmente deseje ajustar suas preferências."
+msgstr ""
+"Seu perfil foi migrado, provavelmente deseje ajustar suas preferências."
 
 #: accounts/views.py:34
 msgid "User profile"
@@ -254,7 +255,8 @@ msgstr "Início"
 #: html/base.html:74
 #, python-format
 msgid "Powered by <a href=\"http://weblate.org\">Weblate %(version)s</a>"
-msgstr "Desenvolvido com <a href=\"http://weblate.org\">Weblate %(version)s</a>"
+msgstr ""
+"Desenvolvido com <a href=\"http://weblate.org\">Weblate %(version)s</a>"
 
 #: html/base.html:75
 msgid "Contact us"
@@ -276,25 +278,16 @@ msgstr ""
 msgid "Send"
 msgstr "Enviar"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Fonte"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Tradução"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Não foi encontrado strings similares no dicionário."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Suas traduções"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Tradução"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -315,7 +308,7 @@ msgstr "Traduzir"
 msgid "Projects"
 msgstr "Projetos"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Projeto"
 
@@ -364,10 +357,6 @@ msgstr "Idiomas"
 msgid "Language"
 msgstr "Idioma"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "Não foram encontradas outras strings."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Por favor, corrija os erros no formulário."
@@ -388,8 +377,8 @@ msgstr "Seu nome e e-mail apareceram como autor de suas ações no Git."
 #, python-format
 msgid "You can change password on <a href=\"%(pw_url)s\">separate page</a>."
 msgstr ""
-"Você pode trocar sua senha em uma <a href=\"%(pw_url)s\">página "
-"específica</a>."
+"Você pode trocar sua senha em uma <a href=\"%(pw_url)s\">página específica</"
+"a>."
 
 #: html/profile.html:40 html/translate.html:138
 msgid "Save"
@@ -419,10 +408,6 @@ msgstr "Lista de discussão para tradutores:"
 msgid "Instructions for translators:"
 msgstr "Instruções para tradutores:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Não foi encontrada strings similares."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Traduções"
@@ -433,8 +418,8 @@ msgid ""
 "Should your language be missing, please <a href=\"%(contact_url)s?subject=New"
 "+language+request+for+%(object)s\">contact us</a>."
 msgstr ""
-"Caso seu idioma esteja faltando, por favor, <a href=\"%"
-"(contact_url)s?subject=New+language+request+for+%(object)s\">nos contate</a>."
+"Caso seu idioma esteja faltando, por favor, <a href=\"%(contact_url)s?"
+"subject=New+language+request+for+%(object)s\">nos contate</a>."
 
 #: html/subproject_info.html:6
 msgid "Git repository:"
@@ -475,6 +460,11 @@ msgstr "Último"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "Procurando por \"%(search_query)s\"."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Fonte"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Contexto"
@@ -637,6 +627,27 @@ msgstr "Status dos repositórios"
 msgid "Status"
 msgstr "Status"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Não foi encontrado strings similares no dicionário."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Registro de usuários"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "Não foram encontradas outras strings."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Não foi encontrada strings similares."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -688,7 +699,8 @@ msgid ""
 "Do not have an account yet? You can <a href=\"%(register_url)s\">register</"
 "a>."
 msgstr ""
-"Não tem conta ainda? Você pode <a href=\"%(register_url)s\">registrar uma</a>."
+"Não tem conta ainda? Você pode <a href=\"%(register_url)s\">registrar uma</"
+"a>."
 
 #: html/registration/login.html:41
 #, python-format
@@ -816,105 +828,105 @@ msgstr ""
 msgid "Plural form %d"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr ""
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr ""
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr ""
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -968,107 +980,111 @@ msgstr ""
 msgid "Search in context strings"
 msgstr ""
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr ""
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr ""
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
 "placeholders"
 msgstr ""
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr ""
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr ""
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr ""
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr ""
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr ""
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr ""
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr ""
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr ""
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr ""
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr ""
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr ""
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr ""
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Página não encontrada"
 

locale/pt_BR/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-25 03:31+0200\n"
 "Last-Translator: Claudio F Filho <filhocf@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/sl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-20 22:53+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -270,25 +270,16 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
+#: html/index.html:8
+msgid "Your translations"
 msgstr ""
 
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
 msgid "Translation"
 msgstr ""
 
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr ""
-
-#: html/index.html:8
-msgid "Your translations"
-msgstr ""
-
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -309,7 +300,7 @@ msgstr ""
 msgid "Projects"
 msgstr ""
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr ""
 
@@ -356,10 +347,6 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr ""
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr ""
@@ -409,10 +396,6 @@ msgstr ""
 msgid "Instructions for translators:"
 msgstr ""
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr ""
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr ""
@@ -463,6 +446,11 @@ msgstr ""
 msgid "Searching for \"%(search_query)s\"."
 msgstr ""
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr ""
+
 #: html/translate.html:54
 msgid "Context"
 msgstr ""
@@ -617,6 +605,27 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr ""
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Registracija uporabnika"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr ""
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr ""
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -785,105 +794,105 @@ msgstr ""
 msgid "Plural form %d"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr ""
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr ""
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr ""
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr ""
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr ""
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr ""
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr ""
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr ""
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -939,106 +948,110 @@ msgstr ""
 msgid "Search in context strings"
 msgstr ""
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr ""
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr ""
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
 "placeholders"
 msgstr ""
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr ""
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr ""
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr ""
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr ""
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr ""
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr ""
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr ""
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr ""
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr ""
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr ""
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr ""
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr ""
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr ""
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr ""

locale/sl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-20 22:53+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/tr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:33+0200\n"
 "PO-Revision-Date: 2012-03-25 14:50+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,25 +278,16 @@ msgstr ""
 msgid "Send"
 msgstr "Gönder"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "Kaynak"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "Çeviri"
-
-#: html/dictionary.html:18
-msgid "No related strings found in dictionary."
-msgstr "Sözlükte bulunan ilgili satırlar yok."
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "Çevirileriniz"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "Çeviri"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -317,7 +308,7 @@ msgstr "Çevir"
 msgid "Projects"
 msgstr "Projeler"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "Proje"
 
@@ -365,10 +356,6 @@ msgstr "diller"
 msgid "Language"
 msgstr "Dil"
 
-#: html/other.html:19
-msgid "No other strings found."
-msgstr "Bulunan diğer satırlar yok."
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "Lütfen formdaki hataları düzeltin."
@@ -418,10 +405,6 @@ msgstr "Çevirmenler için postalama listesi:"
 msgid "Instructions for translators:"
 msgstr "Çevirmenler için talimatlar:"
 
-#: html/similar.html:18
-msgid "No similar strings found."
-msgstr "Bulunan benzer satırlar yok."
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "Çeviriler"
@@ -474,6 +457,11 @@ msgstr "Son"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "\"%(search_query)s\" için aranıyor."
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "Kaynak"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "Bağlam"
@@ -636,6 +624,27 @@ msgstr "Havuzların durumu"
 msgid "Status"
 msgstr "Durum"
 
+#: html/js/dictionary.html:18
+msgid "No related strings found in dictionary."
+msgstr "Sözlükte bulunan ilgili satırlar yok."
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "Kullanıcı kaydı"
+
+#: html/js/other.html:24
+msgid "No other strings found."
+msgstr "Bulunan diğer satırlar yok."
+
+#: html/js/similar.html:18
+msgid "No similar strings found."
+msgstr "Bulunan benzer satırlar yok."
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -832,62 +841,62 @@ msgstr "Çoğul"
 msgid "Plural form %d"
 msgstr "Çoğul formu %d"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Not translated"
 msgstr "Çevrilmemiş"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 msgid "Source and translated strings are same"
 msgstr "Kaynak ve çevrilmiş satırlar aynı"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr "Yeni satıra başlanıyor"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Source and translated do not both start with a newline"
 msgstr "Kaynağın ve çevrilmişin ikiside satır başı ile başlamaz"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr "Satır başını izleme"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Source and translated do not both end with a newline"
 msgstr "Kaynağın ve çevrilmişin ikiside satır başı ile bitmez"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Trailing space"
 msgstr "Boşluğu izleme"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 msgid "Source and translated do not both end with a space"
 msgstr "Kaynağın ve çevrilmişin ikiside boşluk ile bitmez"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr "Durdurmayı izleme"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Source and translated do not both end with a full stop"
 msgstr "Kaynağın ve çevrilmişin ikiside nokta ile bitmez"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid "Trailing colon"
 msgstr "İki nokta üst üste izleme"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr ""
 "Kaynağın ve çevrilmişin ikiside ':' ile bitmez ya da doğru aralıkta değil"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid "Trailing question"
 msgstr "Soru işaretini izleme"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
@@ -895,46 +904,46 @@ msgstr ""
 "Kaynağın ve çevrilmişin ikiside soru işareti ile bitmez ya da doğru aralıkta "
 "değil"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid "Trailing exclamation"
 msgstr "Ünlem işaretini izleme"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr ""
 "Kaynağın ve çevrilmişin ikiside ünlem ile bitmez ya da doğru aralıkta değil"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr "Python biçimi"
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr "Değişken dizgisi kaynakla eşleşmiyor"
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr "PHP biçimi"
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr "C biçimi"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr "Eksik çoğullar"
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr "Bazı çoğul formlar çevrilmez"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr "Tutarsız"
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr "Bu projede daha farklı çevirilere sahip ileti"
 
@@ -990,24 +999,24 @@ msgstr "Çeviri satırlarında ara"
 msgid "Search in context strings"
 msgstr "Bağlam satırlarında ara"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, python-format
 msgid "Bad format string (%s)"
 msgstr "Kötü biçimde satır (%s)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr "Görüntülemek için ad"
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr "URL'lede kullanılan ad"
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "Git havuzu URL'si"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
@@ -1016,83 +1025,87 @@ msgstr ""
 "Havuz tarayıcısına bağlantı, %(file)s ve %(line)s, dosya adı ve satır yer "
 "tutucuları olarak kullan"
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "Çevirmek için Git dalı"
 
-#: trans/models.py:80
+#: trans/models.py:82
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "Çevirmek için dosyaların maskesi, dil kodu yerine * kullanın"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "Tüm satırlar"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Çevrilmemiş satırlar (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Belirsiz satırlar (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Önerileri olan satırlar (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "Çevirileri kaydedebilmek için oturum açmanız gerekli!"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 msgid "You don't have privileges to save translations!"
 msgstr "Çevirileri kaydetmek için yetkileriniz yok!"
 
-#: trans/views.py:223
+#: trans/views.py:238
 msgid "Some checks have failed on your translation!"
 msgstr "Çevirinizde bazı kontroller başarısız oldu!"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "Çevirmek istediğiniz ileti bundan böyle mevcut değil!"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "Önerileri yönetebilmek için oturum açmanız gerekli!"
 
-#: trans/views.py:258
+#: trans/views.py:311
 msgid "You do not have privilege to accept suggestions!"
 msgstr "Önerileri kabul etmek için yetkiniz yok!"
 
-#: trans/views.py:268
+#: trans/views.py:321
 msgid "You do not have privilege to delete suggestions!"
 msgstr "Önerileri silmek için yetkiniz yok!"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "Geçersiz öneri!"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "Çevirme işleminin sonuna geldiniz."
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "Dosya içeriği başarılı olarak çeviri içine birleştirildi."
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "Gönderilen dosyada yeni satırlar yoktu."
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "Dosya içeriğinin birleştirilmesi başarısız oldu: %s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "Sayfa Bulunamadı"
 

locale/tr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-21 21:13+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

locale/zh_CN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:33+0200\n"
 "PO-Revision-Date: 2012-03-10 04:57+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -271,26 +271,16 @@ msgstr "请使用英语，否则我们可能无法理解您的要求。"
 msgid "Send"
 msgstr "发送"
 
-#: html/dictionary.html:6 html/other.html:6 html/similar.html:6
-#: html/translate.html:49 html/translate.html.py:165
-msgid "Source"
-msgstr "源"
-
-#: html/dictionary.html:6 html/index.html:13 html/index.html.py:64
-#: html/other.html:6 html/similar.html:6 html/translate.html:63
-#: html/translate.html.py:165
-msgid "Translation"
-msgstr "翻译"
-
-#: html/dictionary.html:18
-#, fuzzy
-msgid "No related strings found in dictionary."
-msgstr "未翻译条目 (%d)"
-
 #: html/index.html:8
 msgid "Your translations"
 msgstr "您的翻译"
 
+#: html/index.html:13 html/index.html.py:64 html/translate.html:63
+#: html/translate.html.py:165 html/js/dictionary.html:6 html/js/other.html:6
+#: html/js/similar.html:6
+msgid "Translation"
+msgstr "翻译"
+
 #: html/index.html:14 html/index.html.py:40 html/index.html.py:84
 #: html/language.html:16 html/languages.html:15 html/project.html:20
 #: html/subproject.html:21
@@ -311,7 +301,7 @@ msgstr "翻译"
 msgid "Projects"
 msgstr "项目"
 
-#: html/index.html:39 html/other.html:6 html/translate.html:160
+#: html/index.html:39 html/translate.html:160 html/js/other.html:6
 msgid "Project"
 msgstr "项目"
 
@@ -358,11 +348,6 @@ msgstr "语言"
 msgid "Language"
 msgstr "语言"
 
-#: html/other.html:19
-#, fuzzy
-msgid "No other strings found."
-msgstr "未翻译条目 (%d)"
-
 #: html/profile.html:11
 msgid "Please fix errors in the form."
 msgstr "请正确填写表单。"
@@ -412,11 +397,6 @@ msgstr "翻译的邮件列表："
 msgid "Instructions for translators:"
 msgstr "翻译说明："
 
-#: html/similar.html:18
-#, fuzzy
-msgid "No similar strings found."
-msgstr "未翻译条目 (%d)"
-
 #: html/subproject.html:15 html/translate.html:63
 msgid "Translations"
 msgstr "翻译"
@@ -469,6 +449,11 @@ msgstr "最后一条"
 msgid "Searching for \"%(search_query)s\"."
 msgstr "正在搜索 \"%(search_query)s\"。"
 
+#: html/translate.html:49 html/translate.html.py:165 html/js/dictionary.html:6
+#: html/js/other.html:6 html/js/similar.html:6
+msgid "Source"
+msgstr "源"
+
 #: html/translate.html:54
 msgid "Context"
 msgstr "上下文"
@@ -629,6 +614,30 @@ msgstr "Git 库地址"
 msgid "Status"
 msgstr ""
 
+#: html/js/dictionary.html:18
+#, fuzzy
+msgid "No related strings found in dictionary."
+msgstr "未翻译条目 (%d)"
+
+#: html/js/other.html:16
+msgid "Use this translation for all subprojects"
+msgstr ""
+
+#: html/js/other.html:16
+#, fuzzy
+msgid "Use this translation"
+msgstr "注册新用户"
+
+#: html/js/other.html:24
+#, fuzzy
+msgid "No other strings found."
+msgstr "未翻译条目 (%d)"
+
+#: html/js/similar.html:18
+#, fuzzy
+msgid "No similar strings found."
+msgstr "未翻译条目 (%d)"
+
 #: html/registration/activate.html:9
 #, python-format
 msgid ""
@@ -808,118 +817,118 @@ msgstr "复数形式"
 msgid "Plural form %d"
 msgstr ""
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 #, fuzzy
 msgid "Not translated"
 msgstr "翻译"
 
-#: trans/checks.py:105
+#: trans/checks.py:113
 #, fuzzy
 msgid "Source and translated strings are same"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 msgid "Starting newline"
 msgstr ""
 
-#: trans/checks.py:123
+#: trans/checks.py:131
 #, fuzzy
 msgid "Source and translated do not both start with a newline"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 msgid "Trailing newline"
 msgstr ""
 
-#: trans/checks.py:129
+#: trans/checks.py:137
 #, fuzzy
 msgid "Source and translated do not both end with a newline"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 #, fuzzy
 msgid "Trailing space"
 msgstr "要检查的条目"
 
-#: trans/checks.py:142
+#: trans/checks.py:150
 #, fuzzy
 msgid "Source and translated do not both end with a space"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 msgid "Trailing stop"
 msgstr ""
 
-#: trans/checks.py:150
+#: trans/checks.py:158
 #, fuzzy
 msgid "Source and translated do not both end with a full stop"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 #, fuzzy
 msgid "Trailing colon"
 msgstr "翻译"
 
-#: trans/checks.py:163
+#: trans/checks.py:171
 #, fuzzy
 msgid ""
 "Source and translated do not both end with a colon or colon is not correctly "
 "spaced"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 #, fuzzy
 msgid "Trailing question"
 msgstr "翻译"
 
-#: trans/checks.py:176
+#: trans/checks.py:184
 #, fuzzy
 msgid ""
 "Source and translated do not both end with a question mark or it is not "
 "correctly spaced"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 #, fuzzy
 msgid "Trailing exclamation"
 msgstr "翻译"
 
-#: trans/checks.py:189
+#: trans/checks.py:197
 #, fuzzy
 msgid ""
 "Source and translated do not both end with an exclamation mark or it is not "
 "correctly spaced"
 msgstr "未翻译条目 (%d)"
 
-#: trans/checks.py:215
+#: trans/checks.py:229
 msgid "Python format"
 msgstr ""
 
-#: trans/checks.py:215 trans/checks.py:225 trans/checks.py:235
+#: trans/checks.py:229 trans/checks.py:239 trans/checks.py:249
 msgid "Format string does not match source"
 msgstr ""
 
-#: trans/checks.py:225
+#: trans/checks.py:239
 msgid "PHP format"
 msgstr ""
 
-#: trans/checks.py:235
+#: trans/checks.py:249
 msgid "C format"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Missing plurals"
 msgstr ""
 
-#: trans/checks.py:249
+#: trans/checks.py:263
 msgid "Some plural forms are not translated"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Inconsistent"
 msgstr ""
 
-#: trans/checks.py:268
+#: trans/checks.py:282
 msgid "Message has more different translations in this project"
 msgstr ""
 
@@ -975,112 +984,116 @@ msgstr "在翻译中搜索"
 msgid "Search in context strings"
 msgstr "在上下文中搜索"
 
-#: trans/models.py:32
+#: trans/models.py:34
 #, fuzzy, python-format
 msgid "Bad format string (%s)"
 msgstr "未翻译条目 (%d)"
 
-#: trans/models.py:72
+#: trans/models.py:74
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:73
+#: trans/models.py:75
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:75
+#: trans/models.py:77
 msgid "URL of Git repository"
 msgstr "Git 库地址"
 
-#: trans/models.py:77
+#: trans/models.py:79
 #, python-format
 msgid ""
 "Link to repository browser, use %(file)s and %(line)s as filename and line "
 "placeholders"
 msgstr ""
 
-#: trans/models.py:79
+#: trans/models.py:81
 msgid "Git branch to translate"
 msgstr "要翻译的 Git 分支"
 
-#: trans/models.py:80
+#: trans/models.py:82
 #, fuzzy
 msgid "Mask of files to translate, use * instead of language code"
 msgstr "要翻译的文件，使用 * 代替语言代码"
 
-#: trans/models.py:406
+#: trans/models.py:423
 msgid "All strings"
 msgstr "所有条目"
 
-#: trans/models.py:411
+#: trans/models.py:428
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "未翻译条目 (%d)"
 
-#: trans/models.py:413
+#: trans/models.py:430
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "模糊条目 (%d)"
 
-#: trans/models.py:415
+#: trans/models.py:432
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "有建议的条目 (%d)"
 
-#: trans/views.py:204
+#: trans/views.py:219
 msgid "You need to log in to be able to save translations!"
 msgstr "您需要登录才能保存翻译！"
 
-#: trans/views.py:207
+#: trans/views.py:222 trans/views.py:262
 #, fuzzy
 msgid "You don't have privileges to save translations!"
 msgstr "您需要登录才能保存翻译！"
 
-#: trans/views.py:223
+#: trans/views.py:238
 #, fuzzy
 msgid "Some checks have failed on your translation!"
 msgstr "本次翻译已结束。"
 
-#: trans/views.py:241
+#: trans/views.py:256 trans/views.py:294
 msgid "Message you wanted to translate is no longer available!"
 msgstr "您要翻译的条目不存在！"
 
-#: trans/views.py:247
+#: trans/views.py:277
+msgid "Can not merge different messages!"
+msgstr ""
+
+#: trans/views.py:300
 msgid "You need to log in to be able to manage suggestions!"
 msgstr "您需要登录才能管理建议！"
 
-#: trans/views.py:258
+#: trans/views.py:311
 #, fuzzy
 msgid "You do not have privilege to accept suggestions!"
 msgstr "您需要登录才能管理建议！"
 
-#: trans/views.py:268
+#: trans/views.py:321
 #, fuzzy
 msgid "You do not have privilege to delete suggestions!"
 msgstr "您需要登录才能管理建议！"
 
-#: trans/views.py:289
+#: trans/views.py:342
 msgid "Invalid suggestion!"
 msgstr "无效建议！"
 
-#: trans/views.py:334
+#: trans/views.py:387
 msgid "You have reached end of translating."
 msgstr "本次翻译已结束。"
 
-#: trans/views.py:476
+#: trans/views.py:534
 msgid "File content successfully merged into translation."
 msgstr "已成功将文件内容合并到当前翻译。"
 
-#: trans/views.py:478
+#: trans/views.py:536
 msgid "There were no new strings in uploaded file."
 msgstr "上传的文件中没有新翻译的条目。"
 
-#: trans/views.py:480
+#: trans/views.py:538
 #, python-format
 msgid "File content merge failed: %s"
 msgstr "文件内容合并失败：%s"
 
-#: trans/views.py:491
+#: trans/views.py:549
 msgid "Page Not Found"
 msgstr "页面未找到"
 

locale/zh_CN/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 15:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:34+0200\n"
 "PO-Revision-Date: 2012-03-09 14:38+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"