String freeze break request for seahorse
- From: Stef Walter <stefw gnome org>
- To: GNOME I18N List <gnome-i18n gnome org>, GNOME Documentation <gnome-doc-list gnome org>
- Cc: GNOME release team <release-team gnome org>
- Subject: String freeze break request for seahorse
- Date: Mon, 19 Mar 2012 16:55:28 +0100
I accidentally released seahorse 3.3.92 from git master instead of the
seahorse gnome-3-4 branch. We had merged several translation fixes to
the master branch, including three minor string changes.
In order to remedy my mistake. I'd like to ask for a string freeze break.
It also seems like several translators committed updated translations to
the master branch instead of the gnome-3-4 branch. So in general I would
posit that the seahorse master branch is in better shape for a GNOME 3.4
release, despite the string changes.
Attached is a patch with the differences between the gnome-3-4 branch
and master.
Cheers,
Stef
The string changes are:
- prompt = g_strdup_printf (ngettext (_("Are you sure you want to
delete %d secure shell keys?"),
+ prompt = g_strdup_printf (ngettext (_("Are you sure you want to
delete %d secure shell key?"),
- <property name="label"
translatable="yes"><i>Casually:</i> means you have done a
casual verification that the key is owned by the person who claims to
own it. For example, you could read the key fingerprint to the owner
over the phone. </property>
+ <property name="label"
translatable="yes"><i>Casually:</i> means you have done a
casual verification that the key is owned by the person who claims to
own it. For example, you could read the key fingerprint to the owner
over the phone.</property>
- <property name="label"
translatable="yes">Encrypt files and email to the key's owner </property>
+ <property name="label"
translatable="yes">Encrypt files and email to the key's owner</property>
diff --git a/pgp/seahorse-add-uid.xml b/pgp/seahorse-add-uid.xml
index 43ea2b5..08cc4ed 100644
--- a/pgp/seahorse-add-uid.xml
+++ b/pgp/seahorse-add-uid.xml
@@ -70,7 +70,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Full _Name:</property>
+ <property name="label" translatable="yes" comments="Full name of the key, usually the name of the user.">Full _Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
diff --git a/pgp/seahorse-keyserver-results.c b/pgp/seahorse-keyserver-results.c
index 4489c3b..ab698dd 100644
--- a/pgp/seahorse-keyserver-results.c
+++ b/pgp/seahorse-keyserver-results.c
@@ -240,6 +240,7 @@ on_delete_event (GtkWidget* widget, GdkEvent* event, SeahorseKeyserverResults* s
}
static const GtkActionEntry GENERAL_ENTRIES[] = {
+ /* TRANSLATORS: The "Remote" menu contains key operations on remote systems. */
{ "remote-menu", NULL, N_("_Remote") },
{ "app-close", GTK_STOCK_CLOSE, NULL, "<control>W",
N_("Close this window"), G_CALLBACK (on_app_close) },
diff --git a/pgp/seahorse-pgp-generate.xml b/pgp/seahorse-pgp-generate.xml
index 2017396..262b1d0 100644
--- a/pgp/seahorse-pgp-generate.xml
+++ b/pgp/seahorse-pgp-generate.xml
@@ -19,7 +19,7 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Algorithms here</col>
+ <col id="0"></col>
</row>
</data>
</object>
@@ -205,7 +205,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Full _Name:</property>
+ <property name="label" translatable="yes" comments="Full name of the key, usually the name of the user.">Full _Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name-entry</property>
</object>
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index 94c7e1b..dafd3bf 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -421,7 +421,8 @@ names_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object,
SEAHORSE_ICON_SIGN : GTK_STOCK_DIALOG_QUESTION);
name = seahorse_object_get_markup (object);
id = seahorse_object_get_identifier (object);
-
+
+ /* TRANSLATORS: [Unknown] signature name */
gtk_tree_store_set (GTK_TREE_STORE (skmodel), iter,
UIDSIG_OBJECT, NULL,
UIDSIG_ICON, icon,
@@ -530,7 +531,7 @@ do_names (SeahorseWidget *swidget)
-1, "", renderer,
"gicon", UIDSIG_ICON, NULL);
- /* The name column */
+ /* TRANSLATORS: The name and email set on the PGP key */
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget),
-1, _("Name/Email"), gtk_cell_renderer_text_new (),
"markup", UIDSIG_NAME, NULL);
@@ -900,9 +901,10 @@ do_owner (SeahorseWidget *swidget)
if (flags & SEAHORSE_FLAG_EXPIRED) {
widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "expired-message"));
if (widget) {
-
+
expires_date = seahorse_pgp_key_get_expires (pkey);
- if (expires_date == 0)
+ if (expires_date == 0)
+ /* TRANSLATORS: (unknown) expiry date */
t = g_strdup (_("(unknown)"));
else
t = seahorse_util_get_display_date_string (expires_date);
@@ -1559,6 +1561,7 @@ trust_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object,
name = seahorse_object_get_label (object);
id = seahorse_object_get_identifier (object);
+ /* TRANSLATORS: [Unknown] signature name */
gtk_tree_store_set (GTK_TREE_STORE (skmodel), iter,
SIGN_ICON, icon,
SIGN_NAME, name ? name : _("[Unknown]"),
@@ -1842,6 +1845,7 @@ do_trust (SeahorseWidget *swidget)
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget),
-1, "", renderer,
"gicon", SIGN_ICON, NULL);
+ /* TRANSLATORS: The name and email set on the PGP key */
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget),
-1, _("Name/Email"), gtk_cell_renderer_text_new (),
"text", SIGN_NAME, NULL);
diff --git a/pgp/seahorse-pgp-private-key-properties.xml b/pgp/seahorse-pgp-private-key-properties.xml
index 624e108..109cce6 100644
--- a/pgp/seahorse-pgp-private-key-properties.xml
+++ b/pgp/seahorse-pgp-private-key-properties.xml
@@ -382,7 +382,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Photo </b></property>
+ <property name="label" translatable="yes" comments="A photograph"><b>Photo </b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -431,7 +431,7 @@
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" context="name-of-key"><b>Name:</b></property>
+ <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name"><b>Name:</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -888,7 +888,7 @@
<child>
<object class="GtkLabel" id="label22262">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Add Name</property>
+ <property name="label" translatable="yes" comments="Add another name to the PGP key.">_Add Name</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1000,7 +1000,7 @@
<object class="GtkLabel" id="labelsig">
<property name="visible">True</property>
<property name="xpad">3</property>
- <property name="label" translatable="yes">Names and Signatures</property>
+ <property name="label" translatable="yes" comments="List of names and signatures on the PGP key.">Names and Signatures</property>
</object>
<packing>
<property name="position">1</property>
diff --git a/pgp/seahorse-pgp-public-key-properties.xml b/pgp/seahorse-pgp-public-key-properties.xml
index c065e61..ba5ffe5 100644
--- a/pgp/seahorse-pgp-public-key-properties.xml
+++ b/pgp/seahorse-pgp-public-key-properties.xml
@@ -302,7 +302,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Photo </b></property>
+ <property name="label" translatable="yes" comments="A photograph"><b>Photo </b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -353,7 +353,7 @@
<object class="GtkLabel" id="label22228">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Encrypt files and email to the key's owner </property>
+ <property name="label" translatable="yes">Encrypt files and email to the key's owner</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -398,7 +398,7 @@
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes" context="name-of-key"><b>Name:</b></property>
+ <property name="label" translatable="yes" context="name-of-key" comments="Name of key, usually a persons name"><b>Name:</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -548,7 +548,7 @@
<child type="label">
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>_Other Names:</b></property>
+ <property name="label" translatable="yes" comments="Names set on the PGP key."><b>_Other Names:</b></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
</object>
diff --git a/pgp/seahorse-sign.xml b/pgp/seahorse-sign.xml
index 11d73f0..bf0a2eb 100644
--- a/pgp/seahorse-sign.xml
+++ b/pgp/seahorse-sign.xml
@@ -189,7 +189,7 @@
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><i>Casually:</i> means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. </property>
+ <property name="label" translatable="yes"><i>Casually:</i> means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone.</property>
<property name="use_markup">True</property>
<property name="justify">fill</property>
<property name="wrap">True</property>
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index 0ff6c78..e8f2fed 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -514,6 +514,7 @@ seahorse_menu_action_class_init (SeahorseMenuActionClass *klass)
}
static const GtkActionEntry GENERAL_ACTIONS[] = {
+ /* TRANSLATORS: The "Remote" menu contains key operations on remote systems. */
{ "remote-menu", NULL, N_("_Remote") },
{ "new-menu", NULL, N_("_New") },
{ "app-quit", GTK_STOCK_QUIT, NULL, "<control>Q",
diff --git a/ssh/seahorse-ssh-deleter.c b/ssh/seahorse-ssh-deleter.c
index 44044e2..8d4138c 100644
--- a/ssh/seahorse-ssh-deleter.c
+++ b/ssh/seahorse-ssh-deleter.c
@@ -88,7 +88,7 @@ seahorse_ssh_deleter_create_confirm (SeahorseDeleter *deleter,
confirm = NULL;
} else {
- prompt = g_strdup_printf (ngettext (_("Are you sure you want to delete %d secure shell keys?"),
+ prompt = g_strdup_printf (ngettext (_("Are you sure you want to delete %d secure shell key?"),
_("Are you sure you want to delete %d secure shell keys?"),
num),
num);
diff --git a/ssh/seahorse-ssh-key-properties.xml b/ssh/seahorse-ssh-key-properties.xml
index a88c0d9..a323f69 100644
--- a/ssh/seahorse-ssh-key-properties.xml
+++ b/ssh/seahorse-ssh-key-properties.xml
@@ -121,7 +121,7 @@
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Name:</b></property>
+ <property name="label" translatable="yes" context="name-of-ssh-key" comments="Name of key, often a persons name"><b>Name:</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -257,7 +257,7 @@
<object class="GtkLabel" id="trust-message">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><i>This only applies to the '%s'</i> account.</property>
+ <property name="label" translatable="yes">This only applies to the <i>%s</i> account.</property>
<property name="use_markup">True</property>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
