GNOME.org
 

[gedit] Standardise use of "character encoding" vs "character coding"

commit 038b466573ff664439f587ea7396aac9d20743c2
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Feb 17 15:56:44 2010 +0000

    Standardise use of "character encoding" vs "character coding"
    
    Ensure strings consistently refer to "character encoding" rather than
    "character coding". Helps: bgo#610048

 data/gedit.schemas.in.in                |   26 +++++++++++++-------------
 gedit/dialogs/gedit-encodings-dialog.c  |    2 +-
 gedit/dialogs/gedit-encodings-dialog.ui |    2 +-
 gedit/gedit-file-chooser-dialog.c       |    2 +-
 gedit/gedit-io-error-message-area.c     |   16 ++++++++--------
 5 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/data/gedit.schemas.in.in b/data/gedit.schemas.in.in
index f6e5989..976f5f3 100644
--- a/data/gedit.schemas.in.in
+++ b/data/gedit.schemas.in.in
@@ -94,7 +94,7 @@
       <locale name="C">
 	<short>Undo Actions Limit (DEPRECATED)</short>
 	<long>Maximum number of actions that gedit will be able to
-	undo or redo. Use "-1" for unlimited number of actions. 
+	undo or redo. Use "-1" for unlimited number of actions.
 	Deprecated since 2.12.0</long>
       </locale>
     </schema>
@@ -269,7 +269,7 @@
 	<short>Toolbar Buttons Style</short>
 	<long>Style for the toolbar buttons.  Possible values are
 	"GEDIT_TOOLBAR_SYSTEM" to use the system's default style,
-	"GEDIT_TOOLBAR_ICONS" to display icons only, 
+	"GEDIT_TOOLBAR_ICONS" to display icons only,
 	"GEDIT_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and
 	"GEDIT_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons.
 	Note that the values are case-sensitive, so make sure they
@@ -379,7 +379,7 @@
       <owner>gedit</owner>
       <type>string</type>
       <locale name="C">
-        <default><!-- Translators: This is the Body font for printing. 
+        <default><!-- Translators: This is the Body font for printing.
         This is a Pango font.-->Monospace 9</default>
 	<short>Body Font for Printing</short>
 	<long>Specifies the font to use for a document's body when
@@ -393,7 +393,7 @@
       <owner>gedit</owner>
       <type>string</type>
       <locale name="C">
-        <default><!-- Translators: This is the Header font for printing. 
+        <default><!-- Translators: This is the Header font for printing.
         This is a Pango font.-->Sans 11</default>
 	<short>Header Font for Printing</short>
 	<long>Specifies the font to use for page headers when printing
@@ -408,7 +408,7 @@
       <owner>gedit</owner>
       <type>string</type>
       <locale name="C">
-        <default><!-- Translators: This is the Line Number font for printing. 
+        <default><!-- Translators: This is the Line Number font for printing.
         This is a Pango font.-->Sans 8</default>
 	<short>Line Number Font for Printing</short>
 	<long>Specifies the font to use for line numbers when
@@ -437,15 +437,15 @@
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-        <default><!-- Translators: This is the sorted list of encodings used by gedit 
+        <default><!-- Translators: This is the sorted list of encodings used by gedit
 	for auto-detecting the encoding of a file. You may want to customize it adding
 	encodings that are common in your country, for instance the GB18030 encoding
 	for the Chinese	translation. You may also want to remove the ISO-8859-15 encoding
 	(covering English and most Western European languages) if you think people
 	in you country will rarely use it.
 	"CURRENT" is a magic value used by gedit and it represents the encoding
-	for the current locale, so please don't translate the "CURRENT" term. 
-	Only recognized encodings are used. 
+	for the current locale, so please don't translate the "CURRENT" term.
+	Only recognized encodings are used.
 	See http://svn.gnome.org/viewcvs/gedit/trunk/gedit/gedit-encodings.c?view=markup for
 	a list of supported encodings -->[UTF-8,CURRENT,ISO-8859-15,UTF-16]</default>
 	<short>Auto Detected Encodings</short>
@@ -461,10 +461,10 @@
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-        <default><!-- Translators: This is the list of encodings shown by default in the Character Coding 
+        <default><!-- Translators: This is the list of encodings shown by default in the Character Encoding
 	menu in open/save file selector. Only recognized encodings are displayed.-->[ISO-8859-15]</default>
 	<short>Encodings shown in menu</short>
-	<long>List of encodings shown in Character Coding menu in open/save file selector.
+	<long>List of encodings shown in the Character Encoding menu in open/save file selector.
 	Only recognized encodings are used.</long>
       </locale>
     </schema>
@@ -508,7 +508,7 @@
 	is writable by default.</long>
       </locale>
     </schema>
-    
+
     <schema>
       <key>/schemas/apps/gedit-2/preferences/editor/cursor_position/restore_cursor_position</key>
       <applyto>/apps/gedit-2/preferences/editor/cursor_position/restore_cursor_position</applyto>
@@ -520,7 +520,7 @@
 	<long>Whether gedit should restore the previous cursor position when a file is loaded.</long>
       </locale>
     </schema>
