diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
| commit | b3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch) | |
| tree | 0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /doc/po/fr.po | |
| parent | a1a253e8be978998b66af62240a25864db2cc694 (diff) | |
| parent | 128aa7d3630f138f37ef83e3e8564feca01ec429 (diff) | |
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts:
debian/changelog
Diffstat (limited to 'doc/po/fr.po')
| -rw-r--r-- | doc/po/fr.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/po/fr.po b/doc/po/fr.po index 279905402..cabedea51 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-01 14:24+0200\n" +"POT-Creation-Date: 2014-04-10 09:49+0200\n" "PO-Revision-Date: 2014-04-01 14:00+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -785,7 +785,7 @@ msgstr "" #: apt.8.xml:145 msgid "" "The <command>apt</command> command is meant to be pleasant for end users and " -"does not need to be backward compatilbe like &apt-get;. Therefore some " +"does not need to be backward compatible like &apt-get;. Therefore some " "options are different:" msgstr "" |