[tx-robot] updated from transifex

diff --git a/mirall.desktop.in b/mirall.desktop.in
index f5ec89ce583f2f8c066925c9f692f05da40cc62f..3b2d9c52467810aaf02cf416bb3e385203b08bf0 100644 (file)
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -556,6 +556,9 @@ X-GNOME-Autostart-Delay=3
 # Translations
 
 
+# Translations
+
+
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion

diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 919ccc4a5fda50958a30ef86396a35f0bdba6985..6c1dcb722ff95d89123dbfe544f1885aae62a1fc 100644 (file)
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -847,12 +847,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
     <message>
         <location filename="../src/gui/folderman.cpp" line="1341"/>
         <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>ローカルフォルダ %1 にはシンボリックリンクが含まれています。リンク先には既に同期されたフォルダが含まれているため、別のフォルダを選択してください！</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1356"/>
         <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
-        <translation type="unfinished"/>
+        <translation>既に同期されたフォルダがあります。別のフォルダを選択してください！</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1314"/>

diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 8df492181e62483ca8a56dc2f564c741e85dde53..69e5875bca02b49cb5e06640323f20d10fa908ea 100644 (file)
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -849,12 +849,12 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi
     <message>
         <location filename="../src/gui/folderman.cpp" line="1341"/>
         <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>Krajevna mapa %1 vsebuje simbolno povezavo. Ciljno mesto povezave že vključuje mapo, ki se usklajuje. Izbrati je treba drugo.</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1356"/>
         <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
-        <translation type="unfinished"/>
+        <translation>Za to krajevno pot je že ustvarjeno mesto za usklajevanje. Izbrati je treba drugo.</translation>
     </message>
     <message>
         <location filename="../src/gui/folderman.cpp" line="1314"/>