[Pkg-owncloud-commits] [owncloud-client] 146/164: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sun Mar 22 11:57:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 09749e2c7f2a1203a6c96d870f113596b5cec7ec
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Fri Mar 13 02:18:46 2015 -0400
[tx-robot] updated from transifex
---
translations/client_sv.ts | 28 ++++++------
translations/mirall_en.ts | 109 ++++++++++++++++++++++++----------------------
2 files changed, 71 insertions(+), 66 deletions(-)
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 366805e..ea489bb 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -244,27 +244,27 @@ Total tid kvar %5</translation>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate :</source>
- <translation type="unfinished"/>
+ <translation>Certifikat :</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
<source>Browse...</source>
- <translation type="unfinished"/>
+ <translation>Bläddra...</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password :</source>
- <translation type="unfinished"/>
+ <translation>Certifikatlösenord :</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.cpp" line="23"/>
<source>Select a certificate</source>
- <translation type="unfinished"/>
+ <translation>Välj ett certifikat</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.cpp" line="23"/>
<source>Certificate files (*.p12 *.pfx)</source>
- <translation type="unfinished"/>
+ <translation>Certifikatfiler (*.p12 *.pfx)</translation>
</message>
</context>
<context>
@@ -329,7 +329,7 @@ Total tid kvar %5</translation>
<message>
<location filename="../src/libsync/propagateremotedelete.cpp" line="41"/>
<source>Connection timed out</source>
- <translation type="unfinished"/>
+ <translation>Tidsgräns för anslutningen överskreds</translation>
</message>
</context>
<context>
@@ -898,7 +898,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="45"/>
<source>Connection timed out</source>
- <translation type="unfinished"/>
+ <translation>Tidsgräns för anslutningen överskreds</translation>
</message>
</context>
<context>
@@ -1131,7 +1131,7 @@ efter ytterligare privilegier under processen.</translation>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="297"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="318"/>
<source>(%1)</source>
- <translation type="unfinished"/>
+ <translation>(%1)</translation>
</message>
</context>
<context>
@@ -1535,7 +1535,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="156"/>
<source>File Removed</source>
- <translation type="unfinished"/>
+ <translation>Filen Raderad</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="171"/>
@@ -1792,12 +1792,12 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharedialog.ui" line="127"/>
<source>Set password</source>
- <translation type="unfinished"/>
+ <translation>Ange lösenord</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="149"/>
<source>Set expiry date</source>
- <translation type="unfinished"/>
+ <translation>Sätt utgångsdatum</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="67"/>
@@ -1813,7 +1813,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="141"/>
<source>Password Protected</source>
- <translation type="unfinished"/>
+ <translation>Lösenordsskyddad</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="299"/>
@@ -1858,7 +1858,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="453"/>
<source>The file can not be synced.</source>
- <translation type="unfinished"/>
+ <translation>Filen kan inte synkas.</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="463"/>
@@ -1908,7 +1908,7 @@ Det är inte lämpligt använda den.</translation>
<location filename="../src/gui/socketapi.cpp" line="431"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
- <translation type="unfinished"/>
+ <translation>Dela med %1</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index ac40f3e..da7dfda 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -476,62 +476,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="234"/>
+ <location filename="../src/gui/folderman.cpp" line="233"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="235"/>
+ <location filename="../src/gui/folderman.cpp" line="234"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1013"/>
+ <location filename="../src/gui/folderman.cpp" line="1012"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1016"/>
+ <location filename="../src/gui/folderman.cpp" line="1015"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1019"/>
+ <location filename="../src/gui/folderman.cpp" line="1018"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1022"/>
+ <location filename="../src/gui/folderman.cpp" line="1021"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1025"/>
+ <location filename="../src/gui/folderman.cpp" line="1024"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1030"/>
+ <location filename="../src/gui/folderman.cpp" line="1029"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1033"/>
+ <location filename="../src/gui/folderman.cpp" line="1032"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1036"/>
+ <location filename="../src/gui/folderman.cpp" line="1035"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1039"/>
+ <location filename="../src/gui/folderman.cpp" line="1038"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1045"/>
+ <location filename="../src/gui/folderman.cpp" line="1044"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -1561,27 +1561,27 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="188"/>
- <location filename="../src/libsync/propagateupload.cpp" line="549"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="545"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="474"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="470"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="508"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="531"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="527"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="564"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="560"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1649,12 +1649,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="258"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="253"/>
<source>Currently no files are ignored because of previous errors and no downloads are in progress.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/protocolwidget.cpp" line="261"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="256"/>
<source>%n files are ignored because of previous errors.
</source>
<translation type="unfinished">
@@ -1663,7 +1663,7 @@ It is not advisable to use it.</source>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/protocolwidget.cpp" line="262"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="257"/>
<source>%n files are partially downloaded.
</source>
<translation type="unfinished">
@@ -1672,7 +1672,7 @@ It is not advisable to use it.</source>
</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="263"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="258"/>
<source>Try to sync these again.</source>
<translation type="unfinished"></translation>
</message>
@@ -2348,59 +2348,59 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="937"/>
- <location filename="../src/libsync/syncengine.cpp" line="944"/>
+ <location filename="../src/libsync/syncengine.cpp" line="938"/>
+ <location filename="../src/libsync/syncengine.cpp" line="945"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="962"/>
+ <location filename="../src/libsync/syncengine.cpp" line="963"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="968"/>
+ <location filename="../src/libsync/syncengine.cpp" line="969"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="975"/>
+ <location filename="../src/libsync/syncengine.cpp" line="976"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="995"/>
+ <location filename="../src/libsync/syncengine.cpp" line="996"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1012"/>
- <location filename="../src/libsync/syncengine.cpp" line="1032"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1013"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1033"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1045"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1046"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1109"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1110"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1111"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1111"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
@@ -2852,12 +2852,12 @@ It is not advisable to use it.</source>
<context>
<name>main.cpp</name>
<message>
- <location filename="../src/gui/main.cpp" line="45"/>
+ <location filename="../src/gui/main.cpp" line="38"/>
<source>System Tray not available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/main.cpp" line="46"/>
+ <location filename="../src/gui/main.cpp" line="39"/>
<source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -2873,74 +2873,79 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="32"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="31"/>
<source>Downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="34"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="33"/>
<source>Uploaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="36"/>
+ <source>Downloaded, renamed conflicting file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="40"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="42"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="43"/>
<source>Ignored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="44"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Filesystem access error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="46"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="47"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="49"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="63"/>
<source>downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="64"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
<source>uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="66"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="70"/>
<source>moving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
<source>ignoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="73"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="75"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>error</source>
<translation type="unfinished"></translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list