diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
| commit | 9fb71af98850ad6638c4238ae0938972a9f23b50 (patch) | |
| tree | 52e081bc8577f78505ea80fc7158eb9235c7ed59 /lib/l10n/ru_RU.php | |
| parent | 6443e570c2793954309f9541cd6a7a8c309644ac (diff) | |
| parent | 5b7b0536346a4a6608e0b294b6784ac5ff3b142a (diff) | |
| download | nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.tar.gz nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.zip | |
Merge branch 'master' into encryption_enable_public_upload
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'lib/l10n/ru_RU.php')
| -rw-r--r-- | lib/l10n/ru_RU.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php index 622333c3855..23e900721e8 100644 --- a/lib/l10n/ru_RU.php +++ b/lib/l10n/ru_RU.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "Help" => "Помощь", "Settings" => "Настройки", "Files" => "Файлы", +"Text" => "Текст", "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), "_%n day go_::_%n days ago_" => array("","",""), |