* Fixes NB#99998, backup email settings along with email messages

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index d5d3f8b..6483091 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -890,10 +890,10 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
                if (suggested_name)
                        gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
                else
-                       gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
+                       gtk_entry_set_text (GTK_ENTRY (entry), _CS("ckdg_va_new_folder_name_stub"));
                gtk_entry_set_width_chars (GTK_ENTRY (entry),
                                           MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
-                                               g_utf8_strlen (_("mcen_ia_default_folder_name"), -1)));
+                                               g_utf8_strlen (_CS("ckdg_va_new_folder_name_stub"), -1)));
                gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
        }
 
@@ -992,20 +992,18 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
 
        if(suggested_name == NULL)
        {
-               const gchar *default_name = _("mcen_ia_default_folder_name");
+               const gchar *default_name = _CS("ckdg_va_new_folder_name_stub");
                unsigned int i;
-               gchar num_str[3];
 
                for(i = 0; i < 100; ++ i) {
                        gboolean exists = FALSE;
 
-                       sprintf(num_str, "%.2u", i);
-
                        if (i == 0)
                                real_suggested_name = g_strdup (default_name);
                        else
-                               real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
-                                                                      num_str);
+                               real_suggested_name = g_strdup_printf ("%s(%d)",
+                                                                      _CS("ckdg_va_new_folder_name_stub"),
+                                                                      i);
                        exists = modest_tny_folder_has_subfolder_with_name (suggested_folder,
                                                                            real_suggested_name,
                                                                            TRUE);
@@ -1039,10 +1037,10 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                suggested_folder = (TnyFolderStore *)
                        modest_tny_account_store_get_local_folders_account (acc_store);
 
-       tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL);
+       tmp = g_strconcat (_CS("ckdg_fi_new_folder_name"), ":", NULL);
        result = modest_platform_run_folder_common_dialog (parent_window, 
                                                           suggested_folder,
-                                                          _("mcen_ti_new_folder"),
+                                                          _CS("ckdg_fi_new_folder_name"),
                                                           tmp,
                                                           real_suggested_name,
                                                           TRUE,