[tx-robot] updated from transifex

diff --git a/translations/client_de.ts b/translations/client_de.ts
index 1cecafb948c4a738c2fa2a0827a9ba2f83a111f1..303a742fa082700c91d4b6a9cc86ed4101e664cc 100644 (file)
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -360,7 +360,7 @@
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="458"/>
         <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation>
     </message>
     <message>
         <location filename="../src/gui/activitywidget.cpp" line="463"/>
@@ -651,22 +651,24 @@ Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
         <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>Dieser Sync-Vorgang des Synchronisationsordners &apos;%1&apos; würde Dateien auf ein früheres Änderungsdatum zurücksetzen.
+Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt wurde.
+Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1209"/>
         <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Backup erkannt</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1211"/>
         <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Normale Synchronisation</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1212"/>
         <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Lokale Konfliktdateien behalten</translation>
     </message>
 </context>
 <context>
@@ -3344,7 +3346,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
     <message>
         <location filename="../src/gui/application.cpp" line="571"/>
         <source>QT_LAYOUT_DIRECTION</source>
-        <translation type="unfinished"/>
+        <translation>QT_LAYOUT_DIRECTION</translation>
     </message>
 </context>
 <context>
@@ -3357,7 +3359,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
     <message>
         <location filename="../src/libsync/utility.cpp" line="449"/>
         <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>in der Zukunft</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3367,7 +3369,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
     <message>
         <location filename="../src/libsync/utility.cpp" line="458"/>
         <source>now</source>
-        <translation type="unfinished"/>
+        <translation>jetzt</translation>
     </message>
     <message>
         <location filename="../src/libsync/utility.cpp" line="460"/>

diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 729ff3ceb1b19df0bc637e639f1ee6a77573fd26..668624bb1028065f526b3b7321cd2eca18a37045 100644 (file)
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -660,7 +660,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
     <message>
         <location filename="../src/gui/folder.cpp" line="1211"/>
         <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Normaali synkronointi</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1212"/>

diff --git a/translations/client_it.ts b/translations/client_it.ts
index 0fd951f676b8200184fcfd0f6619820bf7f91292..5de0fd4073d5a560292565f8aaf212185b3d4e78 100644 (file)
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -3359,7 +3359,7 @@ Non è consigliabile utilizzarlo.</translation>
     <message>
         <location filename="../src/libsync/utility.cpp" line="449"/>
         <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>nel futuro</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3369,7 +3369,7 @@ Non è consigliabile utilizzarlo.</translation>
     <message>
         <location filename="../src/libsync/utility.cpp" line="458"/>
         <source>now</source>
-        <translation type="unfinished"/>
+        <translation>adesso</translation>
     </message>
     <message>
         <location filename="../src/libsync/utility.cpp" line="460"/>

diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index de9feeecedebd9e98374c25ae2c7a4b75ac5e195..17ef0fcfa2534a7456d1083d42bc927ce583ed5f 100644 (file)
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -3359,7 +3359,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/utility.cpp" line="449"/>
         <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>no futuro</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3369,7 +3369,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/utility.cpp" line="458"/>
         <source>now</source>
-        <translation type="unfinished"/>
+        <translation>agora</translation>
     </message>
     <message>
         <location filename="../src/libsync/utility.cpp" line="460"/>

diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 3cefad4510b0e7a0cdcc76df7b71be6f1870c0cb..9dc5fff33177205c045aa3f9626ee52874473d7f 100644 (file)
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -3359,7 +3359,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/utility.cpp" line="449"/>
         <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>no futuro</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3369,7 +3369,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/utility.cpp" line="458"/>
         <source>now</source>
-        <translation type="unfinished"/>
+        <translation>agora</translation>
     </message>
     <message>
         <location filename="../src/libsync/utility.cpp" line="460"/>