Merge branch 'master' into fix_addNavigation

7 files changed, 90 insertions, 29 deletions

diff --git a/settings/js/users.js b/settings/js/users.js
index ce49eb69c3c..094cddda294 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -263,7 +263,7 @@ $(document).ready(function () {
         UserList.applyMultiplySelect($(element));
     });
 
-    $('td.remove>a').live('click', function (event) {
+    $('table').on('click', 'td.remove>a', function (event) {
         var row = $(this).parent().parent();
         var uid = $(row).attr('data-uid');
         $(row).hide();
@@ -271,7 +271,7 @@ $(document).ready(function () {
         UserList.do_delete(uid);
     });
 
-    $('td.password>img').live('click', function (event) {
+    $('table').on('click', 'td.password>img', function (event) {
         event.stopPropagation();
         var img = $(this);
         var uid = img.parent().parent().attr('data-uid');
@@ -299,11 +299,11 @@ $(document).ready(function () {
             img.css('display', '');
         });
     });
-    $('td.password').live('click', function (event) {
+    $('table').on('click', 'td.password', function (event) {
         $(this).children('img').click();
     });
     
-    $('td.displayName>img').live('click', function (event) {
+    $('table').on('click', 'td.displayName>img', function (event) {
         event.stopPropagation();
         var img = $(this);
         var uid = img.parent().parent().attr('data-uid');
@@ -332,12 +332,12 @@ $(document).ready(function () {
             img.css('display', '');
         });
     });
-    $('td.displayName').live('click', function (event) {
+    $('table').on('click', 'td.displayName', function (event) {
         $(this).children('img').click();
     });
     
 
-    $('select.quota, select.quota-user').live('change', function () {
+    $('select.quota, select.quota-user').on('change', function () {
         var select = $(this);
         var uid = $(this).parent().parent().parent().attr('data-uid');
         var quota = $(this).val();
@@ -356,7 +356,7 @@ $(document).ready(function () {
         $(select).data('previous', $(select).val());
     })
 
-    $('input.quota-other').live('change', function () {
+    $('input.quota-other').on('change', function () {
         var uid = $(this).parent().parent().parent().attr('data-uid');
         var quota = $(this).val();
         var select = $(this).prev();
@@ -392,7 +392,7 @@ $(document).ready(function () {
         }
     });
 
-    $('input.quota-other').live('blur', function () {
+    $('input.quota-other').on('blur', function () {
         $(this).change();
     })
 
@@ -439,7 +439,7 @@ $(document).ready(function () {
     });
     // Handle undo notifications
     OC.Notification.hide();
-    $('#notification .undo').live('click', function () {
+    $('#notification').on('click', '.undo', function () {
         if ($('#notification').data('deleteuser')) {
             $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
             UserList.deleteCanceled = true;
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
new file mode 100644
index 00000000000..f32b79b80f4
--- /dev/null
+++ b/settings/l10n/af_ZA.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Wagwoord",
+"New password" => "Nuwe wagwoord"
+);
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index e7bf0d9d5fe..41f16051fe8 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -18,6 +18,7 @@
 "Disable" => "無効",
 "Enable" => "有効",
 "Please wait...." => "しばらくお待ちください。",
+"Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Error" => "エラー",
 "Updated" => "更新済み",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 08cd85d8571..efbbc8f1abd 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,45 +1,73 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
+"Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Group already exists" => "Grupa jau eksistē",
 "Unable to add group" => "Nevar pievienot grupu",
-"Could not enable app. " => "Nevar ieslēgt aplikāciju.",
-"Email saved" => "Epasts tika saglabāts",
-"Invalid email" => "Nepareizs epasts",
+"Could not enable app. " => "Nevarēja aktivēt lietotni.",
+"Email saved" => "E-pasts tika saglabāts",
+"Invalid email" => "Nederīgs epasts",
 "Unable to delete group" => "Nevar izdzēst grupu",
-"Authentication error" => "Ielogošanās kļūme",
+"Authentication error" => "Autentifikācijas kļūda",
 "Unable to delete user" => "Nevar izdzēst lietotāju",
 "Language changed" => "Valoda tika nomainīta",
-"Invalid request" => "Nepareizs vaicājums",
+"Invalid request" => "Nederīgs pieprasījums",
+"Admins can't remove themself from the admin group" => "Administratori nevar izņemt paši sevi no administratoru grupas",
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
-"Unable to remove user from group %s" => "Nevar noņemt lietotāju no grupas %s",
-"Disable" => "Atvienot",
-"Enable" => "Pievienot",
-"Error" => "Kļūme",
+"Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
+"Couldn't update app." => "Nevarēja atjaunināt lietotni.",
+"Update to {appversion}" => "Atjaunināt uz {appversion}",
+"Disable" => "Deaktivēt",
+"Enable" => "Aktivēt",
+"Please wait...." => "Lūdzu, uzgaidiet....",
+"Updating...." => "Atjaunina....",
+"Error while updating app" => "Kļūda, atjauninot lietotni",
+"Error" => "Kļūda",
+"Updated" => "Atjaunināta",
 "Saving..." => "Saglabā...",
 "__language_name__" => "__valodas_nosaukums__",
-"Add your App" => "Pievieno savu aplikāciju",
-"More Apps" => "Vairāk aplikāciju",
-"Select an App" => "Izvēlies aplikāciju",
-"See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
+"Add your App" => "Pievieno savu lietotni",
+"More Apps" => "Vairāk lietotņu",
+"Select an App" => "Izvēlies lietotni",
+"See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
+"Update" => "Atjaunināt",
+"User Documentation" => "Lietotāja dokumentācija",
+"Administrator Documentation" => "Administratora dokumentācija",
+"Online Documentation" => "Tiešsaistes dokumentācija",
+"Forum" => "Forums",
+"Bugtracker" => "Kļūdu sekotājs",
+"Commercial Support" => "Komerciālais atbalsts",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
 "Clients" => "Klienti",
+"Download Desktop Clients" => "Lejupielādēt darbvirsmas klientus",
+"Download Android Client" => "Lejupielādēt Android klientu",
+"Download iOS Client" => "Lejupielādēt iOS klientu",
 "Password" => "Parole",
 "Your password was changed" => "Jūru parole tika nomainīta",
-"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
+"Unable to change your password" => "Nevar nomainīt jūsu paroli",
 "Current password" => "Pašreizējā parole",
 "New password" => "Jauna parole",
 "show" => "parādīt",
-"Change password" => "Nomainīt paroli",
-"Email" => "Epasts",
-"Your email address" => "Jūsu epasta adrese",
-"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
+"Change password" => "Mainīt paroli",
+"Email" => "E-pasts",
+"Your email address" => "Jūsu e-pasta adrese",
+"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība",
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud",
+"Version" => "Versija",
 "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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Login Name" => "Ierakstīšanās vārds",
 "Groups" => "Grupas",
 "Create" => "Izveidot",
+"Default Storage" => "Noklusējuma krātuve",
+"Unlimited" => "Neierobežota",
 "Other" => "Cits",
+"Display Name" => "Redzamais vārds",
 "Group Admin" => "Grupas administrators",
-"Delete" => "Izdzēst"
+"Storage" => "Krātuve",
+"change display name" => "mainīt redzamo vārdu",
+"set new password" => "iestatīt jaunu paroli",
+"Default" => "Noklusējuma",
+"Delete" => "Dzēst"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index b8745d3805c..6148f1476a2 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -13,9 +13,15 @@
 "Admins can't remove themself from the admin group" => "Administrátori nesmú odstrániť sami seba zo skupiny admin",
 "Unable to add user to group %s" => "Nie je možné pridať užívateľa do skupiny %s",
 "Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
+"Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
+"Update to {appversion}" => "Aktualizovať na {appversion}",
 "Disable" => "Zakázať",
 "Enable" => "Povoliť",
+"Please wait...." => "Čakajte prosím...",
+"Updating...." => "Aktualizujem...",
+"Error while updating app" => "hyba pri aktualizácii aplikácie",
 "Error" => "Chyba",
+"Updated" => "Aktualizované",
 "Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
 "Add your App" => "Pridať vašu aplikáciu",
@@ -60,6 +66,8 @@
 "Display Name" => "Zobrazované meno",
 "Group Admin" => "Správca skupiny",
 "Storage" => "Úložisko",
+"change display name" => "zmeniť zobrazované meno",
+"set new password" => "nastaviť nové heslo",
 "Default" => "Predvolené",
 "Delete" => "Odstrániť"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 0dd369d1e90..9350b78297b 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -13,9 +13,15 @@
 "Admins can't remove themself from the admin group" => "ผู้ดูแลระบบไม่สามารถลบตัวเองออกจากกลุ่มผู้ดูแลได้",
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
+"Couldn't update app." => "ไม่สามารถอัพเดทแอปฯ",
+"Update to {appversion}" => "อัพเดทไปเป็นรุ่น {appversion}",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
+"Please wait...." => "กรุณารอสักครู่...",
+"Updating...." => "กำลังอัพเดทข้อมูล...",
+"Error while updating app" => "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
 "Error" => "ข้อผิดพลาด",
+"Updated" => "อัพเดทแล้ว",
 "Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
 "Add your App" => "เพิ่มแอปของคุณ",
@@ -51,13 +57,17 @@
 "Use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ",
 "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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.",
+"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Groups" => "กลุ่ม",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
+"Display Name" => "ชื่อที่ต้องการแสดง",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "Storage" => "พื้นที่จัดเก็บข้อมูล",
+"change display name" => "เปลี่ยนชื่อที่ต้องการให้แสดง",
+"set new password" => "ตั้งค่ารหัสผ่านใหม่",
 "Default" => "ค่าเริ่มต้น",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 46e497b698f..b540549524d 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -13,9 +13,15 @@
 "Admins can't remove themself from the admin group" => "管理者帳號無法從管理者群組中移除",
 "Unable to add user to group %s" => "使用者加入群組%s錯誤",
 "Unable to remove user from group %s" => "使用者移出群組%s錯誤",
+"Couldn't update app." => "無法更新應用程式",
+"Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "停用",
 "Enable" => "啟用",
+"Please wait...." => "請稍候...",
+"Updating...." => "更新中...",
+"Error while updating app" => "更新應用程式錯誤",
 "Error" => "錯誤",
+"Updated" => "已更新",
 "Saving..." => "儲存中...",
 "__language_name__" => "__語言_名稱__",
 "Add your App" => "添加你的 App",
@@ -51,13 +57,17 @@
 "Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
 "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>許可證下發布。",
+"Login Name" => "登入名稱",
 "Groups" => "群組",
 "Create" => "創造",
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
+"Display Name" => "顯示名稱",
 "Group Admin" => "群組 管理員",
 "Storage" => "儲存區",
+"change display name" => "修改顯示名稱",
+"set new password" => "設定新密碼",
 "Default" => "預設",
 "Delete" => "刪除"
 );