Bug 309879 [1] lists many nitpicky suggestions, which are partially very
important for translators. The attached two patches fix most of them.
For details, see [1].
A notable change is
- label = _("_Browse Folder");
+ label = g_strdup (ngettext ("_Browse Folder",
+ "_Browse Folders", 1));
which has been introduced because the ngettext form is used elsewhere
and therefore, this construction reduces the string count.
[1] http://bugzilla.gnome.org/show_bug.cgi?id=309879
--
Christian Neumair <chris gnome-de org>
Index: libnautilus-private/apps_nautilus_preferences.schemas.in
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/apps_nautilus_preferences.schemas.in,v
retrieving revision 1.26
diff -u -p -r1.26 apps_nautilus_preferences.schemas.in
--- libnautilus-private/apps_nautilus_preferences.schemas.in 8 Jul 2005 11:25:47 -0000 1.26
+++ libnautilus-private/apps_nautilus_preferences.schemas.in 9 Jul 2005 14:44:58 -0000
@@ -547,10 +547,7 @@ most cases, this should be left alone. -
<type>string</type>
<default>standard</default>
<locale name="C">
- <short>Default icon zoom level</short>
- <long>
- Default zoom level used by the icon view.
- </long>
+ <short>Default icon view zoom level</short>
</locale>
</schema>
@@ -594,10 +591,7 @@ most cases, this should be left alone. -
<type>string</type>
<default>smaller</default>
<locale name="C">
- <short>Default list zoom level</short>
- <long>
- Default zoom level used by the list view.
- </long>
+ <short>Default list view zoom level</short>
</locale>
</schema>
@@ -609,10 +603,7 @@ most cases, this should be left alone. -
<list_type>string</list_type>
<default>[name,size,type,date_modified]</default>
<locale name="C">
- <short>Default list of columns visible in the list view</short>
- <long>
- Default list of columns visible in the list view.
- </long>
+ <short>Columns visible in list view</short>
</locale>
</schema>
@@ -624,10 +615,7 @@ most cases, this should be left alone. -
<list_type>string</list_type>
<default>[name,size,type,date_modified]</default>
<locale name="C">
- <short>Default column order in the list view</short>
- <long>
- Default column order in the list view.
- </long>
+ <short>Column order in list view</short>
</locale>
</schema>
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/nautilus/po/POTFILES.in,v
retrieving revision 1.164
diff -u -p -r1.164 POTFILES.in
--- po/POTFILES.in 8 Jul 2005 11:25:48 -0000 1.164
+++ po/POTFILES.in 9 Jul 2005 15:02:15 -0000
@@ -24,7 +24,6 @@ libnautilus-private/nautilus-file.c
libnautilus-private/nautilus-global-preferences.c
libnautilus-private/nautilus-icon-canvas-item.c
libnautilus-private/nautilus-icon-container.c
-libnautilus-private/nautilus-icon-dnd.c
libnautilus-private/nautilus-icon-factory.c
libnautilus-private/nautilus-program-choosing.c
libnautilus-private/nautilus-trash-directory.c
Index: po/POTFILES.skip
===================================================================
RCS file: /cvs/gnome/nautilus/po/POTFILES.skip,v
retrieving revision 1.26
diff -u -p -r1.26 POTFILES.skip
--- po/POTFILES.skip 3 Jun 2005 07:29:55 -0000 1.26
+++ po/POTFILES.skip 9 Jul 2005 15:02:15 -0000
@@ -1,3 +1,4 @@
# List of source files that should NOT be translated.
# Please keep this file sorted alphabetically.
libbackground/applier.c
+libnautilus-private/nautilus-icon-dnd.c
Index: src/nautilus-emblem-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-emblem-sidebar.c,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-emblem-sidebar.c
--- src/nautilus-emblem-sidebar.c 28 Jun 2005 12:54:45 -0000 1.5
+++ src/nautilus-emblem-sidebar.c 9 Jul 2005 15:02:16 -0000
@@ -239,7 +239,7 @@ nautilus_emblem_sidebar_delete_cb (GtkWi
send_emblems_changed ();
} else {
error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_sidebar->details->popup_emblem_display_name);
- eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one you added yourself."),
+ eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
_("Couldn't Remove Emblem"),
NULL);
g_free (error);
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.700
diff -u -p -r1.700 fm-directory-view.c
--- src/file-manager/fm-directory-view.c 6 Jul 2005 12:18:28 -0000 1.700
+++ src/file-manager/fm-directory-view.c 9 Jul 2005 15:02:23 -0000
@@ -6580,7 +6580,8 @@ real_update_location_menu (FMDirectoryVi
if (nautilus_window_info_get_window_type (view->details->window) == NAUTILUS_WINDOW_NAVIGATION) {
label = _("Open in New Window");
} else {
- label = _("_Browse Folder");
+ label = g_strdup (ngettext ("_Browse Folder",
+ "_Browse Folders", 1));
}
action = gtk_action_group_get_action (view->details->dir_action_group,
FM_ACTION_LOCATION_OPEN_ALTERNATE);
@@ -6740,11 +6741,9 @@ real_update_menus (FMDirectoryView *view
selection_count);
}
} else {
- if (selection_count <= 1) {
- label_with_underscore = g_strdup (_("_Browse Folder"));
- } else {
- label_with_underscore = g_strdup_printf (_("_Browse Folders"));
- }
+ label_with_underscore = g_strdup (ngettext ("_Browse Folder",
+ "_Browse Folders",
+ selection_count));
}
action = gtk_action_group_get_action (view->details->dir_action_group,
@@ -6798,9 +6797,9 @@ real_update_menus (FMDirectoryView *view
FM_ACTION_CREATE_LINK);
gtk_action_set_sensitive (action, can_link_files);
g_object_set (action, "label",
- selection_count > 1
- ? _("Ma_ke Links")
- : _("Ma_ke Link"),
+ ngettext ("Ma_ke Link",
+ "Ma_ke Links",
+ selection_count),
NULL);
action = gtk_action_group_get_action (view->details->dir_action_group,
Index: src/file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.216
diff -u -p -r1.216 fm-properties-window.c
--- src/file-manager/fm-properties-window.c 2 Jun 2005 16:16:56 -0000 1.216
+++ src/file-manager/fm-properties-window.c 9 Jul 2005 15:02:23 -0000
@@ -266,6 +266,23 @@ is_multi_file_window (FMPropertiesWindow
return FALSE;
}
+static int
+get_not_gone_original_file_count (FMPropertiesWindow *window)
+{
+ GList *l;
+ int count;
+
+ count = 0;
+
+ for (l = window->details->original_files; l != NULL; l = l->next) {
+ if (!nautilus_file_is_gone (NAUTILUS_FILE (l->data))) {
+ count++;
+ }
+ }
+
+ return count;
+}
+
static NautilusFile *
get_original_file (FMPropertiesWindow *window)
{
@@ -2333,11 +2350,8 @@ create_basic_page (FMPropertiesWindow *w
gtk_box_pack_start (GTK_BOX (hbox), icon_aligner, TRUE, TRUE, 0);
/* Name label */
- if (is_multi_file_window (window)) {
- name_label = gtk_label_new_with_mnemonic (_("Names:"));
- } else {
- name_label = gtk_label_new_with_mnemonic (_("_Name:"));
- }
+ name_label = gtk_label_new_with_mnemonic (ngettext ("_Name:", "_Names:",
+ get_not_gone_original_file_count (window)));
eel_gtk_label_make_bold (GTK_LABEL (name_label));
gtk_widget_show (name_label);
gtk_box_pack_end (GTK_BOX (hbox), name_label, FALSE, FALSE, 0);
Attachment:
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil