merge from branch to HEAD. turkish stays on HEAD, though

1 files changed, 19 insertions, 20 deletions

diff --git a/po/no.po b/po/no.po
index 10c3137e8..1b40c33c5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: install 7.1\n"
-"POT-Creation-Date: 2003-02-20 22:29-0500\n"
+"POT-Creation-Date: 2003-02-24 19:53-0500\n"
 "PO-Revision-Date: 2003-02-10 17:23+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -248,7 +248,7 @@ msgstr ""
 
 #: ../autopart.py:1405 ../bootloader.py:123 ../image.py:386
 #: ../partedUtils.py:247 ../partedUtils.py:732 ../upgrade.py:303
-#: ../upgrade.py:438 ../upgrade.py:458 ../upgrade.py:500
+#: ../upgrade.py:439 ../upgrade.py:459 ../upgrade.py:500
 #: ../iw/blpasswidget.py:148 ../iw/bootloader_advanced_gui.py:42
 #: ../iw/bootloader_main_gui.py:88 ../iw/fdasd_gui.py:93
 #: ../iw/upgrade_swap_gui.py:200 ../iw/upgrade_swap_gui.py:208
@@ -442,8 +442,8 @@ msgstr "_Lag oppstartsdiskett"
 #: ../harddrive.py:217 ../image.py:76 ../image.py:113 ../image.py:249
 #: ../packages.py:140 ../packages.py:154 ../packages.py:341 ../packages.py:513
 #: ../packages.py:586 ../partedUtils.py:531 ../partIntfHelpers.py:147
-#: ../partIntfHelpers.py:332 ../upgrade.py:333 ../upgrade.py:358
-#: ../upgrade.py:384 ../iw/osbootwidget.py:222 ../iw/osbootwidget.py:231
+#: ../partIntfHelpers.py:332 ../upgrade.py:334 ../upgrade.py:359
+#: ../upgrade.py:385 ../iw/osbootwidget.py:222 ../iw/osbootwidget.py:231
 #: ../iw/raid_dialog_gui.py:616 ../iw/raid_dialog_gui.py:655
 #: ../textw/fdasd_text.py:73 ../textw/partition_text.py:1068
 #: ../textw/partition_text.py:1079 ../textw/upgrade_text.py:165
@@ -918,30 +918,30 @@ msgstr "Denne CD-ROMen kunne ikke monteres."
 msgid "Install on System"
 msgstr "Installer på systemet"
 
-#: ../kickstart.py:1170
+#: ../kickstart.py:1168
 msgid "Missing Package"
 msgstr "Manglende pakke"
 
-#: ../kickstart.py:1171
+#: ../kickstart.py:1169
 #, python-format
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
 "does not exist. Would you like to continue or abort your installation?"
 msgstr ""
 
-#: ../kickstart.py:1177 ../kickstart.py:1203
+#: ../kickstart.py:1175 ../kickstart.py:1201
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../kickstart.py:1178 ../kickstart.py:1204 ../iw/partition_gui.py:997
+#: ../kickstart.py:1176 ../kickstart.py:1202 ../iw/partition_gui.py:997
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../kickstart.py:1196
+#: ../kickstart.py:1194
 msgid "Missing Group"
 msgstr "Manglende gruppe"
 
-#: ../kickstart.py:1197
+#: ../kickstart.py:1195
 #, python-format
 msgid ""
 "You have specified that the group '%s' should be installed.  This group does "
@@ -1060,7 +1060,7 @@ msgstr ""
 "Du prøver å installere på en maskin som ikke er støttet av denne versjonen "
 "av %s."
 
-#: ../packages.py:587 ../upgrade.py:334
+#: ../packages.py:587 ../upgrade.py:335
 msgid ""
 "Unable to merge header list.  This may be due to a missing file or bad "
 "media.  Press <return> to try again."
@@ -2055,26 +2055,26 @@ msgstr "Ugyldige kataloger"
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../upgrade.py:346
+#: ../upgrade.py:347
 msgid "Finding"
 msgstr "Finner"
 
-#: ../upgrade.py:347
+#: ../upgrade.py:348
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes..."
 
-#: ../upgrade.py:359
+#: ../upgrade.py:360
 msgid ""
 "The installation program is unable to upgrade systems with a pre-rpm 4.x "
 "database. Please install the errata rpm packages for your release as "
 "described in the release notes and then run the upgrade procedure."
 msgstr ""
 
-#: ../upgrade.py:385
+#: ../upgrade.py:386
 msgid "An error occurred when finding the packages to upgrade."
 msgstr "En feil oppsto under søk etter pakker som skal oppgraderes."
 
-#: ../upgrade.py:439
+#: ../upgrade.py:440
 msgid ""
 "This system appears to have third party packages installed that overlap with "
 "packages included in Red Hat Linux. Because these packages overlap, "
@@ -2088,7 +2088,7 @@ msgstr ""
 "ustabilt hvis du fortsetter med oppgraderingen. Vil du fortsette med "
 "oppgraderingsprosessen?"
 
-#: ../upgrade.py:459
+#: ../upgrade.py:460
 msgid ""
 "This system does not have an /etc/redhat-release file.  It is possible that "
 "this is not a Red Hat Linux system. Continuing with the upgrade process may "
@@ -7600,9 +7600,8 @@ msgstr "Spansk"
 msgid "Swedish"
 msgstr "Svensk"
 
-#. generated from lang-table
-msgid "Turkish"
-msgstr "Tyrkisk"
+#~ msgid "Turkish"
+#~ msgstr "Tyrkisk"
 
 #~ msgid "Slovenian"
 #~ msgstr "Slovensk"