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/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index dc33d008d..e01645e0a 100644
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -138,13 +138,11 @@ $labels['name']         = 'Leasainm';
 $labels['firstname']    = 'Ainm baiste';
 $labels['surname']      = 'Sloinne';
 $labels['email']        = 'Ríomhphost';
-$labels['addcontact'] = 'Sábháil duine nua';
 $labels['editcontact'] = 'Chuir chara in eagar';
 $labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
 $labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$labels['newcontact']     = 'Scríobh carta teagmháil nua';
 $labels['deletecontact']  = 'Scrios na daoine seo';
 $labels['composeto']      = 'Scríobh teachtaireacht go';
 $labels['contactsfromto'] = 'Daoine as $from to $to as $count';
@@ -161,10 +159,6 @@ $labels['preferences'] = 'Tosaíocht';
 $labels['userpreferences'] = 'Tosaíocht Pearsanta';
 $labels['editpreferences'] = 'Athraigh tosaíocht pearsanta';
 $labels['identities'] = 'Céannachtaí';
-$labels['manageidentities'] = 'Stiúir céannachtaí i cuntas seo';
-$labels['newidentity'] = 'Céannacht nua';
-$labels['newitem'] = 'Mír nua';
-$labels['edititem'] = 'Athraigh mhír';
 $labels['preferhtml'] = 'Taispeáin an HTML';
 $labels['htmlmessage'] = 'Teachtaireacht HTML';
 $labels['prettydate'] = 'Dátaí Dheas';
@@ -179,14 +173,18 @@ $labels['htmlsignature'] = 'Mana clabhsúir HTML';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
 $labels['autosavedraft']  = 'Sábháil dréachta go huathoibríoch';
 $labels['never']  = 'riamh';
-$labels['folder']  = 'Fillteán';
-$labels['folders']  = 'Fillteán';
-$labels['foldername']  = 'Ainm fillteán';
-$labels['subscribed']  = 'Síntiú';
-$labels['create']  = 'Cruthaigh';
-$labels['createfolder']  = 'Cruthaigh fillteán nua';
-$labels['managefolders']  = 'Stiúir na fillteán';
+$labels['savelocalstorage'] = "";
+$labels['folder'] = 'Fillteán';
+$labels['folders'] = 'Fillteán';
+$labels['foldername'] = 'Ainm fillteán';
+$labels['subscribed'] = 'Síntiú';
+$labels['create'] = 'Cruthaigh';
+$labels['createfolder'] = 'Cruthaigh fillteán nua';
+$labels['managefolders'] = 'Stiúir na fillteán';
 $labels['sortby'] = 'Sórtáil trí';
 $labels['sortasc']  = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
+$labels['helplistkeyboardnavigation'] = "";
+$labels['helplistkeyboardnavmessages'] = "";
+$labels['helplistkeyboardnavcontacts'] = "";
 ?>