sync with code

1 files changed, 31 insertions, 21 deletions

diff --git a/po/is.po b/po/is.po
index f39f1da0..42061d90 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 14:22+0100\n"
+"POT-Creation-Date: 2007-01-18 15:22+0100\n"
 "PO-Revision-Date: 2006-08-18 01:19+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -183,16 +183,6 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:210
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr ""
-"Til að viðhalda samræmi verða eftirtaldir %d pakkar settir inn:\n"
-"%s\n"
-
 #: ../gurpmi2:217
 #, c-format
 msgid "Package installation..."
@@ -2152,14 +2142,13 @@ msgstr[1] ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(aðeins prófun, ekkert verður í raun fjarlægt)"
 
-#: ../urpmi:578 ../urpmi:589
+#: ../urpmi:578
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed"
+msgid "To satisfy dependencies, the following package is going to be installed"
 msgid_plural ""
-"To satisfy dependencies, the following package is going to be installed"
-msgstr[0] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
-msgstr[1] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
+"To satisfy dependencies, the following packages are going to be installed"
+msgstr[0] "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
+msgstr[1] "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
 
 #: ../urpmi:580
 #, c-format
@@ -2176,6 +2165,15 @@ msgstr ""
 "pakka:\n"
 "%s\n"
 
+#: ../urpmi:589 ../gurpmi2:209
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgid_plural ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr[0] "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
+msgstr[1] "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
+
 #: ../urpmi:592
 #, c-format
 msgid "(test only, installation will not be actually done)"
@@ -2911,6 +2909,22 @@ msgstr "Engir skráarlistar fundust\n"
 msgid "No changelog found\n"
 msgstr "Enginn breytilisti fannst\n"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Til að viðhalda samræmi verða eftirtaldir %d pakkar settir inn:\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr[0] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
+#~ msgstr[1] "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
+
 #~ msgid "skipping media %s: no hdlist"
 #~ msgstr "sleppi miðli %s: engin hdlist skrá"
 
@@ -2968,10 +2982,6 @@ msgstr "Enginn breytilisti fannst\n"
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Undirbý innsetningu á %s..."
 
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn"
-
 #~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 #~ msgstr "  --probe-synthesis - reyna að finna og nota samantektar-skrá.\n"