summaryrefslogtreecommitdiff
path: root/po/nb.po
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-08-21 10:55:15 -0500
committerbubulle@debian.org <>2006-08-21 10:55:15 -0500
commit3784e34677882fbea8538baa1c25b0d35abf429a (patch)
tree2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /po/nb.po
parent8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff)
parent02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff)
Merge with Michael and resolve conflicts
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po8
1 files changed, 4 insertions, 4 deletions
diff --git a/po/nb.po b/po/nb.po
index 01c09f9cf..58b3c024c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -2304,15 +2304,15 @@ msgstr "valgfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
msgid "Building dependency tree"
msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
msgid "Candidate versions"
msgstr "Versjons-kandidater"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
msgid "Dependency generation"
msgstr "Oppretter avhengighetsforhold"