mirror of
https://github.com/nextcloud/desktop.git
synced 2025-10-26 11:17:43 +00:00
Merge remote-tracking branch 'origin/2.4'
This commit is contained in:
Christian Kamm
commit
edacaae15f
@ -335,6 +335,33 @@ X-GNOME-Autostart-Delay=3
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
|
||||
GenericName[oc]=Dorsièr de Sincronizacion
|
||||
@ -419,6 +446,10 @@ Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
|
||||
GenericName[ko]=폴더 동기화
|
||||
Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
|
||||
Icon[ko]=@APPLICATION_EXECUTABLE@
|
||||
Comment[lo]=@APPLICATION_NAME@ ການປະສານຂໍ້ມູນຄອມພິວເຕີລູກຂ່າຍ
|
||||
GenericName[lo]=ໂຟນເດີຊິງ
|
||||
Name[lo]=@APPLICATION_NAME@ ຊິງຄອມພິວເຕີລູກຂ່າຍ
|
||||
Icon[lo]=@APPLICATION_EXECUTABLE@
|
||||
Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizációs kliens
|
||||
GenericName[hu_HU]=Könyvtár szinkronizálás
|
||||
Name[hu_HU]=@APPLICATION_NAME@ asztali szinkr. kliens
|
||||
|
||||
@ -39,8 +39,10 @@ print("Initializing "+appname+"-client-nautilus extension")
|
||||
def get_local_path(url):
|
||||
if url[0:7] == 'file://':
|
||||
url = url[7:]
|
||||
unquote = urllib.parse.unquote if python3 else urllib.unquote
|
||||
return unquote(url)
|
||||
if python3:
|
||||
return urllib.parse.unquote(url)
|
||||
else:
|
||||
return urllib.unquote(url).decode('utf-8')
|
||||
|
||||
def get_runtime_dir():
|
||||
"""Returns the value of $XDG_RUNTIME_DIR, a directory path.
|
||||
@ -62,7 +64,7 @@ class SocketConnect(GObject.GObject):
|
||||
self._watch_id = 0
|
||||
self._sock = None
|
||||
self._listeners = [self._update_registered_paths, self._get_version]
|
||||
self._remainder = ''.encode()
|
||||
self._remainder = ''.encode('utf-8')
|
||||
self.protocolVersion = '1.0'
|
||||
self.nautilusVFSFile_table = {} # not needed in this object actually but shared
|
||||
# all over the other objects.
|
||||
@ -81,7 +83,7 @@ class SocketConnect(GObject.GObject):
|
||||
# print("Server command: " + cmd)
|
||||
if self.connected:
|
||||
try:
|
||||
self._sock.send(cmd.encode())
|
||||
self._sock.send(cmd.encode('utf-8'))
|
||||
except:
|
||||
print("Sending failed.")
|
||||
self.reconnect()
|
||||
@ -131,12 +133,12 @@ class SocketConnect(GObject.GObject):
|
||||
|
||||
# Parses response lines out of collected data, returns list of strings
|
||||
def get_available_responses(self):
|
||||
end = self._remainder.rfind('\n'.encode())
|
||||
end = self._remainder.rfind('\n')
|
||||
if end == -1:
|
||||
return []
|
||||
data = self._remainder[:end]
|
||||
self._remainder = self._remainder[end+1:]
|
||||
return data.decode().split('\n')
|
||||
return data.decode('utf-8').split('\n')
|
||||
|
||||
# Notify is the raw answer from the socket
|
||||
def _handle_notify(self, source, condition):
|
||||
|
||||
@ -83,12 +83,12 @@
|
||||
<message>
|
||||
<location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
|
||||
<source>Unknown error: network reply was deleted</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>未知のエラーです：ネットワーク応答が削除されました</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
|
||||
<source>Server replied "%1 %2" to "%3 %4"</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>サーバの返答は "%1 %2" から "%3 %4"です</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -253,7 +253,7 @@
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="667"/>
|
||||
<source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>ブラウザから権限を取得しています。<a href='%1'>ここをクリック</a>してブラウザを再度開いてください。 </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="671"/>
|
||||
@ -1428,12 +1428,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"/>
|
||||
@ -1693,7 +1693,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: <em>%1</em></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>サーバからエラーが返されました: <em>%1</em> </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/creds/oauth.cpp" line="115"/>
|
||||
@ -1708,17 +1708,17 @@ 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><h1>Login Error</h1><p>%1</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>ログインエラー</h1><p>%1</p> </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/creds/oauth.cpp" line="131"/>
|
||||
<source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation><h1>ユーザの誤りです</h1><p><em>%1</em>としてログインされましたがｍ、<em>%2</em>でなければいけません。<br>別のタブで %3 からログアウトし、<a href='%4'>ここをクリック</a>して %2 としてログインしてください</p> </translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -1885,7 +1885,7 @@ for additional privileges during the process.</source>
|
||||
<message>
|
||||
<location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
|
||||
<source>Login in your browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>御自身のブラウザでログインしてください</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -1962,7 +1962,7 @@ It is not advisable to use it.</source>
|
||||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
|
||||
<source>The server reported the following error:</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>サーバが以下のエラーを報告しています:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
|
||||
@ -2723,12 +2723,12 @@ It is not advisable to use it.</source>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
|
||||
<source>Open link in browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>ブラウザでリンクを開く</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
|
||||
<source>Copy link to clipboard</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>クリップボードにリンクをコピー</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
|
||||
@ -2807,12 +2807,12 @@ It is not advisable to use it.</source>
|
||||
<message>
|
||||
<location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
|
||||
<source>Open link in browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>ブラウザでリンクを開く</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
|
||||
<source>Copy link to clipboard</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>クリップボードにリンクをコピー</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
|
||||
@ -4178,12 +4178,12 @@ It is not advisable to use it.</source>
|
||||
<message>
|
||||
<location filename="../src/gui/guiutility.cpp" line="33"/>
|
||||
<source>Could not open browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>ブラウザを開くことができませんでした。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/guiutility.cpp" line="34"/>
|
||||
<source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>URL %1 をブラウザで開く際にエラーが発生しました。おそらくデフォルトのブラウザが設定されていないのでは？</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/guiutility.cpp" line="55"/>
|
||||
|
||||
@ -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: antwoord van het netwerk is verwijderd</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
|
||||
@ -243,7 +243,7 @@
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="656"/>
|
||||
<source>Server %1 is currently in maintenance mode.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Server %1 is momenteel in onderhoudsmodus.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="658"/>
|
||||
@ -253,7 +253,7 @@
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="667"/>
|
||||
<source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Probeert autorisatie te krijgen van de browser. 1 Klik hier 1 om de browser opnieuw te openen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.cpp" line="671"/>
|
||||
@ -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 onopgeloste 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 doorvoeren</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>Er zijn teveel problemen. Niet alles zal worden vertoond.</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 probleemlijst 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>&Capture debug messages</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>&Capture berichten debuggen</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 'token' endpoint: <br><em>%1</em></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Er heeft zich een fout voorgedaan bij het verkrijgen van de 'token' eindpunt: 1 2 %1 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/creds/oauth.cpp" line="118"/>
|
||||
<source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Kon de JSON dat teruggekomen is van de server niet ontleden: 1 2 %1 2</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 bevat 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><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>1 Verkeerde gebruiker 1 2 U bent ingelogd met user 3 %1 3, maar dient ingelogd te zijn met user 4 %2 4. 5 Log %3 alstublieft uit in een andere tabblad, vervolgens 6 klikt u hier 6 en log-in als user %2 2</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 uw 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 rapporteerde de volgende fout:</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 zal de vrije lokale schijfruimte reduceren tot onder het 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 overtreft de quota van de folder</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>Voer een naam in om een nieuwe publieke link aan te maken</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.ui" line="42"/>
|
||||
<source>&Create new</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>&Create 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>Link delen zijn uitgeschakeld</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
|
||||
<source>Create public link share</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Maak een verdeelbare publieke link aan</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 de link naar het klembord (directe download)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
|
||||
@ -2751,17 +2751,17 @@ 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>Verzend link met email (directe download)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
|
||||
<source>Confirm Link Share Deletion</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Bevestig Gedeelde Link Verwijdering</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
|
||||
<source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>1 Wilt u echt de verdeelbare publieke link verwijderen 2 %1 2 ? 1 3 Let op: deze actie kan niet ongedaan gemaakt worden. 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
|
||||
@ -2777,7 +2777,7 @@ We adviseren deze site niet te gebruiken.</translation>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
|
||||
<source>Delete link share</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Verwijder verdeelbare link</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
|
||||
@ -4186,7 +4186,7 @@ We adviseren deze site niet te gebruiken.</translation>
|
||||
<message>
|
||||
<location filename="../src/gui/guiutility.cpp" line="33"/>
|
||||
<source>Could not open browser</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Kon het browser niet openen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/guiutility.cpp" line="34"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user