Clean up strings for l10n. (#510327)

2008-01-22  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/apps_nautilus_preferences.schemas.in:
        * libnautilus-private/nautilus-file-operations.c:
        * src/Nautilus_shell.server.in:
        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-properties-window.c:
        * src/nautilus-connect-server-dialog-main.c:
        * src/nautilus-file-management-properties.glade:
        * src/nautilus-navigation-window-menus.c:
	Clean up strings for l10n. (#510327)


svn path=/trunk/; revision=13635

9 files changed, 59 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index e7e3e9d54..6225c6087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-01-22  Alexander Larsson  <alexl@redhat.com>
 
+        * libnautilus-private/apps_nautilus_preferences.schemas.in:
+        * libnautilus-private/nautilus-file-operations.c:
+        * src/Nautilus_shell.server.in:
+        * src/file-manager/fm-directory-view.c:
+        * src/file-manager/fm-properties-window.c:
+        * src/nautilus-connect-server-dialog-main.c:
+        * src/nautilus-file-management-properties.glade:
+        * src/nautilus-navigation-window-menus.c:
+	Clean up strings for l10n. (#510327)
+
+2008-01-22  Alexander Larsson  <alexl@redhat.com>
+
         * libnautilus-private/nautilus-file-operations.c:
         * libnautilus-private/nautilus-file.c:
         * libnautilus-private/nautilus-progress-info.c:
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index 3e606106b..bbdfddcc9 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -456,7 +456,7 @@ most cases, this should be left alone. -->Sans 10</default>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Custom Background Set</short>
+         <short>Custom Background</short>
          <long>Whether a custom default folder background has been set.</long>
       </locale>
     </schema>
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index a58e279b1..9fc76a1e4 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1880,7 +1880,7 @@ prompt_empty_trash (GtkWindow *parent_window)
 						    "free space on this volume "
 						    "the trash must be emptied. "
 						    "All trashed items on the volume "
-						    "will be permanently lost. "));
+						    "will be permanently lost."));
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog), 
 	                        _("Don't Empty Trash"), GTK_RESPONSE_REJECT, 
 	                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, 
