Update:Core:massive translation update from launchpad

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6046 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 180 insertions, 116 deletions

diff --git a/po/fr.po.in b/po/fr.po.in
index 2800dab4..a94018d3 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,10 +8,12 @@
 # Elodie https://launchpad.net/~elodie
 # Fred https://launchpad.net/~jelk
 # Gaël Ecorchard https://launchpad.net/~galou-breizh
+# Jean Marc https://launchpad.net/~m-balthazar
 # Jérôme BLUM https://launchpad.net/~jblum
 # KaZeR https://launchpad.net/~kazer
 # Roadrunner IN https://launchpad.net/~online
 # Thibault Lemaitre https://launchpad.net/~thibault.lemaitre
+# Thjazi https://launchpad.net/~pa2l
 # alexb38 https://launchpad.net/~alexb38
 # alfred002 https://launchpad.net/~alfred002
 # boism https://launchpad.net/~boism
@@ -26,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-11 17:45+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2015-03-10 20:10+0000\n"
+"Last-Translator: Jean Marc <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +39,7 @@ msgstr ""
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr "Execution depuis le dossier d'origine\n"
+msgstr "Éxecution depuis le dossier d'origine\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
@@ -130,14 +132,14 @@ msgstr "dans %d kilomètres %d"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "un mille"
-msgstr[1] "%d milles"
+msgstr[0] "un mile"
+msgstr[1] "%d miles"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "dans un mille"
-msgstr[1] "dans %d milles"
+msgstr[0] "dans un mile"
+msgstr[1] "dans %d miles"
 
 #, c-format
 msgid "one kilometer"
@@ -151,8 +153,10 @@ msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-msgid "exit"
-msgstr "sortie"
+#. TRANSLATORS: %1$s is the name_systematic of the next road to merge onto, %2$s it's name
+#, c-format
+msgid "onto the %1$s %2$s"
+msgstr ""
 
 msgid "into the ramp"
 msgstr "vers la sortie"
@@ -182,37 +186,18 @@ msgstr "%ssur l'%s%s%s"
 msgid "%sinto the %s"
 msgstr "%svers la %s"
 
-# tournez à droite
-#. TRANSLATORS: right, as in 'Turn right'
-msgid "right"
-msgstr "à droite"
-
-# tournez à gauche
-#. TRANSLATORS: left, as in 'Turn left'
-msgid "left"
-msgstr "à gauche"
-
-# utilisé pour les changements de voie pour les sorties?
-#. TRANSLATORS: Don't forget the ending space
-msgid "easily "
-msgstr "légèrement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "strongly "
-msgstr "fortement "
-
-#. TRANSLATORS: Don't forget the ending space
-msgid "really strongly "
-msgstr "très fortement "
-
-# attention à l'espace à la fin
-#. TRANSLATORS: Don't forget the ending space
-msgid "unknown "
-msgstr "inconnu "
-
 msgid "When possible, please turn around"
 msgstr "Dès que possible, faites demi-tour"
 
+#. TRANSLATORS: the argument is the destination to follow
+#, c-format
+msgid "towards %s"
+msgstr ""
+
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Suivez la route sur %s"
+
 msgid "Enter the roundabout soon"
 msgstr "Préparez vous à vous engager dans le rond-point"
 
@@ -221,57 +206,136 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 msgid "Enter the roundabout %s"
 msgstr "Entrer dans le rond-point %s"
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "puis prenez la %s du rond-point."
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sortez du rond-point à la %s"
+msgid "then leave the roundabout at the %1$s %2$s"
+msgstr ""
 
+#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
-msgid "Follow the road for the next %s"
-msgstr "Suivez la route sur %s"
+msgid "Leave the roundabout at the %1$s %2$s"
+msgstr ""
 
 msgid "soon"
 msgstr "bientôt"
 
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+msgid "now"
+msgstr "maintenant"
+
+msgid "then"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge left %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'
+#, c-format
+msgid "%1$s merge right %2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s left exit %2$s %3$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is exit_ref and the third is exit_label
+#, c-format
+msgid "%1$s right exit %2$s %3$s"
+msgstr ""
+
+msgid " at the exit "
+msgstr ""
+
+msgid " at the interchange "
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s continue straight%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep right%2$s"
+msgstr ""
+
+#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuvre
+#, c-format
+msgid "%1$s keep left%2$s"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s continue straight"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep right"
+msgstr ""
+
+#. TRANSLATORS: the arg. is distance
+#, c-format
+msgid "%1$s keep left"
+msgstr ""
+
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Empreintez la %1$s rue en direction de %2$s"
 
+# tournez à droite
+msgid "right"
+msgstr "à droite"
+
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-msgid "now"
-msgstr "maintenant"
-
+#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "puis empreintez la %1$s rue en direction de %2$s"
+msgid "Turn %1$s%2$s %3$s %4$s"
+msgstr ""
 
-msgid "error"
-msgstr "erreur"
+# utilisé pour les changements de voie pour les sorties?
+msgid "easily "
+msgstr "légèrement "
+
+msgid "strongly "
+msgstr "fortement "
+
+# tournez à gauche
+msgid "left"
+msgstr "à gauche"
 
-# espace important après le 2
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "%3$s, tournez %1$s%2$s %4$s"
+msgid "%1$s left turnaround"
+msgstr ""
 
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#. TRANSLATORS: the arg. is distance
 #, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "puis tournez %1$s%2$s %3$s%4$s"
+msgid "%1$s right turnaround"
+msgstr ""
+
+msgid "then you have reached your destination."
+msgstr "puis vous arriverez à destination"
 
+#. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination : %s"
 
-msgid "then you have reached your destination."
-msgstr "puis vous arriverez à destination"
+msgid "exit"
+msgstr "sortie"
+
+msgid "interchange"
+msgstr ""
+
+#, c-format
+msgid "%s %s"
+msgstr ""
 
 #. Android resource: @strings/position_popup_title
 msgid "Position"
@@ -355,7 +419,7 @@ msgstr "Arménie"
 
 #. 530
 msgid "Netherlands Antilles"
-msgstr "Antilles Néérlandaises"
+msgstr "Antilles néerlandaises"
 
 #. 024
 msgid "Angola"
@@ -483,7 +547,7 @@ msgstr "Canada"
 
 #. 166
 msgid "Cocos (Keeling) Islands"
-msgstr "Iles Cocos"
+msgstr "Îles Cocos"
 
 #. 180
 msgid "Congo, Democratic Republic of the"
@@ -503,7 +567,7 @@ msgstr "Suisse"
 
 #. 384
 msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
+msgstr "Côte d'Ivoire"
 
 #. 184
 msgid "Cook Islands"
@@ -579,7 +643,7 @@ msgstr "Algérie"
 
 #. 218
 msgid "Ecuador"
-msgstr "Equateur"
+msgstr "Équateur"
 
 #. 233
 msgid "Estonia"
@@ -615,7 +679,7 @@ msgstr "Fiji"
 
 #. 238
 msgid "Falkland Islands (Malvinas)"
-msgstr "Les Malouines (les Malvinas)"
+msgstr "Îles Malouines"
 
 #. 583
 msgid "Micronesia, Federated States of"
@@ -623,7 +687,7 @@ msgstr "Micronésie, États fédérés de"
 
 #. 234
 msgid "Faroe Islands"
-msgstr "Îles Feroe"
+msgstr "Îles Féroé"
 
 #. 250
 msgid "France"
@@ -707,11 +771,11 @@ msgstr "Guyane"
 
 #. 344
 msgid "Hong Kong"
-msgstr "Hong-kong"
+msgstr "Hong Kong"
 
 #. 334
 msgid "Heard Island and McDonald Islands"
-msgstr "Heard, Île et McDonald, Îles"
+msgstr "Îles Heard-et-McDonald"
 
 #. 340
 msgid "Honduras"
@@ -723,7 +787,7 @@ msgstr "Croatie"
 
 #. 332
 msgid "Haiti"
-msgstr "Haiti"
+msgstr "Haïti"
 
 #. 348
 msgid "Hungary"
@@ -751,7 +815,7 @@ msgstr "Inde"
 
 #. 086
 msgid "British Indian Ocean Territory"
-msgstr "Océan Indien, Territoire britannique de l'"
+msgstr "Territoire britannique de l'océan Indien"
 
 #. 368
 msgid "Iraq"
@@ -775,7 +839,7 @@ msgstr "Jersey"
 
 #. 388
 msgid "Jamaica"
-msgstr "Jamaique"
+msgstr "Jamaïque"
 
 #. 400
 msgid "Jordan"
@@ -803,11 +867,11 @@ msgstr "Kiribati"
 
 #. 174
 msgid "Comoros"
-msgstr "Comores, Les"
+msgstr "Comores"
 
 #. 659
 msgid "Saint Kitts and Nevis"
-msgstr "Saint Kitts et Nevis"
+msgstr "Saint-Christophe-et-Niévès"
 
 #. 408
 msgid "Korea, Democratic People's Republic of"
@@ -943,7 +1007,7 @@ msgstr "Malte"
 
 #. 480
 msgid "Mauritius"
-msgstr "Iles Maurice"
+msgstr "Île Maurice"
 
 #. 462
 msgid "Maldives"
@@ -1059,7 +1123,7 @@ msgstr "Puerto Rico"
 
 #. 275
 msgid "Palestinian Territory, Occupied"
-msgstr "Palestine"
+msgstr "Territoire palestinien, occupé"
 
 #. 620
 msgid "Portugal"
@@ -1103,7 +1167,7 @@ msgstr "Arabie Saoudite"
 
 #. 090
 msgid "Solomon Islands"
