Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 11 insertions, 13 deletions

diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 13d9d89fc..61ad47f42 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -215,13 +215,11 @@ $labels['name']         = 'Nama paparan';
 $labels['firstname']    = 'Nama pertama';
 $labels['surname']      = 'Nama akhir';
 $labels['email']        = 'E-Mel';
-$labels['addcontact'] = 'Tambah kontek baru';
 $labels['editcontact'] = 'Ubahsuai Kontek';
 $labels['edit']   = 'Sunting';
 $labels['cancel'] = 'Batal';
 $labels['save']   = 'Simpan';
 $labels['delete'] = 'Padam';
-$labels['newcontact']     = 'Cipta kad kontek baru';
 $labels['deletecontact']  = 'Hapus kontek yang dipilih';
 $labels['composeto']      = 'Karang mel kepada';
 $labels['contactsfromto'] = 'Kontek $from ke $to dari $count';
@@ -238,10 +236,6 @@ $labels['preferences'] = 'Keutamaan';
 $labels['userpreferences'] = 'Keutamaan pengguna';
 $labels['editpreferences'] = 'Sunting keutamaan pengguna';
 $labels['identities'] = 'Identiti';
-$labels['manageidentities'] = 'Urus identiti bagi akaun ini';
-$labels['newidentity'] = 'Identiti baru';
-$labels['newitem'] = 'Butiran baru';
-$labels['edititem'] = 'Ubahsuai butiran';
 $labels['preferhtml'] = 'Papar HTML';
 $labels['htmlmessage'] = 'Mesej HTML';
 $labels['prettydate'] = 'Tarikh-tarikh cantik';
@@ -267,15 +261,19 @@ $labels['readwhendeleted'] = 'Tanda mesej sebagai dibaca ketika hapus';
 $labels['flagfordeletion'] = 'Tanda mesej untuk pembuangan (tidak delete terus)';
 $labels['autosavedraft']  = 'Simpan draf dengan automatik';
 $labels['never']  = 'tidak pernah';
-$labels['folder']  = 'Kabinet Fail';
-$labels['folders']  = 'Folder';
-$labels['foldername']  = 'Nama Kabinet Fail';
-$labels['subscribed']  = 'Dilanggan';
+$labels['savelocalstorage'] = "";
+$labels['folder'] = 'Kabinet Fail';
+$labels['folders'] = 'Folder';
+$labels['foldername'] = 'Nama Kabinet Fail';
+$labels['subscribed'] = 'Dilanggan';
 $labels['messagecount'] = 'Mesej-mesej';
-$labels['create']  = 'Cipta';
-$labels['createfolder']  = 'Cipta kabinet fail baru';
-$labels['managefolders']  = 'Urus kabinet fail';
+$labels['create'] = 'Cipta';
+$labels['createfolder'] = 'Cipta kabinet fail baru';
+$labels['managefolders'] = 'Urus kabinet fail';
 $labels['sortby'] = 'Susun dengan';
 $labels['sortasc']  = 'Susun menaik';
 $labels['sortdesc'] = 'Susun menurun';
+$labels['helplistkeyboardnavigation'] = "";
+$labels['helplistkeyboardnavmessages'] = "";
+$labels['helplistkeyboardnavcontacts'] = "";
 ?>