[evolution-kolab] EPlugin: clarification and unification of translatable UI strings

[Christian Hilberg <chilberg src gnome org>]

commit 5e831d54faae2b18a8af930c33d77f402ff783ed
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Sat Mar 3 11:52:40 2012 +0100

    EPlugin: clarification and unification of translatable UI strings
    
    * unified the various user name strings we had
      to the common "User ID"
    * clarified which options mean "on the server side"
    * refer to "IMAP" explicitly, where applicable
      (annotations, access control)
    * unified to "initial capitals" in labels for
      dialogs/frames/...

 src/eplugin/e-kolab-account-setup.c      |    8 ++++----
 src/eplugin/e-kolab-folder-metadata.c    |    2 +-
 src/eplugin/e-kolab-folder-permissions.c |   12 ++++++------
 src/eplugin/e-kolab-plugin-ui.c          |    6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/eplugin/e-kolab-account-setup.c b/src/eplugin/e-kolab-account-setup.c
index 14fe9a9..16ee744 100644
--- a/src/eplugin/e-kolab-account-setup.c
+++ b/src/eplugin/e-kolab-account-setup.c
@@ -416,7 +416,7 @@ e_kolab_account_setup_backend_create (EPlugin *epl,
 	gtk_box_pack_start (GTK_BOX (kolab_vbox), GTK_WIDGET (hbox), TRUE, TRUE, 0);
 	spacer = gtk_label_new("   ");
 	gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
-	tmp_str = g_strconcat (_("User Name"), ":", NULL);
+	tmp_str = g_strconcat (_("User ID"), ":", NULL);
 	label = gtk_label_new_with_mnemonic (tmp_str);
 	g_free (tmp_str);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -428,7 +428,7 @@ e_kolab_account_setup_backend_create (EPlugin *epl,
 	gtk_box_pack_start (GTK_BOX (kolab_vbox), GTK_WIDGET (hbox), TRUE, TRUE, 0);
 	spacer = gtk_label_new("   ");
 	gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
-	tmp_str = g_strconcat (_("Server Folders"), ":", NULL);
+	tmp_str = g_strconcat (_("Server PIM Folders"), ":", NULL);
 	label = gtk_label_new_with_mnemonic (tmp_str);
 	g_free (tmp_str);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -446,9 +446,9 @@ e_kolab_account_setup_backend_create (EPlugin *epl,
 	spacer = gtk_label_new("   ");
 	gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0);
 	if (widget_type == KOLAB_WIDGET_TYPE_CONTACT)
-		tmp_str = g_strconcat (_("Contact Folder"), ":", NULL);
+		tmp_str = g_strconcat (_("Selected Contact Folder"), ":", NULL);
 	else
-		tmp_str = g_strconcat (_("Calendar Folder"), ":", NULL);
+		tmp_str = g_strconcat (_("Selected Calendar Folder"), ":", NULL);
 	label = gtk_label_new_with_mnemonic (tmp_str);
 	g_free (tmp_str);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
diff --git a/src/eplugin/e-kolab-folder-metadata.c b/src/eplugin/e-kolab-folder-metadata.c
index edbac9e..f11fdee 100644
--- a/src/eplugin/e-kolab-folder-metadata.c
+++ b/src/eplugin/e-kolab-folder-metadata.c
@@ -54,7 +54,7 @@ e_kolab_folder_metadata_ui_new (void)
 	GtkWidget *grid = NULL;
 
 	uidata->widgets = g_new0 (KolabFolderMetaUIWidgets, 1);
-	uidata->widgets->container = gtk_frame_new (_("Folder Type"));
+	uidata->widgets->container = gtk_frame_new (_("Folder Type (Annotation)"));
 	gtk_container_set_border_width (GTK_CONTAINER (uidata->widgets->container), 6);
 
 	grid = gtk_grid_new ();
diff --git a/src/eplugin/e-kolab-folder-permissions.c b/src/eplugin/e-kolab-folder-permissions.c
index 3641b65..96086e8 100644
--- a/src/eplugin/e-kolab-folder-permissions.c
+++ b/src/eplugin/e-kolab-folder-permissions.c
@@ -79,7 +79,7 @@ kolab_folder_permissions_ui_edit_dialog_cb (KolabFolderPermUIData *uidata)
 	g_assert (uidata != NULL);
 	g_assert (uidata->widgets != NULL);
 
-	dialog = gtk_dialog_new_with_buttons (_("Edit Kolab folder permissions..."),
+	dialog = gtk_dialog_new_with_buttons (_("Edit Kolab Folder Permissions..."),
 		                             NULL, /* parent */
 		                             GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
 		                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -90,7 +90,7 @@ kolab_folder_permissions_ui_edit_dialog_cb (KolabFolderPermUIData *uidata)
 	gtk_container_set_border_width (GTK_CONTAINER (content), 6);
 
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-	tmp_str = g_strconcat (_("User Identification"), ":", NULL);
+	tmp_str = g_strconcat (_("User ID"), ":", NULL);
 	label = gtk_label_new (tmp_str);
 	g_free (tmp_str);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -103,7 +103,7 @@ kolab_folder_permissions_ui_edit_dialog_cb (KolabFolderPermUIData *uidata)
 	gtk_box_pack_start (GTK_BOX (hbox), btn, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (content), hbox);
 
-	frame = gtk_frame_new (_("Access Rights"));
+	frame = gtk_frame_new (_("IMAP Folder Permissions"));
 	gtk_container_add (GTK_CONTAINER (content), frame);
 
 	grid = gtk_grid_new ();
@@ -175,7 +175,7 @@ kolab_folder_permissions_ui_create_tree_view (KolabFolderPermUIData *uidata)
 	g_object_set (renderer, "editable", FALSE, NULL);
 	gtk_tree_view_insert_column_with_attributes (tree_view,
 	                                             -1,
-	                                             _("Name"),
+	                                             _("User ID"),
 	                                             renderer,
 	                                             "text",
 	                                             KOLAB_PERM_TREE_VIEW_COL_NAME,
@@ -187,7 +187,7 @@ kolab_folder_permissions_ui_create_tree_view (KolabFolderPermUIData *uidata)
 	g_object_set (renderer, "editable", FALSE, NULL);
 	gtk_tree_view_insert_column_with_attributes (tree_view,
 	                                             -1,
-	                                             _("Permission level"),
+	                                             _("Permissions"),
 	                                             renderer,
 	                                             "text",
 	                                             KOLAB_PERM_TREE_VIEW_COL_LEVEL,
@@ -286,7 +286,7 @@ e_kolab_folder_permissions_ui_new (void)
 	gint row = 0;
 
 	uidata->widgets = g_new0 (KolabFolderPermUIWidgets, 1);
-	uidata->widgets->container = gtk_frame_new (_("Folder Permissions"));
+	uidata->widgets->container = gtk_frame_new (_("IMAP Folder Permissions"));
 	gtk_container_set_border_width (GTK_CONTAINER (uidata->widgets->container), 6);
 	/* gtk_container_set_resize_mode (uidata->widgets->container, GTK_RESIZE_QUEUE); */
 
diff --git a/src/eplugin/e-kolab-plugin-ui.c b/src/eplugin/e-kolab-plugin-ui.c
index 16d44be..0cddfda 100644
--- a/src/eplugin/e-kolab-plugin-ui.c
+++ b/src/eplugin/e-kolab-plugin-ui.c
@@ -281,7 +281,7 @@ kolab_plugin_ui_action_kolab_properties_cb (GtkAction *action,
 	uidata = kolab_folder_prop_ui_data_new ();
 
 	uidata->widgets->dialog = \
-		gtk_dialog_new_with_buttons (_("Edit Kolab folder properties..."),
+		gtk_dialog_new_with_buttons (_("Edit Kolab Folder Properties..."),
 		                             NULL, /* parent */
 		                             GTK_DIALOG_DESTROY_WITH_PARENT,
 		                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -317,7 +317,7 @@ kolab_plugin_ui_action_kolab_properties_cb (GtkAction *action,
 	                          NULL);
 	gtk_notebook_set_tab_label_text (notebook,
 	                                 uidata->meta_ui_data->widgets->container,
-	                                 _("Metadata"));
+	                                 _("IMAP Metadata"));
 
 	/* folder permissions notebook page */
 	gtk_notebook_append_page (notebook,
@@ -325,7 +325,7 @@ kolab_plugin_ui_action_kolab_properties_cb (GtkAction *action,
 	                          NULL);
 	gtk_notebook_set_tab_label_text (notebook,
 	                                 uidata->perm_ui_data->widgets->container,
-	                                 _("Access Control"));
+	                                 _("IMAP Access Control"));
 
 	/* TODO connect signals */