@@ -4051,7 +4051,7 @@ report_link_progress (CopyMoveJob *link_job, int total, int left)
 	job = (CommonJob *)link_job;
 	
 	nautilus_progress_info_take_status (job->progress,
-					    f (_("Creating links in to \"%B\""),
+					    f (_("Creating links in \"%B\""),
 					       link_job->destination));
 
 	nautilus_progress_info_take_details (job->progress,
diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in
index 61f925e25..e84b72a39 100644
--- a/src/Nautilus_shell.server.in
+++ b/src/Nautilus_shell.server.in
@@ -13,8 +13,8 @@
     <item value="IDL:Bonobo/Unknown:1.0"/>
     <item value="IDL:Nautilus/Shell:1.0"/>
   </oaf_attribute>
-  <oaf_attribute name="name" type="string" _value="Nautilus shell"/>
-  <oaf_attribute name="description" type="string" _value="Nautilus shell operations that can be done from subsequent command-line invocations"/>
+  <oaf_attribute name="name" type="string" _value="Nautilus instance"/>
+  <oaf_attribute name="description" type="string" _value="Nautilus operations that can be done from subsequent command-line invocations"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:Nautilus_Metafile_Factory" type="factory" location="OAFIID:Nautilus_Factory">
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index ef4172a74..18329e848 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6214,7 +6214,7 @@ static const GtkActionEntry directory_view_entries[] = {
     N_("Create _Folder"), "<control><shift>N",                /* label, accelerator */
     N_("Create a new empty folder inside this folder"),                   /* tooltip */ 
     G_CALLBACK (action_new_folder_callback) },
-  { "No Templates", NULL, N_("No templates Installed") },               /* name, stock id, label */
+  { "No Templates", NULL, N_("No templates installed") },               /* name, stock id, label */
   { "New Empty File", NULL,                  /* name, stock id */
     /* translators: this is used to indicate that a file doesn't contain anything */
     N_("_Empty File"), NULL,                /* label, accelerator */
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index d5aa5800d..0b1396572 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -2810,7 +2810,7 @@ create_pie_widget (FMPropertiesWindow *window)
 	/* Translators: "free" refers to the capacity of the filesystem */
 	free_label = gtk_label_new (g_strconcat (free, " ", _("free"), NULL));  
 
-	capacity_label = gtk_label_new (g_strconcat (_("Total capacity: "), capacity, NULL));
+	capacity_label = gtk_label_new (g_strconcat (_("Total capacity:"), " ", capacity, NULL));
 	fstype_label = gtk_label_new (NULL);
 
 	location = g_file_new_for_uri (uri);
@@ -2819,7 +2819,7 @@ create_pie_widget (FMPropertiesWindow *window)
 	if (info) {
 		fs_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
 		if (fs_type != NULL) {
-			gtk_label_set_text (GTK_LABEL (fstype_label), g_strconcat (_("Filesystem type: "), fs_type, NULL));
+			gtk_label_set_text (GTK_LABEL (fstype_label), g_strconcat (_("Filesystem type:"), " ", fs_type, NULL));
 		}
 		
 		g_object_unref (info);
@@ -2948,7 +2948,7 @@ create_basic_page (FMPropertiesWindow *window)
 		append_title_value_pair (window,
 					 table, _("Type:"), 
 					 "type",
-					 _("--"),
+					 "--",
 					 FALSE);
 	}
 
@@ -2958,24 +2958,24 @@ create_basic_page (FMPropertiesWindow *window)
 	} else {
 		append_title_value_pair (window, table, _("Size:"), 
 					 "size_detail",
-					 _("--"),
+					 "--",
 					 FALSE);
 	}
 
 	append_title_and_ellipsizing_value (window, table, _("Location:"), 
 					    "where",
-					    _("--"),
+					    "--",
 					    TRUE);
 	
 	append_title_and_ellipsizing_value (window, table, 
 					    _("Volume:"), 
 					    "volume",
-					    _("--"),
+					    "--",
 					    FALSE);
 	if (should_show_free_space (window)) {
 		append_title_value_pair (window, table, _("Free space:"), 
 					 "free_space",
-					 _("--"),
+					 "--",
 					 FALSE);
 	}
 
@@ -2983,13 +2983,13 @@ create_basic_page (FMPropertiesWindow *window)
 		append_title_and_ellipsizing_value (window, table, 
 						    _("Link target:"), 
 						    "link_target",
-						    _("--"),
+						    "--",
 						    FALSE);
 	}
 	if (should_show_mime_type (window)) {
 		append_title_value_pair (window, table, _("MIME type:"), 
 					 "mime_type",
-					 _("--"),
+					 "--",
 					 FALSE);
 	}				  
 	
@@ -2998,13 +2998,13 @@ create_basic_page (FMPropertiesWindow *window)
 	
 	append_title_value_pair (window, table, _("Modified:"), 
 				 "date_modified",
-				 _("--"),
+				 "--",
 				 FALSE);
 	
 	if (should_show_accessed_date (window)) {
 		append_title_value_pair (window, table, _("Accessed:"), 
 					 "date_accessed",
-					 _("--"),
+					 "--",
 					 FALSE);
 	}
 	
@@ -4054,7 +4054,7 @@ create_simple_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 		value = attach_value_field (window, 
 				    page_table, last_row, VALUE_COLUMN,
 				    "owner",
-				    _("--"),
+				    "--",
 				    FALSE); 
 		gtk_label_set_mnemonic_widget (owner_label, value);
 	}
@@ -4087,7 +4087,7 @@ create_simple_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 		value = attach_value_field (window, page_table, last_row, 
 				    VALUE_COLUMN, 
 				    "group",
-				    _("--"),
+				    "--",
 				    FALSE); 
 		gtk_label_set_mnemonic_widget (group_label, value);
 	}
@@ -4260,7 +4260,7 @@ create_advanced_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 		value = attach_value_field (window, 
 				    page_table, last_row, VALUE_COLUMN,
 				    "owner",
-				    _("--"),
+				    "--",
 				    FALSE); 
 		gtk_label_set_mnemonic_widget (owner_label, value);
 	}
@@ -4282,7 +4282,7 @@ create_advanced_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 		attach_value_field (window, page_table, last_row, 
 				    VALUE_COLUMN, 
 				    "group",
-				    _("--"),
+				    "--",
 				    FALSE); 
 	}
 
@@ -4317,7 +4317,7 @@ create_advanced_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 	
 	append_title_value_pair
 		(window, page_table, _("Text view:"), 
-		 "permissions", _("--"),
+		 "permissions", "--",
 		 FALSE);
 }
 
