diff options
Diffstat (limited to 'apps/files_external')
-rw-r--r-- | apps/files_external/l10n/nb.js | 2 | ||||
-rw-r--r-- | apps/files_external/l10n/nb.json | 2 | ||||
-rw-r--r-- | apps/files_external/l10n/zh_TW.js | 12 | ||||
-rw-r--r-- | apps/files_external/l10n/zh_TW.json | 12 | ||||
-rw-r--r-- | apps/files_external/lib/Lib/Storage/Swift.php | 3 |
5 files changed, 28 insertions, 3 deletions
diff --git a/apps/files_external/l10n/nb.js b/apps/files_external/l10n/nb.js index 944f3af56ec..a96f89e8319 100644 --- a/apps/files_external/l10n/nb.js +++ b/apps/files_external/l10n/nb.js @@ -17,7 +17,7 @@ OC.L10N.register( "Are you sure you want to delete this external storage" : "Er du sikker på at du vil slette denne eksterne lagringsplassen?", "Delete storage?" : "Slett lagringsplass", "Saved" : "Lagret", - "Saving..." : "Lagrer...", + "Saving..." : "Lagrer…", "Save" : "Lagre", "Empty response from the server" : "Tomt svar fra tjeneren", "Couldn't access. Please log out and in again to activate this mount point" : "Fikk ikke tilgang. Logg ut og inn igjen for å aktivere dette oppkoblingspunktet.", diff --git a/apps/files_external/l10n/nb.json b/apps/files_external/l10n/nb.json index 576cd2a6420..3cf8c0d42b1 100644 --- a/apps/files_external/l10n/nb.json +++ b/apps/files_external/l10n/nb.json @@ -15,7 +15,7 @@ "Are you sure you want to delete this external storage" : "Er du sikker på at du vil slette denne eksterne lagringsplassen?", "Delete storage?" : "Slett lagringsplass", "Saved" : "Lagret", - "Saving..." : "Lagrer...", + "Saving..." : "Lagrer…", "Save" : "Lagre", "Empty response from the server" : "Tomt svar fra tjeneren", "Couldn't access. Please log out and in again to activate this mount point" : "Fikk ikke tilgang. Logg ut og inn igjen for å aktivere dette oppkoblingspunktet.", diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js index 8e4f1b9669a..b0cc604426c 100644 --- a/apps/files_external/l10n/zh_TW.js +++ b/apps/files_external/l10n/zh_TW.js @@ -12,6 +12,7 @@ OC.L10N.register( "Error generating key pair" : "產生金鑰對錯誤", "All users. Type to select user or group." : "所有人都可以使用,或者選擇特定使用者、群組", "(group)" : "(群組)", + "Compatibility with Mac NFD encoding (slow)" : "與Mac的NFD編碼格式相容(較慢)", "Admin defined" : "管理者定義", "Are you sure you want to delete this external storage" : "您確定要刪除額外的空間?", "Delete storage?" : "刪除空間", @@ -19,15 +20,21 @@ OC.L10N.register( "Saving..." : "儲存中...", "Save" : "儲存", "Empty response from the server" : "服務器没有回應", + "Couldn't access. Please log out and in again to activate this mount point" : "無法存取,請登出後重新登入來啟用這個掛載點。", "Couldn't get the information from the remote server: {code} {type}" : "無法從遠程伺服器上獲取資料 : {code} {type}", "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}", "There was an error with message: " : "錯誤信息:", "External mount error" : "外部掛載錯誤", "external-storage" : "外部儲存", + "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "無法取得Windows網路磁碟掛載點清單:伺服器無回應。", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "有些外部掛載位置設定無法連線,請點(多個)紅色橫幅了解詳情。", + "Please enter the credentials for the {mount} mount" : "請輸入認證來進行掛載{掛載來源}", "Username" : "使用者名稱", "Password" : "密碼", "Credentials saved" : "已儲存憑證", "Credentials saving failed" : "憑證儲存失敗", + "Credentials required" : "需要憑證訊息", + "Storage with ID \"%d\" not found" : "沒有找到使用者 \"%d\" 的儲存空間 ", "Invalid backend or authentication mechanism class" : "無效的後端處理或是驗證方式", "Invalid mount point" : "無效的掛載點", "Objectstore forbidden" : "物件儲存禁止存取", @@ -38,12 +45,15 @@ OC.L10N.register( "Unsatisfied authentication mechanism parameters" : "無法滿足驗證機制所需的參數條件", "Insufficient data: %s" : "資料不足: %s", "%s" : "%s", + "Storage with ID \"%d\" is not user editable" : "使用者\"%d\"無法對此儲存位置進行編輯", "Access key" : "存取金鑰", "Secret key" : "私密金鑰", "Builtin" : "公告", "None" : "無", + "OAuth1" : "OAuth1", "App key" : "App 金鑰", "App secret" : "App 密碼", + "OAuth2" : "OAuth2", "Client ID" : "客戶端ID", "Client secret" : "客戶端密碼", "OpenStack" : "OpenStack", @@ -92,6 +102,7 @@ OC.L10N.register( "Enable sharing" : "啟動分享", "Check for changes" : "檢查變動", "Never" : "絕不", + "Once every direct access" : "在每次進行存取動作時", "Folder name" : "資料夾名稱", "External storage" : "外部儲存", "Authentication" : "驗證", @@ -109,6 +120,7 @@ OC.L10N.register( "Dropbox App Configuration" : "Dropbox 應用設置", "Google Drive App Configuration" : "Google Drive 應用設置", "Storage with id \"%i\" not found" : "沒有找到編號 \"%i\" 的儲存空間 ", + "Storage with id \"%i\" is not user editable" : "使用者\"%i\"無法對此儲存位置進行編輯", "Dropbox" : "Dropbox", "Google Drive" : "Google 雲端硬碟" }, diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json index 21a8d621c5b..aebcada96f9 100644 --- a/apps/files_external/l10n/zh_TW.json +++ b/apps/files_external/l10n/zh_TW.json @@ -10,6 +10,7 @@ "Error generating key pair" : "產生金鑰對錯誤", "All users. Type to select user or group." : "所有人都可以使用,或者選擇特定使用者、群組", "(group)" : "(群組)", + "Compatibility with Mac NFD encoding (slow)" : "與Mac的NFD編碼格式相容(較慢)", "Admin defined" : "管理者定義", "Are you sure you want to delete this external storage" : "您確定要刪除額外的空間?", "Delete storage?" : "刪除空間", @@ -17,15 +18,21 @@ "Saving..." : "儲存中...", "Save" : "儲存", "Empty response from the server" : "服務器没有回應", + "Couldn't access. Please log out and in again to activate this mount point" : "無法存取,請登出後重新登入來啟用這個掛載點。", "Couldn't get the information from the remote server: {code} {type}" : "無法從遠程伺服器上獲取資料 : {code} {type}", "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}", "There was an error with message: " : "錯誤信息:", "External mount error" : "外部掛載錯誤", "external-storage" : "外部儲存", + "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "無法取得Windows網路磁碟掛載點清單:伺服器無回應。", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "有些外部掛載位置設定無法連線,請點(多個)紅色橫幅了解詳情。", + "Please enter the credentials for the {mount} mount" : "請輸入認證來進行掛載{掛載來源}", "Username" : "使用者名稱", "Password" : "密碼", "Credentials saved" : "已儲存憑證", "Credentials saving failed" : "憑證儲存失敗", + "Credentials required" : "需要憑證訊息", + "Storage with ID \"%d\" not found" : "沒有找到使用者 \"%d\" 的儲存空間 ", "Invalid backend or authentication mechanism class" : "無效的後端處理或是驗證方式", "Invalid mount point" : "無效的掛載點", "Objectstore forbidden" : "物件儲存禁止存取", @@ -36,12 +43,15 @@ "Unsatisfied authentication mechanism parameters" : "無法滿足驗證機制所需的參數條件", "Insufficient data: %s" : "資料不足: %s", "%s" : "%s", + "Storage with ID \"%d\" is not user editable" : "使用者\"%d\"無法對此儲存位置進行編輯", "Access key" : "存取金鑰", "Secret key" : "私密金鑰", "Builtin" : "公告", "None" : "無", + "OAuth1" : "OAuth1", "App key" : "App 金鑰", "App secret" : "App 密碼", + "OAuth2" : "OAuth2", "Client ID" : "客戶端ID", "Client secret" : "客戶端密碼", "OpenStack" : "OpenStack", @@ -90,6 +100,7 @@ "Enable sharing" : "啟動分享", "Check for changes" : "檢查變動", "Never" : "絕不", + "Once every direct access" : "在每次進行存取動作時", "Folder name" : "資料夾名稱", "External storage" : "外部儲存", "Authentication" : "驗證", @@ -107,6 +118,7 @@ "Dropbox App Configuration" : "Dropbox 應用設置", "Google Drive App Configuration" : "Google Drive 應用設置", "Storage with id \"%i\" not found" : "沒有找到編號 \"%i\" 的儲存空間 ", + "Storage with id \"%i\" is not user editable" : "使用者\"%i\"無法對此儲存位置進行編輯", "Dropbox" : "Dropbox", "Google Drive" : "Google 雲端硬碟" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 970ade02cea..f07087e903d 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -43,6 +43,7 @@ use Guzzle\Http\Url; use Guzzle\Http\Exception\ClientErrorResponseException; use Icewind\Streams\CallbackWrapper; use Icewind\Streams\IteratorDirectory; +use Icewind\Streams\RetryWrapper; use OpenCloud; use OpenCloud\Common\Exceptions; use OpenCloud\OpenStack; @@ -389,7 +390,7 @@ class Swift extends \OC\Files\Storage\Common { stream_context_set_option($stream, 'swift','content', $streamInterface); if(!strrpos($streamInterface ->getMetaData('wrapper_data')[0], '404 Not Found')) { - return $stream; + return RetryWrapper::wrap($stream); } return false; } catch (\Guzzle\Http\Exception\BadResponseException $e) { |