summaryrefslogtreecommitdiff
path: root/po/nn.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-04-23 08:08:54 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2013-04-23 08:08:54 +0200
commit3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch)
treeb0e63e9bc86ca6d39f6987381ca7bfa64e186048 /po/nn.po
parent52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff)
parent3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff)
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'po/nn.po')
-rw-r--r--po/nn.po8
1 files changed, 8 insertions, 0 deletions
diff --git a/po/nn.po b/po/nn.po
index 9b364902f..f59e9095c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3412,6 +3412,14 @@ 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"