summaryrefslogtreecommitdiff
path: root/po/nb.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/nb.po
parent52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff)
parent3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff)
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po8
1 files changed, 8 insertions, 0 deletions
diff --git a/po/nb.po b/po/nb.po
index 6911c4fae..253900f7a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3459,6 +3459,14 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s ... Ferdig"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Hopper over den ikke-eksisterende fila %s"