diff options
author | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
commit | 2830b8436ac8a6f2f3dac4ce2cd030c24eebce04 (patch) | |
tree | dcdaba1119e595edc8842c2e8746acdf25af6260 /po/nb.po | |
parent | bcc352afa890788825dfbd1454847456748f511f (diff) | |
parent | 521dd27dc33c8b2a6947a76872841f4254df4e58 (diff) |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/deb/deblistparser.cc
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
po/da.po
po/mr.po
po/vi.po
Diffstat (limited to 'po/nb.po')
-rw-r--r-- | po/nb.po | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1,15 +1,15 @@ -# Norsk Bokmal translation of messages in APT.
-# The file is available under Gnu Public License version 2.
-# Get the license from http://www.gnu.org/licenses/gpl.txt
-# Copyright:
-# Lars Bahner <bahner@debian.org>, 2002-2003.
-# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
-# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
-# Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
-msgid "" -msgstr "" -"Project-Id-Version: apt\n" +# Norsk Bokmal translation of messages in APT. +# The file is available under Gnu Public License version 2. +# Get the license from http://www.gnu.org/licenses/gpl.txt +# Copyright: +# Lars Bahner <bahner@debian.org>, 2002-2003. +# Axel Bojer <axelb@skolelinux.no>, 2003-2004. +# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004. +# Bjorn Steensrud <bjornst@powertech.no>, 2004. +# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010. +msgid "" +msgstr "" +"Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2014-06-19 12:24+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" |