mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-25 06:25:56 +03:00
Merge remote-tracking branch 'origin/2.2' into master
This commit is contained in:
Olivier Goffart
commit
6b899be895
8 changed files with 98 additions and 38 deletions
|
|
@ -355,6 +355,66 @@ X-GNOME-Autostart-Delay=3
|
|||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
|
||||
GenericName[oc]=Dorsièr de Sincronizacion
|
||||
|
|
|
|||
|
|
@ -724,7 +724,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1006"/>
|
||||
<source>Backup detected</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Copia de seguretat detectada</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1008"/>
|
||||
|
|
@ -734,7 +734,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="1009"/>
|
||||
<source>Keep Local Files as Conflict</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Manté els fitxers locals com a conflicte</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
@ -817,7 +817,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folderman.cpp" line="1190"/>
|
||||
<source>The selected path is not a folder!</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>La ruta seleccionada no és un directori!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folderman.cpp" line="1194"/>
|
||||
|
|
@ -904,7 +904,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
|
||||
<source>Fetching folder list from server...</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Obtenint la llista de carpetes del servidor...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
|
||||
|
|
@ -1006,7 +1006,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
|
|||
<message>
|
||||
<location filename="../src/gui/folderwizard.cpp" line="544"/>
|
||||
<source>Add Sync Connection</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Afegir una connexió de sincronització</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
@ -1521,7 +1521,7 @@ Els elements que poden ser eliminats s'eliminaran si impedeixen que una car
|
|||
<message>
|
||||
<location filename="../src/gui/notificationwidget.cpp" line="50"/>
|
||||
<source>Created at %1</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Creat el %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/notificationwidget.cpp" line="99"/>
|
||||
|
|
@ -1626,12 +1626,12 @@ privilegis addicionals durant el procés.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
|
||||
<source>Sync the folder '%1'</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Sincronitzar el directori '%1'</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
|
||||
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p><small><strong>Atenció:</strong> La carpeta local no està buida. Trieu una resolució!</small></p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
|
||||
|
|
@ -1741,7 +1741,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
|
||||
<source>Timeout while trying to connect to %1 at %2.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>S'ha esgotat el temps d'espera mentres es conectava a %1 a les %2.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
|
||||
|
|
@ -1931,12 +1931,12 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="376"/>
|
||||
<source>The download would reduce free disk space below %1</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>La descàrrega reduïrà l'espai lliure al disc per sota de %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="381"/>
|
||||
<source>Free space on disk is less than %1</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>L'espai lliure del disc dur es inferior a %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="496"/>
|
||||
|
|
@ -1946,7 +1946,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="545"/>
|
||||
<source>The file could not be downloaded completely.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>No es pot descarregar el fitxer completament.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="552"/>
|
||||
|
|
@ -2363,7 +2363,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/sharedialog.cpp" line="98"/>
|
||||
<source>%1 Sharing</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Compartint amb %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharedialog.cpp" line="73"/>
|
||||
|
|
@ -2378,7 +2378,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/sharedialog.cpp" line="101"/>
|
||||
<source>The server does not allow sharing</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>El servidor no permet la compartició de fitxers</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharedialog.cpp" line="113"/>
|
||||
|
|
@ -3048,7 +3048,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/synclogdialog.ui" line="14"/>
|
||||
<source>Synchronisation Log</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Registre de sincronització</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
@ -3069,7 +3069,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="289"/>
|
||||
<source><p>Copyright ownCloud GmbH</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p>Copyright ownCloud GmbH</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="290"/>
|
||||
|
|
@ -3215,7 +3215,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/gui/owncloudgui.cpp" line="296"/>
|
||||
<source>Account synchronization is disabled</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>La sincronització del compte està deshabilitada</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/owncloudgui.cpp" line="379"/>
|
||||
|
|
@ -3642,7 +3642,7 @@ No és aconsellada usar-la.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
|
||||
<source>Server version downloaded, copied changed local file into conflict file</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>S'ha baixat la versió del servidor i s'ha renomenat el fitxer local com a fitxer de conflicte</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
|
||||
|
|
|
|||
|
|
@ -3071,7 +3071,7 @@ Il est déconseillé de l'utiliser.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="289"/>
|
||||
<source><p>Copyright ownCloud GmbH</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p>Copyright ownCloud, Inc.</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="290"/>
|
||||
|
|
@ -3296,7 +3296,7 @@ Il est déconseillé de l'utiliser.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
|
||||
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p>Version %2. Pour plus d'informations, consultez <a href="%3">%4</a></p><p><small>Par Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz et autres.</small></p><p>Copyright ownCloud GmbH</p><p>Sous licence GNU General Public License (GPL) Version 2.0<br/>ownCloud et le logo ownCloud sont des marques déposées de ownCloud, Inc. aux Etats-Unis, dans d'autres pays, ou dans les deux.</p></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
|
|||
|
|
@ -3601,7 +3601,7 @@ We adviseren deze site niet te gebruiken.</translation>
|
|||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="324"/>
|
||||
<source>%n second(s)</source>
|
||||
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconden</numerusform></translation>
|
||||
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconde(n)</numerusform></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/utility.cpp" line="348"/>
|
||||
|
|
|
|||
|
|
@ -631,17 +631,17 @@
|
|||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="489"/>
|
||||
<source>%1 and %n other file(s) have been removed.</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="496"/>
|
||||
<source>%1 and %n other file(s) have been downloaded.</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="503"/>
|
||||
<source>%1 and %n other file(s) have been updated.</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="510"/>
|
||||
|
|
@ -1156,7 +1156,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
|
|||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="26"/>
|
||||
<source>&Launch on System Startup</source>
|
||||
<translation>&Uruchamiaj podczas startu systemu Windows</translation>
|
||||
<translation>&Uruchamiaj podczas startu systemu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="33"/>
|
||||
|
|
@ -1933,7 +1933,7 @@ Niezalecane jest jego użycie.</translation>
|
|||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="376"/>
|
||||
<source>The download would reduce free disk space below %1</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Pobranie zmniejszy ilość wolnego miejsca poniżej %1.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/propagatedownload.cpp" line="381"/>
|
||||
|
|
@ -3523,12 +3523,12 @@ Kliknij</translation>
|
|||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="469"/>
|
||||
<source>%n day(s) ago</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="477"/>
|
||||
<source>%n hour(s) ago</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/utility.cpp" line="482"/>
|
||||
|
|
@ -3543,7 +3543,7 @@ Kliknij</translation>
|
|||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="487"/>
|
||||
<source>%n minute(s) ago</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/utility.cpp" line="490"/>
|
||||
|
|
@ -3576,27 +3576,27 @@ Kliknij</translation>
|
|||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="319"/>
|
||||
<source>%n year(s)</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="320"/>
|
||||
<source>%n month(s)</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="321"/>
|
||||
<source>%n day(s)</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="322"/>
|
||||
<source>%n hour(s)</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="323"/>
|
||||
<source>%n minute(s)</source>
|
||||
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
|
||||
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
|
||||
</message>
|
||||
<message numerus="yes">
|
||||
<location filename="../src/libsync/utility.cpp" line="324"/>
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@
|
|||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="346"/>
|
||||
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
|
||||
<translation><p>Deseja mesmo parar a sincronização da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation>
|
||||
<translation><p>Deseja mesmo parar a sincronização da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar qualquer ficheiro.</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="488"/>
|
||||
|
|
|
|||
|
|
@ -3070,7 +3070,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="289"/>
|
||||
<source><p>Copyright ownCloud GmbH</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p>Все права принадлежат ownCloud GmbH</p></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/theme.cpp" line="290"/>
|
||||
|
|
@ -3295,7 +3295,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
|
||||
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><p>Версия %2. Дополнительная информация доступна по ссылке <a href="%3">%4</a></p><p><small>Авторы: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz, и другие.</small></p><p>Авторские права принадлежат ownCloud GmbH</p><p>Лицензировано под GNU General Public License (GPL) Версии 2.0<br/>ownCloud и логотип ownCloud - зарегистрированные торговые марки ownCloud, Inc. в Соединенных Штатах, и/или других странах</p></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
|
|||
|
|
@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
|
||||
<source>SSL Chipher Debug View</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>查看SSL加密调试信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue