summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po79
1 files changed, 69 insertions, 10 deletions
diff --git a/po/fr.po b/po/fr.po
index 8223379..b069940 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,16 +6,28 @@
msgid ""
msgstr ""
"Project-Id-Version: upebble\n"
+<<<<<<< HEAD
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2016-02-08 03:04+0100\n"
"PO-Revision-Date: 2016-02-07 15:41+0000\n"
+=======
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-14 23:39+0100\n"
+"PO-Revision-Date: 2016-02-15 06:05+0000\n"
+>>>>>>> refs/heads/rockwork
"Last-Translator: Anne <anneonyme017@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"
+<<<<<<< HEAD
"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
"X-Generator: Launchpad (build 17908)\n"
+=======
+"X-Launchpad-Export-Date: 2016-02-16 05:44+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
+"Language: fr\n"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
msgid "App Settings"
@@ -73,16 +85,29 @@ msgstr "Captures d'écran"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
msgid "Report problem"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "Signaler un problème"
+
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
+msgid "Install app or watchface from file"
+msgstr "Installer une application ou un cadran à partir d'un fichier"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
msgid "Preparing logs package..."
-msgstr ""
+msgstr "Préparation de l'ensemble des rapports…"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
msgid "rockworkd.log"
msgstr ""
+=======
+msgid "pebble.log"
+msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
msgid "Send rockworkd.log"
@@ -90,7 +115,7 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
msgid "Send watch logs"
-msgstr ""
+msgstr "Envoi des rapports"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -104,10 +129,14 @@ msgid "Firmware upgrade"
msgstr "Mise à niveau du micrologiciel"
#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
msgid "A new firmware upgrade is available for your Pebble smarwatch."
+=======
+msgid "A new firmware upgrade is available for your Pebble smartwatch."
+>>>>>>> refs/heads/rockwork
msgstr ""
-"Une nouvelle version du logiciel est disponible pour votre montre connectée "
-"Pebble."
+"Une nouvelle mise à niveau du micrologiciel est disponible pour votre montre "
+"connectée Pebble."
#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
#, qt-format
@@ -143,7 +172,11 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
msgid "Health app enabled"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "L'application Bien-Être est activée"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
msgid "Female"
@@ -163,19 +196,27 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
msgid "Weight"
-msgstr ""
+msgstr "Masse"
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
msgid "I want to be more active"
-msgstr ""
+msgstr "Je veux être plus actif"
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
msgid "I want to sleep more"
-msgstr ""
+msgstr "Je veux dormir plus"
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
msgid "OK"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "Valider"
+
+#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
+msgid "Import watchapp or watchface"
+msgstr "Importer une application ou un cadran"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
#, qt-format
@@ -183,22 +224,27 @@ msgid "Version %1"
msgstr ""
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+<<<<<<< HEAD
msgid "Contributors"
msgstr ""
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
+=======
+>>>>>>> refs/heads/rockwork
msgid "Legal"
msgstr ""
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
msgid ""
"This application is neither affiliated with nor endorsed by Pebble "
"Technology Corp."
msgstr ""
+"Cette application n'est ni affiliée et ni approuvée par Pebble Technology "
+"Corp."
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
msgid "Pebble is a trademark of Pebble Technology Corp."
-msgstr ""
+msgstr "Pebble est une marque déposée par Pebble Technology Corp."
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
msgid "Apps & Watchfaces"
@@ -229,9 +275,18 @@ msgstr "Supprimer"
msgid "Close"
msgstr "Fermer"
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
msgid "Info"
msgstr ""
+=======
+msgid "About"
+msgstr "À propos"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
msgid "Developer tools"
@@ -353,4 +408,8 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
msgid "Sync calendar to timeline"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "Synchroniser l'agenda sur la Timeline."
+>>>>>>> refs/heads/rockwork