mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 13:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Camila Ayres 2018-08-13 08:58:26 +02:00 committed by GitHub
commit 3ad33a368a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 464 additions and 13058 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.tx/nextcloud.client-desktop/de_translation
View file

@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
# Translations
Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Icon[de_DE]=@APPLICATION_EXECUTABLE@
Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de_DE]=Synchronisationsordner
Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
Icon[de]=@APPLICATION_EXECUTABLE@
Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
GenericName[de]=Synchronisationsordner

204
.tx/nextcloud.client-desktop/nb_translation Normal file
View file

@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
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
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
Icon[nb_NO]=@APPLICATION_EXECUTABLE@
Name[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
GenericName[nb_NO]=Mappe synkroinisering

204
.tx/nextcloud.client-desktop/nl_translation Normal file
View file

@ -0,0 +1,204 @@
[Desktop Entry]
Categories=Utility;X-SuSE-SyncUtility;
Type=Application
Exec=@APPLICATION_EXECUTABLE@
Name=@APPLICATION_NAME@ desktop sync client
Comment=@APPLICATION_NAME@ desktop synchronization client
GenericName=Folder Sync
Icon=@APPLICATION_EXECUTABLE@
Keywords=@APPLICATION_NAME@;syncing;file;sharing;
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
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
# Translations
Comment[nl]=@APPLICATION_NAME@ desktopsynchronisatieclient
Icon[nl]=@APPLICATION_EXECUTABLE@
Name[nl]=@APPLICATION_NAME@ desktop sync client
GenericName[nl]=Map synchronisatie

13003
src/3rdparty/nlohmann/json.hpp vendored
View file

File diff suppressed because it is too large Load diff

50
translations/client_nl.ts
View file

@ -83,7 +83,7 @@
<message>
<location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
<source>Unknown error: network reply was deleted</source>
<translation type="unfinished"/>
<translation>Onbekende fout: netwerkantwoord verwijderd</translation>
</message>
<message>
<location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
@ -253,7 +253,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="667"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
<translation>Authorization van de browser verkrijgen. &lt;a href=&apos;%1&apos;&gt;Klik hier&lt;/a&gt; om de browser te heropenen.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="671"/>
@ -388,7 +388,7 @@
<message>
<location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
<translation>Vragen naar inloggegevens</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="140"/>
@ -990,7 +990,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
<source>There are unresolved conflicts. Click for details.</source>
<translation type="unfinished"/>
<translation>Er zijn nog niet-opgehelderde conflicten. Klik voor details.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@ -1000,7 +1000,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="884"/>
<source>Reconciling changes</source>
<translation type="unfinished"/>
<translation>Wijzigingen in overeenstemming brengen</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
@ -1434,12 +1434,12 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
<message>
<location filename="../src/gui/issueswidget.ui" line="133"/>
<source>There were too many issues. Not all will be visible here.</source>
<translation type="unfinished"/>
<translation>Te veel problemen. Niet alles is hier zichtbaar.</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="155"/>
<source>Copy the issues list to the clipboard.</source>
<translation type="unfinished"/>
<translation>Kopieer de problemen naar het klembord.</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="158"/>
@ -1482,7 +1482,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
<message>
<location filename="../src/gui/logbrowser.cpp" line="89"/>
<source>&amp;Capture debug messages</source>
<translation type="unfinished"/>
<translation>&amp;Opvangen debug berichten</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
@ -1704,17 +1704,17 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
<message>
<location filename="../src/gui/creds/oauth.cpp" line="115"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>Er trad een fout op bij het benaderen van het &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="118"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>Kon de van de server ontvangen JSON niet verklaren: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="121"/>
<source>The reply from the server did not contain all expected fields</source>
<translation type="unfinished"/>
<translation>Het antwoord van de server bevatte niet alle verwachte velden</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="125"/>
@ -1724,7 +1724,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
<message>
<location filename="../src/gui/creds/oauth.cpp" line="131"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;Verkeerde gebruiker&lt;/h1&gt;&lt;p&gt;Je bent ingelogd met gebruiker &lt;em&gt;%1&lt;/em&gt;, maar moest inloggen als gebruiker &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Log uit van %3 in een andere tab en dan &lt;a href=&apos;%4&apos;&gt;klik hier&lt;/a&gt; en log in als gebruiker %2&lt;/p&gt;</translation>
</message>
</context>
<context>
@ -1892,7 +1892,7 @@ vragen om extra autorisaties tijdens installatie.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
<source>Login in your browser</source>
<translation type="unfinished"/>
<translation>Login in je browser</translation>
</message>
</context>
<context>
@ -1970,7 +1970,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>The server reported the following error:</source>
<translation type="unfinished"/>
<translation>De server gaf de volgende foutmelding:</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@ -2132,7 +2132,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="459"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"/>
<translation>De download zou de vrije lokale schijfruimte beperken tot onder de limiet</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="463"/>
@ -2319,7 +2319,7 @@ We adviseren deze site niet te gebruiken.</translation>
<location filename="../src/libsync/propagateupload.cpp" line="186"/>
<location filename="../src/libsync/propagateupload.cpp" line="549"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
<translation>Upload van %1 overschrijdt het quotum voor de map</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="622"/>
@ -2659,12 +2659,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="35"/>
<source>Enter a name to create a new public link...</source>
<translation type="unfinished"/>
<translation>Geef een naam op om een nieuwe openbare link te maken...</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="42"/>
<source>&amp;Create new</source>
<translation type="unfinished"/>
<translation>&amp;Creëer nieuw</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@ -2715,12 +2715,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="93"/>
<source>Link shares have been disabled</source>
<translation type="unfinished"/>
<translation>Deellinks zijn uitgeschakeld</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
<source>Create public link share</source>
<translation type="unfinished"/>
<translation>Creëren openbare deellink</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
@ -2741,7 +2741,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
<source>Copy link to clipboard (direct download)</source>
<translation type="unfinished"/>
<translation>Kopieer link naar klembord (directe download)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
@ -2751,12 +2751,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
<source>Send link by email (direct download)</source>
<translation type="unfinished"/>
<translation>Verstuur link per e-mail (directe download)</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
<translation>Bevestig verwijderen deellink</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="521"/>
@ -3639,7 +3639,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="306"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
<translation>Fout bij synchronisatie</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="314"/>
@ -3859,7 +3859,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
<source>Re-open Browser</source>
<translation type="unfinished"/>
<translation>Heropen browser</translation>
</message>
</context>
<context>

13
translations/client_sk.ts
View file

@ -753,7 +753,8 @@
<location filename="../src/gui/folder.cpp" line="891"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
<translation>Bol pridaný priečinok z externého úložiska.
</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="892"/>
@ -1255,7 +1256,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/generalsettings.ui" line="147"/>
<source>Edit &amp;Ignored Files</source>
<translation type="unfinished"/>
<translation>Editovať &amp;ignorované súbory</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="232"/>
@ -1387,7 +1388,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.ui" line="20"/>
<source>List of issues</source>
<translation type="unfinished"/>
<translation>Zoznam problémov</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="34"/>
@ -1409,7 +1410,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.ui" line="73"/>
<source>Show warnings</source>
<translation type="unfinished"/>
<translation>Zobraziť varovania</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="83"/>
@ -1955,7 +1956,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>The server reported the following error:</source>
<translation type="unfinished"/>
<translation>Server nahlásil nasledovnú chybu:</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@ -4171,7 +4172,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/gui/guiutility.cpp" line="33"/>
<source>Could not open browser</source>
<translation type="unfinished"/>
<translation>Nepodarilo sa otvoriť prehliadač</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="34"/>

40
translations/client_zh_CN.ts
View file

@ -4,7 +4,7 @@
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
<source>Form</source>
<translation>窗体</translation>
<translation>格式</translation>
</message>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="33"/>
@ -22,7 +22,7 @@
<message>
<location filename="../src/gui/folderwizardtargetpage.ui" line="14"/>
<source>Form</source>
<translation>窗体</translation>
<translation>格式</translation>
</message>
<message>
<location filename="../src/gui/folderwizardtargetpage.ui" line="131"/>
@ -55,7 +55,7 @@
<message>
<location filename="../src/gui/notificationwidget.ui" line="20"/>
<source>Form</source>
<translation>窗体</translation>
<translation>格式</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="56"/>
@ -96,7 +96,7 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
<source>Form</source>
<translation>窗体</translation>
<translation>格式</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="58"/>
@ -388,7 +388,7 @@
<message>
<location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
<translation>凭证</translation>
</message>
<message>
<location filename="../src/gui/accountstate.cpp" line="140"/>
@ -1000,7 +1000,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="884"/>
<source>Reconciling changes</source>
<translation type="unfinished"/>
<translation>状态发生变化</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
@ -1398,7 +1398,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.ui" line="20"/>
<source>List of issues</source>
<translation type="unfinished"/>
<translation>问题列表</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="34"/>
@ -1430,12 +1430,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.ui" line="133"/>
<source>There were too many issues. Not all will be visible here.</source>
<translation type="unfinished"/>
<translation>问题太多了。不是所有的都能在这里看到。</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="155"/>
<source>Copy the issues list to the clipboard.</source>
<translation type="unfinished"/>
<translation>将问题列表复制到剪贴板。</translation>
</message>
<message>
<location filename="../src/gui/issueswidget.ui" line="158"/>
@ -1455,7 +1455,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/issueswidget.cpp" line="84"/>
<source>Issue</source>
<translation type="unfinished"/>
<translation>问题</translation>
</message>
</context>
<context>
@ -1478,7 +1478,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/logbrowser.cpp" line="89"/>
<source>&amp;Capture debug messages</source>
<translation type="unfinished"/>
<translation>抓取调试消息</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="101"/>
@ -1696,7 +1696,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/creds/oauth.cpp" line="112"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
<translation>服务器返回错误:&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="115"/>
@ -1711,12 +1711,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/creds/oauth.cpp" line="121"/>
<source>The reply from the server did not contain all expected fields</source>
<translation type="unfinished"/>
<translation>服务器没有回复预期的字段</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="125"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;登录错误&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/creds/oauth.cpp" line="131"/>
@ -2314,7 +2314,7 @@ It is not advisable to use it.</source>
<location filename="../src/libsync/propagateupload.cpp" line="186"/>
<location filename="../src/libsync/propagateupload.cpp" line="549"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
<translation>上传 %1 超过文件夹的限额</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="622"/>
@ -2659,7 +2659,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="42"/>
<source>&amp;Create new</source>
<translation type="unfinished"/>
<translation>&amp;创建新的</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@ -2751,7 +2751,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
<source>Confirm Link Share Deletion</source>
<translation type="unfinished"/>
<translation>确认删除共享链接</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="521"/>
@ -2772,7 +2772,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="254"/>
<source>Delete link share</source>
<translation type="unfinished"/>
<translation>删除共享链接</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="459"/>
@ -3216,7 +3216,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/syncengine.cpp" line="264"/>
<source>%1 (skipped due to earlier error, trying again in %2)</source>
<translation type="unfinished"/>
<translation>%1 (由于先前的错误而跳过，在%2中再次尝试 )</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="474"/>
@ -3226,7 +3226,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/syncengine.cpp" line="477"/>
<source>Folder hierarchy is too deep</source>
<translation type="unfinished"/>
<translation>文件夹等级制度太深</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="493"/>