Updated Norwegian Nynorsk translation. Resolved a number of CVS conflicts.

2003-10-29  Åsmund Skjæveland  <aasmunds@fys.uio.no>

	* nn.po: Updated Norwegian Nynorsk translation. Resolved a number
	of CVS conflicts.

po/ChangeLog

+2003-10-29  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation. Resolved a number
+	of CVS conflicts.
+
 2003-10-28  KAMAGASAKO Masatoshi  <emerald@gnome.gr.jp>
 
 	* ja.po: Updated Japanese translation.

po/nn.po

+# translation of nn.po to Norwegian (nynorsk)
 # Norwegian translation of gtk+.
-# Copyright (C) 1998-2002 Free Software Foundation, Inc.
+# Copyright (C) 1998-2002, 2003 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 1998-2001.
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002.
+# Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gtk20 1.3.2\n"
-"POT-Creation-Date: 2003-10-24 16:15-0400\n"
-"PO-Revision-Date: 2001-09-06 01:16GMT\n"
-"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
-"Language-Team: nynorsk <nn@li.org>\n"
+"Project-Id-Version: nn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-29 13:34+0100\n"
+"PO-Revision-Date: 2003-10-13 02:45+0200\n"
+"Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
+"Language-Team: Norwegian (nynorsk) <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:147 gdk-pixbuf/gdk-pixbuf-io.c:712
 #: gdk-pixbuf/gdk-pixbuf-io.c:845
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Kunne ikkje opne fil: %s: %s"
+msgstr "Kunne ikkje opna fila: %s: %s"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:158 gdk-pixbuf/gdk-pixbuf-io.c:722
 #, c-format
@@ -31,6 +35,8 @@ msgstr "Biletefila «%s» inneheld ikkje noko data"
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
+"Klarte ikkje å lasta biletefila «%s». Ukjend årsak, truleg ei øydelagt "
+"biletefil."
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:226
 #, c-format
@@ -741,7 +747,7 @@ msgstr "Skriftnamn"
 msgid "A unique name for the action."
 msgstr ""
 
-#: gtk/gtkaction.c:193 gtk/gtkbutton.c:190 gtk/gtkexpander.c:194
+#: gtk/gtkaction.c:193 gtk/gtkbutton.c:190 gtk/gtkexpander.c:200
 #: gtk/gtkframe.c:125 gtk/gtklabel.c:290 gtk/gtktoolbutton.c:179
 msgid "Label"
 msgstr "Etikett"
@@ -774,7 +780,7 @@ msgstr ""
 msgid "The stock icon displayed in widgets representing this action."
 msgstr ""
 
-#: gtk/gtkaction.c:221 gtk/gtktoolitem.c:169
+#: gtk/gtkaction.c:221 gtk/gtktoolitem.c:168
 msgid "Is important"
 msgstr ""
 
@@ -982,7 +988,7 @@ msgid ""
 "g., help buttons"
 msgstr ""
 
-#: gtk/gtkbox.c:128 gtk/gtkexpander.c:210
+#: gtk/gtkbox.c:128 gtk/gtkexpander.c:216
 msgid "Spacing"
 msgstr "Avstand"
 
@@ -1053,12 +1059,12 @@ msgid ""
 "widget"
 msgstr ""
 
-#: gtk/gtkbutton.c:198 gtk/gtkexpander.c:202 gtk/gtklabel.c:311
+#: gtk/gtkbutton.c:198 gtk/gtkexpander.c:208 gtk/gtklabel.c:311
 #: gtk/gtktoolbutton.c:186
 msgid "Use underline"
 msgstr ""
 
-#: gtk/gtkbutton.c:199 gtk/gtkexpander.c:203 gtk/gtklabel.c:312
+#: gtk/gtkbutton.c:199 gtk/gtkexpander.c:209 gtk/gtklabel.c:312
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -1667,7 +1673,7 @@ msgstr ""
 msgid "Size of check or radio indicator"
 msgstr ""
 
-#: gtk/gtkcheckbutton.c:106 gtk/gtkexpander.c:236 gtk/gtkoptionmenu.c:205
+#: gtk/gtkcheckbutton.c:106 gtk/gtkexpander.c:242 gtk/gtkoptionmenu.c:205
 msgid "Indicator Spacing"
 msgstr ""
 
@@ -2183,15 +2189,15 @@ msgstr ""
 #: gtk/gtkentry.c:4079 gtk/gtktextview.c:6875
 #, fuzzy
 msgid "Select _All"
-msgstr "Vel alle"
+msgstr "Vel _alle"
 
 #: gtk/gtkentry.c:4089 gtk/gtktextview.c:6885
 msgid "Input _Methods"
-msgstr "Inndata _metoder"
+msgstr "Inndata_metodar"
 
 #: gtk/gtkentry.c:4099 gtk/gtktextview.c:6896
 msgid "_Insert Unicode Control Character"
-msgstr ""
+msgstr "Set _inn Unicode-kontrollteikn"
 
 #: gtk/gtkentrycompletion.c:193
 msgid "Completion Model"
@@ -2232,41 +2238,42 @@ msgid ""
 "child widget as opposed to below it."
 msgstr ""
 
-#: gtk/gtkexpander.c:186
+#: gtk/gtkexpander.c:192
 #, fuzzy
 msgid "Expanded"
 msgstr "Utvid"
 
-#: gtk/gtkexpander.c:187
+#: gtk/gtkexpander.c:193
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr ""
 
-#: gtk/gtkexpander.c:195
+#: gtk/gtkexpander.c:201
 #, fuzzy
 msgid "Text of the expander's label"
 msgstr "Vindaugetype"
 
