[file-roller] Fixed a series of l18n bugs
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Fixed a series of l18n bugs
- Date: Sun, 11 Jul 2010 15:23:42 +0000 (UTC)
commit e808bf428ef95227af309fc908573688065d7424
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Jul 11 17:02:11 2010 +0200
Fixed a series of l18n bugs
Added comments for translators; added context to some strings;
added ellipses to some menu commands; renamed the File menu to
Archive.
Bugs fixed: 611220 611226 611356 611332 611357 611359 611360
611361 611365 611366 611367 611368 611369 611370 611371
611372 611375 611376 611380 611381 611392 614521
copy-n-paste/eggdesktopfile.c | 4 +++-
data/ui/batch-add-files.ui | 4 ++--
data/ui/update.ui | 11 ++++++++---
nautilus/nautilus-fileroller.c | 3 ++-
src/dlg-add-files.c | 2 ++
src/dlg-new.c | 4 ++--
src/dlg-prop.c | 3 ++-
src/dlg-update.c | 4 ++--
src/fr-command-tar.c | 3 +++
src/fr-window.c | 14 +++++++++-----
src/ui.h | 14 +++++++++-----
11 files changed, 44 insertions(+), 22 deletions(-)
---
diff --git a/copy-n-paste/eggdesktopfile.c b/copy-n-paste/eggdesktopfile.c
index 357e548..092868e 100644
--- a/copy-n-paste/eggdesktopfile.c
+++ b/copy-n-paste/eggdesktopfile.c
@@ -183,6 +183,8 @@ egg_desktop_file_new_from_key_file (GKeyFile *key_file,
}
else if (version_num > 1.0)
{
+ /* Translators: Version here is capitalized because it refers to a
+ * field in the desktop file */
g_set_error (error, EGG_DESKTOP_FILE_ERROR,
EGG_DESKTOP_FILE_ERROR_INVALID,
_("Unrecognized desktop file Version '%s'"), version);
@@ -1370,7 +1372,7 @@ egg_desktop_file_launch (EggDesktopFile *desktop_file,
{
g_set_error (error, EGG_DESKTOP_FILE_ERROR,
EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE,
- _("Can't pass document URIs to a 'Type=Link' desktop entry"));
+ _("Can't pass documents to this desktop element"));
return FALSE;
}
diff --git a/data/ui/batch-add-files.ui b/data/ui/batch-add-files.ui
index 7af30c6..c926c45 100644
--- a/data/ui/batch-add-files.ui
+++ b/data/ui/batch-add-files.ui
@@ -193,7 +193,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="a_volume_checkbutton">
- <property name="label" translatable="yes">Split into _volumes of</property>
+ <property name="label" translatable="yes" comments="this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte.">Split into _volumes of</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -370,9 +370,9 @@
</action-widgets>
</object>
<object class="GtkAdjustment" id="volume_adjustment">
+ <property name="value">10</property>
<property name="lower">0.10000000000000001</property>
<property name="upper">9999999999</property>
- <property name="value">10</property>
<property name="step_increment">0.10000000000000001</property>
<property name="page_increment">10</property>
</object>
diff --git a/data/ui/update.ui b/data/ui/update.ui
index e072894..0128909 100644
--- a/data/ui/update.ui
+++ b/data/ui/update.ui
@@ -9,6 +9,7 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">14</property>
<child>
<object class="GtkHBox" id="hbox2">
@@ -18,6 +19,7 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
@@ -37,6 +39,7 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="update_file_primary_text_label">
@@ -55,7 +58,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">The file has been modified with an external application. If you don't update the version in the archive, all of your changes will be lost.</property>
+ <property name="label" translatable="yes">The file has been modified with an external application. If you don't update the file in the archive, all of your changes will be lost.</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -112,7 +115,6 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
- <property name="icon-size">4</property>
</object>
<packing>
<property name="expand">False</property>
@@ -164,6 +166,7 @@
<child internal-child="vbox">
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">14</property>
<child>
<object class="GtkHBox" id="hbox4">
@@ -173,6 +176,7 @@
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
@@ -192,6 +196,7 @@
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="update_files_primary_text_label">
@@ -221,6 +226,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="GtkLabel" id="label9">
@@ -309,7 +315,6 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
- <property name="icon-size">4</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index d67b69e..d04ae1f 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -311,7 +311,8 @@ nautilus_fr_get_file_items (NautilusMenuProvider *provider,
item = nautilus_menu_item_new ("NautilusFr::extract_here",
_("Extract Here"),
- _("Extract the selected archive in the current position"),
+ /* Translators: the current position is the current folder */
+ _("Extract the selected archive to the current position"),
"drive-harddisk");
g_signal_connect (item,
"activate",
diff --git a/src/dlg-add-files.c b/src/dlg-add-files.c
index 82f0582..b77e7b6 100644
--- a/src/dlg-add-files.c
+++ b/src/dlg-add-files.c
@@ -157,6 +157,8 @@ add_files_cb (GtkWidget *widget,
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_sel), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (file_sel), GTK_RESPONSE_OK);
+ /* Translators: add a file to the archive only if the disk version is
+ * newer than the archive version. */
data->add_if_newer_checkbutton = gtk_check_button_new_with_mnemonic (_("Add only if _newer"));
main_box = gtk_hbox_new (FALSE, 20);
diff --git a/src/dlg-new.c b/src/dlg-new.c
index f88ae82..dac1d00 100644
--- a/src/dlg-new.c
+++ b/src/dlg-new.c
@@ -436,7 +436,7 @@ dlg_new (FrWindow *window)
DlgNewData *data;
data = dlg_new_archive (window, create_type, NULL);
- gtk_window_set_title (GTK_WINDOW (data->dialog), _("New"));
+ gtk_window_set_title (GTK_WINDOW (data->dialog), C_("File", "New"));
return data;
}
@@ -449,7 +449,7 @@ dlg_save_as (FrWindow *window,
DlgNewData *data;
data = dlg_new_archive (window, save_type, default_name);
- gtk_window_set_title (GTK_WINDOW (data->dialog), _("Save"));
+ gtk_window_set_title (GTK_WINDOW (data->dialog), C_("File", "Save"));
return data;
}
diff --git a/src/dlg-prop.c b/src/dlg-prop.c
index b67e8cb..e359743 100644
--- a/src/dlg-prop.c
+++ b/src/dlg-prop.c
@@ -103,6 +103,7 @@ dlg_prop (FrWindow *window)
/* Set widgets data. */
label_label = _gtk_builder_get_widget (data->builder, "p_path_label_label");
+ /* Translators: after the colon there is a folder name. */
set_label (label_label, _("Location:"));
label = _gtk_builder_get_widget (data->builder, "p_path_label");
@@ -115,7 +116,7 @@ dlg_prop (FrWindow *window)
/**/
label_label = _gtk_builder_get_widget (data->builder, "p_name_label_label");
- set_label (label_label, _("Name:"));
+ set_label (label_label, C_("File", "Name:"));
label = _gtk_builder_get_widget (data->builder, "p_name_label");
utf8_name = g_uri_display_basename (fr_window_get_archive_uri (window));
diff --git a/src/dlg-update.c b/src/dlg-update.c
index bfcacee..411ceaa 100644
--- a/src/dlg-update.c
+++ b/src/dlg-update.c
@@ -178,8 +178,8 @@ update_file_list (DialogData *data)
/* secondary text */
- label = g_strdup_printf (ngettext ("The file has been modified with an external application. If you don't update the version in the archive, all of your changes will be lost.",
- "There are %d files that have been modified with an external application. If you don't update the files in the archive, all of your changes will be lost.",
+ label = g_strdup_printf (ngettext ("The file has been modified with an external application. If you don't update the file in the archive, all of your changes will be lost.",
+ "%d files have been modified with an external application. If you don't update the files in the archive, all of your changes will be lost.",
n_files),
n_files);
gtk_label_set_text (GTK_LABEL (data->update_files_secondary_text_label), label);
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 2290a01..8caeab1 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -304,6 +304,7 @@ static void
process_line__add (char *line,
gpointer data)
{
+ /* Translators: after the colon there is a filename. */
process_line__generic (line, data, _("Adding file: "));
}
@@ -368,6 +369,7 @@ static void
process_line__delete (char *line,
gpointer data)
{
+ /* Translators: after the colon there is a filename. */
process_line__generic (line, data, _("Removing file: "));
}
@@ -421,6 +423,7 @@ static void
process_line__extract (char *line,
gpointer data)
{
+ /* Translators: after the colon there is a filename. */
process_line__generic (line, data, _("Extracting file: "));
}
diff --git a/src/fr-window.c b/src/fr-window.c
index 074e1ae..433c375 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -4676,10 +4676,10 @@ static void
add_file_list_columns (FrWindow *window,
GtkTreeView *treeview)
{
- static char *titles[] = {N_("Size"),
- N_("Type"),
- N_("Date Modified"),
- N_("Location")};
+ static char *titles[] = {NC_("File", "Size"),
+ NC_("File", "Type"),
+ NC_("File", "Date Modified"),
+ NC_("File", "Location")};
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GValue value = { 0, };
@@ -4688,7 +4688,7 @@ add_file_list_columns (FrWindow *window,
/* First column. */
window->priv->filename_column = column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (column, _("Name"));
+ gtk_tree_view_column_set_title (column, C_("File", "Name"));
/* emblem */
@@ -5816,6 +5816,7 @@ fr_window_construct (FrWindow *window)
/* current location */
location_box = gtk_hbox_new (FALSE, 6);
+ /* Translators: after the colon there is a folder name. */
window->priv->location_label = gtk_label_new_with_mnemonic (_("_Location:"));
gtk_box_pack_start (GTK_BOX (location_box),
window->priv->location_label, FALSE, FALSE, 5);
@@ -7366,14 +7367,17 @@ valid_name (const char *new_name,
utf8_new_name = g_filename_display_name (new_name);
if (*new_name == '\0') {
+ /* Translators: the name references to a filename. This message can appear when renaming a file. */
*reason = g_strdup_printf ("%s\n\n%s", _("The new name is void."), _("Please use a different name."));
retval = FALSE;
}
else if (strcmp (new_name, old_name) == 0) {
+ /* Translators: the name references to a filename. This message can appear when renaming a file. */
*reason = g_strdup_printf ("%s\n\n%s", _("The new name is equal to the old one."), _("Please use a different name."));
retval = FALSE;
}
else if (strchrs (new_name, BAD_CHARS)) {
+ /* Translators: the name references to a filename. This message can appear when renaming a file. */
*reason = g_strdup_printf (_("The name \"%s\" is not valid because it cannot contain the characters: %s\n\n%s"), utf8_new_name, BAD_CHARS, _("Please use a different name."));
retval = FALSE;
}
diff --git a/src/ui.h b/src/ui.h
index 0619717..3287196 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -29,11 +29,12 @@
static GtkActionEntry action_entries[] = {
- { "FileMenu", NULL, N_("_File") },
+ { "FileMenu", NULL, N_("_Archive") },
{ "EditMenu", NULL, N_("_Edit") },
{ "ViewMenu", NULL, N_("_View") },
{ "HelpMenu", NULL, N_("_Help") },
{ "ArrangeFilesMenu", NULL, N_("_Arrange Files") },
+ /* Translators: this is the label for the "open recent file" sub-menu. */
{ "OpenRecentMenu", NULL, N_("Open _Recent") },
{ "About", GTK_STOCK_ABOUT,
@@ -124,7 +125,7 @@ static GtkActionEntry action_entries[] = {
N_("Extract files from the archive"),
G_CALLBACK (activate_action_extract) },
{ "Find", GTK_STOCK_FIND,
- NULL, NULL,
+ N_("Find..."), NULL,
NULL,
G_CALLBACK (activate_action_find) },
@@ -133,11 +134,11 @@ static GtkActionEntry action_entries[] = {
N_("View the output produced by the last executed command"),
G_CALLBACK (activate_action_last_output) },
{ "New", GTK_STOCK_NEW,
- NULL, NULL,
+ NC_("File", "New..."), NULL,
N_("Create a new archive"),
G_CALLBACK (activate_action_new) },
{ "Open", GTK_STOCK_OPEN,
- NULL, NULL,
+ NC_("File", "Open..."), NULL,
N_("Open archive"),
G_CALLBACK (activate_action_open) },
{ "Open_Toolbar", GTK_STOCK_OPEN,
@@ -161,7 +162,7 @@ static GtkActionEntry action_entries[] = {
N_("Reload current archive"),
G_CALLBACK (activate_action_reload) },
{ "SaveAs", GTK_STOCK_SAVE_AS,
- NULL, NULL,
+ NC_("File", "Save As..."), NULL,
N_("Save the current archive with a different name"),
G_CALLBACK (activate_action_save_as) },
{ "SelectAll", GTK_STOCK_SELECT_ALL,
@@ -207,6 +208,7 @@ static GtkActionEntry action_entries[] = {
G_CALLBACK (activate_action_go_up) },
{ "GoHome", GTK_STOCK_HOME,
NULL, NULL,
+ /* Translators: the home location is the home folder. */
N_("Go to the home location"),
G_CALLBACK (activate_action_go_home) },
};
@@ -263,7 +265,9 @@ static GtkRadioActionEntry sort_by_entries[] = {
N_("by _Date Modified"), NULL,
N_("Sort file list by modification time"), FR_WINDOW_SORT_BY_TIME },
{ "SortByLocation", NULL,
+ /* Translators: this is the "sort by file location" menu item */
N_("by _Location"), NULL,
+ /* Translators: location is the file location */
N_("Sort file list by location"), FR_WINDOW_SORT_BY_PATH },
};
static guint n_sort_by_entries = G_N_ELEMENTS (sort_by_entries);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
