Skip to content

Commit

Permalink
Merge pull request #2 from Sugaroverdose/fix-error-typo-en-fr
Browse files Browse the repository at this point in the history
Fix typo in error message, add Russian translation
  • Loading branch information
leizh committed Dec 30, 2014
2 parents b670064 + 1d7f523 commit 5572abe
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 3 deletions.
2 changes: 1 addition & 1 deletion js/clipboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function paste() {
if (data.status == 'error') {
var message;
if (clipboard.operation == 'cut') message = t(appid, "An error occurred during the move.");
else message = t(appid, "Une erreur s'est produite during the copy.");
else message = t(appid, "An error occurred during the copy.");
OC.Notification.hide();
OC.Notification.show(message);
} else {
Expand Down
2 changes: 1 addition & 1 deletion l10n/fr.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Unable to paste: you do not have the permissions to create files in this directory." => "Impossible de coller : vous n'avez pas les permissions pour créer des fichiers dans ce répertoire.",
"_Paste %n item_::_Paste %n items_" => array("Coller un élément","Coller %n éléments"),
"An error occurred during the move." => "Une erreur s'est produite lors du déplacement.",
"Une erreur s'est produite during the copy." => "Une erreur s'est produite lors de la copie.",
"An error occurred during the copy." => "Une erreur s'est produite lors de la copie.",
"Processing. Leaving the page now will interrupt the move." => "Traitement en cours. Quitter la page maintenant va interrompre le déplacement.",
"Processing. Leaving the page now will interrupt the copy." => "Traitement en cours. Quitter la page maintenant va interrompre la copie.",
"The contents of the clipboard is in conflicts with elements already present in this directory. Do you want to replace them ?" => "Le contenu du presse-papier entre en conflit avec des éléments déjà présent à cet emplacement. Souhaitez-vous les remplacer ?"
Expand Down
2 changes: 1 addition & 1 deletion l10n/fr/files_clipboard.po
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ msgid "An error occurred during the move."
msgstr "Une erreur s'est produite lors du déplacement."

#: js/clipboard.js:132
msgid "Une erreur s'est produite during the copy."
msgid "An error occurred during the copy."
msgstr "Une erreur s'est produite lors de la copie."

#: js/clipboard.js:153
Expand Down
16 changes: 16 additions & 0 deletions l10n/ru.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php $TRANSLATIONS = array(
"Could not remove '%s'" => "Невозможно удалить '%s'.",
"Could not move '%s'" => "Невозможно переместить '%s'.",
"Could not copy '%s'" => "Невозможно копировать '%s'.",
"Cut" => "Вырезать",
"Copy" => "Копировать",
"Paste" => "Вставить",
"Unable to paste: the files come from this directory." => "Вставка не возможна: элементы взяты из этой директории.",
"Unable to paste: you do not have the permissions to create files in this directory." => "Вставка не возможна: у Вас недостаточно прав для создания элементов в этой директории.",
"_Paste %n item_::_Paste %n items_" => array("Вставить элемент","Вставить элементы: %n"),
"An error occurred during the move." => "Во время перемещения элементов произошла ошибка.",
"An error occurred during the copy." => "Во время копирования элементов произошла ошибка.",
"Processing. Leaving the page now will interrupt the move." => "Обработка. Выход с данной страницы приведет к прерыванию процесса переноса.",
"Processing. Leaving the page now will interrupt the copy." => "Обработка. Выход с данной страницы приведет к прерыванию процесса копирования.",
"The contents of the clipboard is in conflicts with elements already present in this directory. Do you want to replace them ?" => "Содержимое буфера обмена конфликтует с элементами находящимися в папке. Заменить конфликтующие эелементы папки ?"
);
86 changes: 86 additions & 0 deletions l10n/ru/files_clipboard.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
#
# Translators:
# Sugaroverdose <n1nj4p0w3r@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud files_clipboard\n"
"Last-Translator: Sugaroverdose <n1nj4p0w3r@gmail.com>\n"
"Language-Team: Russian\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: ajax/clipboard.php:48
#, php-format
msgid "Could not remove '%s'"
msgstr "Невозможно удалить '%s'."

#: ajax/clipboard.php:55
#, php-format
msgid "Could not move '%s'"
msgstr "Невозможно переместить '%s'."

#: ajax/clipboard.php:59
#, php-format
msgid "Could not copy '%s'"
msgstr "Невозможно копировать '%s'."

#: js/clipboard.js:11
msgid "Cut"
msgstr "Вырезать"

#: js/clipboard.js:19
msgid "Copy"
msgstr "Копировать"

#: js/clipboard.js:26 js/clipboard.js:165
msgid "Paste"
msgstr "Вставить"

#: js/clipboard.js:63
msgid "Unable to paste: the files come from this directory."
msgstr "Вставка не возможна: элементы взяты из этой директории."

#: js/clipboard.js:64
msgid ""
"Unable to paste: you do not have the permissions to create files in this "
"directory."
msgstr ""
"Вставка не возможна: у Вас недостаточно прав для создания элементов в этой "
"директории."

#: js/clipboard.js:65
msgid "Paste %n item"
msgid_plural "Paste %n items"
msgstr[0] "Вставить элемент"
msgstr[1] "Вставить элементы: %n"

#: js/clipboard.js:131
msgid "An error occurred during the move."
msgstr "Во время перемещения элементов произошла ошибка."

#: js/clipboard.js:132
msgid "An error occurred during the copy."
msgstr "Во время копирования элементов произошла ошибка."

#: js/clipboard.js:153
msgid "Processing. Leaving the page now will interrupt the move."
msgstr ""
"Обработка. Выход с данной страницы приведет к прерыванию процесса "
"переноса."

#: js/clipboard.js:154
msgid "Processing. Leaving the page now will interrupt the copy."
msgstr ""
"Обработка. Выход с данной страницы приведет к прерыванию процесса "
"копирования."

#: js/clipboard.js:164
msgid ""
"The contents of the clipboard is in conflicts with elements already present "
"in this directory. Do you want to replace them ?"
msgstr ""
"Содержимое буфера обмена конфликтует с элементами находящимися в папке. "
"Заменить конфликтующие элементы папки ?"

0 comments on commit 5572abe

Please sign in to comment.