2007-04-20 Murray Cumming <murrayc@murrayc.com>

* po/en_GB.po:
        * src/maemo/easysetup/modest-easysetup-wizard.c:
        (create_page_custom_outgoing), (create_page_complete_custom):
        * src/maemo/modest-account-settings-dialog.c:
        (create_page_user_details), (create_page_outgoing):
        * src/maemo/modest-account-view-window.c: (button_box_new):
        Use changed logical IDs as per the most recent UI spec:
        mcen_bd_emailsetup_edit -> mcen_bd_edit
        mcen_bd_emailsetup_delete -> mcen_bd_delete
        mcen_bd_emailsetup_close -> mcen_bd_close

pmo-trunk-r1618

diff --git a/ChangeLog2 b/ChangeLog2
index 3fff506..6b6332f 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,16 @@
+2007-04-20  Murray Cumming  <murrayc@murrayc.com>
+
+       * po/en_GB.po:
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
+       (create_page_custom_outgoing), (create_page_complete_custom):
+       * src/maemo/modest-account-settings-dialog.c:
+       (create_page_user_details), (create_page_outgoing):
+       * src/maemo/modest-account-view-window.c: (button_box_new):
+       Use changed logical IDs as per the most recent UI spec:
+       mcen_bd_emailsetup_edit -> mcen_bd_edit
+       mcen_bd_emailsetup_delete -> mcen_bd_delete
+       mcen_bd_emailsetup_close -> mcen_bd_close
+
 2007-04-20  2007-04-20  Murray Cumming  <murrayc@murrayc.com>
 
        * configure.ac:

diff --git a/po/en_GB.po b/po/en_GB.po
index f9eeca9..4eb8786 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1512,14 +1512,14 @@ msgid "mcen_bd_new"
 msgstr "New"
 
 # Button label
-msgid "mcen_bd_emailsetup_edit"
+msgid "mcen_bd_edit"
 msgstr "Edit"
 
 # Button label
-msgid "mcen_bd_emailsetup_delete"
+msgid "mcen_bd_delete"
 msgstr "Delete"
 
 # Button label
-msgid "mcen_bd_emailsetup_close"
+msgid "mcen_bd_close"
 msgstr "Close"
 

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 8c29837..1d17134 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -647,7 +647,7 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        
        /* Connection-specific SMTP-Severs Edit button: */
        if (!self->button_outgoing_smtp_servers)
-               self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+               self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
                self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->button_outgoing_smtp_servers);
@@ -675,7 +675,7 @@ static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self
        gtk_widget_show (label);
        
        if (!self->button_edit)
-               self->button_edit = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+               self->button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
        GtkWidget *caption = hildon_caption_new (NULL, _("mcen_fi_advanced_settings"), 
                self->button_edit, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->button_edit);

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 44831ea..a77b639 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -368,7 +368,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        
        /* Signature button: */
        if (!self->button_signature)
-               self->button_signature = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+               self->button_signature = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_email_signature"), 
                self->button_signature, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->button_signature);
@@ -665,7 +665,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        
        /* Connection-specific SMTP-Severs Edit button: */
        if (!self->button_outgoing_smtp_servers)
-               self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+               self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
                self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->button_outgoing_smtp_servers);

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index ebf1262..4a14f06 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -245,9 +245,9 @@ button_box_new (ModestAccountViewWindow *self)
                                   GTK_BUTTONBOX_START);
        
        priv->new_button     = gtk_button_new_from_stock(_("mcen_bd_new"));
-       priv->edit_button = gtk_button_new_with_label(_("mcen_bd_emailsetup_edit"));
-       priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_emailsetup_delete"));
-       priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_emailsetup_close"));
+       priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit"));
+       priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_delete"));
+       priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_close"));
        
        g_signal_connect (G_OBJECT(priv->new_button), "clicked",
                          G_CALLBACK(on_new_button_clicked),