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/nn.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/nn.po')
-rw-r--r-- | po/nn.po | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -13,10 +13,11 @@ msgstr "" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" -"Language: \n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.9.1\n" #. Only warn if there are no sources.list.d. |