From 371acb296df562d81aaa9f47238635985d8449ea Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 13 Mar 2018 02:18:36 +0100 Subject: [PATCH 01/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index e56a9980f3..d0a4c90e94 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -335,6 +335,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion From 991f4faafb824243c5fc25ce62a6b6feccf47770 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 14 Mar 2018 02:18:31 +0100 Subject: [PATCH 02/11] [tx-robot] updated from transifex --- mirall.desktop.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index d0a4c90e94..b1ab49808d 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -338,6 +338,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion @@ -422,6 +425,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 From d1c887d754f62aa5efb6fa9d87326fe2f1751bd3 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 15 Mar 2018 02:18:32 +0100 Subject: [PATCH 03/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index b1ab49808d..70e36da2b6 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -341,6 +341,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion From c3c8ab85eceee4a774ea70418d3450dbe543d6fb Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 16 Mar 2018 02:18:30 +0100 Subject: [PATCH 04/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ translations/client_ja.ts | 34 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index 70e36da2b6..a2eb1ec5f0 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -344,6 +344,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_ja.ts b/translations/client_ja.ts index da41a94a0a..a13d92b3d2 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -83,12 +83,12 @@ Unknown error: network reply was deleted - + 未知のエラーです：ネットワーク応答が削除されました Server replied "%1 %2" to "%3 %4" - + サーバの返答は "%1 %2" から "%3 %4"です @@ -253,7 +253,7 @@ Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser. - + ブラウザから権限を取得しています。<a href='%1'>ここをクリック</a>してブラウザを再度開いてください。 @@ -1428,12 +1428,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from There were too many issues. Not all will be visible here. - + 問題が多すぎます。すべてはここに表示できません。 Copy the issues list to the clipboard. - + 問題リストをクリップボードにコピーしてください。 @@ -1693,7 +1693,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from Error returned from the server: <em>%1</em> - + サーバからエラーが返されました: <em>%1</em>  @@ -1708,17 +1708,17 @@ Items where deletion is allowed will be deleted if they prevent a directory from The reply from the server did not contain all expected fields - + サーバからの返答にあるべきフィールドがありません <h1>Login Error</h1><p>%1</p> - + <h1>ログインエラー</h1><p>%1</p> <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> - + <h1>ユーザの誤りです</h1><p><em>%1</em>としてログインされましたがｍ、<em>%2</em>でなければいけません。<br>別のタブで %3 からログアウトし、<a href='%4'>ここをクリック</a>して %2 としてログインしてください</p> @@ -1885,7 +1885,7 @@ for additional privileges during the process. Login in your browser - + 御自身のブラウザでログインしてください @@ -1962,7 +1962,7 @@ It is not advisable to use it. The server reported the following error: - + サーバが以下のエラーを報告しています: @@ -2723,12 +2723,12 @@ It is not advisable to use it. Open link in browser - + ブラウザでリンクを開く Copy link to clipboard - + クリップボードにリンクをコピー @@ -2807,12 +2807,12 @@ It is not advisable to use it. Open link in browser - + ブラウザでリンクを開く Copy link to clipboard - + クリップボードにリンクをコピー @@ -4178,12 +4178,12 @@ It is not advisable to use it. Could not open browser - + ブラウザを開くことができませんでした。 There was an error when launching the browser to go to URL %1. Maybe no default browser is configured? - + URL %1 をブラウザで開く際にエラーが発生しました。おそらくデフォルトのブラウザが設定されていないのでは？ From 567f7eb205fb2a7071b64b9880a0624a182aa4da Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Fri, 16 Mar 2018 15:40:44 +0100 Subject: [PATCH 05/11] Apply branding to crashreporter resources file --- OWNCLOUD.cmake | 2 +- src/crashreporter/CMakeLists.txt | 28 +++++++++++++++++++++------- src/crashreporter/resources.qrc | 5 ----- src/crashreporter/resources.qrc.in | 5 +++++ 4 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 src/crashreporter/resources.qrc create mode 100644 src/crashreporter/resources.qrc.in diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake index a98c0787f2..56a11057ab 100644 --- a/OWNCLOUD.cmake +++ b/OWNCLOUD.cmake @@ -19,4 +19,4 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back option( WITH_CRASHREPORTER "Build crashreporter" OFF ) set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" ) -set( CRASHREPORTER_ICON ":/owncloud-icon.png" ) + diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index b73e38fab5..43261c54f9 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -1,13 +1,6 @@ PROJECT( CrashReporter ) cmake_policy(SET CMP0017 NEW) -list(APPEND crashreporter_SOURCES main.cpp) -list(APPEND crashreporter_RC resources.qrc) - -qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) -qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) - - # TODO: differentiate release channel # if(BUILD_RELEASE) # set(CRASHREPORTER_RELEASE_CHANNEL "release") @@ -15,9 +8,30 @@ qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) set(CRASHREPORTER_RELEASE_CHANNEL "nightly") # endif() +# Theme +if(DEFINED OEM_THEME_DIR AND EXISTS "${OEM_THEME_DIR}/theme/colored") + set(CRASHREPORTER_ICON_DIR "${OEM_THEME_DIR}/theme/colored") +else() + set(CRASHREPORTER_ICON_DIR "${CMAKE_SOURCE_DIR}/theme/colored") +endif() + +set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.png") +set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}") +set(CRASHREPORTER_ICON_SIZE "128") +set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${APPLICATION_ICON_NAME}-icon-${CRASHREPORTER_ICON_SIZE}.png") + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc.in + ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h) +# Sources +list(APPEND crashreporter_SOURCES main.cpp) +list(APPEND crashreporter_RC "${CMAKE_CURRENT_BINARY_DIR}/resources.qrc") + +qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) +qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) include_directories(${CMAKE_CURRENT_BINARY_DIR} "../3rdparty/libcrashreporter-qt/src/" diff --git a/src/crashreporter/resources.qrc b/src/crashreporter/resources.qrc deleted file mode 100644 index 830281e77e..0000000000 --- a/src/crashreporter/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - ../../theme/colored/owncloud-icon-128.png - - diff --git a/src/crashreporter/resources.qrc.in b/src/crashreporter/resources.qrc.in new file mode 100644 index 0000000000..8afaf4327e --- /dev/null +++ b/src/crashreporter/resources.qrc.in @@ -0,0 +1,5 @@ + + + @CRASHREPORTER_ICON_PATH@ + + From ff3e3ce886bf27c4307d593328d565b44354d554 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 17 Mar 2018 02:18:31 +0100 Subject: [PATCH 06/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ translations/client_nl.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index a2eb1ec5f0..6cbcb6075f 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -347,6 +347,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 0797409fd6..a850a8a51b 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -4186,7 +4186,7 @@ We adviseren deze site niet te gebruiken. Could not open browser - + Kon het browser niet openen From 861d777899f984d34747edace49bad86afebe068 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 18 Mar 2018 02:18:31 +0100 Subject: [PATCH 07/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ translations/client_nl.ts | 50 +++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index 6cbcb6075f..d5c7697023 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -350,6 +350,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_nl.ts b/translations/client_nl.ts index a850a8a51b..ccaa574ce9 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -83,7 +83,7 @@ Unknown error: network reply was deleted - + Onbekende fout: antwoord van het netwerk is verwijderd @@ -243,7 +243,7 @@ Server %1 is currently in maintenance mode. - + Server %1 is momenteel in onderhoudsmodus. @@ -253,7 +253,7 @@ Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser. - + Probeert autorisatie te krijgen van de browser. 1 Klik hier 1 om de browser opnieuw te openen. @@ -990,7 +990,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v There are unresolved conflicts. Click for details. - + Er zijn onopgeloste conflicten. Klik voor details. @@ -1000,7 +1000,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v Reconciling changes - + Wijzigingen doorvoeren @@ -1434,12 +1434,12 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma There were too many issues. Not all will be visible here. - + Er zijn teveel problemen. Niet alles zal worden vertoond. Copy the issues list to the clipboard. - + Kopieer de probleemlijst naar het klembord. @@ -1482,7 +1482,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma &Capture debug messages - + &Capture berichten debuggen @@ -1704,17 +1704,17 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma There was an error accessing the 'token' endpoint: <br><em>%1</em> - + Er heeft zich een fout voorgedaan bij het verkrijgen van de 'token' eindpunt: 1 2 %1 2 Could not parse the JSON returned from the server: <br><em>%1</em> - + Kon de JSON dat teruggekomen is van de server niet ontleden: 1 2 %1 2 The reply from the server did not contain all expected fields - + Het antwoord van de server bevat niet alle verwachte velden @@ -1724,7 +1724,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma <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> - + 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 @@ -1892,7 +1892,7 @@ vragen om extra autorisaties tijdens installatie. Login in your browser - + Login in uw browser @@ -1970,7 +1970,7 @@ We adviseren deze site niet te gebruiken. The server reported the following error: - + De server rapporteerde de volgende fout: @@ -2132,7 +2132,7 @@ We adviseren deze site niet te gebruiken. The download would reduce free local disk space below the limit - + De download zal de vrije lokale schijfruimte reduceren tot onder het limiet @@ -2319,7 +2319,7 @@ We adviseren deze site niet te gebruiken. Upload of %1 exceeds the quota for the folder - + Upload van %1 overtreft de quota van de folder @@ -2659,12 +2659,12 @@ We adviseren deze site niet te gebruiken. Enter a name to create a new public link... - + Voer een naam in om een nieuwe publieke link aan te maken &Create new - + &Create nieuw @@ -2715,12 +2715,12 @@ We adviseren deze site niet te gebruiken. Link shares have been disabled - + Link delen zijn uitgeschakeld Create public link share - + Maak een verdeelbare publieke link aan @@ -2741,7 +2741,7 @@ We adviseren deze site niet te gebruiken. Copy link to clipboard (direct download) - + Kopieer de link naar het klembord (directe download) @@ -2751,17 +2751,17 @@ We adviseren deze site niet te gebruiken. Send link by email (direct download) - + Verzend link met email (directe download) Confirm Link Share Deletion - + Bevestig Gedeelde Link Verwijdering <p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p> - + 1 Wilt u echt de verdeelbare publieke link verwijderen 2 %1 2 ? 1 3 Let op: deze actie kan niet ongedaan gemaakt worden. 3 @@ -2777,7 +2777,7 @@ We adviseren deze site niet te gebruiken. Delete link share - + Verwijder verdeelbare link From fc8e3b091417575974193f579acb396b6b12469b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 19 Mar 2018 02:18:32 +0100 Subject: [PATCH 08/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index d5c7697023..39a813774a 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -353,6 +353,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion From b632b7e0fa545d783ef393ab533dcf421b5b004d Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 20 Mar 2018 02:18:30 +0100 Subject: [PATCH 09/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index 39a813774a..174e5e1c08 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -356,6 +356,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion From 37a93dca636771ce8bdf6ee93231181b200c30b0 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 21 Mar 2018 02:18:33 +0100 Subject: [PATCH 10/11] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index 174e5e1c08..f2953f86bf 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -359,6 +359,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion From 29557ea550a0baa6c223e87fdd54042944a5dd43 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 21 Mar 2018 10:16:44 +0100 Subject: [PATCH 11/11] Fix nautilus/nemo shell integration encoding issues #6393 The problem was that plain encode()/decode() in python2 use ascii encoding, not utf8. --- shell_integration/nautilus/syncstate.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py index 77a233d3dd..442958882d 100644 --- a/shell_integration/nautilus/syncstate.py +++ b/shell_integration/nautilus/syncstate.py @@ -38,8 +38,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. @@ -61,7 +63,7 @@ class SocketConnect(GObject.GObject): self._watch_id = 0 self._sock = None self._listeners = [self._update_registered_paths] - self._remainder = ''.encode() + self._remainder = ''.encode('utf-8') self.nautilusVFSFile_table = {} # not needed in this object actually but shared # all over the other objects. @@ -79,7 +81,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() @@ -118,17 +120,17 @@ class SocketConnect(GObject.GObject): # Prepend the remaining data from last call if len(self._remainder) > 0: data = self._remainder + data - self._remainder = ''.encode() + self._remainder = ''.encode('utf-8') if len(data) > 0: # Remember the remainder for next round - lastNL = data.rfind('\n'.encode()); + lastNL = data.rfind('\n'.encode('utf-8')); if lastNL > -1 and lastNL < len(data): self._remainder = data[lastNL+1:] data = data[:lastNL] - for l in data.split('\n'.encode()): - self._handle_server_response(l.decode()) + for l in data.split('\n'.encode('utf-8')): + self._handle_server_response(l.decode('utf-8')) else: return False