Merge branch 'master' into fix-20151

16 files changed, 42 insertions, 0 deletions

diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index a6b9404d73d..1c655bfc990 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "Nebylo povoleno použití ověřovacího mechanismu \"%s\"",
     "Unsatisfied backend parameters" : "Neuspokojivé parametry služby",
     "Unsatisfied authentication mechanism parameters" : "Neuspokojivé parametry ověřovacího mechanismu",
+    "Insufficient data: %s" : "Nedostatečná data: %s",
     "Personal" : "Osobní",
     "System" : "Systém",
     "Grant access" : "Povolit přístup",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 6c7e4c5b8d5..50d12af8052 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "Nebylo povoleno použití ověřovacího mechanismu \"%s\"",
     "Unsatisfied backend parameters" : "Neuspokojivé parametry služby",
     "Unsatisfied authentication mechanism parameters" : "Neuspokojivé parametry ověřovacího mechanismu",
+    "Insufficient data: %s" : "Nedostatečná data: %s",
     "Personal" : "Osobní",
     "System" : "Systém",
     "Grant access" : "Povolit přístup",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 12738d841e4..b62896fae57 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
+    "Insufficient data: %s" : "Données insuffisantes : %s",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 425413b7e8d..ceb38a2ace6 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
+    "Insufficient data: %s" : "Données insuffisantes : %s",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index a5f8afb474b..1727924f18e 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
+    "Insufficient data: %s" : "Dati insufficienti: %s",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 2f6dad37d7c..19d86a6196a 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
+    "Insufficient data: %s" : "Dati insufficienti: %s",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index ac5d1bfe6f8..b766f3010e6 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -1,19 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "リクエストトークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "アクセストークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
     "Please provide a valid app key and secret." : "有効なアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
     "Invalid mount point" : "無効なマウントポイント",
+    "Objectstore forbidden" : "オブジェクトストアが禁じられています",
     "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
     "Not permitted to use backend \"%s\"" : "バックエンド %s を使うための権限がありません",
+    "Not permitted to use authentication mechanism \"%s\"" : "認証システム %s を使う権限がありません",
+    "Unsatisfied backend parameters" : "バックエンドのためのパラメーターが不十分です。",
     "Unsatisfied authentication mechanism parameters" : "認証のためのパラメータが不十分です",
+    "Insufficient data: %s" : "データが不足しています: %s",
     "Personal" : "個人",
     "System" : "システム",
     "Grant access" : "アクセスを許可",
     "Access granted" : "アクセスは許可されました",
+    "Error configuring OAuth1" : "OAuth1 設定エラー",
+    "Error configuring OAuth2" : "OAuth2 設定エラー",
     "Generate keys" : "キーを生成",
     "Error generating key pair" : "キーペアの生成エラー",
     "Enable encryption" : "暗号化を有効に",
