Merge branch 'master' into oc_avatars

Conflicts:
	config/config.sample.php

5 files changed, 16 insertions, 6 deletions

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 1ae45932172..54810776d2b 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -169,7 +169,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				var navEntries=response.nav_entries;
 				for(var i=0; i< navEntries.length; i++){
 					var entry = navEntries[i];
-					var container = $('#apps');
+					var container = $('#apps .wrapper');
 
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
@@ -181,10 +181,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
-						// prepend the new app before the 'More apps' function
-						$('#apps-management').before(li);
+						// append the new app as last item in the list (.push is from sticky footer)
+						$('#apps .wrapper .push').before(li);
 						// scroll the app navigation down so the newly added app is seen
-						$('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow');
+						$('#navigation').animate({ scrollTop: $('#navigation').height() }, 'slow');
 						// draw attention to the newly added app entry by flashing it twice
 						container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1});
 
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 0fda1309395..29594a95dcf 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
 "Please wait...." => "Attendere...",
+"Error while disabling app" => "Errore durante la disattivazione",
+"Error while enabling app" => "Errore durante l'attivazione",
 "Updating...." => "Aggiornamento in corso...",
 "Error while updating app" => "Errore durante l'aggiornamento",
 "Error" => "Errore",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 8bbdc222e43..63e83cab4dd 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "無効",
 "Enable" => "有効化",
 "Please wait...." => "しばらくお待ちください。",
+"Error while disabling app" => "アプリ無効化中にエラーが発生",
+"Error while enabling app" => "アプリ有効化中にエラーが発生",
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Error" => "エラー",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index d72bca799dd..e1299bb9649 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor aguarde...",
+"Error while disabling app" => "Erro enquanto desactivava a aplicação",
+"Error while enabling app" => "Erro enquanto activava a aplicação",
 "Updating...." => "A Actualizar...",
 "Error while updating app" => "Erro enquanto actualizava a aplicação",
 "Error" => "Erro",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
 "Saving..." => "A guardar...",
 "deleted" => "apagado",
 "undo" => "desfazer",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
 "Encryption" => "Encriptação",
+"The encryption app is no longer enabled, decrypt all your file" => "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro",
+"Log-in password" => "Password de entrada",
+"Decrypt all Files" => "Desencriptar todos os ficheiros",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 5cd3679751b..73c015d17af 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -75,7 +75,7 @@ $TRANSLATIONS = array(
 "More" => "更多",
 "Less" => "更少",
 "Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 許可證下發布。",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
 "Add your App" => "添加你的 App",
 "More Apps" => "更多Apps",
 "Select an App" => "選擇一個應用程式",
@@ -103,7 +103,7 @@ $TRANSLATIONS = array(
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "以上的 WebDAV 位址可以讓您<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">透過 WebDAV 協定存取檔案</a>",
 "Encryption" => "加密",
 "The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案",
 "Log-in password" => "登入密碼",