-msgstr "Îles Solomon"
+msgstr "Îles Salomon"
 
 #. 690
 msgid "Seychelles"
@@ -1111,7 +1175,7 @@ msgstr "Seychelles"
 
 #. 736
 msgid "Sudan"
-msgstr "Sudan"
+msgstr "Soudan"
 
 #. 752
 msgid "Sweden"
@@ -1127,11 +1191,11 @@ msgstr "Sainte Hélène"
 
 #. 705
 msgid "Slovenia"
-msgstr "Slovènie"
+msgstr "Slovénie"
 
 #. 744
 msgid "Svalbard and Jan Mayen"
-msgstr "Svalbard et île Jan Mayen"
+msgstr "Svalbard et Jan Mayen"
 
 #. 703
 msgid "Slovakia"
@@ -1239,7 +1303,7 @@ msgstr "Tuvalu"
 
 #. 158
 msgid "Taiwan, Province of China"
-msgstr "Taiwan, province de la Chine"
+msgstr "Taïwan, province de Chine"
 
 #. 834
 msgid "Tanzania, United Republic of"
@@ -1255,7 +1319,7 @@ msgstr "Uganda"
 
 #. 581
 msgid "United States Minor Outlying Islands"
-msgstr "Îles périphériques mineures des Etats-Unis"
+msgstr "Îles mineures éloignées des États-Unis"
 
 #. 840
 msgid "United States"
@@ -1307,7 +1371,7 @@ msgstr "Samoa"
 
 #. 887
 msgid "Yemen"
-msgstr "Yemen"
+msgstr "Yémen"
 
 #. 175
 msgid "Mayotte"
@@ -1331,17 +1395,14 @@ msgstr "Inconnu, ajoutez des étiquettes d'is_in à ces villes"
 msgid ""
 "navit usage:\n"
 "navit [options] [configfile]\n"
-"\t-c <file>: use <file> as config file\n"
-"\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting "
-"from config file.\n"
+"\t-c <file>: use <file> as config file, instead of using the default file.\n"
+"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, "
+"2=info, 3=debug).\n"
+"\tSettings from config file will still take effect where they set a higher "
+"level.\n"
 "\t-h: print this usage info and exit.\n"
-"\t-v: Print the version and exit.\n"
+"\t-v: print the version and exit.\n"
 msgstr ""
-"Utilisation de navit;\n"
-"navit [options] [fichier de configuration]\n"
-"\t-c <fichier>: utiliser <fichier> comme fichier de configuration\n"
-"\t-h: afficher les informations d'utilisation et quitter\n"
-"\t-v: afficher la version et quitter\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
@@ -1480,7 +1541,7 @@ msgid "Opens address search dialog"
 msgstr "Ouvrir la fenêtre de recherche d'adresse"
 
 msgid "_POI search"
-msgstr ""
+msgstr "recherche de points d'intérêt"
 
 msgid "Opens POI search dialog"
 msgstr ""
@@ -1528,46 +1589,46 @@ msgid "Data"
 msgstr "Données"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Pharmacie"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurant"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restauration rapide"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hôtel"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Parking"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Station-service"
 
 msgid "Bank"
-msgstr ""
+msgstr "Banque"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Hôpital"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Cinéma"
 
 msgid "Train station"
-msgstr ""
+msgstr "Gare"
 
 msgid "School"
-msgstr ""
+msgstr "École"
 
 msgid "Police"
-msgstr ""
+msgstr "Poste de police"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 msgid "Shopping"
 msgstr ""
@@ -1577,11 +1638,11 @@ msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
-msgstr ""
+msgstr "point d'intérêt %s. %s"
 
 #, c-format
 msgid "Set destination to %ld, %ld \n"
-msgstr ""
+msgstr "Définir la destination vers %ld, %ld \n"
 
 #, c-format
 msgid "Set map to %ld, %ld \n"
@@ -1592,7 +1653,7 @@ msgid "Set next visit to %ld, %ld \n"
 msgstr ""
 
 msgid "POI search"
-msgstr ""
+msgstr "recherche de point d'intérêt"
 
 msgid "Select a category"
 msgstr ""
@@ -1601,22 +1662,22 @@ msgid "Select a distance to look for (km)"
 msgstr ""
 
 msgid "Select a POI"
-msgstr ""
+msgstr "Sélectionnez un point d'intérêt"
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 msgid "Direction"
-msgstr ""
+msgstr "Direction"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Distance (m)"
 
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 msgid "Visit Before"
 msgstr ""
@@ -1706,6 +1767,9 @@ msgstr "Supprimer les résultats de la carte"
 msgid "Show results on the map"
 msgstr "Montrer les résultats sur la carte"
 
+msgid "Foursquare"
+msgstr ""
+
 msgid "Cut Bookmark"
 msgstr "Couper le signet"