mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into enh/notifications/do_not_show_dismissed

Browse source
This commit is contained in:
Camila Ayres 2019-02-04 20:27:44 +01:00 committed by GitHub
commit d4a77be3f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/activitywidget.cpp
View file

@ -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 {

2
translations/client_de.ts
View file

@ -809,7 +809,7 @@
<message>
<location filename="../src/gui/folder.cpp" line="1015"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisert werden.</translation>
<translation>Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisiert werden.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1026"/>

2
translations/client_eo.ts
View file

@ -519,7 +519,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced</source>
<translation type="unfinished"/>
<translation>Sinkronigita</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>

2
translations/client_nl.ts
View file

@ -519,7 +519,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced</source>
<translation type="unfinished"/>
<translation>Gesynchroniseerd</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>

2
translations/client_ru.ts
View file

@ -519,7 +519,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced</source>
<translation type="unfinished"/>
<translation>Синхронизировано</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>

8
translations/client_sr.ts
View file

@ -519,7 +519,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="182"/>
<source>Synced</source>
<translation type="unfinished"/>
<translation>Синхронизовано</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="217"/>
@ -1538,7 +1538,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="89"/>
<source>&amp;Capture debug messages</source>
<translation type="unfinished"/>
<translation>&amp;Хватај поруке за исправљање грешака</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
@ -1865,7 +1865,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="174"/>
<source>Free space: %1</source>
<translation type="unfinished"/>
<translation>Слободан простор: %1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/>
@ -1881,7 +1881,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="385"/>
<source>There is no enough free space in the local folder!</source>
<translation type="unfinished"/>
<translation>Нема довољно слободног места у локалној фасцикли!</translation>
</message>
</context>
<context>