Update po files

weblate/locale/cs/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-05 10:59+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <http://l10n.cihar.com/projects/weblate/master/cs/>\n"
@@ -794,7 +794,7 @@ msgstr "Překládejte %(object)s pomocí %%23Weblate!"
 msgid "Tweet this translation!"
 msgstr "Twittrujte tento překlad!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nový jazyk"
 
@@ -2352,7 +2352,44 @@ msgstr "Použít kontaktní formulář"
 msgid "Point to translation instructions URL"
 msgstr "Odkázat na instrukce pro překladatele"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Stránky projektu:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Emailová konference pro překladatele:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Návod pro překladatele:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2361,16 +2398,16 @@ msgstr ""
 "Můžete použít %(language)s, %(subproject)s nebo %(project)s pro zkratku "
 "jazyka, jméno podprojektu nebo projektu."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Zda má být repozitář odeslán při každém zapsání změn."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr "Jestli má být hlavička Translation-Team aktualizována Weblate."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2378,15 +2415,15 @@ msgstr ""
 "Prosím zadejte URL s instrukcemi nebo zvolte jinou možnost přidávání nového "
 "jazyka."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Zobrazené jméno"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Jméno použité v URL"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2394,11 +2431,11 @@ msgstr ""
 "URL Gitového repozitáře, použijte weblate://projekt/podprojekt pro sdílení s "
 "jiným podprojektem"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL pro odesílání do Git repozitáře"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2407,11 +2444,11 @@ msgstr ""
 "Odkaz na prohlížení Gitu, použijte %(branch)s místo větve, %(file)s a "
 "%(line)s místo jména souboru a řádky"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Větev Gitu k překladu"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2419,7 +2456,7 @@ msgstr ""
 "Cesta souborů k překladu, použijte * místo kódu jazyka, například: po/*.po "
 "nebo locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2427,40 +2464,45 @@ msgstr ""
 "Jméno souboru s šablonou překladu, toto je potřeba jen pro překlady, které "
 "ukládají jen přeložené řetězce jako například překlady pro Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Jestli je projekt zamknutý pro překlady"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Nepodařilo se stáhnout Git repozitář: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Odesílání je vypnuté pro %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Nepodařilo se odeslat do vzdálené větve %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Nepodařilo se resetovat na vzdálenou větev %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Nepodařilo se sloučit vzdálenou větev do %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Nepodařilo se resetovat na vzdálenou větev %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Masce neodpovídají žádné soubory!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2468,25 +2510,25 @@ msgstr ""
 "Bylo nalezeno více souborů pro jeden jazyk. Prosím opravte masku a použijte "
 "podprojekty pro překládání různých souborů."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Nepodařilo ze rozpoznat formát %d souborů."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Nepodařilo ze zpracovat %d souborů!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Nepodařilo ze rozpoznat formát šablony překladů."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Nepodařilo se zpracovat šablonu překladů."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2495,56 +2537,56 @@ msgstr ""
 "Soubor %s nebyl nalezen v repozitáři! Chcete-li přidat nový překlad, "
 "přidejte soubor s překladem do repozitáře."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Nepodařilo ze rozpoznat formát souboru %s."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Nepodařilo ze zpracovat soubor %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Tento překlad je v současné době uzamčen!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "Tento překlad je do %(time)s uzamčen pro uživatele %(user)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Všechny řetězce"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Nepřeložených řetězců (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Nejasných řetězců (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Řetězců s návrhy (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Řetězců s jakoukoliv selhavší kontrolou (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Řetězec nebyl nalezen v překládaném souboru, pravděpodobně došlo k jeho "
 "poškození."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID jednotky %s"

weblate/locale/cs/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-12 12:58+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/da/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-06 00:19+0200\n"
 "Last-Translator: Aputsiaq Niels Janussen <aj@isit.gl>\n"
 "Language-Team: Danish <http://l10n.cihar.com/projects/weblate/master/da/>\n"
@@ -794,7 +794,7 @@ msgstr "Oversæt %(object)s med brug af %%23Weblate!"
 msgid "Tweet this translation!"
 msgstr "Tweet denne oversættelse!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nyt sprog"
 
@@ -2369,7 +2369,44 @@ msgstr "Brug kontaktformular"
 msgid "Point to translation instructions URL"
 msgstr "Henvis til URL for oversættelses-instruktser"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Projektets websted:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Postliste for oversættere:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Vejledning for oversættere:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2378,16 +2415,16 @@ msgstr ""
 "Du kan anvende %(language)s, %(subproject)s eller %(project)s til sprog-"
 "genvej, delprojekt eller projektnavne."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Om arkivet skal skubbes opstrøm ved hver indsendelse."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr "Om hvorvidt oversættelseshold i filhoveder bør opdateres af Weblate."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2395,15 +2432,15 @@ msgstr ""
 "Udfyld venligst enten instruktions-URL eller benyt en anden metode til "
 "tilføjelse af nyt sprog."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Navn som skal vises"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Navn som bruges i URL'er"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2411,11 +2448,11 @@ msgstr ""
 "URL på Git-arkiv, brug weblate://projekt/delprojekt for at dele med andet "
 "delprojekt"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL for Git-arkiv som der skubbes til (push)"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2424,11 +2461,11 @@ msgstr ""
 "Henvisning til arkiv-browser, brug %(branch)s for forgrening, %(file)s og "
 "%(line)s som filnavn og pladsholdere for linjer"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Git-forgrening som skal oversættes"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2436,7 +2473,7 @@ msgstr ""
 "Sti for filer som skal oversættes, brug * i stedet for sprogkode, "
 "eksempelvis: po/*.po eller locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2445,40 +2482,45 @@ msgstr ""
 "oversættelser, der blot lagrer oversætte strenge, såsom ressource-strenge "
 "for Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Om hvorvidt delprojektet er låst for oversættelsesopdateringer"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Mislykkedes med at hente git-arkiv: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Skub/push er deaktiveret for %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Mislykkedes med at skubbe (push) til fjern forgrening på %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Mislykkedes med at nulstille fjern forgrening på %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Mislykkedes med at flette fjern forgrening i ind %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Mislykkedes med at nulstille fjern forgrening på %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Denne maske matchede ingen filer!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2486,25 +2528,25 @@ msgstr ""
 "Der er flere filer for enkelt sprog. Tilpas venligst masken og brug "
 "delprojekter til oversættelse af forskellige ressourcer."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Format på %d matchede filer, kunne ikke genkendes."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Mislykkedes med at fortolke %d matchede filer!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Format på oversættelsesskabelon kunne ikke genkendes."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Mislykkedes med at fortolke oversættelsesskabelon."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2513,56 +2555,56 @@ msgstr ""
 "Filnavnet %s blev ikke fundet i arkivet. For at tilføje en ny oversættelse, "
 "så tilføj sprogfil i arkivet."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Format fra %s kunne ikke genkendes."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Mislykkedes med at fortolke filen %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Denne oversættelse er i øjeblikket låst for opdateringer!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 "Denne oversættelse er låst for oversættelse af %(user)s indtil %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Alle strenge"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Ikke-oversatte strenge (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Uklare strenge (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Strenge med forslag (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Alle strenge med tjekfejl (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Beskeden blev ikke fundet i bagendens lager. Den er sandsynligvis beskadiget."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "enheds-ID %s"

