summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2005-05-22 22:16:54 +0000
committerMartin Wehner <mwehner@src.gnome.org>2005-05-22 22:16:54 +0000
commit3c9731618c491f4b4edcbf5ba74037047f8df057 (patch)
tree5ff6e8ef32603e84c79b5e01030485baf5435006
parent8d98d2f38ab5a6f9c74569d04dc38d6bb67384a0 (diff)
downloadnautilus-3c9731618c491f4b4edcbf5ba74037047f8df057.tar.gz
Fix a string conflict between the c-format plural string and non-c-format
2005-05-23 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-directory-view.c: (real_update_menus): Fix a string conflict between the c-format plural string and non-c-format strings. Fixes bug #167344. Patch from Changwoo Ryu <cwryu@debian.org>
-rw-r--r--ChangeLog8
-rw-r--r--src/file-manager/fm-directory-view.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 77e55f979..f4930360e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-23 Martin Wehner <martin.wehner@gmail.com>
+
+ * src/file-manager/fm-directory-view.c: (real_update_menus):
+ Fix a string conflict between the c-format plural string and
+ non-c-format strings. Fixes bug #167344.
+
+ Patch from Changwoo Ryu <cwryu@debian.org>
+
2005-05-12 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-clipboard.c:
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 14ecd9b88..e24781324 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6246,10 +6246,10 @@ real_update_menus (FMDirectoryView *view)
show_open_alternate = file_list_all_are_folders (selection);
if (nautilus_window_info_get_window_type (view->details->window) == NAUTILUS_WINDOW_NAVIGATION) {
- if (selection_count == 0) {
+ if (selection_count == 0 || selection_count == 1) {
label_with_underscore = g_strdup (_("Open in New Window"));
} else {
- label_with_underscore = g_strdup_printf (ngettext("Open in New Window",
+ label_with_underscore = g_strdup_printf (ngettext("Open in %d New Window",
"Open in %d New Windows",
selection_count),
selection_count);