[krb5-auth-dialog] various string and translation improvements



commit 6a13af9075e7fc89e5398d747ba9802ccf7eb71d
Author: Claude Paroz <claude 2xlibre net>
Date:   Sat Jun 13 12:27:00 2009 +0200

    various string and translation improvements
    
    Typo, translator comments added, removed markup from GTKBuilder
    translatable strings, removed translatable property on stock
    items.

 .../krb5-auth-dialog-preferences.desktop.in        |    2 +-
 preferences/krb5-auth-dialog-preferences.xml       |   54 +++++++++++--------
 src/krb5-auth-applet.c                             |    1 +
 3 files changed, 33 insertions(+), 24 deletions(-)
---
diff --git a/preferences/krb5-auth-dialog-preferences.desktop.in b/preferences/krb5-auth-dialog-preferences.desktop.in
index 2aabd47..954a69e 100644
--- a/preferences/krb5-auth-dialog-preferences.desktop.in
+++ b/preferences/krb5-auth-dialog-preferences.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Network Authentication
-_Comment=Set your Kerberos network authenticaion preferences
+_Comment=Set your Kerberos network authentication preferences
 Exec=krb5-auth-dialog-preferences
 Icon=krb-valid-ticket
 Terminal=false
diff --git a/preferences/krb5-auth-dialog-preferences.xml b/preferences/krb5-auth-dialog-preferences.xml
index 5e27687..47b32d4 100644
--- a/preferences/krb5-auth-dialog-preferences.xml
+++ b/preferences/krb5-auth-dialog-preferences.xml
@@ -30,8 +30,10 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Kerberos User&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Kerberos User</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -79,7 +81,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -106,7 +108,7 @@
                               <object class="GtkLabel" id="label7">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">PKINIT userid:	</property>
+                                <property name="label" translatable="yes">PKINIT userid:</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -121,7 +123,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -164,7 +166,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label20">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -212,8 +214,10 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Ticket Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Ticket Options</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -258,7 +262,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label11">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -292,7 +296,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -326,7 +330,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label19">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -394,8 +398,10 @@
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Notifications&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Notifications</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -427,7 +433,7 @@
                             <child>
                               <object class="GtkLabel" id="label14">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">    </property>
+                                <property name="label">    </property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -438,7 +444,7 @@
                             <child>
                               <object class="GtkLabel" id="label15">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Warn</property>
+                                <property name="label" comments="Used in combination: 'Warn x minutes before expiry'" translatable="yes">Warn</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -450,7 +456,7 @@
                               <object class="GtkSpinButton" id="prompt_mins_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires. </property>
+                                <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property>
                                 <property name="activates_default">True</property>
                                 <property name="adjustment">adjustment1</property>
                               </object>
@@ -463,7 +469,7 @@
                             <child>
                               <object class="GtkLabel" id="label16">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">minutes before expiry</property>
+                                <property name="label" comments="Used in combination: 'Warn x minutes before expiry'" translatable="yes">minutes before expiry</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -497,8 +503,10 @@
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Appearance&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Appearance</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -534,7 +542,7 @@
                                 <child>
                                   <object class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">    </property>
+                                    <property name="label">    </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -548,7 +556,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">If checked, display the tray icon in the status bar.</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, display the tray icon in the status bar</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -607,7 +615,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-help</property>
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -621,7 +629,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/src/krb5-auth-applet.c b/src/krb5-auth-applet.c
index e4f0c1a..f98d175 100644
--- a/src/krb5-auth-applet.c
+++ b/src/krb5-auth-applet.c
@@ -350,6 +350,7 @@ ka_applet_tooltip_text(int remaining)
 		if (remaining >= 3600) {
 			hours = remaining / 3600;
 			minutes = (remaining % 3600) / 60;
+			/* Translators: First number is hours, second number is minutes */
 			tooltip_text = g_strdup_printf (_("Your credentials expire in %.2d:%.2dh"), hours, minutes);
 		} else {
 			minutes = remaining / 60;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]