aboutsummaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2014-04-09 07:40:17 +1200
committerWilliam Hua <william.hua@canonical.com>2014-04-09 07:40:17 +1200
commit0e4cbba14d910e40cafb37199730f3387c9ce279 (patch)
treef7dd1872184e01aed644b4afebe367f31c98615e /po/fr.po
parent26afec3a316a0f7c2e62ae8d574a5d354ebcdde4 (diff)
parente8c1f8e82148dd928b37d9e5a0750b356fb0e156 (diff)
downloadayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.gz
ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.bz2
ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.zip
Merge trunk fixing conflicts.
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po18
1 files changed, 9 insertions, 9 deletions
diff --git a/po/fr.po b/po/fr.po
index 06a6d463..c32825a1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,29 +7,29 @@ msgid ""
msgstr ""
"Project-Id-Version: indicator-keyboard\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-27 08:18+0000\n"
+"POT-Creation-Date: 2014-04-07 06:57+0000\n"
"PO-Revision-Date: 2013-08-29 08:33+0000\n"
"Last-Translator: Matthieu Baerts <matttbe@gmail.com>\n"
"Language-Team: French <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-28 06:45+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-08 07:10+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
-#: ../lib/main.vala:628
+#: ../lib/main.vala:676
#, c-format
msgid "%s input source"
-msgstr "Agencement : %s"
+msgstr "%s source d'entrée"
-#: ../lib/main.vala:770
+#: ../lib/main.vala:824
msgid "Character Map"
msgstr "Table de caractères"
-#: ../lib/main.vala:771
+#: ../lib/main.vala:825
msgid "Keyboard Layout Chart"
msgstr "Représentation de l'agencement"
-#: ../lib/main.vala:772
+#: ../lib/main.vala:826
msgid "Text Entry Settings..."
-msgstr "Paramètres d'agencement"
+msgstr "Paramètres de saisie de texte..."