2009-04-02 Claudio Saavedra <csaavedra@igalia.com>

* debian/control: Depend on osso-system-lock localization package.
	* src/hildon-code-dialog.c: Obtain the secu_application_title
	translation from osso-system-lock.
	* src/hildon-get-password-dialog.c (create_contents): Do not mark
	for translation the atk related strings, that's not necessary.
	* src/hildon-set-password-dialog.c (create_contents): Ditto.
	* src/hildon-sort-dialog.c (hildon_sort_dialog_init): Remove the
	cancel button, it is not required.

diff --git a/ChangeLog b/ChangeLog
index 7a3f165..9516380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-02  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * debian/control: Depend on osso-system-lock localization package.
+       * src/hildon-code-dialog.c: Obtain the secu_application_title
+       translation from osso-system-lock.
+       * src/hildon-get-password-dialog.c (create_contents): Do not mark
+       for translation the atk related strings, that's not necessary.
+       * src/hildon-set-password-dialog.c (create_contents): Ditto.
+       * src/hildon-sort-dialog.c (hildon_sort_dialog_init): Remove the
+       cancel button, it is not required.
+
 2009-04-02  Alejandro G. Castro  <alex@igalia.com>
 
        * src/hildon-pannable-area.c,

diff --git a/debian/control b/debian/control
index 7ab0ca5..f2699cc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Description: Hildon libraries development files
 Package: libhildon1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui, hildon-libs-l10n-mr | hildon-libs-l10n-mr0
+Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui, hildon-libs-l10n-mr | hildon-libs-l10n-mr0, osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0
 Description: Hildon libraries
 
 Package: libhildon1-dbg

diff --git a/src/hildon-code-dialog.c b/src/hildon-code-dialog.c
index c886590..0c8d8ae 100644 (file)
--- a/src/hildon-code-dialog.c
+++ b/src/hildon-code-dialog.c
@@ -62,7 +62,7 @@
 
 #define                                         DEVICELOCK_OK _("wdgt_bd_done")
 
-#define                                         DEVICELOCK_TITLE _("secu_application_title")
+#define                                         DEVICELOCK_TITLE dgettext("osso-system-lock", "secu_application_title")
 
 #define                                         DEVICELOCK_MAX_CHAR_REACHED c_("ckdg_ib_maximum_characters_reached")
         

diff --git a/src/hildon-get-password-dialog.c b/src/hildon-get-password-dialog.c
index 5c03a55..43f9004 100644 (file)
--- a/src/hildon-get-password-dialog.c
+++ b/src/hildon-get-password-dialog.c
@@ -423,7 +423,7 @@ create_contents                                 (HildonGetPasswordDialog *dialog
     control = gtk_entry_new ();
     if ((atk_aux = gtk_widget_get_accessible(control)))
       {
-       atk_object_set_name(atk_aux, _("Passwd"));
+       atk_object_set_name(atk_aux, "Passwd");
       }
 
     gtk_entry_set_width_chars (GTK_ENTRY (control), 20);

diff --git a/src/hildon-set-password-dialog.c b/src/hildon-set-password-dialog.c
index 75384ba..3b39e25 100644 (file)
--- a/src/hildon-set-password-dialog.c
+++ b/src/hildon-set-password-dialog.c
@@ -280,7 +280,7 @@ create_contents                                 (HildonSetPasswordDialog *dialog
     priv->pwd1st_entry = gtk_entry_new ();
     if ((atk_aux = gtk_widget_get_accessible(priv->pwd1st_entry)))
       {
-       atk_object_set_name(atk_aux, _("Old Passwd"));
+       atk_object_set_name(atk_aux, "Old Passwd");
       }
     
 
@@ -305,7 +305,7 @@ create_contents                                 (HildonSetPasswordDialog *dialog
     priv->pwd2nd_entry = gtk_entry_new();
     if ((atk_aux = gtk_widget_get_accessible(priv->pwd2nd_entry)))
       {
-       atk_object_set_name(atk_aux, _("New Passwd"));
+       atk_object_set_name(atk_aux, "New Passwd");
       }
 
 

diff --git a/src/hildon-sort-dialog.c b/src/hildon-sort-dialog.c
index c3c4213..3c7a3c1 100644 (file)
--- a/src/hildon-sort-dialog.c
+++ b/src/hildon-sort-dialog.c
@@ -302,9 +302,6 @@ hildon_sort_dialog_init                         (HildonSortDialog * dialog)
     (void) gtk_dialog_add_button (GTK_DIALOG(dialog),
             _("wdgt_bd_sort"),
             GTK_RESPONSE_OK);
-    (void) gtk_dialog_add_button (GTK_DIALOG(dialog),
-            _("ckdg_bd_sort_dialog_cancel"),
-            GTK_RESPONSE_CANCEL);
     /* FIXME: Hardcoded sizes are bad */
     gtk_window_resize (GTK_WINDOW (dialog), 370, 100);
     gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);