GNOME.org
 

[eog] Miscellaneous string fixes

commit 7dd5435f7640a9bdeced67f4a6f66c90327eb18a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jan 1 13:54:30 2010 +0000

    Miscellaneous string fixes
    
    Various string fixes, including capitalisation, punctuation and terminology
    fixes. Proper Unicode ellipsis characters have been introduced, as well as
    proper multiplication symbols. Fixes bug #605851.

 data/eog.schemas.in         |   29 ++++++++++++++---------------
 src/eog-print-image-setup.c |    2 +-
 src/eog-window.c            |   16 ++++++++--------
 src/main.c                  |    4 ++--
 4 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/data/eog.schemas.in b/data/eog.schemas.in
index 4411d5f..e37c3c7 100644
--- a/data/eog.schemas.in
+++ b/data/eog.schemas.in
@@ -21,7 +21,7 @@
       <default>1</default>
       <locale name="C">
 	<short>Interpolate Image</short>
-	<long>Whether the image should be interpolated on zoom-out or not.
+	<long>Whether the image should be interpolated on zoom-out.
 	This leads to better quality but is somewhat slower than non 
         interpolated images.</long>
       </locale>
@@ -35,9 +35,9 @@
       <default>1</default>
       <locale name="C">
 	<short>Extrapolate Image</short>
-	<long>Whether the image should be extrapolated on zoom-in or not.
-	This leads to blurry quality and is somewhat slower than non 
-        extrapolated images.</long>
+	<long>Whether the image should be extrapolated on zoom-in.
+	This leads to blurry quality and is somewhat slower than
+        non-extrapolated images.</long>
       </locale>
     </schema>
 
@@ -64,7 +64,7 @@
       <default>1</default>
       <locale name="C">
 	<short>Scroll wheel zoom</short>
-	<long>Whether the scroll wheel should be used for zooming or not.</long>
+	<long>Whether the scroll wheel should be used for zooming.</long>
       </locale>
     </schema>
 
@@ -105,7 +105,7 @@
       <default>1</default>
       <locale name="C">
         <short>Loop through the image sequence</short>
-        <long>Whether or not the sequence of images should be shown in an
+        <long>Whether the sequence of images should be shown in an
         endless loop.</long>
       </locale>
     </schema>
@@ -144,7 +144,7 @@
       <type>bool</type>
       <default>1</default>
       <locale name="C">
-        <short>Show/hide the window toolbar.</short>
+        <short>Show/Hide the window toolbar.</short>
       </locale>
     </schema>
 
@@ -155,7 +155,7 @@
       <type>bool</type>
       <default>1</default>
       <locale name="C">
-        <short>Show/hide the window statusbar.</short>
+        <short>Show/Hide the window statusbar.</short>
       </locale>
     </schema>
 
@@ -166,7 +166,7 @@
       <type>bool</type>
       <default>0</default>
       <locale name="C">
-        <short>Show/hide the image collection pane.</short>
+        <short>Show/Hide the image collection pane.</short>
       </locale>
     </schema>
 
@@ -189,8 +189,7 @@
       <type>bool</type>
       <default>0</default>
       <locale name="C">
-        <short>Whether the image collection pane should be resizable 
-        or not.</short>
+        <short>Whether the image collection pane should be resizable.</short>
       </locale>
     </schema>
 
@@ -201,7 +200,7 @@
       <type>bool</type>
       <default>1</default>
       <locale name="C">
-        <short>Show/hide the window side pane.</short>
+        <short>Show/Hide the window side pane.</short>
       </locale>
     </schema>
 
@@ -212,7 +211,7 @@
       <type>bool</type>
       <default>1</default>
       <locale name="C">
-        <short>Show/hide the image collection pane scroll buttons.</short>
+        <short>Show/Hide the image collection pane scroll buttons.</short>
       </locale>
     </schema>
 
@@ -237,8 +236,8 @@
       <type>bool</type>
       <default>1</default>
       <locale name="C">
-        <short>Whether the filechooser should show the user's pictures folder if no images are loaded.</short>
-        <long>If activated and no image is loaded in the active window, the filechooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up it will show the current working directory.</long>
+        <short>Whether the file chooser should show the user's pictures folder if no images are loaded.</short>
+        <long>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up it will show the current working directory.</long>
       </locale>
     </schema>
 
