From 158b34ed429888bfb64a6d5f06f8401b8ab2daf9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 16 Jul 2016 13:59:54 +0200
Subject: [PATCH] Rename Addressbook to Contacts (#5233)

---
 CHANGELOG                           | 1 +
 program/steps/addressbook/func.inc  | 2 +-
 program/steps/settings/func.inc     | 2 +-
 skins/classic/includes/taskbar.html | 2 +-
 skins/larry/includes/header.html    | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e18683a5263..9ca7fda9f07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Rename Addressbook to Contacts (#5233)
 - Remove PHP mail() support, smtp_server is required now (#5340)
 - Display full message subject in onmouseover on truncated subject in mail view (#5346)
 - Searching in both contacts and groups when LDAP addressbook with group_filters option is used
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index f37ce05f794..916c7c6bac0 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -82,7 +82,7 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
     $OUTPUT->set_env('address_sources', $js_list);
     $OUTPUT->set_env('writable_source', $writeable);
 
-    $OUTPUT->set_pagetitle($RCMAIL->gettext('addressbook'));
+    $OUTPUT->set_pagetitle($RCMAIL->gettext('contacts'));
     $_SESSION['addressbooks_count'] = $count;
     $_SESSION['addressbooks_count_writeable'] = $writeable;
 
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 93e780b4639..f610d2dc6b5 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -157,7 +157,7 @@ function rcmail_user_prefs($current = null)
     $sections['mailbox']     = array('id' => 'mailbox', 'section' => $RCMAIL->gettext('mailboxview'));
     $sections['mailview']    = array('id' => 'mailview','section' => $RCMAIL->gettext('messagesdisplaying'));
     $sections['compose']     = array('id' => 'compose', 'section' => $RCMAIL->gettext('messagescomposition'));
-    $sections['addressbook'] = array('id' => 'addressbook','section' => $RCMAIL->gettext('addressbook'));
+    $sections['addressbook'] = array('id' => 'addressbook','section' => $RCMAIL->gettext('contacts'));
     $sections['folders']     = array('id' => 'folders', 'section' => $RCMAIL->gettext('specialfolders'));
     $sections['server']      = array('id' => 'server',  'section' => $RCMAIL->gettext('serversettings'));
 
diff --git a/skins/classic/includes/taskbar.html b/skins/classic/includes/taskbar.html
index dfb547b8800..5c098d0038b 100644
--- a/skins/classic/includes/taskbar.html
+++ b/skins/classic/includes/taskbar.html
@@ -1,6 +1,6 @@
 <div id="taskbar">
 <roundcube:button command="mail" label="mail" class="button-mail" />
-<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
+<roundcube:button command="addressbook" label="contacts" class="button-addressbook" />
 <roundcube:container name="taskbar" id="taskbar" />
 <roundcube:button command="settings" label="settings" class="button-settings" />
 <roundcube:button command="logout" label="logout" class="button-logout" />
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 5660a56857a..72a02f26803 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -26,7 +26,7 @@ <h2 id="aria-label-topnav" class="voice"><roundcube:label name="arialabeltopnav"
 	<h2 id="aria-label-tasknav" class="voice"><roundcube:label name="arialabeltasknav" /></h2>
 	<div id="taskbar" class="topright" role="navigation" aria-labelledby="aria-label-tasknav">
 		<roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
-		<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
+		<roundcube:button command="addressbook" label="contacts" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
 		<roundcube:container name="taskbar" id="taskbar" />
 		<roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
 		<roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />