summaryrefslogtreecommitdiff
path: root/po/nb.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
commitb3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch)
tree0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /po/nb.po
parenta1a253e8be978998b66af62240a25864db2cc694 (diff)
parent128aa7d3630f138f37ef83e3e8564feca01ec429 (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts: debian/changelog
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po38
1 files changed, 19 insertions, 19 deletions
diff --git a/po/nb.po b/po/nb.po
index 08379c91f..5600dca35 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-04-10 10:18+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -837,9 +837,9 @@ msgstr "Tidsavbrudd på forbindelsen"
msgid "Server closed the connection"
msgstr "Tjeneren lukket forbindelsen"
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1468
-#: apt-pkg/contrib/fileutl.cc:1477 apt-pkg/contrib/fileutl.cc:1482
-#: apt-pkg/contrib/fileutl.cc:1484
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
msgid "Read error"
msgstr "Lesefeil"
@@ -852,9 +852,9 @@ msgid "Protocol corruption"
msgstr "Protokollødeleggelse"
#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1590 apt-pkg/contrib/fileutl.cc:1599
-#: apt-pkg/contrib/fileutl.cc:1604 apt-pkg/contrib/fileutl.cc:1606
-#: apt-pkg/contrib/fileutl.cc:1631
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
msgid "Write error"
msgstr "Skrivefeil"
@@ -1111,7 +1111,7 @@ msgstr "Forbindelsen mislykkes"
msgid "Internal error"
msgstr "Intern feil"
-#: apt-private/private-list.cc:132
+#: apt-private/private-list.cc:131
msgid "Listing"
msgstr ""
@@ -2582,54 +2582,54 @@ msgstr "Underprosessen %s avsluttet uventet"
msgid "Problem closing the gzip file %s"
msgstr "Problem ved låsing av gzip-fila %s"
-#: apt-pkg/contrib/fileutl.cc:1097
+#: apt-pkg/contrib/fileutl.cc:1104
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikke åpne fila %s"
-#: apt-pkg/contrib/fileutl.cc:1156 apt-pkg/contrib/fileutl.cc:1203
+#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Klarte ikke åpne fildeskriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1310
+#: apt-pkg/contrib/fileutl.cc:1317
msgid "Failed to create subprocess IPC"
msgstr "Klarte ikke å opprette underprosessen IPC"
-#: apt-pkg/contrib/fileutl.cc:1365
+#: apt-pkg/contrib/fileutl.cc:1372
msgid "Failed to exec compressor "
msgstr "Klarte ikke å kjøre komprimeringen"
-#: apt-pkg/contrib/fileutl.cc:1506
+#: apt-pkg/contrib/fileutl.cc:1513
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
-#: apt-pkg/contrib/fileutl.cc:1619 apt-pkg/contrib/fileutl.cc:1641
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
-#: apt-pkg/contrib/fileutl.cc:1911
+#: apt-pkg/contrib/fileutl.cc:1918
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved låsing av fila %s"
-#: apt-pkg/contrib/fileutl.cc:1923
+#: apt-pkg/contrib/fileutl.cc:1930
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved endring av navn på fila %s til %s"
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1941
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenke til fila %s"
-#: apt-pkg/contrib/fileutl.cc:1947
+#: apt-pkg/contrib/fileutl.cc:1954
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
-#: apt-pkg/contrib/fileutl.cc:2043 apt-pkg/acquire-item.cc:148
+#: apt-pkg/contrib/fileutl.cc:2050 apt-pkg/acquire-item.cc:148
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."