diff --git a/src/eog-print-image-setup.c b/src/eog-print-image-setup.c
index 89fef2d..79ee1f9 100644
--- a/src/eog-print-image-setup.c
+++ b/src/eog-print-image-setup.c
@@ -832,7 +832,7 @@ eog_print_image_setup_class_init (EogPrintImageSetupClass *class)
 	g_object_class_install_property (object_class, PROP_IMAGE,
 					 g_param_spec_object ("image",
 							      _("Image"),
-							      _("The image whose printing properties will be setup"),
+							      _("The image whose printing properties will be set up"),
 							      EOG_TYPE_IMAGE,
 							      G_PARAM_READWRITE));
 
diff --git a/src/eog-window.c b/src/eog-window.c
index 8e395b6..3ec02b1 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -771,8 +771,8 @@ update_status_bar (EogWindow *window)
 			 * - image height
 			 * - image size in bytes
 			 * - zoom in percent */
-			str = g_strdup_printf (ngettext("%i x %i pixel  %s    %i%%",
-							"%i x %i pixels  %s    %i%%", height),
+			str = g_strdup_printf (ngettext("%i Ã? %i pixel  %s    %i%%",
+							"%i Ã? %i pixels  %s    %i%%", height),
 						width,
 						height,
 						size_string,
@@ -3215,7 +3215,7 @@ eog_window_cmd_wallpaper (GtkAction *action, gpointer user_data)
 								    "copy_file_cid");
 		gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar),
 				    priv->copy_file_cid,
-				    _("Saving image locally..."));
+				    _("Saving image locallyâ?¦"));
 
 		files = g_list_append (files, eog_image_get_file (image));
 		priv->copy_job = eog_job_copy_new (files, g_get_user_data_dir ());
@@ -3682,7 +3682,7 @@ static const GtkActionEntry action_entries_window[] = {
 	{ "Tools", NULL, N_("_Tools") },
 	{ "Help",  NULL, N_("_Help") },
 
-	{ "FileOpen", GTK_STOCK_OPEN,  N_("_Open..."), "<control>O",
+	{ "FileOpen", GTK_STOCK_OPEN,  N_("_Openâ?¦"), "<control>O",
 	  N_("Open a file"),
 	  G_CALLBACK (eog_window_cmd_file_open) },
 	{ "FileClose", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
@@ -3724,13 +3724,13 @@ static const GtkActionEntry action_entries_image[] = {
 	{ "FileOpenWith", NULL, N_("Open _with"), NULL,
 	  N_("Open the selected image with a different application"),
 	  NULL},
-	{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<control><shift>s",
+	{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _Asâ?¦"), "<control><shift>s",
 	  N_("Save the selected images with a different name"),
 	  G_CALLBACK (eog_window_cmd_save_as) },
 	{ "FilePageSetup", GTK_STOCK_PAGE_SETUP, NULL, NULL,
-	  N_("Setup the page properties for printing"),
+	  N_("Set up the page properties for printing"),
 	  G_CALLBACK (eog_window_cmd_page_setup) },
-	{ "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>p",
+	{ "FilePrint", GTK_STOCK_PRINT, N_("_Printâ?¦"), "<control>p",
 	  N_("Print the selected image"),
 	  G_CALLBACK (eog_window_cmd_print) },
 	{ "FileProperties", GTK_STOCK_PROPERTIES, N_("Prope_rties"), "<alt>Return",
@@ -3784,7 +3784,7 @@ static const GtkActionEntry action_entries_image[] = {
 };
 
 static const GtkToggleActionEntry toggle_entries_image[] = {
-	{ "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Full Screen"), "F11",
+	{ "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
 	  N_("Show the current image in fullscreen mode"),
 	  G_CALLBACK (eog_window_cmd_fullscreen), FALSE },
 };
diff --git a/src/main.c b/src/main.c
index f1e746d..c37dd32 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,11 +62,11 @@ static const GOptionEntry goption_options[] =
 {
 	{ "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen, N_("Open in fullscreen mode"), NULL  },
 	{ "disable-image-collection", 'c', 0, G_OPTION_ARG_NONE, &disable_collection, N_("Disable image collection"), NULL  },
-	{ "slide-show", 's', 0, G_OPTION_ARG_NONE, &slide_show, N_("Open in slide show mode"), NULL  },
+	{ "slide-show", 's', 0, G_OPTION_ARG_NONE, &slide_show, N_("Open in slideshow mode"), NULL  },
 #if HAVE_DBUS
 	{ "new-instance", 'n', 0, G_OPTION_ARG_NONE, &force_new_instance, N_("Start a new instance instead of reusing an existing one"), NULL },
 #endif
-	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &startup_files, NULL, N_("[FILE...]") },
+	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &startup_files, NULL, N_("[FILEâ?¦]") },
 	{ NULL }
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]