diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /po/nn.po | |
parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'po/nn.po')
-rw-r--r-- | po/nn.po | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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" |