diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 12:12:07 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 12:12:07 +0200 |
| commit | 13017ce9e114d84ba9b4ced240e5648447fdfe45 (patch) | |
| tree | 5a4ae7b311319a239d9c6792cefc879b5558d1cc /apps/files/l10n/ru.php | |
| parent | b25ab94a08ab9ba5e322043ac470d5352d456c71 (diff) | |
| parent | db06b906e50d7d1b7eca28f51db913af1fbc81f1 (diff) | |
| download | nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.tar.gz nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'apps/files/l10n/ru.php')
| -rw-r--r-- | apps/files/l10n/ru.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 83412bf2be8..43a8dc70080 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} папок", "1 file" => "1 файл", "{count} files" => "{count} файлов", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.", "Unable to rename file" => "Невозможно переименовать файл", "Upload" => "Загрузка", "File handling" => "Управление файлами", |