@@ -27,6 +36,7 @@ OC.L10N.register(
     "Saved" : "保存されました",
     "Access key" : "アクセスキー",
     "Secret key" : "シークレットキー",
+    "Builtin" : "ビルトイン",
     "None" : "なし",
     "OAuth1" : "OAuth1",
     "App key" : "アプリキー",
@@ -37,9 +47,12 @@ OC.L10N.register(
     "OpenStack" : "OpenStack",
     "Username" : "ユーザー名",
     "Password" : "パスワード",
+    "Tenant name" : "テナント名",
+    "Identity endpoint URL" : "認証エンドポイントURL",
     "Rackspace" : "Rackspace",
     "API key" : "APIキー",
     "Username and password" : "ユーザー名とパスワード",
+    "Session credentials" : "セッション資格情報",
     "RSA public key" : "RSA公開鍵",
     "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
@@ -89,6 +102,7 @@ OC.L10N.register(
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
     "Add storage" : "ストレージを追加",
+    "Allow users to mount external storages" : "ユーザーに外部ストレージのマウントを許可する",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 6664b3d97db..b9a3eda0566 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -1,17 +1,26 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "リクエストトークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "アクセストークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
     "Please provide a valid app key and secret." : "有効なアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
     "Invalid mount point" : "無効なマウントポイント",
+    "Objectstore forbidden" : "オブジェクトストアが禁じられています",
     "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
     "Not permitted to use backend \"%s\"" : "バックエンド %s を使うための権限がありません",
+    "Not permitted to use authentication mechanism \"%s\"" : "認証システム %s を使う権限がありません",
+    "Unsatisfied backend parameters" : "バックエンドのためのパラメーターが不十分です。",
     "Unsatisfied authentication mechanism parameters" : "認証のためのパラメータが不十分です",
+    "Insufficient data: %s" : "データが不足しています: %s",
     "Personal" : "個人",
     "System" : "システム",
     "Grant access" : "アクセスを許可",
     "Access granted" : "アクセスは許可されました",
+    "Error configuring OAuth1" : "OAuth1 設定エラー",
+    "Error configuring OAuth2" : "OAuth2 設定エラー",
     "Generate keys" : "キーを生成",
     "Error generating key pair" : "キーペアの生成エラー",
     "Enable encryption" : "暗号化を有効に",
@@ -25,6 +34,7 @@
     "Saved" : "保存されました",
     "Access key" : "アクセスキー",
     "Secret key" : "シークレットキー",
+    "Builtin" : "ビルトイン",
     "None" : "なし",
     "OAuth1" : "OAuth1",
     "App key" : "アプリキー",
@@ -35,9 +45,12 @@
     "OpenStack" : "OpenStack",
     "Username" : "ユーザー名",
     "Password" : "パスワード",
+    "Tenant name" : "テナント名",
+    "Identity endpoint URL" : "認証エンドポイントURL",
     "Rackspace" : "Rackspace",
     "API key" : "APIキー",
     "Username and password" : "ユーザー名とパスワード",
+    "Session credentials" : "セッション資格情報",
     "RSA public key" : "RSA公開鍵",
     "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
@@ -87,6 +100,7 @@
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
     "Add storage" : "ストレージを追加",
+    "Allow users to mount external storages" : "ユーザーに外部ストレージのマウントを許可する",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index bfcf493ee04..d26f5595f1f 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
+    "Insufficient data: %s" : "Onvoldoende gegevens: %s",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index e3ff8826ef5..cb1db40e3c9 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
+    "Insufficient data: %s" : "Onvoldoende gegevens: %s",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 3abc6d280d9..1830ab1f993 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
+    "Insufficient data: %s" : "Dados insuficientes: %s",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 31f71df8be9..d33e4eba927 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
+    "Insufficient data: %s" : "Dados insuficientes: %s",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 813226a9cf9..ce816fa01d2 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"",
     "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Insufficient data: %s" : "Dados insuficientes: %s",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Conceder acesso",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 310ffffcbed..89926c0fe27 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -12,6 +12,7 @@
     "Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"",
     "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Insufficient data: %s" : "Dados insuficientes: %s",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Conceder acesso",
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index 7edf0b5e67b..85d8c251c89 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Not permitted to use authentication mechanism \"%s\"" : "S’i lejohet të përdorë mekanizmin e mirëfilltësimit \"%s\"",
     "Unsatisfied backend parameters" : "Parametra mekanizmi shërbimi të paplotësuar",
     "Unsatisfied authentication mechanism parameters" : "Parametra mekanizmi mirëfilltësimi të papërmbushur",
+    "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s",
     "Personal" : "Personale",
     "System" : "Sistem",
     "Grant access" : "Akordoji hyrje",
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index 3d597974f48..c200be40d03 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -14,6 +14,7 @@
     "Not permitted to use authentication mechanism \"%s\"" : "S’i lejohet të përdorë mekanizmin e mirëfilltësimit \"%s\"",
     "Unsatisfied backend parameters" : "Parametra mekanizmi shërbimi të paplotësuar",
     "Unsatisfied authentication mechanism parameters" : "Parametra mekanizmi mirëfilltësimi të papërmbushur",
+    "Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s",
     "Personal" : "Personale",
     "System" : "Sistem",
     "Grant access" : "Akordoji hyrje",