[file-roller] Renamed the "Create Archive" command as "Compress"
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Subject: [file-roller] Renamed the "Create Archive" command as "Compress"
- Date: Mon, 13 Jul 2009 20:19:53 +0000 (UTC)
commit cb462def7615efb2827e6e6db4044165dd9e638e
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Jul 13 17:55:59 2009 +0200
Renamed the "Create Archive" command as "Compress"
The Nautilus context menu command is now named "Compress..."
instead of "Create Archive"; changed the dialog as well
[bug #300655]
data/ui/batch-add-files.ui | 8 +++++---
nautilus/nautilus-fileroller.c | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/data/ui/batch-add-files.ui b/data/ui/batch-add-files.ui
index 7d47e74..f387e3f 100644
--- a/data/ui/batch-add-files.ui
+++ b/data/ui/batch-add-files.ui
@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="batch_add_files_dialog">
<property name="border_width">5</property>
- <property name="title" translatable="yes">Create Archive</property>
+ <property name="title" translatable="yes">Compress</property>
<property name="resizable">False</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
@@ -12,6 +12,7 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkHBox" id="hbox28">
@@ -33,6 +34,7 @@
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkTable" id="table5">
@@ -45,7 +47,7 @@
<object class="GtkLabel" id="a_archive_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Archive:</property>
+ <property name="label" translatable="yes">_Filename:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">a_add_to_entry</property>
@@ -305,7 +307,6 @@
<object class="GtkImage" id="a_create_image">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- <property name="icon-size">4</property>
</object>
<packing>
<property name="expand">False</property>
@@ -349,6 +350,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index 60c7bdd..e467e17 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -204,7 +204,7 @@ get_file_mime_info (NautilusFileInfo *file)
{
FileMimeInfo file_mime_info;
int i;
-
+
file_mime_info.is_archive = FALSE;
file_mime_info.is_derived_archive = FALSE;
@@ -213,20 +213,20 @@ get_file_mime_info (NautilusFileInfo *file)
char *mime_type;
char *content_type_mime_file;
char *content_type_mime_compare;
-
+
mime_type = nautilus_file_info_get_mime_type (file);
-
+
content_type_mime_file = g_content_type_from_mime_type (mime_type);
content_type_mime_compare = g_content_type_from_mime_type (mime_types[i]);
-
+
file_mime_info.is_archive = TRUE;
if ((content_type_mime_file != NULL) && (content_type_mime_compare != NULL))
file_mime_info.is_derived_archive = ! g_content_type_equals (content_type_mime_file, content_type_mime_compare);
-
+
g_free (mime_type);
g_free (content_type_mime_file);
g_free (content_type_mime_compare);
-
+
return file_mime_info;
}
@@ -280,15 +280,15 @@ nautilus_fr_get_file_items (NautilusMenuProvider *provider,
if (unsupported_scheme ((NautilusFileInfo *) files->data))
return NULL;
- for (scan = files; scan; scan = scan->next) {
+ for (scan = files; scan; scan = scan->next) {
NautilusFileInfo *file = scan->data;
FileMimeInfo file_mime_info;
-
+
file_mime_info = get_file_mime_info (file);
if (all_archives && ! file_mime_info.is_archive)
all_archives = FALSE;
-
+
if (all_archives_derived && file_mime_info.is_archive && ! file_mime_info.is_derived_archive)
all_archives_derived = FALSE;
@@ -348,8 +348,8 @@ nautilus_fr_get_file_items (NautilusMenuProvider *provider,
NautilusMenuItem *item;
item = nautilus_menu_item_new ("NautilusFr::add",
- _("Create Archive..."),
- _("Create an archive with the selected objects"),
+ _("Compress..."),
+ _("Create a compressed archive with the selected objects"),
"gnome-mime-application-x-archive");
g_signal_connect (item,
"activate",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]