merged debian-sid branch and resolved conflicts

[apt.git] / po / nn.po

diff --git a/po/nn.po b/po/nn.po
index 9b364902f2103806138dddf9079e56cb04024cea..f59e9095cd55dec0d312151b9d1d95423643c0f2 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -3411,6 +3411,14 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s ... Ferdig"
+
 #, fuzzy
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Opnar oppsettsfila %s"