diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /settings/l10n/ru.php | |
parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'settings/l10n/ru.php')
-rw-r--r-- | settings/l10n/ru.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 949e9572c1c..5cbeb002ec6 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "Загрузка из App Store запрещена", +"Authentication error" => "Ошибка авторизации", "Email saved" => "Email сохранен", "Invalid email" => "Неправильный Email", "OpenID Changed" => "OpenID изменён", "Invalid request" => "Неверный запрос", -"Authentication error" => "Ошибка авторизации", "Language changed" => "Язык изменён", "Error" => "Ошибка", "Disable" => "Отключить", @@ -21,8 +21,6 @@ "Add your App" => "Добавить приложение", "Select an App" => "Выберите приложение", "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com", -"-licensed" => "-лицензия", -"by" => "от", "Documentation" => "Документация", "Managing Big Files" => "Управление большими файлами", "Ask a question" => "Задать вопрос", |