Merge remote-tracking branch 'origin/2.0'

This commit is contained in:
Daniel Molkentin 2015-11-04 14:25:14 +01:00
commit b82ffb52c7
4 changed files with 11 additions and 11 deletions

View file

@ -2825,7 +2825,7 @@ No se recomienda usarla.</translation>
<location filename="../src/gui/owncloudgui.cpp" line="451"/>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Log out</source>
<translation>Salir</translation>
<translation>Cerrar sesión</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="387"/>

View file

@ -2826,7 +2826,7 @@ Non è consigliabile utilizzarlo.</translation>
<location filename="../src/gui/owncloudgui.cpp" line="451"/>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Log out</source>
<translation>Esci</translation>
<translation>Disconnetti</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="387"/>

View file

@ -235,12 +235,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
<translation>%2 %1(%3%) </translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="448"/>
<source>%1 of %2 in use</source>
<translation>%2 %1 使</translation>
<translation>%2 %1 使</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="453"/>
@ -1033,7 +1033,7 @@ Account: %3
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="20"/>
<source>Global Ignore Settings</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="26"/>
@ -1043,7 +1043,7 @@ Account: %3
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="36"/>
<source>Files Ignored by Patterns</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="55"/>
@ -1058,7 +1058,7 @@ Account: %3
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="80"/>
<source>Allow Deletion</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="45"/>
@ -1366,7 +1366,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
<source>Update Check</source>
<translation></translation>
<translation></translation>
</message>
</context>
<context>
@ -2349,7 +2349,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sslbutton.cpp" line="118"/>
<source>Issuer:</source>
<translation>: %1</translation>
<translation>: </translation>
</message>
<message>
<location filename="../src/gui/sslbutton.cpp" line="119"/>
@ -2400,7 +2400,7 @@ It is not advisable to use it.</source>
<location filename="../src/gui/sslbutton.cpp" line="192"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>%1 使%2 bit
<translation>%1 %2 bit 使
</translation>
</message>
<message>

View file

@ -655,7 +655,7 @@ Tem a certeza que deseja realizar esta operação?</translation>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="33"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"/>
<translation>Adicionar Ligação de Sincronização de Pasta</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>