Fixed some sting translation issues for bug #460407.

2007-07-26  Lukasz Zalewski <lukas@dcs.qmul.ac.uk>

        * daemon/gdm.c, gui/gdmsetup.glade: Fixed some sting translation
          issues for bug #460407.

svn path=/trunk/; revision=5093

3 files changed, 55 insertions, 47 deletions

diff --git a/ChangeLog b/ChangeLog
index 75900d1d..5e2d3c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-26  Lukasz Zalewski <lukas@dcs.qmul.ac.uk>
+
+	* daemon/gdm.c, gui/gdmsetup.glade: Fixed some sting translation 
+	  issues for bug #460407.
+	
 2007-07-18  Lo\357c Minier  <lool@dooz.org>
 
 	* configure.ac:
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 35caebd9..23db902c 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -630,6 +630,7 @@ try_commands (const char **array)
 			ret = (status == 0);
 
 			if (! ret) {
+				/* %s is the command string and %d defines the exit status (both non-translatable) */
 				gdm_error (_("command failed %s: %d"), array[i], status);
 			}
 
diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade
index 81cf0e24..2464f51a 100644
--- a/gui/gdmsetup.glade
+++ b/gui/gdmsetup.glade
@@ -136,7 +136,7 @@
 			      <child>
 				<widget class="GtkLabel" id="label297">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">    </property>
+				  <property name="label">    </property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -576,7 +576,7 @@ Themed with face browser</property>
 				      <child>
 					<widget class="GtkLabel" id="local_background_indent_label">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -659,7 +659,7 @@ Themed with face browser</property>
 					      <child>
 						<widget class="GtkLabel" id="local_background_scale_indent_label">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">    </property>
+						  <property name="label">    </property>
 						  <property name="use_underline">False</property>
 						  <property name="use_markup">False</property>
 						  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -818,7 +818,7 @@ Themed with face browser</property>
 					  <child>
 					    <widget class="GtkLabel" id="label506">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -876,7 +876,7 @@ Themed with face browser</property>
 					  <child>
 					    <widget class="GtkLabel" id="label507">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -934,7 +934,7 @@ Themed with face browser</property>
 					  <child>
 					    <widget class="GtkLabel" id="label508">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">     </property>
+					      <property name="label">     </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -992,7 +992,7 @@ Themed with face browser</property>
 					  <child>
 					    <widget class="GtkLabel" id="label509">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1187,7 +1187,7 @@ Themed with face browser</property>
 				      <child>
 					<widget class="GtkLabel" id="label169">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1876,7 +1876,7 @@ Random from selected
 			      <child>
 				<widget class="GtkLabel" id="label170">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">    </property>
+				  <property name="label">    </property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1933,7 +1933,7 @@ Random from selected
 				      <child>
 					<widget class="GtkLabel" id="label171">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1991,7 +1991,7 @@ Random from selected
 				      <child>
 					<widget class="GtkLabel" id="label172">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2101,7 +2101,7 @@ Random from selected
 			      <child>
 				<widget class="GtkLabel" id="local_welcome_message_indent">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">    </property>
+				  <property name="label">    </property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2425,7 +2425,7 @@ Same as Local</property>
 				      <child>
 					<widget class="GtkLabel" id="label186">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2511,7 +2511,7 @@ Same as Local</property>
 					      <child>
 						<widget class="GtkLabel" id="label187">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">    </property>
+						  <property name="label">    </property>
 						  <property name="use_underline">False</property>
 						  <property name="use_markup">False</property>
 						  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2568,7 +2568,7 @@ Same as Local</property>
 					      <child>
 						<widget class="GtkLabel" id="label198">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">    </property>
+						  <property name="label">    </property>
 						  <property name="use_underline">False</property>
 						  <property name="use_markup">False</property>
 						  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2717,7 +2717,7 @@ Same as Local</property>
 					  <child>
 					    <widget class="GtkLabel" id="label512">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2775,7 +2775,7 @@ Same as Local</property>
 					  <child>
 					    <widget class="GtkLabel" id="label513">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2833,7 +2833,7 @@ Same as Local</property>
 					  <child>
 					    <widget class="GtkLabel" id="label514">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">     </property>
+					      <property name="label">     </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2891,7 +2891,7 @@ Same as Local</property>
 					  <child>
 					    <widget class="GtkLabel" id="label515">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes"> </property>
+					      <property name="label"> </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3086,7 +3086,7 @@ Same as Local</property>
 				      <child>
 					<widget class="GtkLabel" id="label193">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </property>
+					  <property name="label">    </property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3780,7 +3780,7 @@ Random from selected
 			  <child>
 			    <widget class="GtkLabel" id="label161">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label">    </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4076,7 +4076,7 @@ Random from selected
 			  <child>
 			    <widget class="GtkLabel" id="themes_indent_label">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label">    </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4172,7 +4172,7 @@ Random from selected
 			  <child>
 			    <widget class="GtkLabel" id="sounds_indent_label">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label">    </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4508,7 +4508,7 @@ Random from selected
 			  <child>
 			    <widget class="GtkLabel" id="label227">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label">    </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4641,7 +4641,7 @@ Random from selected
 			  <child>
 			    <widget class="GtkLabel" id="label231">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label">    </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4913,7 +4913,7 @@ Random from selected
 			      <child>
 				<widget class="GtkLabel" id="label238">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">    </property>
+				  <property name="label">    </property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5182,7 +5182,7 @@ Random from selected
 					  <child>
 					    <widget class="GtkLabel" id="label505">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">    </property>
+					      <property name="label">    </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5299,7 +5299,7 @@ Random from selected
 					  <child>
 					    <widget class="GtkLabel" id="label448">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">     </property>
+					      <property name="label">     </property>
 					      <property name="use_underline">False</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7022,7 +7022,7 @@ Random from selected
 		      <child>
 			<widget class="GtkLabel" id="label268">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label">    </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7426,7 +7426,7 @@ Random from selected
 				  <child>
 				    <widget class="GtkLabel" id="label269">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
+				      <property name="label">    </property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8671,7 +8671,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label475">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Path:       </property>
+			  <property name="label" translatable="yes">_Path:        </property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8700,7 +8700,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label518">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8815,7 +8815,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label504">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8990,7 +8990,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label502">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9100,7 +9100,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label520">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9179,7 +9179,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label521">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9258,7 +9258,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label522">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9292,7 +9292,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label500">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9357,7 +9357,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label498">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9467,7 +9467,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label523">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9501,7 +9501,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label494">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9611,7 +9611,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label524">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">  </property>
+			  <property name="label">  </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9645,7 +9645,7 @@ Chooser</property>
 			  <child>
 			    <widget class="GtkLabel" id="label496">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">     </property>
+			      <property name="label">     </property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9717,7 +9717,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label483">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label">    </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9775,7 +9775,8 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label490">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">         </property>
+			  <property name="sensitive">False</property>
+			  <property name="label">         </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9838,7 +9839,7 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label484">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label">    </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9896,7 +9897,8 @@ Chooser</property>
 		      <child>
 			<widget class="GtkLabel" id="label492">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">         </property>
+			  <property name="sensitive">False</property>
+			  <property name="label">         </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>