-#: gtk/gtkexpander.c:211
+#: gtk/gtkexpander.c:217
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: gtk/gtkexpander.c:220 gtk/gtkframe.c:169 gtk/gtktoolbutton.c:193
+#: gtk/gtkexpander.c:226 gtk/gtkframe.c:169 gtk/gtktoolbutton.c:193
+#, fuzzy
 msgid "Label widget"
-msgstr ""
+msgstr "Ikon"
 
-#: gtk/gtkexpander.c:221
+#: gtk/gtkexpander.c:227
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: gtk/gtkexpander.c:227 gtk/gtktreeview.c:607
+#: gtk/gtkexpander.c:233 gtk/gtktreeview.c:607
 msgid "Expander Size"
 msgstr ""
 
-#: gtk/gtkexpander.c:228 gtk/gtktreeview.c:608
+#: gtk/gtkexpander.c:234 gtk/gtktreeview.c:608
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: gtk/gtkexpander.c:237
+#: gtk/gtkexpander.c:243
 msgid "Spacing around expander arrow"
 msgstr ""
 
@@ -2459,7 +2466,7 @@ msgstr ""
 
 #: gtk/gtkfilesel.c:3142
 msgid "Invalid UTF-8"
-msgstr ""
+msgstr "Ugyldig UTF-8"
 
 #: gtk/gtkfilesel.c:4019
 msgid "Name too long"
@@ -2638,7 +2645,7 @@ msgid "_Gamma value"
 msgstr "_Gammaverdi"
 
 #: gtk/gtkhandlebox.c:202 gtk/gtkmenubar.c:156 gtk/gtkstatusbar.c:194
-#: gtk/gtktoolbar.c:514 gtk/gtkviewport.c:150
+#: gtk/gtktoolbar.c:506 gtk/gtkviewport.c:150
 msgid "Shadow type"
 msgstr ""
 
@@ -2978,7 +2985,7 @@ msgstr "Tittelen på vindauge"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:806
+#: gtk/gtkmain.c:840
 msgid "default:LTR"
 msgstr "default:LTR"
 
@@ -3089,7 +3096,7 @@ msgstr ""
 msgid "Style of bevel around the menubar"
 msgstr ""
 
-#: gtk/gtkmenubar.c:164 gtk/gtktoolbar.c:490
+#: gtk/gtkmenubar.c:164 gtk/gtktoolbar.c:482
 msgid "Internal padding"
 msgstr ""
 
@@ -4778,60 +4785,51 @@ msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "Om ein palette skal brukast"
 
 #: gtk/gtktoolbar.c:473
-msgid "Pack End"
-msgstr ""
-
-#: gtk/gtktoolbar.c:474
-#, fuzzy
-msgid "Whether the item is positioned at the end of the toolbar"
-msgstr "Om grensesnittelementet har fokus"
-
-#: gtk/gtktoolbar.c:481
 msgid "Spacer size"
 msgstr "Storleik på avstandsstykke"
 
-#: gtk/gtktoolbar.c:482
+#: gtk/gtktoolbar.c:474
 msgid "Size of spacers"
 msgstr "Storleik på avstandsstykke"
 
-#: gtk/gtktoolbar.c:491
+#: gtk/gtktoolbar.c:483
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr ""
 
-#: gtk/gtktoolbar.c:499
+#: gtk/gtktoolbar.c:491
 msgid "Space style"
 msgstr ""
 
-#: gtk/gtktoolbar.c:500
+#: gtk/gtktoolbar.c:492
 msgid "Whether spacers are vertical lines or just blank"
 msgstr ""
 
-#: gtk/gtktoolbar.c:507
+#: gtk/gtktoolbar.c:499
 msgid "Button relief"
 msgstr ""
 
-#: gtk/gtktoolbar.c:508
+#: gtk/gtktoolbar.c:500
 msgid "Type of bevel around toolbar buttons"
 msgstr ""
 
-#: gtk/gtktoolbar.c:515
+#: gtk/gtktoolbar.c:507
 msgid "Style of bevel around the toolbar"
 msgstr ""
 
-#: gtk/gtktoolbar.c:521
+#: gtk/gtktoolbar.c:513
 msgid "Toolbar style"
 msgstr "Stil på verktylinje"
 
-#: gtk/gtktoolbar.c:522
+#: gtk/gtktoolbar.c:514
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr ""
 
-#: gtk/gtktoolbar.c:528
+#: gtk/gtktoolbar.c:520
 msgid "Toolbar icon size"
 msgstr ""
 
-#: gtk/gtktoolbar.c:529
+#: gtk/gtktoolbar.c:521
 msgid "Size of icons in default toolbars"
 msgstr ""
 
@@ -4866,27 +4864,27 @@ msgstr "Ikon"
 msgid "Icon widget to display in the item"
 msgstr ""
 
-#: gtk/gtktoolitem.c:155
+#: gtk/gtktoolitem.c:154
 msgid "Visible when horizontal"
 msgstr ""
 
-#: gtk/gtktoolitem.c:156
+#: gtk/gtktoolitem.c:155
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
 msgstr ""
 
-#: gtk/gtktoolitem.c:162
+#: gtk/gtktoolitem.c:161
 msgid "Visible when vertical"
 msgstr ""
 
-#: gtk/gtktoolitem.c:163
+#: gtk/gtktoolitem.c:162
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
 msgstr ""
 
-#: gtk/gtktoolitem.c:170
+#: gtk/gtktoolitem.c:169
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -5607,6 +5605,10 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Whether the item is positioned at the end of the toolbar"
+#~ msgstr "Om grensesnittelementet har fokus"
+
 #, fuzzy
 #~ msgid "The leftmost column of the child"
 #~ msgstr "Tittelen på vindauge"