Remove translatable="yes" from icon labels. Remnant of a bug in

2002-02-23  Kjartan Maraas  <kmaraas@gnome.org>

	* capplets/default-applications/gnome-default-applications-properties.glade:
	Remove translatable="yes" from icon labels. Remnant of a bug in
	libglade-convert. (Thanks to James).
	* capplets/file-types/file-types-properties.glade: Same
	* capplets/keyboard/gnome-keyboard-properties.glade: Same
	* capplets/mouse/gnome-mouse-properties.glade: Same.
	* capplets/ui-properties/gnome2-ui-properties.glade: Same
	* control-center/gnomecc.glade: Same

ChangeLog

@@ -1,3 +1,14 @@
+2002-02-23  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* capplets/default-applications/gnome-default-applications-properties.glade:
+	Remove translatable="yes" from icon labels. Remnant of a bug in
+	libglade-convert. (Thanks to James).
+	* capplets/file-types/file-types-properties.glade: Same
+	* capplets/keyboard/gnome-keyboard-properties.glade: Same
+	* capplets/mouse/gnome-mouse-properties.glade: Same.
+	* capplets/ui-properties/gnome2-ui-properties.glade: Same
+	* control-center/gnomecc.glade: Same
+						
 2002-02-22  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* root-manager/root-manager-wrap.c: Remove calls to deprecated

capplets/default-applications/gnome-default-applications-properties.glade

@@ -28,7 +28,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="response_id">2</property>
                 <property name="use_underline">yes</property>

capplets/file-types/file-types-properties.glade

@@ -32,7 +32,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -43,7 +43,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -213,7 +213,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -224,7 +224,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -800,7 +800,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -811,7 +811,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -822,7 +822,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -1119,7 +1119,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -1130,7 +1130,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>

capplets/keyboard/gnome-keyboard-properties.glade

@@ -28,7 +28,7 @@
               <widget class="GtkButton" id="button3">
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="response_id">2</property>
                 <property name="visible">yes</property>

capplets/mouse/gnome-mouse-properties.glade

@@ -28,7 +28,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-help</property>
+                <property name="label">gtk-help</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -39,7 +39,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>

capplets/ui-properties/gnome2-ui-properties.glade

@@ -29,7 +29,7 @@
                 <property name="can_focus">yes</property>
                 <property name="response_id">2</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>

control-center/gnomecc.glade

@@ -35,7 +35,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -46,7 +46,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-apply</property>
+                <property name="label">gtk-apply</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>
@@ -57,7 +57,7 @@
                 <property name="can_default">yes</property>
                 <property name="can_focus">yes</property>
                 <property name="visible">yes</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="use_stock">yes</property>
                 <property name="use_underline">yes</property>
               </widget>

po/no.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.5.8\n"
-"POT-Creation-Date: 2002-02-23 13:59+0100\n"
+"POT-Creation-Date: 2002-02-23 14:41+0100\n"
-"PO-Revision-Date: 2002-02-23 14:19+0100\n"
+"PO-Revision-Date: 2002-02-23 14:43+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,9 @@ msgstr "Hje_lpleser"
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
-msgstr "Velg vindushåndtereren du ønsker. Du må trykke «Bruk», vifte med den magiske staven, og utføre den magiske dansen for at dette skal virke."
+msgstr ""
+"Velg vindushåndtereren du ønsker. Du må trykke «Bruk», vifte med den magiske "
+"staven, og utføre den magiske dansen for at dette skal virke."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:17
 msgid "Start in T_erminal"
@@ -274,14 +276,6 @@ msgstr "_Tekstredigerer"
 msgid "_Window Manager"
 msgstr "_Vindushåndterer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
-#: capplets/file-types/file-types-properties.glade.h:28
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:32
-#: capplets/mouse/gnome-mouse-properties.glade.h:30
-#: capplets/ui-properties/gnome2-ui-properties.glade.h:24
-msgid "gtk-close"
-msgstr "gtk-close"
-
 #: capplets/desktop-links/Advanced.directory.in.in.h:1
 msgid "Advanced"
 msgstr "Avansert"
@@ -606,27 +600,12 @@ msgstr "Bruk forvalg for kategori"
 
 #: capplets/file-types/file-types-properties.glade.h:24
 msgid "Use parent category defaults"
-msgstr ""
+msgstr "Bruk forvalg fra opphavskategori"
 
 #: capplets/file-types/file-types-properties.glade.h:25
 msgid "Viewing component"
 msgstr "Visningskomponent"
 
-#: capplets/file-types/file-types-properties.glade.h:26
-#: control-center/gnomecc.glade.h:10
-msgid "gtk-apply"
-msgstr ""
-
-#: capplets/file-types/file-types-properties.glade.h:27
-#: control-center/gnomecc.glade.h:11
-msgid "gtk-cancel"
-msgstr ""
-
-#: capplets/file-types/file-types-properties.glade.h:29
-#: control-center/gnomecc.glade.h:12
-msgid "gtk-ok"
-msgstr ""
-
 #: capplets/file-types/mime-category-edit-dialog.c:137
 msgid "Edit file category"
 msgstr "Rediger filkategori"
@@ -880,7 +859,7 @@ msgid ""
 "The keyboard bell is the <i>beep</i> sound heard when the system wants to "
 "get your attention.  You can select a custom sound file to play instead of "
 "the traditional beeping noise."
-msgstr ""
+msgstr "Tastaturpip er <i>pip</i>-lyden du hører når systemet vil ha din oppmerksomhet. Du kan velge en egendefinert lydfil som skal spilles i stedet for den tradisjonelle pipelyden."
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:23
 msgid "Very fast"
@@ -1008,7 +987,8 @@ msgid ""
 "effect."
 msgstr ""
 "<b>Merk:</b>\n"
-"Du vil måtte logge inn på nytt igjen for at denne innstillingen skal tre i kraft."
+"Du vil måtte logge inn på nytt igjen for at denne innstillingen skal tre i "
+"kraft."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:3
 msgid "<i>Fast</i>"
@@ -1038,7 +1018,9 @@ msgstr "<i>Liten</i>"
 msgid ""
 "Animates a quick marker around the cursor when the Control key has been "
 "pressed and released."
-msgstr "Animerer en rask linjal rundt markøren når Ctrl-tasten trykkes ned og slippes ut igjen."
+msgstr ""
+"Animerer en rask linjal rundt markøren når Ctrl-tasten trykkes ned og "
+"slippes ut igjen."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:10
 msgid "C_ursors"
@@ -1069,7 +1051,9 @@ msgstr "Lokaliser peker"
 msgid ""
 "Maximum time allowed between clicks when double-clicking.   Use the box on "
 "the right to test."
-msgstr "Maksimal tid som tillates mellom klikk ved dobbeltklikk. Bruk boksen til høyre for å teste."
+msgstr ""
+"Maksimal tid som tillates mellom klikk ved dobbeltklikk. Bruk boksen til "
+"høyre for å teste."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:17
 msgid "Mouse Orientation"
@@ -1119,10 +1103,6 @@ msgstr "Vi_s markørposisjonen når Ctrl-tasten trykkes ned"
 msgid "_Threshold:"
 msgstr "_Terskel:"
 
-#: capplets/mouse/gnome-mouse-properties.glade.h:31
-msgid "gtk-help"
-msgstr ""
-
 #: capplets/mouse/mouse.desktop.in.h:1
 msgid "Mouse"
 msgstr "Mus"