From 1e9abb496485c7c47d95facd146cc3ef6fac1e78 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 21 Oct 2015 14:37:42 +0200
Subject: add tooltip to ldap server wizard

---
 apps/user_ldap/js/wizard/view.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apps/user_ldap')

diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 7dedfab75f0..3d994af652d 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -352,6 +352,7 @@ OCA = OCA || {};
 			$('.ldap_submit').button();
 			$('.ldap_action_test_connection').button();
 			$('#ldapSettings').tabs({ beforeActivate: this.onTabChange });
+			$('#ldapSettings :input').tooltip({placement: "right", container: "body", trigger: "hover"});
 
 			this.initControls();
 			this.disableTabs();
-- 
cgit v1.2.3


From a2f2ffb8dbcb7f9cb0fe139f592be0d4772bec20 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 30 Oct 2015 19:20:42 +0100
Subject: if a user that is flag as deleted shows up again, remove that flag.
 Fixes #20090

---
 apps/user_ldap/lib/access.php           | 5 +++++
 apps/user_ldap/lib/user/offlineuser.php | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'apps/user_ldap')

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dd8ffe14bca..bb423ecb016 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -35,6 +35,7 @@
 
 namespace OCA\user_ldap\lib;
 
+use OCA\user_ldap\lib\user\OfflineUser;
 use OCA\User_LDAP\Mapping\AbstractMapping;
 
 /**
@@ -696,6 +697,10 @@ class Access extends LDAPUtility implements user\IUserTools {
 			$ocName  = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]);
 			$this->cacheUserExists($ocName);
 			$user = $this->userManager->get($ocName);
+			if($user instanceof OfflineUser) {
+				$user->unmark();
+				$user = $this->userManager->get($ocName);
+			}
 			$user->processAttributes($userRecord);
 		}
 	}
diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/user/offlineuser.php
index 72c02427928..3456a27b412 100644
--- a/apps/user_ldap/lib/user/offlineuser.php
+++ b/apps/user_ldap/lib/user/offlineuser.php
@@ -85,6 +85,13 @@ class OfflineUser {
 		$this->fetchDetails();
 	}
 
+	/**
+	 * remove the Delete-flag from the user.
+	 */
+	public function unmark() {
+		$this->config->setUserValue($this->ocName, 'user_ldap', 'isDeleted', '0');
+	}
+
 	/**
 	 * exports the user details in an assoc array
 	 * @return array
-- 
cgit v1.2.3


From 2374a0df5da3e983b28687b5d0a0387897bddb5c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 1 Nov 2015 01:54:58 -0400
Subject: [tx-robot] updated from transifex

---
 apps/encryption/l10n/ja.js          |  2 ++
 apps/encryption/l10n/ja.json        |  2 ++
 apps/files_external/l10n/ja.js      | 14 ++++++++++++++
 apps/files_external/l10n/ja.json    | 14 ++++++++++++++
 apps/files_external/l10n/pt_PT.js   |  1 +
 apps/files_external/l10n/pt_PT.json |  1 +
 apps/files_sharing/l10n/pt_PT.js    |  1 +
 apps/files_sharing/l10n/pt_PT.json  |  1 +
 apps/user_ldap/l10n/pt_PT.js        |  1 +
 apps/user_ldap/l10n/pt_PT.json      |  1 +
 core/l10n/pt_PT.js                  |  3 +++
 core/l10n/pt_PT.json                |  3 +++
 lib/l10n/pt_PT.js                   |  1 +
 lib/l10n/pt_PT.json                 |  1 +
 settings/l10n/pt_PT.js              |  3 +++
 settings/l10n/pt_PT.json            |  3 +++
 16 files changed, 52 insertions(+)

(limited to 'apps/user_ldap')

diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index 6babac76b2f..fdae19d72e5 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -32,6 +32,8 @@ OC.L10N.register(
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"ownCloud 基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
+    "Encrypt the home storage" : "メインストレージ暗号化",
+    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイル全てが暗号化されます。",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index 9ae46a8d9c2..6b5811d5bce 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -30,6 +30,8 @@
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"ownCloud 基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
+    "Encrypt the home storage" : "メインストレージ暗号化",
+    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイル全てが暗号化されます。",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
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/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_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 64600b5ff9b..c0a79ac58fa 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Shared by %2$s" : "Partilhado por %2$s",
     "Shared via public link" : "Partilhado via hiperligação pública",
     "Shares" : "Partilhas",
+    "You received %2$s as a remote share from %1$s" : "Recebeu %2$s como uma partilha remota de %1$s",
     "Accept" : "Aceitar",
     "Decline" : "Recusar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 52e1c8bbc68..f57f939e5cb 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -50,6 +50,7 @@
     "Shared by %2$s" : "Partilhado por %2$s",
     "Shared via public link" : "Partilhado via hiperligação pública",
     "Shares" : "Partilhas",
+    "You received %2$s as a remote share from %1$s" : "Recebeu %2$s como uma partilha remota de %1$s",
     "Accept" : "Aceitar",
     "Decline" : "Recusar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 109c2efa85e..7288c683303 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Verify settings" : "Verificar definições",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
+    "Add a new and blank configuration" : "Adicione uma nova configuração em branco",
     "Delete the current configuration" : "Apagar a configuração actual",
     "Host" : "Anfitrião",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 30c8078964a..5de030281b3 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -64,6 +64,7 @@
     "Verify settings" : "Verificar definições",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
+    "Add a new and blank configuration" : "Adicione uma nova configuração em branco",
     "Delete the current configuration" : "Apagar a configuração actual",
     "Host" : "Anfitrião",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 300dbda2d80..e00f09e7eff 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -148,6 +148,7 @@ OC.L10N.register(
     "change" : "alterar",
     "delete" : "apagar",
     "access control" : "controlo de acesso",
+    "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.",
     "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
     "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
@@ -185,6 +186,7 @@ OC.L10N.register(
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
+    "No search results in other folders" : "Sem resultados de procura nas outras pastas",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
     "Apps" : "Apps",
@@ -251,6 +253,7 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Log in" : "Iniciar Sessão",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
+    "Stay logged in" : "Manter sessão iniciada",
     "Alternative Logins" : "Contas de acesso alternativas",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
     "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 4af808cb24b..b0bf92a78c8 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -146,6 +146,7 @@
     "change" : "alterar",
     "delete" : "apagar",
     "access control" : "controlo de acesso",
+    "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.",
     "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
     "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
@@ -183,6 +184,7 @@
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
+    "No search results in other folders" : "Sem resultados de procura nas outras pastas",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
     "Apps" : "Apps",
@@ -249,6 +251,7 @@
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Log in" : "Iniciar Sessão",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
+    "Stay logged in" : "Manter sessão iniciada",
     "Alternative Logins" : "Contas de acesso alternativas",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
     "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 48c82db8c80..8930b5b28b3 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Can't read file" : "Não é possível ler o ficheiro",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
+    "Archive does not contain a directory named %s" : "O arquivo não contém uma diretoria com o nome %s",
     "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
     "No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
     "No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 017656dccd3..88b69924f38 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -44,6 +44,7 @@
     "Can't read file" : "Não é possível ler o ficheiro",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
+    "Archive does not contain a directory named %s" : "O arquivo não contém uma diretoria com o nome %s",
     "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
     "No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
     "No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 96128ea26c4..c964856142f 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
+    "Server-side encryption" : "Atualizar App",
     "External Storage" : "Armazenamento Externo",
     "Cron" : "Cron",
     "Email server" : "Servidor de Correio Eletrónico",
@@ -73,6 +74,7 @@ OC.L10N.register(
     "Uninstalling ...." : "A desinstalar....",
     "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
+    "App update" : "Atualizar App",
     "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
@@ -146,6 +148,7 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
     "Enable encryption" : "Ative a encriptação",
+    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 36df3e7e5cd..53a9da55517 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -3,6 +3,7 @@
     "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
+    "Server-side encryption" : "Atualizar App",
     "External Storage" : "Armazenamento Externo",
     "Cron" : "Cron",
     "Email server" : "Servidor de Correio Eletrónico",
@@ -71,6 +72,7 @@
     "Uninstalling ...." : "A desinstalar....",
     "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
+    "App update" : "Atualizar App",
     "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
@@ -144,6 +146,7 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
     "Enable encryption" : "Ative a encriptação",
+    "Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
-- 
cgit v1.2.3