summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po93
1 files changed, 69 insertions, 24 deletions
diff --git a/po/fr.po b/po/fr.po
index 0f95bd5..b069940 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,17 +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"
@@ -56,15 +67,15 @@ msgstr "Ajouter une nouvelle application pour montre"
#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
msgid "Add new watchface"
-msgstr "Ajouter une nouveau cadran"
+msgstr "Ajouter un nouveau thème de montre"
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
msgid "See all"
msgstr "Tout voir"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
msgid "Developer Tools"
-msgstr "Outils pour développeurs"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -74,27 +85,33 @@ 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 "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"
-msgstr "Envoi de rockworkd.log"
-
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr "rockworkd.log"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
msgid "Send watch logs"
@@ -112,7 +129,11 @@ 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 mise à niveau du micrologiciel est disponible pour votre montre "
"connectée Pebble."
@@ -147,27 +168,31 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
msgid "Health settings"
-msgstr "Paramètre de Bien-Être"
+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"
-msgstr "Femme"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
msgid "Male"
-msgstr "Homme"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
msgid "Age"
-msgstr "Âge"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
msgid "Height (cm)"
-msgstr "Taille (cm):"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
msgid "Weight"
@@ -183,20 +208,31 @@ 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
msgid "Version %1"
-msgstr "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 "Informations légales"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
msgid ""
@@ -212,7 +248,7 @@ msgstr "Pebble est une marque déposée par Pebble Technology Corp."
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
msgid "Apps & Watchfaces"
-msgstr "Applications & Cadrans"
+msgstr "Applications & thèmes de montre"
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
msgid "Apps"
@@ -220,7 +256,7 @@ msgstr "Applications"
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
msgid "Watchfaces"
-msgstr "Cadrans"
+msgstr "Thèmes de montre"
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:167
msgid "Launch"
@@ -244,12 +280,17 @@ 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"
-msgstr "Outils de développement"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
msgid "Manage notifications"
@@ -261,12 +302,12 @@ msgstr "Gérer les applications"
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:67
msgid "Manage Watchfaces"
-msgstr "Gérer les cadrans"
+msgstr "Gérer les thèmes de montre"
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
msgid "Settings"
-msgstr "Paramètres"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -351,20 +392,24 @@ msgstr "Enregistrer"
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
msgid "Distance Units"
-msgstr "Unités de Distance"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
msgid "Metric"
-msgstr "Métrique"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
msgid "Imperial"
-msgstr "Impérial"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
msgid "Calendar"
-msgstr "Agenda"
+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