weblate/locale/da/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-19 00:24+0200\n"
 "Last-Translator: Aputsiaq Niels Janussen <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-05 13:07+0200\n"
 "Last-Translator: f k <cihar@eideo.de>\n"
 "Language-Team: German <http://l10n.cihar.com/projects/weblate/master/de/>\n"
@@ -808,7 +808,7 @@ msgstr "Vielen Dank, dass Sie Weblate verwenden!"
 msgid "Tweet this translation!"
 msgstr "Diese Übersetzung verwenden"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Neue Sprache"
 
@@ -2390,47 +2390,84 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr "Nicht übersetzte Zeichenketten"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Projekt-Website:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Mailingliste für Übersetzer:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Anweisungen für Übersetzer:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Anzuzeigender Name"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "In URLs verwendeter Name"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL des Push-Git-Repositories"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2439,11 +2476,11 @@ msgstr ""
 "Link zum Repository-Browser, verwenden Sie %(branch)s für Zweig, %(file)s "
 "und %(line)s als Platzhalter für Dateinamen und Zeile"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Zu übersetzender Git-Zweig"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2451,46 +2488,51 @@ msgstr ""
 "Pfade zu übersetzendener Dateien, verwenden Sie * anstelle von Sprach-Codes, "
 "z.B.: po/*.po oder locale/*/LC_MESSAGE/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Abrufen des Git-Repositories fehlgeschlagen: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Push ist für %s deaktiviert."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Fehler beim Pushen des Remote-Branches auf %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, fuzzy, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Fehler beim Pushen des Remote-Branches auf %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Fehler beim Zusammenführen des Remote-Branches nach %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Fehler beim Pushen des Remote-Branches auf %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Es wurden keine auf das Suchmuster passenden Dateien gefunden!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2499,79 +2541,79 @@ msgstr ""
 "Sie das Suchmuster an und benutzen Sie Unterprojekte, um unterschiedliche "
 "Ressourcen zu übersetzen."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Format von %d passenden Dateien konnte nicht erkannt werden."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Fehler beim Verarbeiten von %d passenden Dateien!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Format der Übersetzungs-Vorlage konnte nicht erkannt werden."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Fehler beim Verarbeiten der Übersetzungs-Vorlage."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, fuzzy, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Format von %d passenden Dateien konnte nicht erkannt werden."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, fuzzy, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Fehler beim Verarbeiten von %d passenden Dateien!"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Alle Zeichenketten"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Nicht übersetzte Zeichenketten (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Ungenaue Zeichenketten (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Zeichenketten mit Vorschlägen (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, fuzzy, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Zeichenketten mit Vorschlägen (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/de/LC_MESSAGES/djangojs.po

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-05 13:06+0200\n"
 "Last-Translator: f k <cihar@eideo.de>\n"
-"Language-Team: German "
-"<http://l10n.cihar.com/projects/weblate/javascript/de/>\n"
+"Language-Team: German <http://l10n.cihar.com/projects/weblate/javascript/de/"
+">\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

weblate/locale/el/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-09 08:48+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: Greek <http://l10n.cihar.com/projects/weblate/javascript/el/"

weblate/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-05 15:40+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: Spanish <http://l10n.cihar.com/projects/weblate/master/es/>\n"
@@ -799,7 +799,7 @@ msgstr "¡Traducir %(object)s utilizando Weblate!"
 msgid "Tweet this translation!"
 msgstr "¡Twiteá esta traducción!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nuevo idioma"
 
@@ -2374,7 +2374,44 @@ msgstr "Utilizar formulario de contacto"
 msgid "Point to translation instructions URL"
 msgstr "Apuntar a la URL con instrucciones de traducción"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Sitio web del proyecto:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Lista de correo para traductores:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Instrucciones para traductores:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2383,16 +2420,16 @@ msgstr ""
 "Puede utilizar %(language)s, %(subproject)s o %(project)s para atajos de "
 "idioma, nombres de subproyecto o nombres de proyecto."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Si el repositorio debe ser enviado a origen con cada «commit»."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr "Si Weblate debe actualizar la cabecera «Translation-Team» del archivo."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2400,15 +2437,15 @@ msgstr ""
 "Complete la URL de instrucciones o utilice una opción diferente para agregar "
 "un idioma."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nombre a mostrar"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nombre a utilizar en URLs"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2416,11 +2453,11 @@ msgstr ""
 "URL del repositorio Git, utilice weblate://proyecto/subproyecto para "
 "compartirlo con otro subproyecto"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL de repositorio GIT remoto"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2429,11 +2466,11 @@ msgstr ""
 "Enlace al navegador del repositorio, utilice %(branch)s, %(file)s y %(line)s "
 "como reemplazos para nombres de rama, nombres de archivo y números de línea"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Rama Git a traducir"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2441,7 +2478,7 @@ msgstr ""
 "Ruta de los archivos a traducir, utilice * en lugar del código de idioma; "
 "por ejemplo: «po/*.po» o «locale/*/LC_MESSAGES/django.po»"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2450,40 +2487,45 @@ msgstr ""
 "utilizarlos para traducciones que sólo guardan las cadenas traducidas como "
 "las cadenas de recursos Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Si el subproyecto está bloqueado para actualizaciones de traducción"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "No se pudieron importar los cambios del repositorio git: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "«Push» desactivado para %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "No se pudieron guardar los cambios a la rama remota en %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "No se pudieron deshacer los cambios a la rama remota en %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "No se pudo fusionar la rama remota con %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "No se pudieron deshacer los cambios a la rama remota en %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "¡No se encontraron archivos en la ruta provista!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2491,25 +2533,25 @@ msgstr ""
 "Existen más archivos por idioma individual, ajuste la ruta y utilice "
 "subproyectos para traducir diferentes recursos."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "No se reconoció el formato de %d archivos encontrados."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "¡No se pudieron procesar %d archivos encontrados!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "No se reconoció el formato de la plantilla de traducción."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "No se pudo procesar la plantilla de traducción."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2518,56 +2560,56 @@ msgstr ""
 "¡No se encontró el archivo %s en el repositorio! Para agregar una nueva "
 "traducción, agregue el archivo de idioma en el repositorio."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "No se reconoció el formato de %s."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "No se pudo procesar el archivo %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "¡Esta traducción tiene las actualizaciones bloqueadas!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "¡Esta traducción está bloqueada por %(user)s hasta %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Todas las cadenas"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Cadenas sin traducir (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Cadenas parciales (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Cadenas con sugerencias (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Cadenas con chequeos fallidos (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "No se encontró el mensaje almacenado en la base de datos, probablemente esté "
 "corrupto."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID de unidad %s"

weblate/locale/es/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-12 23:36+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/fi/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-06-29 23:35+0200\n"
 "Last-Translator: Jukka Penttinen <tikkakalja@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -804,7 +804,7 @@ msgstr "Kiitos Weblaten käyttämisestä!"
 msgid "Tweet this translation!"
 msgstr "Käytä tätä käännöstä"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Uusi kieli"
 
@@ -2366,37 +2366,74 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr "Kääntämättömät merkkijonot"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Projektin verkkosivu:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Sähköpostituslista kääntäjille:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Ohjeet kääntäjille:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Näytettävä nimi"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Osoitteissa (URL) käytettävä nimi"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2404,11 +2441,11 @@ msgstr ""
 "Git tietolähteen osoite, käytä weblate://project/subproject jakaaksesi "
 "aliprojekteiksi"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "Git ohjelmoistolähteen lähetysosoite (URL)"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2417,11 +2454,11 @@ msgstr ""
 "Linkki tietolähdeselaimeen, käytä %(branch)s haaralle, %(file)s ja %(line)s "
 "tiedostonimenä ja linjan malleina"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Git haara käännettäväksi"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2429,124 +2466,129 @@ msgstr ""
 "Käännettävien tiedostojen polku, käytä * kielikoodina, esimerkiksi po/*.po "
 "tai locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Haku Git ohjelmistokähteestä epäonnistui: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Lähetys ei ole mahdollista tekstille %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, fuzzy, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Erähaaran liitääminen %s:n epäonnistui."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Erähaaran liitääminen %s:n epäonnistui."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Erähaaran liitääminen %s:n epäonnistui."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Maski ei sovi yhteenkään tiedostoon!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "%d muotoisten tiedotojen muoto ei tunnisteta."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "%d:n täsmäävien tiedostojen jäsennys epäonnitui!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Käännöspohjan muotoa ei voida tunnistaa."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Käännöspohjan jäsennys epäonnistui."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, fuzzy, python-format
 msgid "Format of %s could not be recognized."
 msgstr "%d muotoisten tiedotojen muoto ei tunnisteta."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, fuzzy, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "%d:n täsmäävien tiedostojen jäsennys epäonnitui!"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Kaikki merkkijonot"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Kääntämättömät merkkijonot (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Epäselvät merkkijonot (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Merkkijonojen ehdotukset (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, fuzzy, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Merkkijonojen ehdotukset (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr "Viestiä ei löytynyt taustavarastosta, mahdollisesti vioittunut."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/fi/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-05-18 22:51+0200\n"
 "Last-Translator: Jukka Penttinen <tikkakalja@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-09 20:53+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: French <http://l10n.cihar.com/projects/weblate/master/fr/>\n"
@@ -799,7 +799,7 @@ msgstr "Traduire %(object)s au moyen de %%23Weblate !"
 msgid "Tweet this translation!"
 msgstr "Envoyez cette traduction via Twitter !"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nouvelle langue"
 
@@ -2389,7 +2389,44 @@ msgstr "Utilisez le formulaire de contact"
 msgid "Point to translation instructions URL"
 msgstr "Pointer vers un URL contenant les directives de traduction"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Site web du projet : "
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Liste de discussion pour les traducteurs : "
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Directives pour les traducteurs : "
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2398,18 +2435,18 @@ msgstr ""
 "Vous pouvez utiliser %(language)s, %(subproject)s ou %(project)s comme "
 "raccourci de langue, sous-projet ou nom de projet."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Le dépôt doit être poussé en amont à chaque commit."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 "Si le champs \"Translation-Team\" dans les entêtes de fichiers doit être mis "
 "à jour par Weblate."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2417,15 +2454,15 @@ msgstr ""
 "Veuillez remplir l'URL d'instructions ou utiliser une option différente pour "
 "ajouter une nouvelle langue."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nom à afficher"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nom utilisé dans les URLs"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2433,11 +2470,11 @@ msgstr ""
 "URL du dépôt Git, utilisez weblate://projet/sousprojet pour le partager avec "
 "d'autre sous-projet"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL du dépôt Git pour l'envoi"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2447,11 +2484,11 @@ msgstr ""
 "comme paramètres fictifs pour le nom de la branche, du fichier et le numéro "
 "de ligne"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Branche Git à traduire"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2459,7 +2496,7 @@ msgstr ""
 "Chemin des fichiers à traduire, utilisez * à la place du code de langue, par "
 "exemple : po/*.po ou locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2468,40 +2505,45 @@ msgstr ""
 "traductions qui ne conservent que le message traduit, tel que les chaînes de "
 "ressources Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Le sous-projet est bloqué pour les mises à jour de traduction"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Impossible de récupérer le dépôt Git: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "L'envoi (push) est désactivé pour %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "L'envoi à la branche distante de %s a échoué."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Échec de réinitialisation vers la branche distance sur %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Échec de la fusion de la branche distante dans %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Échec de réinitialisation vers la branche distance sur %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Le masque ne correspond à aucun fichier !"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2509,25 +2551,25 @@ msgstr ""
 "Il y a plusieurs fichiers pour un même langage, veuillez ajuster le masque "
 "et utiliser des sous-projets pour traduire différentes ressources."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Le format de %d fichiers qui correspondent n'a pu être reconnu."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Échec d'analyse de %d fichiers correspondants !"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Le format du modèle de traduction n'a pu être reconnu."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Échec d'analyse du modèle de traduction."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2536,55 +2578,55 @@ msgstr ""
 "Le fichier %s n'a pas été trouvé dans le dépôt! Pour ajouter de nouvelles "
 "traductions, ajoutez une nouvelle langue dans le dépôt."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Le format de %s n'est pas reconnu."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Échec de l'analyse du fichier %(file)s : %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Cette traduction est actuellement bloqué pour les mises à jour !"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "Cette traduction est verrouillée par %(user)s jusqu'à %(time)s !"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Toutes les chaînes"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Chaînes non traduites (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Chaînes floues (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Chaînes avec suggestions (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Chaînes ayant au moins une vérification en échec (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Le message n'a pas été trouvé dans le stock, il est probablement corrompu."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "identification d'unité %s"

weblate/locale/fr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-18 12:32+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/gl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-27 17:27+0200\n"
 "Last-Translator: Antón Méixome <meixome@certima.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -797,7 +797,7 @@ msgstr "Grazas por usar Weblate!"
 msgid "Tweet this translation!"
 msgstr "Utilice esta tradución"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Novo idioma"
 
@@ -2369,7 +2369,44 @@ msgstr "Use o formulario de contacto"
 msgid "Point to translation instructions URL"
 msgstr "Apuntar ao URL das instrucións de tradución"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Páxina web do proxecto:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Lista de discusión para tradutores:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Instrucións para tradutores:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2378,18 +2415,18 @@ msgstr ""
 "Pode utilizar %(language)s, %(subproject)s ou %(project)s como atallo ao "
 "nome idioma, nome de subproxecto ou nome de proxecto."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Cando o repositorio debería pularse cara á troncal en cada remisión."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 "Cando Weblate debería actualizar o equipo de tradución nas cabeceiras do "
 "ficheiro."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2397,15 +2434,15 @@ msgstr ""
 "Cumpra as indicacións do URL de instrucións ou utilice unha opción diferente "
 "para engadir un novo idioma."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nome para presentar"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nome usado nos URL"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2413,11 +2450,11 @@ msgstr ""
 "O URL do repositorio Git, usa weblate://project/subproject para compartir "
 "con outro subproxecto"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL do repositorio Git para pular"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2426,11 +2463,11 @@ msgstr ""
 "Ligazón ao navegador do repositorio, use  %(branch)s para ramificación, "
 "%(file)s e %(line)s como nome de ficheiro e marcadores de posición de liña"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Ramificación Git para traducir"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2438,7 +2475,7 @@ msgstr ""
 "Ruta dos ficheiros para traducir, use * no canto do código de idioma, por "
 "exemplo: po/*.po ou locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2446,40 +2483,45 @@ msgstr ""
 "Nome do ficheiro do modelo de traducións, que é recomendábel usar para "
 "traducións que almacenan só texto traducido como cadeas de recursos Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Cando o subproxecto está bloqueado para actualizacións de tradución"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Fallou o tentar obeter o repositorio git: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "O pulo está desactivado para %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Fallou o pular á ramificación remota en %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Produciuse un erro ao restabelecer a ramificación remota en %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Fallou o fusionar a ramificación remota en %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Produciuse un erro ao restabelecer a ramificación remota en %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "A máscara non casa con ningún ficheiro!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2487,25 +2529,25 @@ msgstr ""
 "Hai máis ficheiros para un idioma particular, axuste a máscara e use "
 "subproxectos para traducir recursos diferentes."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Non se pode recoñecer o formto dos %d ficheiros atopados."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Fallou ao procesar os %d ficheiros atopados!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Non se recoñeceu o formato do modelo de tradución."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Fallou ao procesar o modelo da tradución."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2514,57 +2556,57 @@ msgstr ""
 "O nome de ficheiro %s non se atopa no repositorio! Para engadir unha nova "
 "tradución, engada un ficheiro de idioma no repositorio."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Non se puido recoñecer o formato de %s."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Produciuse un fallo ao procesar o ficheiro %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Neste intre, esta tradución está bloqueada para actualizacións!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 "Ata %(time)s, esta tradución está bloqueada por %(user)s para traducila!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Todas as cadeas"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Cadeas non traducidas (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Cadeas revisábeis (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Cadeas con suxestións (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Cadeas nas que as comprobacións detectaron fallos (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Non se atopou a mensaxe no almacenamento da infraestrutura, probabelmente "
 "está corrupta."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID de unidade %s"

weblate/locale/gl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-26 13:30+0200\n"
 "Last-Translator: Antón Méixome <meixome@certima.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/hu/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-03 01:36+0200\n"
 "Last-Translator: Péter Báthory <bathory@index.hu>\n"
 "Language-Team: Hungarian <http://l10n.cihar.com/projects/weblate/master/hu/"
@@ -758,7 +758,7 @@ msgstr ""
 msgid "Tweet this translation!"
 msgstr "Fordításaid"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Új nyelv"
 
@@ -2242,181 +2242,221 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr ""
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Projektek"
+
+#: trans/models.py:135
+msgid "Email conference for translators"
+msgstr ""
+
+#: trans/models.py:139
+msgid "URL with instructions for translators"
+msgstr ""
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr ""
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
 "as filename and line placeholders"
 msgstr ""
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
 msgstr ""
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr ""
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr ""
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr ""
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr ""
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr ""
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr ""
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr ""
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr ""
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr ""
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr ""
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr ""
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Minden szöveg"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Lefordítatlan szövegek (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Zavaros szövegek (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Javaslattal rendelkező szövegek (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Ellenőrzési hibás szövegek (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/hu/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-03 01:15+0200\n"
 "Last-Translator: Péter Báthory <bathory@index.hu>\n"
 "Language-Team: Hungarian <http://l10n.cihar.com/projects/weblate/javascript/"

weblate/locale/id/LC_MESSAGES/django.po

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-06 02:08+0200\n"
 "Last-Translator: Hascore Eleven <hascore@gmail.com>\n"
-"Language-Team: Indonesian "
-"<http://l10n.cihar.com/projects/weblate/master/id/>\n"
+"Language-Team: Indonesian <http://l10n.cihar.com/projects/weblate/master/id/"
+">\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -802,7 +802,7 @@ msgstr "Menerjemahkan %(object)s menggunakan %%23Weblate!"
 msgid "Tweet this translation!"
 msgstr "Twit penerjemahan ini!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Bahasa baru"
 
@@ -2376,7 +2376,44 @@ msgstr "Gunakan formulir kontak"
 msgid "Point to translation instructions URL"
 msgstr "URL menunjuki ke petunjuk peterjemahan"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Situs web proyek:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Daftar menyurat untuk penerjemah:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Petunjuk untuk penerjemah:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2385,17 +2422,17 @@ msgstr ""
 "Anda dapat menggunakan %(language)s, %(subproject)s atau %(project)s untuk "
 "jalan pintas bahasa, nama sub-proyek atau proyek."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Apakah repositori harus mendorong dari Hulu pada setiap komit."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 "Apakah tim penerjemahan didalam file header harus diperbarui oleh Weblate."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2403,15 +2440,15 @@ msgstr ""
 "Silakan mengisi pada URL petunjuk atau menggunakan berbagai pilihan untuk "
 "menambahkan bahasa baru."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nama untuk menampilkan"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nama yang digunakan dalam URL"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2419,11 +2456,11 @@ msgstr ""
 "URL atau Git repositori, gunakan weblate://project/subproject untuk berbagi "
 "dengan subproyek lainnya"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL dari push Git repositori"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2432,11 +2469,11 @@ msgstr ""
 "Tautan ke peramban repositori, gunakan %(branch)s untuk cabang, %(file)s dan "
 "%(line)s sebagai nama berkas dan barisnya."
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Cabang Git untuk menerjemahkan"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2444,7 +2481,7 @@ msgstr ""
 "Path berkas untuk menerjemahkan, gunakan*bukan kode bahasa, misalnya: po/*."
 "po atau locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2453,40 +2490,45 @@ msgstr ""
 "untuk penerjemahan yang hanya menyetorkan string yang diterjemahkannya saja "
 "seperti sumber string Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Apakah subproyek dikunci untuk memutakhirkan penerjemahan"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Gagal untuk mengambil repositori git: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Dorong dinonaktifkan untuk %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Gagal untuk mendorong ke cabang remot jauh di %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Gagal untuk mentata ulang ke cabang remot jauh di %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Gagal untuk menggabungkan cabang remot jauh didalam %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Gagal untuk mentata ulang ke cabang remot jauh di %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Topeng (mask) tidak cocok dengan berkas mana saja!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2494,25 +2536,25 @@ msgstr ""
 "Terdapat banyak berkas untuk satu bahasa, silahkan menyesuaikan topeng "
 "(mask) dan gunakan subproyek untuk menerjemahkan sumber yang berbeda."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Format dari berkas %d ini tidak bisa dikenali."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Gagal untuk mem-parsing berkas %d ini!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Format dari templat penerjemahan tidak bisa dikenali."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Gagal untuk men-parsing templat penerjemahan."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2521,55 +2563,55 @@ msgstr ""
 "Nama berkas %s tidak ditemukan dalam repositori! Untuk menambahkan "
 "penerjemahan baru, tambahkan berkas bahasa ke dalam repositori."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Format dari %s tidak bisa dikenali."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Gagal untuk men-parsing berkas %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Penerjemahan ini saat ini dikunci untuk pemutakhiran!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 "Penerjemahan ini dikunci oleh %(user)s untuk penerjemahan sampai %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Semua string"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "String tidak diterjemahkan (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "String samar (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "String dengan saran (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "String dengan pemeriksaan gagal (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr "Pesan tidak ditemukan di penyimpanan backend, kemungkinan rusak."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID unit %s"

weblate/locale/id/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-17 07:02+0200\n"
 "Last-Translator: Hascore Eleven <hascore@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/ja/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-05-18 11:10+0200\n"
 "Last-Translator: Yuichiro Takahashi <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
@@ -798,7 +798,7 @@ msgstr "Weblate のご利用ありがとうございました！"
 msgid "Tweet this translation!"
 msgstr "この翻訳を使う"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "新しい言語"
 
@@ -2349,183 +2349,225 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr "未翻訳"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "プロジェクトのウェブサイト:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "翻訳者メーリングリスト:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "翻訳に関する説明:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "プッシュする Git リポジトリの URL"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
 "as filename and line placeholders"
 msgstr ""
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "翻訳する Git ブランチ"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
 msgstr ""
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, fuzzy, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Git リポジトリの URL"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "%s に対するプッシュは無効でした。"
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "ブランチ %s のリモートへのプッシュに失敗しました。"
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, fuzzy, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "ブランチ %s のリモートへのプッシュに失敗しました。"
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "リモートからブランチ %s へのマージに失敗しました。"
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "ブランチ %s のリモートへのプッシュに失敗しました。"
+
+#: trans/models.py:859
 #, fuzzy
 msgid "The mask did not match any files!"
 msgstr "不完全なものはありません！"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr ""
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr ""
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr ""
 
-#: trans/models.py:828
+#: trans/models.py:896
 #, fuzzy
 msgid "Failed to parse translation template."
 msgstr "翻訳の失敗"
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr ""
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr ""
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "すべて"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "未翻訳 (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "あいまい (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "提案があるもの (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, fuzzy, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "提案があるもの (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/ja/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-04-16 11:57+0200\n"
 "Last-Translator: Yuichiro Takahashi <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"

weblate/locale/nl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-27 21:51+0200\n"
 "Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
 "Language-Team: Dutch <http://l10n.cihar.com/projects/weblate/master/nl/>\n"
@@ -796,7 +796,7 @@ msgstr "Vertaal %(object)s met %%23Weblate!"
 msgid "Tweet this translation!"
 msgstr "Tweet deze vertaling!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nieuwe taal"
 
@@ -2366,47 +2366,84 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr "Niet-vertaalde tekenreeksen"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Project website :"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Mailinglist voor vertalers :"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Richtlijnen voor vertalers :"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Weer te geven naam"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Naam gebruikt in URL's"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL van push Git repository"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2415,11 +2452,11 @@ msgstr ""
 "Link naar repository browser, gebruik %(branch)s voor tak, %(file)s en "
 "%(line)s als bestandsnaam en regel parameters"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Git tak om te vertalen"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2427,7 +2464,7 @@ msgstr ""
 "Pad van te vertalen bestanden, gebruik * in plaats van de taalcode, "
 "bijvoorbeeld : po/*.po of locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2436,119 +2473,124 @@ msgstr ""
 "vertalingen die enkel de vertaalde tekenreeks opslaan, zoals Android "
 "hulpbrontekenreeksen"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Ophalen van git repository is mislukt: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Push is uitgeschakeld voor %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Push naar externe tak op %s is mislukt."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, fuzzy, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Push naar externe tak op %s is mislukt."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Samenvoegen van externe tak met %s is mislukt."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Push naar externe tak op %s is mislukt."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Het masker komt met geen enkel bestand overeen!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr ""
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, fuzzy, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Het formulier kon niet verwerkt worden!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr ""
 
-#: trans/models.py:828
+#: trans/models.py:896
 #, fuzzy
 msgid "Failed to parse translation template."
 msgstr "Vertaling mislukt"
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr ""
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, fuzzy, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Het formulier kon niet verwerkt worden!"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Alle tekenreeksen"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Niet vertaalde tekenreeksen (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Vage tekenreeksen (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Tekenreeksen met suggesties (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, fuzzy, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Tekenreeksen met suggesties (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/nl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-27 21:24+0200\n"
 "Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
 "Language-Team: Dutch <http://l10n.cihar.com/projects/weblate/javascript/nl/"

weblate/locale/pl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-06 09:53+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Polish <http://l10n.cihar.com/projects/weblate/master/pl/>\n"
@@ -800,7 +800,7 @@ msgstr "Dzięki za używanie Weblate!"
 msgid "Tweet this translation!"
 msgstr "Użyj tego tłumaczenia"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nowy język"
 
@@ -2375,7 +2375,44 @@ msgstr "Użyj formularza kontaktowego"
 msgid "Point to translation instructions URL"
 msgstr "Wskaż na tłumaczenia instrukcji URL"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Witryna projektu:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Lista dyskusyjna dla tłumaczy:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Instrukcje dla tłumaczy:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2384,20 +2421,20 @@ msgstr ""
 "Nie można użyć %(language)s, %(subproject)s lub %(project)s do skrótu nazwy "
 "języka, nazwy projektu lub podprojektu."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 "Czy repozytorium powinno być przesunięte w górę za każdym przesłaniem "
 "(pliku)."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 "Czy Zespół Tłumaczy w nagłówkach pliku powinien być aktualizowany przez "
 "Weblate."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2405,15 +2442,15 @@ msgstr ""
 "Proszę wypełnić w instrukcjach URL, albo użyć innej opcji dla dodania nowego "
 "języka."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nazwa do wyświetlenia"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nazwa używana w adresach URL"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2421,11 +2458,11 @@ msgstr ""
 "URL do repozytorium Git, użyj: weblate://project/subproject (do "
 "współdzielenia z innym podprojektem)"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL repozytorium Git push"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2434,11 +2471,11 @@ msgstr ""
 "Link do przeglądarki repozytorium, użyj %(branch)s dla gałęzi, oraz %(file)s "
 "i %(line)s jako nazwy pliku i symboli zastępczych dla linii"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Gałąź Git do tłumaczenia"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2446,7 +2483,7 @@ msgstr ""
 "Ścieżka do plików do tłumaczenia, użyj * zamiast kodu języka, np: po/*.po "
 "lub locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2455,40 +2492,45 @@ msgstr ""
 "przechowują jedynie przetłumaczony napis, jak na przykład napis źródłowy "
 "Androida"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Czy podprojekt jest zablokowany do aktualizacji tłumaczenia"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Pobranie repozytorium git nie powiodło się: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Przesyłanie dla %s jest wyłączone."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Przesłanie do zdalnej gałęzi dla %s nie powiodło się."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Resetowanie zdalnej gałęzi na %s nie powiodło się."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Scalenie zdalnej gałęzi z %s nie powiodło się."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Resetowanie zdalnej gałęzi na %s nie powiodło się."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Maska nie pasuje do żadnych plików!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2496,25 +2538,25 @@ msgstr ""
 "Istnieje więcej plików dla jednego języka, proszę poprawić maskę i używać "
 "podprojektów do tłumaczenia różnych zasobów."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Nie można było rozpoznać formatu %d pasujących plików. "
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Analiza %d dopasowanych plików nie powiodła się!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Nie można było rozpoznać format szablonu tłumaczenia."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Analiza szablonu tłumaczenia nie powiodła się."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2523,56 +2565,56 @@ msgstr ""
 "Nie znaleziono nazwy pliku %s w repozytorium! Aby dodać nowe tłumaczenie, "
 "dodaj plik języka do repozytorium."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Format %s nie mógł być rozpoznany."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Nie powiodła się analiza pliku %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "To tłumaczenie jest aktualnie zablokowane do aktualizacji!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "To tłumaczenie jest zablokowane przez %(user)s do %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Wszystkie napisy"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Nieprzetłumaczone napisy (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Napisy niepewne (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Napisy z sugestiami (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Napisy z nieudanymi testami (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Nie odnaleziono komunikatu w przechowalni, gdyż jest on prawdopodobnie "
 "uszkodzony."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID jednostki %s"

weblate/locale/pl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-22 13:14+0200\n"
 "Last-Translator: Jan Kowalski <pst3qga@tormail.org>\n"
 "Language-Team: none\n"

weblate/locale/pt/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-05-14 13:55+0200\n"
 "Last-Translator: Vítor Martins <vjmartins@sapo.pt>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -759,7 +759,7 @@ msgstr ""
 msgid "Tweet this translation!"
 msgstr ""
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr ""
 
@@ -2238,181 +2238,220 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr ""
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+msgid "Project website"
+msgstr ""
+
+#: trans/models.py:135
+msgid "Email conference for translators"
+msgstr ""
+
+#: trans/models.py:139
+msgid "URL with instructions for translators"
+msgstr ""
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr ""
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
 "as filename and line placeholders"
 msgstr ""
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
 msgstr ""
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr ""
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr ""
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr ""
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr ""
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr ""
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr ""
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr ""
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr ""
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr ""
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr ""
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr ""
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr ""
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/pt/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2011-03-11 11:09+0000\n"
 "Last-Translator: nmariz <nmariz@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/pt_BR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-30 05:02+0200\n"
 "Last-Translator: Claudio F Filho <filhocf@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-doc@kde.org>\n"
@@ -799,7 +799,7 @@ msgstr "Obrigado por usar Weblate!"
 msgid "Tweet this translation!"
 msgstr "Utilize esta tradução"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Novo Idioma"
 
@@ -2371,7 +2371,44 @@ msgstr "Use o formulário de contato"
 msgid "Point to translation instructions URL"
 msgstr "Apontar para a URL de instruções de tradução"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Página web do projeto:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Lista de discussão para tradutores:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Instruções para tradutores:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
@@ -2380,18 +2417,18 @@ msgstr ""
 "Você pode usar %(language)s, %(subproject)s ou %(project)s para atalhos de "
 "idioma, nome de projetos ou subprojetos."
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr "Quando o repositório deveria ser enviado em cada publicação."
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 "Quando o Weblate deveria atualizar o time de tradução nos cabeçalhos de "
 "arquivo."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2399,15 +2436,15 @@ msgstr ""
 "Por favor, preencha a URL de instrução ou use uma opção diferente para "
 "adicionar um novo idioma."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Nome de exibição"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Nome usado nas URLs"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2415,11 +2452,11 @@ msgstr ""
 "URL ou repositório GIT, usar weblate://project/subproject para compartilhar "
 "com outros subprojetos"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL do repositório Git para publicação"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2428,11 +2465,11 @@ msgstr ""
 "Link para o navegador do repositório, utilize %(branch)s, %(file)s e "
 "%(line)s como moe do ramo, arquivo e linha."
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Ramo Git para traduzir"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2440,7 +2477,7 @@ msgstr ""
 "Caminho dos arquivos para traduzir, use * invés do código do idioma, como "
 "por exemplo: po/*.po ou locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2449,40 +2486,45 @@ msgstr ""
 "traduções que armazenam apenas texto traduzido como sequências de caracteres "
 "Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Quando um subprojeto está bloqueado para atualização de tradução"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Falha ao importar do repositório Git: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Envio está desativado para %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Falha ao enviar para o ramo remoto em %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Reinicialização do ramo remoto em %s falhou."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Falha ao fundir no ramo remoto com %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Reinicialização do ramo remoto em %s falhou."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Não foram encontrados arquivos com a máscara dada!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2490,25 +2532,25 @@ msgstr ""
 "Existem mais arquivos para um único idioma, por favor, ajuste a máscara e "
 "use os subprojetos para traduzir recursos diferentes."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Formato dos %d arquivos encontrados não pode ser reconhecido."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Falha ao analisar %d arquivos encontrados!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Formato do template da tradução não foi reconhecido."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Falha ao analisar o modelo de tradução."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2517,56 +2559,56 @@ msgstr ""
 "O nome de arquivo %s não foi encontrado no repositório! Para adicionar uma "
 "nova tradução, adicione um novo arquivo de idioma no repositório."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Formato dos %s não foi reconhecido."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Falha ao analisar arquivo %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Esta tradução está atualmente bloqueada para atualização!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "Esta tradução está bloqueada por %(user)s para tradução até %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Todas as cadeias"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Cadeias não traduzidas (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Cadeias vagas (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Cadeias com sugestões (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Cadeias com alguma falha de verificação (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 "Mensagem não encontrada no armazenamento de backend, ele provavelmente está "
 "corrompido."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID de unidade %s"

weblate/locale/pt_BR/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-23 21:58+0200\n"
 "Last-Translator: Claudio F Filho <filhocf@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-doc@kde.org>\n"

weblate/locale/sl/LC_MESSAGES/django.po

@@ -7,16 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-09-06 13:23+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
-"Language-Team: Slovenian <http://l10n.cihar.com/projects/weblate/master/sl/>\n"
+"Language-Team: Slovenian <http://l10n.cihar.com/projects/weblate/master/sl/"
+">\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 "X-Generator: Weblate 1.2\n"
 
 #: urls.py:123 urls.py:130 urls.py:137 urls.py:144
@@ -794,7 +795,7 @@ msgstr "Prevedite %(object)s z %%23Weblate!"
 msgid "Tweet this translation!"
 msgstr "Tweetajte prevod!"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nov jezik"
 
@@ -2354,23 +2355,60 @@ msgstr "Uporabite kontaktni obrazec"
 msgid "Point to translation instructions URL"
 msgstr "Pokažite na URL z navodili za prevajanje"
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Spletna stran projekta:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Poštni seznam za prevajalce:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Navodila za prevajalce:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr "Ali naj Weblate posodobi Translation-Team v glavah datotek."
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
@@ -2378,15 +2416,15 @@ msgstr ""
 "Prosimo, vnesite URL navodil ali uporabite drugačno možnost za dodajanje "
 "novega jezika."
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr "Prikazno ime"
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr "Ime, uporabljeno v URL-jih"
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
@@ -2394,11 +2432,11 @@ msgstr ""
 "URL shrambe Git; uporabite weblate://project/subproject za deljenje z "
 "ostalimi podprojekti"
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr "URL shrambe Git za potiskanje"
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
@@ -2407,11 +2445,11 @@ msgstr ""
 "Povezava do brskalnika po shrambi; uporabite %(branch)s za podvejo, %(file)s "
 "in %(line)s za ime datoteke in označbe mesta vrstice"
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr "Podveja Git za prevajanje"
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
@@ -2419,7 +2457,7 @@ msgstr ""
 "Pot datotek za prevajanje; uporabite * namesto kode jezika, na primer: po/*."
 "po ali locale/*/LC_MESSAGES/django.po"
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
@@ -2427,40 +2465,45 @@ msgstr ""
 "Ime datoteke predloge prevodov; priporočljivo za prevode, ki shranjujejo "
 "samo preveden niz, kot so nizi virov Android"
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr "Ali je podprojekt zaklenjen zaradi posodobitev prevodov"
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr "Zajemanje shrambe git je spodletelo: %s"
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr "Potiskanje je onemogočeno za %s."
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr "Nisem uspel potisniti na oddaljeno podvejo na %s."
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr "Nisem uspel ponastaviti oddaljene podveje na %s."
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr "Nisem uspel združiti oddaljene podveje z %s."
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, fuzzy, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr "Nisem uspel ponastaviti oddaljene podveje na %s."
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr "Maska se ne ujema z nobeno datoteko!"
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
@@ -2468,25 +2511,25 @@ msgstr ""
 "Za posamezen jezik obstaja več datotek; prosimo, prilagodite masko in "
 "uporabite podprojekte za prevajanje različnih virov."
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr "Oblike %d ujemajočih datotek nisem mogel prepoznati."
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr "Nisem uspel razčleniti %d ujemajočih se datotek!"
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr "Oblike predloge prevoda ni mogoče prepoznati."
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr "Razčlenjevanje predloge prevoda ni uspelo."
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
@@ -2495,54 +2538,54 @@ msgstr ""
 "V shrambi nisem našel datoteke z imenom %s! Da dodate nov prevod, v shrambo "
 "dodajte datoteko jezika."
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr "Oblike %s ne morem prepoznati."
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr "Nisem uspel razčleniti datoteke %(file)s: %(error)s"
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr "Prevod je trenutno zaklenjen zaradi posodobitev!"
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr "Prevod je zaklenil %(user)s zaradi prevajanja do %(time)s!"
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr "Vsi nizi"
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr "Neprevedeni nizi (%d)"
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr "Neurejeni nizi (%d)"
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr "Nizi s predlogi (%d)"
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr "Nizi s katerim koli spodletelim preverjanjem (%d)"
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr "Sporočila nisem našel v zaledni shrambi; najverjetneje je pokvarjeno."
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr "ID enote %s"

weblate/locale/sl/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-08-07 14:21+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: Slovenian <http://l10n.cihar.com/projects/weblate/javascript/"

weblate/locale/sv/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-06-27 15:21+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -790,7 +790,7 @@ msgstr "Tack för att du använder Weblate!"
 msgid "Tweet this translation!"
 msgstr "Använd denna översättning"
 
-#: html/subproject.html:28
+#: html/subproject.html:28 trans/models.py:142
 msgid "New language"
 msgstr "Nytt språk"
 
@@ -2294,181 +2294,223 @@ msgstr ""
 msgid "Point to translation instructions URL"
 msgstr ""
 
-#: trans/models.py:138
+#: trans/models.py:123
+msgid "Merge"
+msgstr ""
+
+#: trans/models.py:124
+msgid "Rebase"
+msgstr ""
+
+#: trans/models.py:131
+#, fuzzy
+msgid "Project website"
+msgstr "Projektets webbplats:"
+
+#: trans/models.py:135
+#, fuzzy
+msgid "Email conference for translators"
+msgstr "Sändlista för översättare:"
+
+#: trans/models.py:139
+#, fuzzy
+msgid "URL with instructions for translators"
+msgstr "Instruktioner för översättare:"
+
+#: trans/models.py:146
+msgid "How to handle requests for creating new languages"
+msgstr ""
+
+#: trans/models.py:149
+msgid "Merge style"
+msgstr ""
+
+#: trans/models.py:153
+msgid ""
+"Define whether Weblate should merge upstream repository or rebase changes "
+"onto it"
+msgstr ""
+
+#: trans/models.py:159
 #, python-format
 msgid ""
 "You can use %(language)s, %(subproject)s or %(project)s for language "
 "shortcut, subproject or project names."
 msgstr ""
 
-#: trans/models.py:152
+#: trans/models.py:173
 msgid "Whether the repository should be pushed upstream on every commit."
 msgstr ""
 
-#: trans/models.py:157
+#: trans/models.py:178
 msgid ""
 "Whether the Translation-Team in file headers should be updated by Weblate."
 msgstr ""
 
-#: trans/models.py:165
+#: trans/models.py:186
 msgid ""
 "Please either fill in instructions URL or use different option for adding "
 "new language."
 msgstr ""
 
-#: trans/models.py:321
+#: trans/models.py:342
 msgid "Name to display"
 msgstr ""
 
-#: trans/models.py:325
+#: trans/models.py:346
 msgid "Name used in URLs"
 msgstr ""
 
-#: trans/models.py:330
+#: trans/models.py:351
 msgid ""
 "URL of Git repository, use weblate://project/subproject for sharing with "
 "other subproject"
 msgstr ""
 
-#: trans/models.py:335
+#: trans/models.py:356
 msgid "URL of push Git repository"
 msgstr ""
 
-#: trans/models.py:339
+#: trans/models.py:360
 #, python-format
 msgid ""
 "Link to repository browser, use %(branch)s for branch, %(file)s and %(line)s "
 "as filename and line placeholders"
 msgstr ""
 
-#: trans/models.py:345
+#: trans/models.py:366
 msgid "Git branch to translate"
 msgstr ""
 
-#: trans/models.py:350
+#: trans/models.py:371
 msgid ""
 "Path of files to translate, use * instead of language code, for example: po/"
 "*.po or locale/*/LC_MESSAGES/django.po"
 msgstr ""
 
-#: trans/models.py:355
+#: trans/models.py:376
 msgid ""
 "Filename of translations template, this is recommended to use for "
 "translations which store only translated string like Android resource strings"
 msgstr ""
 
-#: trans/models.py:359
+#: trans/models.py:380
 msgid "Whether subproject is locked for translation updates"
 msgstr ""
 
-#: trans/models.py:519
+#: trans/models.py:540
 #, python-format
 msgid "Failed to fetch git repository: %s"
 msgstr ""
 
-#: trans/models.py:599
+#: trans/models.py:620
 #, python-format
 msgid "Push is disabled for %s."
 msgstr ""
 
-#: trans/models.py:631
+#: trans/models.py:652
 #, python-format
 msgid "Failed to push to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:657
+#: trans/models.py:678
 #, python-format
 msgid "Failed to reset to remote branch on %s."
 msgstr ""
 
-#: trans/models.py:713
+#: trans/models.py:730
 #, python-format
 msgid "Failed to merge remote branch into %s."
 msgstr ""
 
-#: trans/models.py:791
+#: trans/models.py:757
+#, python-format
+msgid "Failed to rebase our branch onto remote branch %s."
+msgstr ""
+
+#: trans/models.py:859
 msgid "The mask did not match any files!"
 msgstr ""
 
-#: trans/models.py:796
+#: trans/models.py:864
 msgid ""
 "There are more files for single language, please adjust the mask and use "
 "subprojects for translating different resources."
 msgstr ""
 
-#: trans/models.py:811
+#: trans/models.py:879
 #, python-format
 msgid "Format of %d matched files could not be recognized."
 msgstr ""
 
-#: trans/models.py:816
+#: trans/models.py:884
 #, python-format
 msgid "Failed to parse %d matched files!"
 msgstr ""
 
-#: trans/models.py:826
+#: trans/models.py:894
 msgid "Format of translation template could not be recognized."
 msgstr ""
 
-#: trans/models.py:828
+#: trans/models.py:896
 msgid "Failed to parse translation template."
 msgstr ""
 
-#: trans/models.py:935
+#: trans/models.py:1003
 #, python-format
 msgid ""
 "Filename %s not found in repository! To add new translation, add language "
 "file into repository."
 msgstr ""
 
-#: trans/models.py:939
+#: trans/models.py:1007
 #, python-format
 msgid "Format of %s could not be recognized."
 msgstr ""
 
-#: trans/models.py:941
+#: trans/models.py:1009
 #, python-format
 msgid "Failed to parse file %(file)s: %(error)s"
 msgstr ""
 
-#: trans/models.py:966 trans/views.py:310
+#: trans/models.py:1034 trans/views.py:310
 msgid "This translation is currently locked for updates!"
 msgstr ""
 
-#: trans/models.py:974
+#: trans/models.py:1042
 #, python-format
 msgid "This translation is locked by %(user)s for translation till %(time)s!"
 msgstr ""
 
-#: trans/models.py:1484
+#: trans/models.py:1552
 msgid "All strings"
 msgstr ""
 
-#: trans/models.py:1490
+#: trans/models.py:1558
 #, python-format
 msgid "Not translated strings (%d)"
 msgstr ""
 
-#: trans/models.py:1492
+#: trans/models.py:1560
 #, python-format
 msgid "Fuzzy strings (%d)"
 msgstr ""
 
-#: trans/models.py:1494
+#: trans/models.py:1562
 #, python-format
 msgid "Strings with suggestions (%d)"
 msgstr ""
 
-#: trans/models.py:1496
+#: trans/models.py:1564
 #, python-format
 msgid "Strings with any failing checks (%d)"
 msgstr ""
 
-#: trans/models.py:1733
+#: trans/models.py:1801
 msgid "Message not found in backend storage, it is probably corrupted."
 msgstr ""
 
-#: trans/models.py:1826
+#: trans/models.py:1894
 #, python-format
 msgid "unit ID %s"
 msgstr ""

weblate/locale/sv/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2004-07-29 21:59+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"

weblate/locale/sw/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+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"

weblate/locale/tr/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-12 19:12+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

weblate/locale/zh_CN/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:28+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+0200\n"
 "PO-Revision-Date: 2012-07-21 02:22+0800\n"
 "Last-Translator: Shanyan Baishui <Siramizu@gmail.com>\n"
 "Language-Team: none\n"

weblate/locale/zh_TW/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Weblate 1.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nijel/weblate/issues\n"
-"POT-Creation-Date: 2012-09-05 10:29+0200\n"
+"POT-Creation-Date: 2012-09-11 15:08+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"