From 652304e82e62f41dad39d346d3226b12c337fcc4 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 2 Feb 2019 01:42:34 +0000 Subject: [PATCH 1/3] [tx-robot] updated from transifex --- .tx/nextcloud.client-desktop/de_translation | 8 ++++---- translations/client_eo.ts | 2 +- translations/client_nl.ts | 2 +- translations/client_ru.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 09564e030d..e3d9ad4069 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Icon[de_DE]=@APPLICATION_ICON_NAME@ -Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -GenericName[de_DE]=Synchronisationsordner +Icon[de]=@APPLICATION_ICON_NAME@ +Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +GenericName[de]=Synchronisationsordner diff --git a/translations/client_eo.ts b/translations/client_eo.ts index a1d630fbb2..c6261388ce 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -519,7 +519,7 @@ Synced - + Sinkronigita diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 116ea50efc..127abad6df 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -519,7 +519,7 @@ Synced - + Gesynchroniseerd diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 5a5ee63dfd..3f3f0bbf9c 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -519,7 +519,7 @@ Synced - + Синхронизировано From 97c54249d5b5e909232ab0cbde70a35450310989 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 4 Feb 2019 01:41:57 +0000 Subject: [PATCH 2/3] [tx-robot] updated from transifex --- .tx/nextcloud.client-desktop/de_translation | 8 ++++---- translations/client_de.ts | 2 +- translations/client_sr.ts | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index e3d9ad4069..09564e030d 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Icon[de]=@APPLICATION_ICON_NAME@ -Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -GenericName[de]=Synchronisationsordner +Icon[de_DE]=@APPLICATION_ICON_NAME@ +Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +GenericName[de_DE]=Synchronisationsordner diff --git a/translations/client_de.ts b/translations/client_de.ts index 7b259bd152..20fc777330 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -809,7 +809,7 @@ The file %1 was created but was excluded from synchronization previously. It will not be synchronized. - Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisert werden. + Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisiert werden. diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 5ab156aff0..6fd6e284ee 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -519,7 +519,7 @@ Synced - + Синхронизовано @@ -1538,7 +1538,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from &Capture debug messages - + &Хватај поруке за исправљање грешака @@ -1865,7 +1865,7 @@ for additional privileges during the process. Free space: %1 - + Слободан простор: %1 @@ -1881,7 +1881,7 @@ for additional privileges during the process. There is no enough free space in the local folder! - + Нема довољно слободног места у локалној фасцикли! From d564279254a8a6e5062a17e5416edebdb7dbc165 Mon Sep 17 00:00:00 2001 From: rakekniven Date: Mon, 4 Feb 2019 17:13:53 +0100 Subject: [PATCH 3/3] Fixed l18n issue. Added space for separating string Related to #1068 Reported at forums with screenshots. See https://help.nextcloud.com/t/client-2-5-1-linux-typo/46796 Signed-off-by: Mark Ziegler --- src/gui/activitywidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index 6a58bbd22f..ac12292ea1 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -179,6 +179,7 @@ void ActivityWidget::slotItemCompleted(const QString &folder, const SyncFileItem if(item->_status == SyncFileItem::NoStatus || item->_status == SyncFileItem::Success){ qCWarning(lcActivity) << "Item " << item->_file << " retrieved successfully."; + activity._message.prepend(" "); activity._message.prepend(tr("Synced")); _model->addSyncFileItemToActivityList(activity); } else {