diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 13:49:54 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 13:49:54 -0400 |
commit | ea2385432817dcf5ad47396d83932f564aa76e4b (patch) | |
tree | effc5c5489cf385ee79c73a4bea59605f53240f9 /l10n/ru/settings.po | |
parent | ba0cf9817526e1206a25a5fe6d70255ab3c9e3bc (diff) | |
parent | fe6450002d6059260c743f48b6f40378454fa1dc (diff) | |
download | nextcloud-server-ea2385432817dcf5ad47396d83932f564aa76e4b.tar.gz nextcloud-server-ea2385432817dcf5ad47396d83932f564aa76e4b.zip |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
Diffstat (limited to 'l10n/ru/settings.po')
-rw-r--r-- | l10n/ru/settings.po | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index aaac8ba2549..28d5f3edccc 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -7,14 +7,15 @@ # <icewind1991@gmail.com>, 2012. # <jekader@gmail.com>, 2012. # <lankme@gmail.com>, 2012. +# Nick Remeslennikov <homolibere@gmail.com>, 2012. # <tony.mccourin@gmail.com>, 2011. # Victor Bravo <>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-07-27 02:02+0200\n" -"PO-Revision-Date: 2012-07-27 00:02+0000\n" +"POT-Creation-Date: 2012-08-05 19:00+0200\n" +"PO-Revision-Date: 2012-08-05 17:01+0000\n" "Last-Translator: owncloud_robot <thomas.mueller@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -23,6 +24,10 @@ msgstr "" "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" +#: ajax/apps/ocs.php:23 +msgid "Unable to load list from App Store" +msgstr "" + #: ajax/lostpassword.php:14 msgid "Email saved" msgstr "Email сохранен" @@ -41,17 +46,21 @@ msgstr "Неверный запрос" #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18 msgid "Authentication error" -msgstr "" +msgstr "Ошибка авторизации" #: ajax/setlanguage.php:18 msgid "Language changed" msgstr "Язык изменён" -#: js/apps.js:31 js/apps.js:67 +#: js/apps.js:18 +msgid "Error" +msgstr "" + +#: js/apps.js:39 js/apps.js:73 msgid "Disable" msgstr "Отключить" -#: js/apps.js:31 js/apps.js:54 +#: js/apps.js:39 js/apps.js:62 msgid "Enable" msgstr "Включить" @@ -65,13 +74,13 @@ msgstr "Русский " #: templates/admin.php:14 msgid "Security Warning" -msgstr "" +msgstr "Предупреждение безопасности" #: templates/admin.php:28 msgid "Log" msgstr "Журнал" -#: templates/admin.php:55 +#: templates/admin.php:56 msgid "More" msgstr "Ещё" @@ -79,19 +88,19 @@ msgstr "Ещё" msgid "Add your App" msgstr "Добавить приложение" -#: templates/apps.php:24 +#: templates/apps.php:26 msgid "Select an App" msgstr "Выберите приложение" -#: templates/apps.php:27 +#: templates/apps.php:29 msgid "See application page at apps.owncloud.com" msgstr "Смотрите дополнения на apps.owncloud.com" -#: templates/apps.php:28 +#: templates/apps.php:30 msgid "-licensed" msgstr "-лицензия" -#: templates/apps.php:28 +#: templates/apps.php:30 msgid "by" msgstr "от" @@ -207,7 +216,7 @@ msgstr "Квота по умолчанию" msgid "Other" msgstr "Другое" -#: templates/users.php:80 +#: templates/users.php:80 templates/users.php:112 msgid "SubAdmin" msgstr "" @@ -215,10 +224,6 @@ msgstr "" msgid "Quota" msgstr "Квота" -#: templates/users.php:112 -msgid "SubAdmin for ..." -msgstr "" - -#: templates/users.php:145 +#: templates/users.php:146 msgid "Delete" msgstr "Удалить" |