-    
+
     <schema>
       <key>/schemas/apps/gedit-2/preferences/editor/search_highlighting/enable</key>
       <applyto>/apps/gedit-2/preferences/editor/search_highlighting/enable</applyto>
@@ -532,6 +532,6 @@
 	<long>Whether gedit should highlight all the occurrences of the searched text.</long>
       </locale>
     </schema>
-    
+
   </schemalist>
 </gconfschemafile>
diff --git a/gedit/dialogs/gedit-encodings-dialog.c b/gedit/dialogs/gedit-encodings-dialog.c
index 9297567..b480080 100644
--- a/gedit/dialogs/gedit-encodings-dialog.c
+++ b/gedit/dialogs/gedit-encodings-dialog.c
@@ -318,7 +318,7 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dlg)
 				GTK_RESPONSE_HELP,
 				NULL);
 
-	gtk_window_set_title (GTK_WINDOW (dlg), _("Character Codings"));
+	gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings"));
 	gtk_window_set_default_size (GTK_WINDOW (dlg), 650, 400);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
 	
diff --git a/gedit/dialogs/gedit-encodings-dialog.ui b/gedit/dialogs/gedit-encodings-dialog.ui
index 9dafd45..0f37b43 100644
--- a/gedit/dialogs/gedit-encodings-dialog.ui
+++ b/gedit/dialogs/gedit-encodings-dialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkDialog" id="encodings-dialog">
     <property name="width_request">650</property>
     <property name="height_request">400</property>
-    <property name="title" translatable="yes">Character codings</property>
+    <property name="title" translatable="yes">Character encodings</property>
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
     <property name="window_position">GTK_WIN_POS_NONE</property>
     <property name="modal">True</property>
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index a03ed30..8094ea9 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -78,7 +78,7 @@ create_option_menu (GeditFileChooserDialog *dialog)
 	GtkWidget *label;
 	GtkWidget *menu;
 
-	label = gtk_label_new_with_mnemonic (_("C_haracter Coding:"));
+	label = gtk_label_new_with_mnemonic (_("C_haracter Encoding:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
 	menu = gedit_encodings_combo_box_new (
diff --git a/gedit/gedit-io-error-message-area.c b/gedit/gedit-io-error-message-area.c
index 2b79eff..7f1d226 100644
--- a/gedit/gedit-io-error-message-area.c
+++ b/gedit/gedit-io-error-message-area.c
@@ -457,7 +457,7 @@ create_combo_box (GtkWidget *message_area, GtkWidget *vbox)
 	hbox = gtk_hbox_new (FALSE, 6);
 
 	label_markup = g_strdup_printf ("<small>%s</small>",
-					_("Ch_aracter Coding:"));
+					_("Ch_aracter Encoding:"));
 	label = gtk_label_new_with_mnemonic (label_markup);
 	g_free (label_markup);
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
@@ -647,9 +647,9 @@ gedit_io_loading_error_message_area_new (const gchar         *uri,
 		error_message = g_strdup_printf (_("Could not open the file %s."),
 						 uri_for_display);
 		message_details = g_strconcat (_("gedit has not been able to detect "
-				               "the character coding."), "\n", 
+				               "the character encoding."), "\n", 
 				               _("Please check that you are not trying to open a binary file."), "\n",
-					       _("Select a character coding from the menu and try again."), NULL);
+					       _("Select a character encoding from the menu and try again."), NULL);
 		convert_error = TRUE;
 	}
 	else if (error->domain == GEDIT_DOCUMENT_ERROR &&
@@ -667,11 +667,11 @@ gedit_io_loading_error_message_area_new (const gchar         *uri,
 	}
 	else if (is_gio_error (error, G_IO_ERROR_INVALID_DATA) && encoding != NULL)
 	{
-		error_message = g_strdup_printf (_("Could not open the file %s using the %s character coding."),
+		error_message = g_strdup_printf (_("Could not open the file %s using the %s character encoding."),
 						 uri_for_display, 
 						 encoding_name);
 		message_details = g_strconcat (_("Please check that you are not trying to open a binary file."), "\n",
-					       _("Select a different character coding from the menu and try again."), NULL);
+					       _("Select a different character encoding from the menu and try again."), NULL);
 		convert_error = TRUE;
 	}
 	else
@@ -734,12 +734,12 @@ gedit_conversion_error_while_saving_message_area_new (
 
 	encoding_name = gedit_encoding_to_string (encoding);
 	
-	error_message = g_strdup_printf (_("Could not save the file %s using the %s character coding."),
+	error_message = g_strdup_printf (_("Could not save the file %s using the %s character encoding."),
 					 uri_for_display, 
 					 encoding_name);
 	message_details = g_strconcat (_("The document contains one or more characters that cannot be encoded "
-					 "using the specified character coding."), "\n",
-				       _("Select a different character coding from the menu and try again."), NULL);
+					 "using the specified character encoding."), "\n",
+				       _("Select a different character encoding from the menu and try again."), NULL);
 	
 	message_area = create_conversion_error_message_area (
 								error_message,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]