From 0de4a2af050495e12497d175dd55d69936986423 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 28 Jul 2021 10:34:58 +0300 Subject: [PATCH 01/47] change downloadAs resource --- js/main.js | 2 +- l10n/bg.js | 1 - l10n/bg.json | 1 - l10n/de.js | 1 - l10n/de.json | 1 - l10n/de_DE.js | 1 - l10n/de_DE.json | 1 - l10n/es.js | 1 - l10n/es.json | 1 - l10n/fr.js | 1 - l10n/fr.json | 1 - l10n/it.js | 1 - l10n/it.json | 1 - l10n/ja.js | 1 - l10n/ja.json | 1 - l10n/pl.js | 1 - l10n/pl.json | 1 - l10n/pt_BR.js | 1 - l10n/pt_BR.json | 1 - l10n/ru.js | 4 ++-- l10n/ru.json | 4 ++-- l10n/sv.js | 1 - l10n/sv.json | 1 - l10n/zh_CN.js | 1 - l10n/zh_CN.json | 1 - 25 files changed, 5 insertions(+), 27 deletions(-) diff --git a/js/main.js b/js/main.js index be7dba0d..8448602a 100644 --- a/js/main.js +++ b/js/main.js @@ -190,7 +190,7 @@ dialog_title: t("onlyoffice", "Download as") }); - $(dialog[0].querySelectorAll("p")).text(fileName + " " + t(OCA.Onlyoffice.AppName, "Convert into")); + $(dialog[0].querySelectorAll("p")).text(t(OCA.Onlyoffice.AppName, "Choose a format to convert {fileName}", {fileName: fileName})); var extension = getFileExtension(fileName); var selectNode = dialog[0].querySelectorAll("select")[0]; diff --git a/l10n/bg.js b/l10n/bg.js index 7f9f7931..60b1fdc2 100644 --- a/l10n/bg.js +++ b/l10n/bg.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Файлът бе преобразуван. Съдържанието му може да изглежда различно.", "Download as": "Изтегли като", "Download": "Изтегли", - "Convert into": "Конвертирай в", "Origin format": "Формат на произход", "Failed to send notification": "Неуспешно изпращане на известие", "Notification sent successfully": "Успешно изпратено известие", diff --git a/l10n/bg.json b/l10n/bg.json index 88f466a9..e693a1e4 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Файлът бе преобразуван. Съдържанието му може да изглежда различно.", "Download as": "Изтегли като", "Download": "Изтегли", - "Convert into": "Конвертирай в", "Origin format": "Формат на произход", "Failed to send notification": "Неуспешно изпращане на известие", "Notification sent successfully": "Успешно изпратено известие", diff --git a/l10n/de.js b/l10n/de.js index 23682f81..0b95c91a 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.", "Download as": "Herunterladen als", "Download": "Herunterladen", - "Convert into": "Konvertieren in", "Origin format": "Ursprüngliches Format", "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", diff --git a/l10n/de.json b/l10n/de.json index 048a12f1..37d3deb9 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.", "Download as": "Herunterladen als", "Download": "Herunterladen", - "Convert into": "Konvertieren in", "Origin format": "Ursprüngliches Format", "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 5819f73a..700efd17 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.", "Download as": "Herunterladen als", "Download": "Herunterladen", - "Convert into": "Konvertieren in", "Origin format": "Ursprüngliches Format", "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 71a103c0..d3088d89 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.", "Download as": "Herunterladen als", "Download": "Herunterladen", - "Convert into": "Konvertieren in", "Origin format": "Ursprüngliches Format", "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", diff --git a/l10n/es.js b/l10n/es.js index 196b9314..3a3760f5 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "El archivo se ha convertido. Su contenido puede ser distinto.", "Download as": "Descargar como", "Download": "Descargar", - "Convert into": "Convertir en", "Origin format": "Formato original", "Failed to send notification": "Error al enviar la notificación", "Notification sent successfully": "Notificación enviada correctamente", diff --git a/l10n/es.json b/l10n/es.json index 82dcc576..00709c62 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "El archivo se ha convertido. Su contenido puede ser distinto.", "Download as": "Descargar como", "Download": "Descargar", - "Convert into": "Convertir en", "Origin format": "Formato original", "Failed to send notification": "Error al enviar la notificación", "Notification sent successfully": "Notificación enviada correctamente", diff --git a/l10n/fr.js b/l10n/fr.js index c81a006c..e5b3aa98 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.", "Download as": "Télécharger sous", "Download": "Télécharger", - "Convert into": "Convertir en", "Origin format": "Format d’origin", "Failed to send notification": "Échec de l’envoi de la notification", "Notification sent successfully": "Notification a été envoyée avec succès", diff --git a/l10n/fr.json b/l10n/fr.json index c4339388..b59c3bee 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.", "Download as": "Télécharger sous", "Download": "Télécharger", - "Convert into": "Convertir en", "Origin format": "Format d’origin", "Failed to send notification": "Échec de l’envoi de la notification", "Notification sent successfully": "Notification a été envoyée avec succès", diff --git a/l10n/it.js b/l10n/it.js index 2b8ac6e0..d1b9f30f 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Il file è stato convertito. Il suo contenuto potrebbe avere un aspetto diverso.", "Download as": "Scaricare come", "Download": "Scaricare", - "Convert into": "Convertire in", "Origin format": "Formato di origine", "Failed to send notification": "Invio di notifica non riuscito", "Notification sent successfully": "Notifica è stata inviata con successo", diff --git a/l10n/it.json b/l10n/it.json index b6867d42..e0c0b34a 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Il file è stato convertito. Il suo contenuto potrebbe avere un aspetto diverso.", "Download as": "Scaricare come", "Download": "Scaricare", - "Convert into": "Convertire in", "Origin format": "Formato di origine", "Failed to send notification": "Invio di notifica non riuscito", "Notification sent successfully": "Notifica è stata inviata con successo", diff --git a/l10n/ja.js b/l10n/ja.js index 86a16b80..9bbfa768 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "ファイルが変換されました。 その内容は異なって見えるかもしれません。", "Download as": "別の形式でダウンロード", "Download": "ダウンロード", - "Convert into": "に変換する", "Origin format": "オリジンの形式", "Failed to send notification": "通知を送信できませんでした", "Notification sent successfully": "通知を送信しました", diff --git a/l10n/ja.json b/l10n/ja.json index 4c1f4bdb..47baf443 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "ファイルが変換されました。 その内容は異なって見えるかもしれません。", "Download as": "別の形式でダウンロード", "Download": "ダウンロード", - "Convert into": "に変換する", "Origin format": "オリジンの形式", "Failed to send notification": "通知を送信できませんでした", "Notification sent successfully": "通知を送信しました", diff --git a/l10n/pl.js b/l10n/pl.js index 70b40f7e..796fda8f 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Plik został przekonwertowany. Jego zawartość może wyglądać inaczej.", "Download as": "Pobierz jako", "Download": "Pobierz", - "Convert into": "Konwertuj do", "Origin format": "Oryginalny format", "Failed to send notification": "Nie udało się wysłać powiadomienia", "Notification sent successfully": "Powiadomienie zostało wysłane", diff --git a/l10n/pl.json b/l10n/pl.json index e2652689..28f0ab1f 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Plik został przekonwertowany. Jego zawartość może wyglądać inaczej.", "Download as": "Pobierz jako", "Download": "Pobierz", - "Convert into": "Konwertuj do", "Origin format": "Oryginalny format", "Failed to send notification": "Nie udało się wysłać powiadomienia", "Notification sent successfully": "Powiadomienie zostało wysłane", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 6558701e..e268d991 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "O arquivo foi convertido. Seu conteúdo pode ser diferente.", "Download as": "Baixar", "Download": "Baixar como", - "Convert into": "Converter em", "Origin format": "Formato de origem", "Failed to send notification": "Falha ao enviar notificação", "Notification sent successfully": "Notificação enviada com sucesso", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 75557f07..bd96c5fc 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "O arquivo foi convertido. Seu conteúdo pode ser diferente.", "Download as": "Baixar", "Download": "Baixar como", - "Convert into": "Converter em", "Origin format": "Formato de origem", "Failed to send notification": "Falha ao enviar notificação", "Notification sent successfully": "Notificação enviada com sucesso", diff --git a/l10n/ru.js b/l10n/ru.js index 6543f1b5..b986af5c 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -104,11 +104,11 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Файл был сконвертирован. Его форматирование могло измениться.", "Download as": "Скачать как", "Download": "Скачать", - "Convert into": "Конвертировать в", "Origin format": "Оригинальный формат", "Failed to send notification": "Ошибка отправки оповещения", "Notification sent successfully": "Оповещение успешно отправлено", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упоминул в %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упоминул в {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упоминул в {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Выберите формат для конвертации {fileName}" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/l10n/ru.json b/l10n/ru.json index 38b928e6..e7c594ad 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -102,11 +102,11 @@ "File has been converted. Its content might look different.": "Файл был сконвертирован. Его форматирование могло измениться.", "Download as": "Скачать как", "Download": "Скачать", - "Convert into": "Конвертировать в", "Origin format": "Оригинальный формат", "Failed to send notification": "Ошибка отправки оповещения", "Notification sent successfully": "Оповещение успешно отправлено", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упоминул в %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упоминул в {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упоминул в {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Выберите формат для конвертации {fileName}" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" } \ No newline at end of file diff --git a/l10n/sv.js b/l10n/sv.js index 3d00d9c8..787906ee 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "Filen har konverterats. Dess innehåll kan se annorlunda ut.", "Download as": "Ladda ned som", "Download": "Ladda ned", - "Convert into": "Konvertera till", "Origin format": "Ursprungsformat", "Failed to send notification": "Det gick inte att skicka aviseringen", "Notification sent successfully": "Aviseringen har skickats", diff --git a/l10n/sv.json b/l10n/sv.json index 99c88450..55830b87 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "Filen har konverterats. Dess innehåll kan se annorlunda ut.", "Download as": "Ladda ned som", "Download": "Ladda ned", - "Convert into": "Konvertera till", "Origin format": "Ursprungsformat", "Failed to send notification": "Det gick inte att skicka aviseringen", "Notification sent successfully": "Aviseringen har skickats", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 81512d0e..66b4db05 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -104,7 +104,6 @@ OC.L10N.register( "File has been converted. Its content might look different.": "文件已被转换。其内容可能看起来有所不同。", "Download as": "下载为", "Download": "下载", - "Convert into": "转换为", "Origin format": "原产地格式", "Failed to send notification": "发送通知失败", "Notification sent successfully": "通知发送成功", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index 4b082dee..f68257b0 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -102,7 +102,6 @@ "File has been converted. Its content might look different.": "文件已被转换。其内容可能看起来有所不同。", "Download as": "下载为", "Download": "下载", - "Convert into": "转换为", "Origin format": "原产地格式", "Failed to send notification": "发送通知失败", "Notification sent successfully": "通知发送成功", From d9b100489d31993543ebad6d2acd55c152c3ec78 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Wed, 28 Jul 2021 13:30:02 +0300 Subject: [PATCH 02/47] Add translations (de, es, fr, it, pt, zh), fix ru --- l10n/de.js | 3 ++- l10n/de.json | 3 ++- l10n/de_DE.js | 3 ++- l10n/de_DE.json | 3 ++- l10n/es.js | 3 ++- l10n/es.json | 3 ++- l10n/fr.js | 3 ++- l10n/fr.json | 3 ++- l10n/it.js | 3 ++- l10n/it.json | 3 ++- l10n/pt_BR.js | 3 ++- l10n/pt_BR.json | 3 ++- l10n/ru.js | 6 +++--- l10n/ru.json | 6 +++--- l10n/zh_CN.js | 3 ++- l10n/zh_CN.json | 3 ++- 16 files changed, 34 insertions(+), 20 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index 0b95c91a..170c66e0 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".", + "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index 37d3deb9..72bba771 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -106,6 +106,7 @@ "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".", + "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 700efd17..e8b56766 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".", + "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de_DE.json b/l10n/de_DE.json index d3088d89..91740b01 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -106,6 +106,7 @@ "Failed to send notification": "Fehler beim Senden einer Benachrichtigung", "Notification sent successfully": "Benachrichtigung erfolgreich gesendet", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".", + "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js index 3a3760f5..081207b2 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Error al enviar la notificación", "Notification sent successfully": "Notificación enviada correctamente", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha mencionado en %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/l10n/es.json index 00709c62..4f2b097e 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -106,6 +106,7 @@ "Failed to send notification": "Error al enviar la notificación", "Notification sent successfully": "Notificación enviada correctamente", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha mencionado en %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha mencionado en {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha mencionado en {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/fr.js b/l10n/fr.js index e5b3aa98..7536c5e3 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Échec de l’envoi de la notification", "Notification sent successfully": "Notification a été envoyée avec succès", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s a mentionné dans %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} a mentionné dans {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} a mentionné dans {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/fr.json b/l10n/fr.json index b59c3bee..f25d3621 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -106,6 +106,7 @@ "Failed to send notification": "Échec de l’envoi de la notification", "Notification sent successfully": "Notification a été envoyée avec succès", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s a mentionné dans %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} a mentionné dans {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} a mentionné dans {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } diff --git a/l10n/it.js b/l10n/it.js index d1b9f30f..901f3bce 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Invio di notifica non riuscito", "Notification sent successfully": "Notifica è stata inviata con successo", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha menzionato in %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha menzionato nel {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha menzionato nel {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}" }, "nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/it.json b/l10n/it.json index e0c0b34a..70878d5e 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -106,6 +106,7 @@ "Failed to send notification": "Invio di notifica non riuscito", "Notification sent successfully": "Notifica è stata inviata con successo", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha menzionato in %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha menzionato nel {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha menzionato nel {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index e268d991..88c9a5e4 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Falha ao enviar notificação", "Notification sent successfully": "Notificação enviada com sucesso", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s mencionado em %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} mencionado em {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} mencionado em {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index bd96c5fc..215e5b9b 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -106,6 +106,7 @@ "Failed to send notification": "Falha ao enviar notificação", "Notification sent successfully": "Notificação enviada com sucesso", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s mencionado em %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} mencionado em {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} mencionado em {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } diff --git a/l10n/ru.js b/l10n/ru.js index b986af5c..63ac85a3 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -107,8 +107,8 @@ OC.L10N.register( "Origin format": "Оригинальный формат", "Failed to send notification": "Ошибка отправки оповещения", "Notification sent successfully": "Оповещение успешно отправлено", - "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упоминул в %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упоминул в {file}: \"%1\$s\".", - "Choose a format to convert {fileName}": "Выберите формат для конвертации {fileName}" + "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упомянул в %2\$s: \"%3\$s\".", + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упомянул в {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Выберите формат для {fileName}" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/l10n/ru.json b/l10n/ru.json index e7c594ad..81b2801a 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -105,8 +105,8 @@ "Origin format": "Оригинальный формат", "Failed to send notification": "Ошибка отправки оповещения", "Notification sent successfully": "Оповещение успешно отправлено", - "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упоминул в %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упоминул в {file}: \"%1$s\".", - "Choose a format to convert {fileName}": "Выберите формат для конвертации {fileName}" + "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упомянул в %2$s: \"%3$s\".", + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упомянул в {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Выберите формат для {fileName}" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" } \ No newline at end of file diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 66b4db05..59e6c9e5 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "发送通知失败", "Notification sent successfully": "通知发送成功", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s 提到 %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 提到 {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 提到 {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "选择要转换{fileName}的格式" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index f68257b0..54028f10 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -106,6 +106,7 @@ "Failed to send notification": "发送通知失败", "Notification sent successfully": "通知发送成功", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s 提到 %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} 提到 {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} 提到 {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "选择要转换{fileName}的格式" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From a72268828c37a6c9096ef2b390d2dd2c67ea24cb Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Wed, 28 Jul 2021 17:31:00 +0300 Subject: [PATCH 03/47] Add translation - ja --- l10n/ja.js | 3 ++- l10n/ja.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/l10n/ja.js b/l10n/ja.js index 9bbfa768..4eb00f75 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "通知を送信できませんでした", "Notification sent successfully": "通知を送信しました", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s は %2\$s: \"%3\$s\"に記載されました。", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は {file}: \"%1\$s\"に記載しました。" + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は {file}: \"%1\$s\"に記載しました。", + "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/ja.json b/l10n/ja.json index 47baf443..90eb6cea 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -106,6 +106,7 @@ "Failed to send notification": "通知を送信できませんでした", "Notification sent successfully": "通知を送信しました", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s は %2$s: \"%3$s\"に記載されました。", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} は {file}: \"%1$s\"に記載しました。" + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} は {file}: \"%1$s\"に記載しました。", + "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From 8214ba1dd69cf8fcf2159a9873d1dffc0631796a Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Tue, 3 Aug 2021 16:16:20 +0300 Subject: [PATCH 04/47] Add translations - bg, sv --- l10n/bg.js | 3 ++- l10n/bg.json | 3 ++- l10n/sv.js | 3 ++- l10n/sv.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/l10n/bg.js b/l10n/bg.js index 60b1fdc2..026a007c 100644 --- a/l10n/bg.js +++ b/l10n/bg.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Неуспешно изпращане на известие", "Notification sent successfully": "Успешно изпратено известие", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s, споменат във %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/l10n/bg.json b/l10n/bg.json index e693a1e4..334e09d6 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -106,6 +106,7 @@ "Failed to send notification": "Неуспешно изпращане на известие", "Notification sent successfully": "Успешно изпратено известие", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s, споменат във %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier}, споменат във {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier}, споменат във {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" } \ No newline at end of file diff --git a/l10n/sv.js b/l10n/sv.js index 787906ee..ce8e492d 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Det gick inte att skicka aviseringen", "Notification sent successfully": "Aviseringen har skickats", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} har nämnt i {file}: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} har nämnt i {file}: \"%1\$s\".", + "Choose a format to convert {fileName}": "Välj ett filformat för att konvertera {fileName}" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/sv.json b/l10n/sv.json index 55830b87..b2fd4a22 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -106,6 +106,7 @@ "Failed to send notification": "Det gick inte att skicka aviseringen", "Notification sent successfully": "Aviseringen har skickats", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} har nämnt i {file}: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} har nämnt i {file}: \"%1$s\".", + "Choose a format to convert {fileName}": "Välj ett filformat för att konvertera {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From bde9f41e46a6c7c47222fceac42baca70b6943d1 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Wed, 4 Aug 2021 19:03:36 +0300 Subject: [PATCH 05/47] Add translation - pl, fix sv --- l10n/pl.js | 3 ++- l10n/pl.json | 3 ++- l10n/sv.js | 2 +- l10n/sv.json | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/l10n/pl.js b/l10n/pl.js index 796fda8f..c8b04a9d 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -108,6 +108,7 @@ OC.L10N.register( "Failed to send notification": "Nie udało się wysłać powiadomienia", "Notification sent successfully": "Powiadomienie zostało wysłane", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s dodał(a) w %2\$s następujący komentarz: \"%3\$s\".", - "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1\$s\"." + "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1\$s\".", + "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}" }, "nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/pl.json b/l10n/pl.json index 28f0ab1f..73f35f17 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -106,6 +106,7 @@ "Failed to send notification": "Nie udało się wysłać powiadomienia", "Notification sent successfully": "Powiadomienie zostało wysłane", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s dodał(a) w %2$s następujący komentarz: \"%3$s\".", - "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1$s\"." + "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1$s\".", + "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/sv.js b/l10n/sv.js index ce8e492d..60321072 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -109,6 +109,6 @@ OC.L10N.register( "Notification sent successfully": "Aviseringen har skickats", "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} har nämnt i {file}: \"%1\$s\".", - "Choose a format to convert {fileName}": "Välj ett filformat för att konvertera {fileName}" + "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till." }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/sv.json b/l10n/sv.json index b2fd4a22..3cab2068 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -107,6 +107,6 @@ "Notification sent successfully": "Aviseringen har skickats", "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} har nämnt i {file}: \"%1$s\".", - "Choose a format to convert {fileName}": "Välj ett filformat för att konvertera {fileName}" + "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till." },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file From aec3300ff6e0ff363447cc1fb3e867578aa29a14 Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Wed, 11 Aug 2021 10:24:01 +0300 Subject: [PATCH 06/47] open share link directly --- js/main.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/js/main.js b/js/main.js index be7dba0d..acd4f2c6 100644 --- a/js/main.js +++ b/js/main.js @@ -430,16 +430,27 @@ return; } - var button = document.createElement("a"); - button.href = OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/s/" + encodeURIComponent($("#sharingToken").val())); - button.className = "onlyoffice-public-open button"; - button.innerText = t(OCA.Onlyoffice.AppName, "Open in ONLYOFFICE") + var editorUrl = OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/s/" + encodeURIComponent($("#sharingToken").val())); - if (!OCA.Onlyoffice.setting.sameTab) { - button.target = "_blank"; - } + if (_oc_appswebroots.richdocuments + || _oc_appswebroots.files_pdfviewer && extension === "pdf" + || _oc_appswebroots.text && extension === "txt") { + + var button = document.createElement("a"); + button.href = editorUrl; + button.className = "onlyoffice-public-open button"; + button.innerText = t(OCA.Onlyoffice.AppName, "Open in ONLYOFFICE") - $("#preview").prepend(button); + if (!OCA.Onlyoffice.setting.sameTab) { + button.target = "_blank"; + } + + $("#preview").prepend(button); + } else { + OCA.Onlyoffice.frameSelector = "#onlyofficeFrame"; + var $iframe = $("