@@ -4487,11 +4487,11 @@ create_permissions_page (FMPropertiesWindow *window)
 	
 		append_title_value_pair
 			(window, page_table, _("SELinux context:"), 
-			 "selinux_context", _("--"),
+			 "selinux_context", "--",
 			 FALSE);
 		append_title_value_pair
 			(window, page_table, _("Last changed:"), 
-			 "date_permissions", _("--"),
+			 "date_permissions", "--",
 			 FALSE);
 	
 		if (window->details->has_recursive_apply) {
diff --git a/src/nautilus-connect-server-dialog-main.c b/src/nautilus-connect-server-dialog-main.c
index 290a75a58..6f5cf8911 100644
--- a/src/nautilus-connect-server-dialog-main.c
+++ b/src/nautilus-connect-server-dialog-main.c
@@ -108,6 +108,8 @@ main (int argc, char *argv[])
 	textdomain (GETTEXT_PACKAGE);
 
 	args = NULL;
+	/* Translators: This is the --help description gor the connect to server app,
+	   the initial newlines are between the command line arg and the description */
 	context = g_option_context_new (N_("\n\nAdd connect to server mount"));
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
diff --git a/src/nautilus-file-management-properties.glade b/src/nautilus-file-management-properties.glade
index 95d5bdb4e..483cc99aa 100644
--- a/src/nautilus-file-management-properties.glade
+++ b/src/nautilus-file-management-properties.glade
@@ -92,7 +92,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label4">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Default View&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Default View&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -306,7 +306,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label5">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Icon View Defaults&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Icon View Defaults&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -468,7 +468,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label6">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;List View Defaults&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;List View Defaults&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -592,7 +592,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label25">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Tree View Defaults&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Tree View Defaults&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -712,7 +712,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label10">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Behavior&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -835,7 +835,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label12">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Executable Text Files&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Executable Text Files&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -959,7 +959,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label14">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Trash&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Trash&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1098,7 +1098,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label28">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Icon Captions&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Icon Captions&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1172,7 +1172,7 @@ By Emblems</property>
 			      <child>
 				<widget class="GtkLabel" id="captions_label_0">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
+				  <property name="label" translatable="no"></property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1224,7 +1224,7 @@ By Emblems</property>
 			      <child>
 				<widget class="GtkLabel" id="captions_label_1">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
+				  <property name="label" translatable="no"></property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1276,7 +1276,7 @@ By Emblems</property>
 			      <child>
 				<widget class="GtkLabel" id="captions_label_2">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes"></property>
+				  <property name="label" translatable="no"></property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1344,7 +1344,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label34">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Date&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1485,7 +1485,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label31">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;List Columns&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;List Columns&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1516,7 +1516,7 @@ By Emblems</property>
 		      <child>
 			<widget class="GtkLabel" id="label32">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label" translatable="no">    </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1639,7 +1639,7 @@ By Emblems</property>
 		  <child>
 		    <widget class="GtkLabel" id="label16">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Text Files&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Text Files&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1759,7 +1759,7 @@ Never</property>
 		  <child>
 		    <widget class="GtkLabel" id="label18">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Other Previewable Files&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Other Previewable Files&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1939,7 +1939,7 @@ Never</property>
 		  <child>
 		    <widget class="GtkLabel" id="label20">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Sound Files&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Sound Files&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2059,7 +2059,7 @@ Never</property>
 		  <child>
 		    <widget class="GtkLabel" id="label22">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Folders&lt;/span&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Folders&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2221,7 +2221,7 @@ Never</property>
 		      <child>
 			<widget class="GtkLabel" id="label42">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Media Handling&lt;/span&gt;</property>
+			  <property name="label" translatable="yes">&lt;b&gt;Media Handling&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2551,7 +2551,7 @@ Never</property>
 		      <child>
 			<widget class="GtkLabel" id="label61">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Other Media&lt;/span&gt;</property>
+			  <property name="label" translatable="yes">&lt;b&gt;Other Media&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index d062d7d04..2ab18bec2 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -111,6 +111,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 		 * implemented this feature so I could use this joke. 
 		 */
 		prompt = _("Are you sure you want to forget history?");
+		/* Translators: This is part of a joke and is paired with "Are you sure you want to forget history?" */
 		detail = _("If you do, you will be doomed to repeat it.");
 	} else {
 		prompt = _("Are you sure you want to clear the list "