Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

4 files changed, 24 insertions, 9 deletions

diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 96b82d2481d..98e52faf989 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
 "Delete" => "Verwijder",
+"already exists" => "bestaat al",
+"replace" => "vervang",
+"cancel" => "annuleren",
+"replaced" => "vervangen",
+"with" => "door",
+"undo" => "ongedaan maken",
+"deleted" => "verwijderd",
 "generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
 "Upload Error" => "Upload Fout",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index b606c8ef649..e0da05ba99c 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Files" => "Arquivos",
 "Delete" => "Excluir",
+"already exists" => "já existe",
+"replace" => "substituir",
+"cancel" => "cancelar",
+"replaced" => "substituido ",
+"with" => "com",
+"undo" => "desfazer",
+"deleted" => "deletado",
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 203a4f81ede..71b30d22df4 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -22,30 +22,30 @@
 "Upload cancelled." => "Загрузка отменена.",
 "Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
 "Size" => "Размер",
-"Modified" => "Изменен",
+"Modified" => "Изменён",
 "folder" => "папка",
 "folders" => "папки",
 "file" => "файл",
 "files" => "файлы",
 "File handling" => "Управление файлами",
-"Maximum upload size" => "Максимальный размер файла",
+"Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
-"Needed for multi-file and folder downloads." => "Требуется для загрузки нескольких файорв и папок",
-"Enable ZIP-download" => "Включить ZIP-загрузку",
+"Needed for multi-file and folder downloads." => "Требуется для скачивания нескольких файлов и папок",
+"Enable ZIP-download" => "Включить ZIP-скачивание",
 "0 is unlimited" => "0 - без ограничений",
 "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
 "From url" => "С url",
-"Upload" => "Закачать",
-"Cancel upload" => "Отмена закачки",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Закачайте что-нибудь!",
+"Upload" => "Загрузить",
+"Cancel upload" => "Отмена загрузки",
+"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Name" => "Название",
-"Share" => "Поделиться",
+"Share" => "Опубликовать",
 "Download" => "Скачать",
 "Upload too large" => "Файл слишком большой",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь закачать, превышают лимит для файлов на этом сервере.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
 "Current scanning" => "Текущее сканирование"
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index c6fc9f907d6..ec5ed8ffb4c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -12,6 +12,7 @@
 "replace" => "替换",
 "cancel" => "取消",
 "replaced" => "已经替换",
+"with" => "随着",
 "undo" => "撤销",
 "deleted" => "已经删除",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",