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/ja.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/ja.po')
| -rw-r--r-- | po/ja.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8 bit\n" -"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. |