Mercurial > kallithea
changeset 4679:d16a52f1afb3
Merge new translations from Weblate
author | Andrew Shadura <andrew@shadura.me> |
---|---|
date | Thu, 20 Nov 2014 09:55:21 +0100 |
parents | d07c5501e579 (current diff) 2f2543b9d466 (diff) |
children | 0a45511d1003 |
files | |
diffstat | 4 files changed, 92 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Nov 20 09:54:11 2014 +0100 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Nov 20 09:55:21 2014 +0100 @@ -5,23 +5,25 @@ # stephanj <info@stephan-jauernick.de>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" "POT-Creation-Date: 2014-07-02 19:08-0400\n" -"PO-Revision-Date: 2014-02-13 14:34+0000\n" -"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" +"PO-Revision-Date: 2014-11-19 14:34+0200\n" +"Last-Translator: Ingo von borstel <kallithea@planetmaker.de>\n" "Language-Team: German " -"(http://www.transifex.com/projects/p/Kallithea/language/de/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"<https://hosted.weblate.org/projects/kallithea/kallithea/de/>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.1-dev\n" "Generated-By: Babel 0.9.6\n" #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 #: kallithea/controllers/pullrequests.py:265 msgid "There are no changesets yet" -msgstr "" +msgstr "Es gibt noch keine Änderungssätze" #: kallithea/controllers/changelog.py:186 msgid "All Branches" @@ -29,7 +31,7 @@ #: kallithea/controllers/changelog.py:189 msgid "(closed)" -msgstr "" +msgstr "(geschlossen)" #: kallithea/controllers/changeset.py:87 msgid "Show whitespace" @@ -42,28 +44,30 @@ #: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" -msgstr "" +msgstr "diff-Kontext auf %(num)s Zeilen erhöhen" #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 #: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" -msgstr "" +msgstr "Die angegebene Version existiert nicht in diesem Repository" #: kallithea/controllers/changeset.py:355 #: kallithea/controllers/pullrequests.py:482 #, python-format msgid "Status change -> %s" -msgstr "" +msgstr "Statusänderung -> %s" #: kallithea/controllers/changeset.py:386 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" +"Eine Änderung des Status eines Änderungssatzes, der mit einem geschlossen " +"Pull-Request assoziert ist, ist nicht erlaubt" #: kallithea/controllers/compare.py:194 kallithea/templates/base/root.html:65 msgid "Select changeset" -msgstr "" +msgstr "Änderungssätze auswählen" #: kallithea/controllers/error.py:72 msgid "Home page" @@ -73,7 +77,7 @@ msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Die Anfrage konnte vom Server nicht ausgewertet werden weil sie einen " -"Ungültigen Syntax nutzt" +"Ungültigen Syntax nutzt." #: kallithea/controllers/error.py:104 msgid "Unauthorized access to resource" @@ -81,7 +85,7 @@ #: kallithea/controllers/error.py:106 msgid "You don't have permission to view this page" -msgstr "Du hast keine Rechte um diese Seite zu betrachten" +msgstr "Du hast keine Rechte, um diese Seite zu betrachten" #: kallithea/controllers/error.py:108 msgid "The resource could not be found" @@ -93,7 +97,7 @@ "fulfilling the request." msgstr "" "Aufgrund einer Unerwarteten Gegebenheit konnte der Server diese Anfrage " -"nicht vollenden" +"nicht vollenden." #: kallithea/controllers/feed.py:55 #, python-format @@ -113,7 +117,7 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:178 #: kallithea/templates/pullrequests/pullrequest_show.html:202 msgid "Changeset was too big and was cut off..." -msgstr "" +msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." #: kallithea/controllers/feed.py:93 #, python-format @@ -122,18 +126,18 @@ #: kallithea/controllers/files.py:92 msgid "Click here to add new file" -msgstr "" +msgstr "Hier klicken, um eine neue Datei hinzuzufügen" #: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" -msgstr "" +msgstr "Es gibt hier noch keine Dateien. %s" #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 #: kallithea/controllers/files.py:428 #, python-format msgid "This repository is has been locked by %s on %s" -msgstr "" +msgstr "Dieses Repository ist von %s am %s gesperrt worden" #: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " @@ -142,12 +146,12 @@ #: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" -msgstr "" +msgstr "Datei %s via Kallithea gelöscht" #: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" -msgstr "" +msgstr "Datei %s erfolgreich gelöscht" #: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 #: kallithea/controllers/files.py:498 @@ -161,7 +165,7 @@ #: kallithea/controllers/files.py:387 #, python-format msgid "Edited file %s via Kallithea" -msgstr "" +msgstr "Datei %s via Kallithea editiert" #: kallithea/controllers/files.py:403 msgid "No changes" @@ -174,7 +178,7 @@ #: kallithea/controllers/files.py:440 msgid "Added file via Kallithea" -msgstr "" +msgstr "Datei via Kallithea hinzugefügt" #: kallithea/controllers/files.py:461 msgid "No content" @@ -186,11 +190,11 @@ #: kallithea/controllers/files.py:490 msgid "Location must be relative path and must not contain .. in path" -msgstr "" +msgstr "Der Ort muss ein relativer Pfad sein und darf nicht .. enthalten" #: kallithea/controllers/files.py:524 msgid "Downloads disabled" -msgstr "" +msgstr "Downloads gesperrt" #: kallithea/controllers/files.py:535 #, python-format @@ -233,7 +237,7 @@ #: kallithea/controllers/home.py:86 msgid "Groups" -msgstr "" +msgstr "Gruppen" #: kallithea/controllers/home.py:91 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 @@ -256,11 +260,11 @@ #: kallithea/controllers/home.py:138 msgid "Tag" -msgstr "" +msgstr "Marke" #: kallithea/controllers/home.py:144 msgid "Bookmark" -msgstr "" +msgstr "Lesezeichen" #: kallithea/controllers/journal.py:114 kallithea/controllers/journal.py:157 msgid "public journal" @@ -273,7 +277,7 @@ #: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" -msgstr "" +msgstr "falsches Captcha" #: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" @@ -295,7 +299,7 @@ #: kallithea/templates/changeset/changeset.html:13 #: kallithea/templates/email_templates/changeset_comment.html:15 msgid "Changeset" -msgstr "" +msgstr "Änderungssatz" #: kallithea/controllers/pullrequests.py:157 msgid "Special" @@ -313,12 +317,12 @@ #: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" -msgstr "" +msgstr "Pull-Requests benötigen einen Title mit mindestens 3 Zeichen" #: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" -msgstr "" +msgstr "Fehler beim Erstellen des Pull-Requests: %s" #: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" @@ -330,15 +334,17 @@ #: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" -msgstr "" +msgstr "Erfolgreich Pull-Request gelöscht" #: kallithea/controllers/pullrequests.py:485 msgid "Closing with" -msgstr "" +msgstr "Schließen mit" #: kallithea/controllers/pullrequests.py:522 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" +"Es ist verboten, Pull-Requests bei einem anderem Status als 'abgelehnt' oder " +"'angenommen' zu schließen" #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -371,11 +377,11 @@ #: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" -msgstr "" +msgstr "Standardeinstellungen erfolgreich geupdated" #: kallithea/controllers/admin/defaults.py:111 msgid "Error occurred during update of defaults" -msgstr "" +msgstr "Ein Fehler trat beim updaten der Standardeinstellungen auf" #: kallithea/controllers/admin/gists.py:60 #: kallithea/controllers/admin/my_account.py:257 @@ -387,40 +393,40 @@ #: kallithea/controllers/admin/my_account.py:258 #: kallithea/controllers/admin/users.py:290 msgid "5 minutes" -msgstr "" +msgstr "5 Minuten" #: kallithea/controllers/admin/gists.py:62 #: kallithea/controllers/admin/my_account.py:259 #: kallithea/controllers/admin/users.py:291 msgid "1 hour" -msgstr "" +msgstr "1 Stunde" #: kallithea/controllers/admin/gists.py:63 #: kallithea/controllers/admin/my_account.py:260 #: kallithea/controllers/admin/users.py:292 msgid "1 day" -msgstr "" +msgstr "1 Tag" #: kallithea/controllers/admin/gists.py:64 #: kallithea/controllers/admin/my_account.py:261 #: kallithea/controllers/admin/users.py:293 msgid "1 month" -msgstr "" +msgstr "1 Monat" #: kallithea/controllers/admin/gists.py:68 #: kallithea/controllers/admin/my_account.py:263 #: kallithea/controllers/admin/users.py:295 msgid "Lifetime" -msgstr "" +msgstr "Lebenszeit" #: kallithea/controllers/admin/gists.py:147 msgid "Error occurred during gist creation" -msgstr "" +msgstr "Ein fehler trat auf bei der Erstellung des gist" #: kallithea/controllers/admin/gists.py:185 #, python-format msgid "Deleted gist %s" -msgstr "" +msgstr "gist %s gelöscht" #: kallithea/controllers/admin/gists.py:234 msgid "unmodified" @@ -1105,7 +1111,7 @@ #: kallithea/lib/helpers.py:1101 #, python-format msgid " and %s more" -msgstr "und %s weitere" +msgstr " und %s weitere" #: kallithea/lib/helpers.py:1105 msgid "No Files" @@ -5660,4 +5666,3 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "" -
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Nov 20 09:54:11 2014 +0100 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Nov 20 09:55:21 2014 +0100 @@ -14,18 +14,20 @@ # zhmylove <zhmylove@narod.ru>, 2013 msgid "" msgstr "" -"Project-Id-Version: Kallithea\n" +"Project-Id-Version: Kallithea\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" "POT-Creation-Date: 2014-07-02 19:08-0400\n" -"PO-Revision-Date: 2014-02-13 14:34+0000\n" -"Last-Translator: marcinkuzminski <marcin@python-blog.com>\n" +"PO-Revision-Date: 2014-11-19 13:22+0200\n" +"Last-Translator: Andrew Shadura <andrew@shadura.me>\n" "Language-Team: Russian " -"(http://www.transifex.com/projects/p/Kallithea/language/ru/)\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"<https://hosted.weblate.org/projects/kallithea/kallithea/ru/>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.1-dev\n" "Generated-By: Babel 0.9.6\n" #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90 @@ -52,12 +54,12 @@ #: kallithea/controllers/changeset.py:167 #, python-format msgid "increase diff context to %(num)s lines" -msgstr "" +msgstr "увеличить контекст до %(num)s строк" #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98 #: kallithea/controllers/files.py:121 msgid "Such revision does not exist for this repository" -msgstr "" +msgstr "Нет такой ревизии в этом репозитории" #: kallithea/controllers/changeset.py:355 #: kallithea/controllers/pullrequests.py:482 @@ -106,7 +108,7 @@ #: kallithea/controllers/feed.py:55 #, python-format msgid "Changes on %s repository" -msgstr "Изменения в репозитарии %s" +msgstr "Изменения в репозитории %s" #: kallithea/controllers/feed.py:56 #, python-format @@ -126,7 +128,7 @@ #: kallithea/controllers/feed.py:93 #, python-format msgid "%s committed on %s" -msgstr "%s выполнил commit в %s" +msgstr "%s выполнил коммит в %s" #: kallithea/controllers/files.py:92 msgid "Click here to add new file" @@ -135,7 +137,7 @@ #: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" -msgstr "" +msgstr "Нет файлов. %s" #: kallithea/controllers/files.py:301 kallithea/controllers/files.py:361 #: kallithea/controllers/files.py:428 @@ -146,27 +148,28 @@ #: kallithea/controllers/files.py:313 msgid "You can only delete files with revision being a valid branch " msgstr "" +"Вы можете удалять файлы только в ревизии, связанной с существующей веткой " #: kallithea/controllers/files.py:324 #, python-format msgid "Deleted file %s via Kallithea" -msgstr "" +msgstr "Файл %s удалён с помощью Kallithea" #: kallithea/controllers/files.py:346 #, python-format msgid "Successfully deleted file %s" -msgstr "" +msgstr "Файл %s удалён" #: kallithea/controllers/files.py:350 kallithea/controllers/files.py:416 #: kallithea/controllers/files.py:498 msgid "Error occurred during commit" -msgstr "Во время фиксации изменений произошла ошибка" +msgstr "Во время коммита произошла ошибка" #: kallithea/controllers/files.py:373 msgid "You can only edit files with revision being a valid branch " msgstr "" -"Вы можете редактировать файлы только в редакции, связанной с существующей" -" веткой" +"Вы можете редактировать файлы только в ревизии, связанной с существующей " +"веткой " #: kallithea/controllers/files.py:387 #, python-format @@ -207,7 +210,7 @@ #: kallithea/controllers/files.py:535 #, python-format msgid "Unknown revision %s" -msgstr "Неизвестная версия %s" +msgstr "Неизвестная ревизия %s" #: kallithea/controllers/files.py:537 msgid "Empty repository" @@ -245,7 +248,7 @@ #: kallithea/controllers/home.py:86 msgid "Groups" -msgstr "" +msgstr "Группы" #: kallithea/controllers/home.py:91 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 @@ -285,7 +288,7 @@ #: kallithea/controllers/login.py:187 kallithea/controllers/login.py:232 msgid "bad captcha" -msgstr "" +msgstr "неверная капча" #: kallithea/controllers/login.py:193 msgid "You have successfully registered into Kallithea" @@ -299,7 +302,7 @@ msgid "" "Your password reset was successful, new password has been sent to your " "email" -msgstr "Сброс пароля прошел успешно, новый пароль был отправлен на ваш email" +msgstr "Сброс пароля произведён, новый пароль был отправлен на ваш email" #: kallithea/controllers/pullrequests.py:140 #: kallithea/templates/changeset/changeset.html:13 @@ -323,24 +326,24 @@ #: kallithea/controllers/pullrequests.py:330 msgid "Pull request requires a title with min. 3 chars" -msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" +msgstr "Заголовок pull-запроса должен быть не менее 3-х символов" #: kallithea/controllers/pullrequests.py:332 #, python-format msgid "Error creating pull request: %s" -msgstr "Ошибка при создании pull запроса: %s" +msgstr "Ошибка при создании pull-запроса: %s" #: kallithea/controllers/pullrequests.py:354 msgid "Successfully opened new pull request" -msgstr "Pull запрос создан успешно" +msgstr "Pull-запрос создан успешно" #: kallithea/controllers/pullrequests.py:357 msgid "Error occurred during sending pull request" -msgstr "Произошла ошибка при создании Pull запроса" +msgstr "Произошла ошибка при создании pull-запроса" #: kallithea/controllers/pullrequests.py:397 msgid "Successfully deleted pull request" -msgstr "Pull запрос успешно удалён" +msgstr "Pull-запрос успешно удалён" #: kallithea/controllers/pullrequests.py:485 msgid "Closing with" @@ -349,8 +352,8 @@ #: kallithea/controllers/pullrequests.py:522 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -"Закрытие pull-requst'а со статусом, отличным от 'Одобрено' или " -"'Отклонено' " +"Закрытие pull-запроса со статусом, отличным от «Одобрено» или «Отклонено», " +"невозможно" #: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." @@ -469,22 +472,22 @@ #: kallithea/controllers/admin/my_account.py:161 msgid "Successfully updated password" -msgstr "" +msgstr "Пароль обновлён" #: kallithea/controllers/admin/my_account.py:171 msgid "Error occurred during update of user password" -msgstr "" +msgstr "Ошибка при обновлении пароля" #: kallithea/controllers/admin/my_account.py:213 #: kallithea/controllers/admin/users.py:432 #, python-format msgid "Added email %s to user" -msgstr "Пользователю добавлен E-mail %s" +msgstr "Пользователю добавлен e-mail %s" #: kallithea/controllers/admin/my_account.py:219 #: kallithea/controllers/admin/users.py:438 msgid "An error occurred during email saving" -msgstr "Произошла ошибка при сохранении E-mail" +msgstr "Произошла ошибка при сохранении e-mail" #: kallithea/controllers/admin/my_account.py:228 #: kallithea/controllers/admin/users.py:449 @@ -817,6 +820,8 @@ "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" +"Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " +"отсутствует" #: kallithea/controllers/admin/settings.py:182 #: kallithea/controllers/admin/settings.py:274 @@ -1832,7 +1837,7 @@ #: kallithea/model/validators.py:294 msgid "Invalid old password" -msgstr "" +msgstr "Неверно задан старый пароль" #: kallithea/model/validators.py:310 msgid "Passwords do not match" @@ -1981,7 +1986,7 @@ #: kallithea/templates/index_base.html:6 #: kallithea/templates/admin/repos/repos.html:12 msgid "repositories" -msgstr "репозитарии" +msgstr "репозитории" #: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 @@ -5485,6 +5490,7 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:77 #: kallithea/templates/pullrequests/pullrequest_show.html:79 +#, fuzzy msgid "Pull changes" msgstr "Pull изменения" @@ -5498,7 +5504,7 @@ #: kallithea/templates/pullrequests/pullrequest_show.html:137 msgid "Save Changes" -msgstr "" +msgstr "Сохранить изменения" #: kallithea/templates/pullrequests/pullrequest_show.html:149 msgid "Compare view" @@ -5517,7 +5523,7 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:14 #, python-format msgid "Pull requests to %s" -msgstr "Pull запросы для %s" +msgstr "Pull-запросы для %s" #: kallithea/templates/pullrequests/pullrequest_show_all.html:38 #, python-format @@ -5535,7 +5541,7 @@ #: kallithea/templates/pullrequests/pullrequest_show_all.html:52 msgid "Show closed pull requests too" -msgstr "Показать закрытые pull запросы" +msgstr "Показать закрытые pull-запросы" #: kallithea/templates/search/search.html:6 #, python-format @@ -5561,7 +5567,7 @@ #: kallithea/templates/search/search.html:69 msgid "Commit messages" -msgstr "Сообщения commit'а" +msgstr "Сообщения коммитов" #: kallithea/templates/search/search.html:70 msgid "File names" @@ -5731,4 +5737,3 @@ #: kallithea/templates/tags/tags.html:29 msgid "Compare tags" msgstr "Сравнить метки" -