From 1e22cb1e86d1e4c9e689d2e5bca7beccb380742a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 14 Jun 2014 17:54:36 +0200 Subject: Unify some labels --- program/localization/en_US/labels.inc | 20 ++++++++++---------- program/steps/addressbook/edit.inc | 2 ++ program/steps/settings/edit_identity.inc | 2 +- program/steps/settings/edit_response.inc | 2 +- program/steps/settings/func.inc | 2 +- skins/classic/templates/addressbook.html | 2 +- skins/classic/templates/compose.html | 2 +- skins/larry/templates/addressbook.html | 4 ++-- skins/larry/templates/compose.html | 2 +- skins/larry/templates/contactedit.html | 5 +---- skins/larry/templates/identities.html | 2 +- skins/larry/templates/responses.html | 2 +- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 21c774b97..ba8fe2e40 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -255,9 +255,10 @@ $labels['restoremessage'] = 'Restore message?'; $labels['responses'] = 'Responses'; $labels['insertresponse'] = 'Insert a response'; $labels['manageresponses'] = 'Manage responses'; -$labels['savenewresponse'] = 'Save new response'; -$labels['editresponses'] = 'Edit responses'; +$labels['newresponse'] = 'Create new response'; +$labels['addresponse'] = 'Add response'; $labels['editresponse'] = 'Edit response'; +$labels['editresponses'] = 'Edit responses'; $labels['responsename'] = 'Name'; $labels['responsetext'] = 'Response Text'; @@ -353,7 +354,7 @@ $labels['typeblog'] = 'Blog'; $labels['typeprofile'] = 'Profile'; $labels['addfield'] = 'Add field...'; -$labels['addcontact'] = 'Add new contact'; +$labels['addcontact'] = 'Add contact'; $labels['editcontact'] = 'Edit contact'; $labels['contacts'] = 'Contacts'; $labels['contactproperties'] = 'Contact properties'; @@ -370,7 +371,7 @@ $labels['addphoto'] = 'Add'; $labels['replacephoto'] = 'Replace'; $labels['uploadphoto'] = 'Upload photo'; -$labels['newcontact'] = 'Create new contact card'; +$labels['newcontact'] = 'Create new contact'; $labels['deletecontact'] = 'Delete selected contacts'; $labels['composeto'] = 'Compose mail to'; $labels['contactsfromto'] = 'Contacts $from to $to of $count'; @@ -379,7 +380,7 @@ $labels['export'] = 'Export'; $labels['exportall'] = 'Export all'; $labels['exportsel'] = 'Export selected'; $labels['exportvcards'] = 'Export contacts in vCard format'; -$labels['newcontactgroup'] = 'Create new contact group'; +$labels['newgroup'] = 'Create new group'; $labels['grouprename'] = 'Rename group'; $labels['groupdelete'] = 'Delete group'; $labels['groupremoveselected'] = 'Remove selected contacts from group'; @@ -417,11 +418,10 @@ $labels['userpreferences'] = 'User preferences'; $labels['editpreferences'] = 'Edit user preferences'; $labels['identities'] = 'Identities'; -$labels['manageidentities'] = 'Manage identities for this account'; -$labels['newidentity'] = 'New identity'; - -$labels['newitem'] = 'New item'; -$labels['edititem'] = 'Edit item'; +$labels['manageidentities'] = 'Manage identities'; +$labels['newidentity'] = 'Create new identity'; +$labels['addidentity'] = 'Add identity'; +$labels['editidentity'] = 'Edit identity'; $labels['preferhtml'] = 'Display HTML'; $labels['defaultcharset'] = 'Default Character Set'; diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 0fc753056..27d26791b 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -69,6 +69,8 @@ $OUTPUT->add_handlers(array( 'filedroparea' => 'rcmail_photo_drop_area', )); +$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add' ? 'addcontact' : 'editcontact'))); + if ($RCMAIL->action == 'add' && $OUTPUT->template_exists('contactadd')) { $OUTPUT->send('contactadd'); } diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index e43a7bb60..20f822027 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -54,7 +54,7 @@ $OUTPUT->add_handler('identityform', 'rcube_identity_form'); $OUTPUT->set_env('identities_level', IDENTITIES_LEVEL); $OUTPUT->add_label('deleteidentityconfirm'); -$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add-identity' ? 'newidentity' : 'edititem'))); +$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add-identity' ? 'addidentity' : 'editidentity'))); if ($RCMAIL->action == 'add-identity' && $OUTPUT->template_exists('identityadd')) { $OUTPUT->send('identityadd'); diff --git a/program/steps/settings/edit_response.inc b/program/steps/settings/edit_response.inc index 6d3c3dc41..10dec1096 100644 --- a/program/steps/settings/edit_response.inc +++ b/program/steps/settings/edit_response.inc @@ -72,7 +72,7 @@ if ($RCMAIL->action == 'save-response' && isset($_POST['_name']) && !$RESPONSE_R $OUTPUT->set_env('readonly', !empty($RESPONSE_RECORD['static'])); $OUTPUT->add_handler('responseform', 'rcube_response_form'); -$OUTPUT->set_pagetitle($RCMAIL->gettext($RCMAIL->action == 'add-response' ? 'savenewresponse' : 'editresponse')); +$OUTPUT->set_pagetitle($RCMAIL->gettext($RCMAIL->action == 'add-response' ? 'addresponse' : 'editresponse')); $OUTPUT->send('responseedit'); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 8f9cf090f..89103ee44 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -1332,7 +1332,7 @@ function rcmail_settings_tabs($attrib) array('command' => 'preferences', 'type' => 'link', 'label' => 'preferences', 'title' => 'editpreferences'), array('command' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'), array('command' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'), - array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'editresponses'), + array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'manageresponses'), ); // get all identites from DB and define list of cols to be displayed diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html index 98658f28b..53995860d 100644 --- a/skins/classic/templates/addressbook.html +++ b/skins/classic/templates/addressbook.html @@ -63,7 +63,7 @@ diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 4705600c7..19b22bc69 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -202,7 +202,7 @@
    • -
    • +
    • diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html index e1101e648..0ce036850 100644 --- a/skins/larry/templates/addressbook.html +++ b/skins/larry/templates/addressbook.html @@ -67,7 +67,7 @@ @@ -99,7 +99,7 @@
    - + diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 98ef2963c..83a47913e 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -212,7 +212,7 @@ -
    • +
    • diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html index b7aafed31..da7953eae 100644 --- a/skins/larry/templates/contactedit.html +++ b/skins/larry/templates/contactedit.html @@ -6,10 +6,7 @@ -

    - - -

    +

    diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html index 91f7f8f71..5878155c6 100644 --- a/skins/larry/templates/identities.html +++ b/skins/larry/templates/identities.html @@ -22,7 +22,7 @@
    - +
    diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html index 503ed2177..538a025f0 100644 --- a/skins/larry/templates/responses.html +++ b/skins/larry/templates/responses.html @@ -22,7 +22,7 @@
    - +
    -- cgit v1.2.3