From c4dddade28f5f6c016ad73e98578d35ee19081ae Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Thu, 9 Sep 2010 13:06:15 +0200
Subject: [PATCH 01/16] better english phrasing

---
 application/languages/lang_en.po          | 132 +++++++++++-----------
 application/languages/lang_fr.po          | 130 ++++++++++-----------
 application/views/scripts/idx/index.phtml |   2 +-
 3 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index ea39c68..f7a5559 100644
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-25 15:09+0200\n"
+"POT-Creation-Date: 2010-09-09 13:05+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -55,8 +55,8 @@ msgid "Welcome on Syj."
 msgstr "Welcome on Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just click on the map to add points to your route. You can zoom and move map with controls upper left."
-msgstr "To create a journey, just click on the map to add points to your route. You can zoom and move map with controls upper left."
+msgid "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+msgstr "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"save\", button."
@@ -106,12 +106,12 @@ msgid "gpx export"
 msgstr "gpx export"
 
 #: application/views/scripts/idx/index.phtml:101
-#: application/controllers/IdxController.php:148
+#: application/controllers/IdxController.php:142
 msgid "duplicate"
 msgstr "duplicate"
 
 #: application/views/scripts/idx/index.phtml:103
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:140
 msgid "edit"
 msgstr "edit"
 
@@ -156,7 +156,7 @@ msgid "Sources of the software running the website are <a href=\"http://dev.rene
 msgstr "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:133
 msgid "A link to reset your password has been emailed to you"
 msgstr "A link to reset your password has been emailed to you"
 
@@ -436,51 +436,51 @@ msgstr ""
 "\n"
 "Syj team"
 
-#: application/controllers/LoginController.php:100
-#: application/controllers/IdxController.php:129
+#: application/controllers/LoginController.php:99
+#: application/controllers/IdxController.php:123
 msgid "you must enter a login name"
 msgstr "you must enter a login name"
 
-#: application/controllers/PendingController.php:32
+#: application/controllers/PendingController.php:33
 msgid "account validated"
 msgstr "account validated"
 
-#: application/controllers/PendingController.php:39
+#: application/controllers/PendingController.php:40
 msgid "account deleted"
 msgstr "account deleted"
 
-#: application/controllers/PendingController.php:43
+#: application/controllers/PendingController.php:44
 msgid "account creation validation"
 msgstr "account creation validation"
 
-#: application/controllers/PendingController.php:53
+#: application/controllers/PendingController.php:54
 msgid "password changed"
 msgstr "password changed"
 
-#: application/controllers/PendingController.php:61
+#: application/controllers/PendingController.php:62
 msgid "request canceled"
 msgstr "request canceled"
 
-#: application/controllers/PendingController.php:65
+#: application/controllers/PendingController.php:66
 msgid "password reset validation"
 msgstr "password reset validation"
 
-#: application/controllers/ContactController.php:14
+#: application/controllers/ContactController.php:13
 msgid "contact form"
 msgstr "contact form"
 
-#: application/controllers/ContactController.php:113
+#: application/controllers/ContactController.php:112
 msgid "Hi,"
 msgstr "Hi,"
 
-#: application/controllers/ContactController.php:122
-#: application/controllers/NewpwdController.php:69
-#: application/controllers/AccountController.php:71
-#: application/controllers/IdxController.php:150
+#: application/controllers/ContactController.php:121
+#: application/controllers/NewpwdController.php:68
+#: application/controllers/AccountController.php:70
+#: application/controllers/IdxController.php:144
 msgid "Value is required"
 msgstr "Value is required"
 
-#: application/controllers/ContactController.php:123
+#: application/controllers/ContactController.php:122
 #: application/forms/Contact.php:32
 #: application/validate/EmailAddress.php:13
 msgid "Invalid email"
@@ -497,163 +497,163 @@ msgstr "Oups, something went wrong"
 msgid "terms of use"
 msgstr "terms of use"
 
-#: application/controllers/ListController.php:18
+#: application/controllers/ListController.php:15
 #: application/layouts/scripts/footer.phtml:53
 msgid "my routes"
 msgstr "my routes"
 
-#: application/controllers/ListController.php:35
+#: application/controllers/ListController.php:32
 msgid "There is no undo. Delete this route definitively ?"
 msgstr "There is no undo. Delete this route definitively ?"
 
-#: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:126
+#: application/controllers/ListController.php:33
+#: application/controllers/IdxController.php:120
 msgid "server could not be reached"
 msgstr "server could not be reached"
 
-#: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:123
+#: application/controllers/ListController.php:34
+#: application/controllers/IdxController.php:117
 msgid "server did not understood request. That's probably caused by a bug in SYJ"
 msgstr "server did not understood request. That's probably caused by a bug in SYJ"
 
-#: application/controllers/ListController.php:38
-#: application/controllers/IdxController.php:124
+#: application/controllers/ListController.php:35
+#: application/controllers/IdxController.php:118
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "route not referenced on the server. It has probably been deleted."
 
-#: application/controllers/ListController.php:39
-#: application/controllers/IdxController.php:127
+#: application/controllers/ListController.php:36
+#: application/controllers/IdxController.php:121
 msgid "there was a server error"
 msgstr "there was a server error"
 
-#: application/controllers/ListController.php:40
-#: application/controllers/IdxController.php:128
+#: application/controllers/ListController.php:37
+#: application/controllers/IdxController.php:122
 msgid "there was an unknown error"
 msgstr "there was an unknown error"
 
-#: application/controllers/ListController.php:41
+#: application/controllers/ListController.php:38
 msgid "route was successfully deleted"
 msgstr "route was successfully deleted"
 
-#: application/controllers/AccountController.php:16
+#: application/controllers/AccountController.php:15
 #: application/layouts/scripts/footer.phtml:39
 msgid "my account"
 msgstr "my account"
 
-#: application/controllers/AccountController.php:31
+#: application/controllers/AccountController.php:30
 msgid "Wrong password"
 msgstr "Wrong password"
 
-#: application/controllers/AccountController.php:44
-#: application/controllers/IdxController.php:137
+#: application/controllers/AccountController.php:43
+#: application/controllers/IdxController.php:131
 msgid "an user is already registered with this email"
 msgstr "an user is already registered with this email"
 
-#: application/controllers/AccountController.php:72
-#: application/controllers/IdxController.php:133
+#: application/controllers/AccountController.php:71
+#: application/controllers/IdxController.php:127
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Password do not match"
 
-#: application/controllers/AccountController.php:73
+#: application/controllers/AccountController.php:72
 #: application/forms/Account.php:33
 #: application/forms/User.php:20
 #, php-format
 msgid "At least %d characters"
 msgstr "At least %d characters"
 
-#: application/controllers/AccountController.php:74
+#: application/controllers/AccountController.php:73
 msgid "You have made no change"
 msgstr "You have made no change"
 
-#: application/controllers/IdxController.php:32
-#: application/controllers/IdxController.php:84
+#: application/controllers/IdxController.php:26
+#: application/controllers/IdxController.php:78
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "route by <strong>%s</strong>"
 
-#: application/controllers/IdxController.php:54
+#: application/controllers/IdxController.php:48
 msgid "route has been deleted"
 msgstr "route has been deleted"
 
-#: application/controllers/IdxController.php:57
+#: application/controllers/IdxController.php:51
 msgid "route does not exist"
 msgstr "route does not exist"
 
-#: application/controllers/IdxController.php:116
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:110
+#: application/controllers/IdxController.php:136
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:116
 msgid "save took place successfully"
 msgstr "save took place successfully"
 
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:119
 msgid "similar path seems to already exist. Please do not create two exactly identical paths"
 msgstr "similar path seems to already exist. Please do not create two exactly identical paths"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:124
 msgid "Login correct"
 msgstr "Login correct"
 
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:125
 msgid "Wrong login/password"
 msgstr "Wrong login/password"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:126
 msgid "you must enter a password"
 msgstr "you must enter a password"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:128
 msgid "You must accept terms of use"
 msgstr "You must accept terms of use"
 
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:129
 msgid "you must enter an email"
 msgstr "you must enter an email"
 
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:130
 msgid "invalid email"
 msgstr "invalid email"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:132
 msgid "Account created"
 msgstr "Account created"
 
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:134
 msgid "Now, you can retry to save"
 msgstr "Now, you can retry to save"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:135
 msgid "route by"
 msgstr "route by"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:137
 msgid "checking availibilty"
 msgstr "checking availibilty"
 
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:138
 msgid "available pseudo"
 msgstr "available pseudo"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:139
 msgid "unavailable pseudo"
 msgstr "unavailable pseudo"
 
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:141
 msgid "create"
 msgstr "create"
 
-#: application/controllers/IdxController.php:149
+#: application/controllers/IdxController.php:143
 msgid "You have an unsaved route"
 msgstr "You have an unsaved route"
 
-#: application/controllers/IdxController.php:151
+#: application/controllers/IdxController.php:145
 msgid "no result"
 msgstr "no result"
 
-#: application/controllers/IdxController.php:152
+#: application/controllers/IdxController.php:146
 msgid "could not analyze file content"
 msgstr "could not analyze file content"
 
diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po
index 6791b0b..30c4552 100644
--- a/application/languages/lang_fr.po
+++ b/application/languages/lang_fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-25 15:09+0200\n"
+"POT-Creation-Date: 2010-09-09 13:05+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -55,7 +55,7 @@ msgid "Welcome on Syj."
 msgstr "Bienvenue sur Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just click on the map to add points to your route. You can zoom and move map with controls upper left."
+msgid "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
 msgstr "Pour créer un trajet, cliquez simplement sur la carte pour ajouter des points à votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche."
 
 #: application/views/scripts/idx/index.phtml:19
@@ -106,12 +106,12 @@ msgid "gpx export"
 msgstr "export gpx"
 
 #: application/views/scripts/idx/index.phtml:101
-#: application/controllers/IdxController.php:148
+#: application/controllers/IdxController.php:142
 msgid "duplicate"
 msgstr "dupliquer"
 
 #: application/views/scripts/idx/index.phtml:103
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:140
 msgid "edit"
 msgstr "modifier"
 
@@ -156,7 +156,7 @@ msgid "Sources of the software running the website are <a href=\"http://dev.rene
 msgstr "Les sources du logiciel qui fait tourner le site web sont <a href=\"http://dev.renevier.net/?p=syj.git\">disponibles publiquement</a> sous une licence agpl. La carte utilisée pour l'affichage des itinéraires vient d'<a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:133
 msgid "A link to reset your password has been emailed to you"
 msgstr "Un email contenant un lien pour réinitialiser votre mot de passe vous a été envoyé"
 
@@ -438,51 +438,51 @@ msgstr ""
 "\n"
 "L'équipe de Syj"
 
-#: application/controllers/LoginController.php:100
-#: application/controllers/IdxController.php:129
+#: application/controllers/LoginController.php:99
+#: application/controllers/IdxController.php:123
 msgid "you must enter a login name"
 msgstr "vous devez entrer un nom d'utilisateur"
 
-#: application/controllers/PendingController.php:32
+#: application/controllers/PendingController.php:33
 msgid "account validated"
 msgstr "compte validé"
 
-#: application/controllers/PendingController.php:39
+#: application/controllers/PendingController.php:40
 msgid "account deleted"
 msgstr "Compte supprimé"
 
-#: application/controllers/PendingController.php:43
+#: application/controllers/PendingController.php:44
 msgid "account creation validation"
 msgstr "validation de la création du compte"
 
-#: application/controllers/PendingController.php:53
+#: application/controllers/PendingController.php:54
 msgid "password changed"
 msgstr "mot de passe modifié"
 
-#: application/controllers/PendingController.php:61
+#: application/controllers/PendingController.php:62
 msgid "request canceled"
 msgstr "requête annulée"
 
-#: application/controllers/PendingController.php:65
+#: application/controllers/PendingController.php:66
 msgid "password reset validation"
 msgstr "validation de la réinitialisation du mot de passe"
 
-#: application/controllers/ContactController.php:14
+#: application/controllers/ContactController.php:13
 msgid "contact form"
 msgstr "formulaire de contact"
 
-#: application/controllers/ContactController.php:113
+#: application/controllers/ContactController.php:112
 msgid "Hi,"
 msgstr "Bonjour,"
 
-#: application/controllers/ContactController.php:122
-#: application/controllers/NewpwdController.php:69
-#: application/controllers/AccountController.php:71
-#: application/controllers/IdxController.php:150
+#: application/controllers/ContactController.php:121
+#: application/controllers/NewpwdController.php:68
+#: application/controllers/AccountController.php:70
+#: application/controllers/IdxController.php:144
 msgid "Value is required"
 msgstr "Le champ est requis"
 
-#: application/controllers/ContactController.php:123
+#: application/controllers/ContactController.php:122
 #: application/forms/Contact.php:32
 #: application/validate/EmailAddress.php:13
 msgid "Invalid email"
@@ -499,163 +499,163 @@ msgstr "Oups, il y a eu un souci"
 msgid "terms of use"
 msgstr "conditions d'utilisation"
 
-#: application/controllers/ListController.php:18
+#: application/controllers/ListController.php:15
 #: application/layouts/scripts/footer.phtml:53
 msgid "my routes"
 msgstr "mes itinéraires"
 
-#: application/controllers/ListController.php:35
+#: application/controllers/ListController.php:32
 msgid "There is no undo. Delete this route definitively ?"
 msgstr "Vous ne pourrez pas annuler. Supprimer l'itinéraire définitivement ?"
 
-#: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:126
+#: application/controllers/ListController.php:33
+#: application/controllers/IdxController.php:120
 msgid "server could not be reached"
 msgstr "serveur inaccessible"
 
-#: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:123
+#: application/controllers/ListController.php:34
+#: application/controllers/IdxController.php:117
 msgid "server did not understood request. That's probably caused by a bug in SYJ"
 msgstr "Le serveur n'a pas compris la requête. Il s'agit probablement d'un bug dans SYJ"
 
-#: application/controllers/ListController.php:38
-#: application/controllers/IdxController.php:124
+#: application/controllers/ListController.php:35
+#: application/controllers/IdxController.php:118
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "chemin non référencé sur le serveur. Il a probablement été supprimé."
 
-#: application/controllers/ListController.php:39
-#: application/controllers/IdxController.php:127
+#: application/controllers/ListController.php:36
+#: application/controllers/IdxController.php:121
 msgid "there was a server error"
 msgstr "Il s'est produit une erreur serveur"
 
-#: application/controllers/ListController.php:40
-#: application/controllers/IdxController.php:128
+#: application/controllers/ListController.php:37
+#: application/controllers/IdxController.php:122
 msgid "there was an unknown error"
 msgstr "Il s'est produit une erreur inconnue"
 
-#: application/controllers/ListController.php:41
+#: application/controllers/ListController.php:38
 msgid "route was successfully deleted"
 msgstr "l'itinéraire a été correctement supprimé"
 
-#: application/controllers/AccountController.php:16
+#: application/controllers/AccountController.php:15
 #: application/layouts/scripts/footer.phtml:39
 msgid "my account"
 msgstr "mon compte"
 
-#: application/controllers/AccountController.php:31
+#: application/controllers/AccountController.php:30
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: application/controllers/AccountController.php:44
-#: application/controllers/IdxController.php:137
+#: application/controllers/AccountController.php:43
+#: application/controllers/IdxController.php:131
 msgid "an user is already registered with this email"
 msgstr "il y'a déjà un utilisateur enregistré avec cet email"
 
-#: application/controllers/AccountController.php:72
-#: application/controllers/IdxController.php:133
+#: application/controllers/AccountController.php:71
+#: application/controllers/IdxController.php:127
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: application/controllers/AccountController.php:73
+#: application/controllers/AccountController.php:72
 #: application/forms/Account.php:33
 #: application/forms/User.php:20
 #, php-format
 msgid "At least %d characters"
 msgstr "Au moins %d caractères"
 
-#: application/controllers/AccountController.php:74
+#: application/controllers/AccountController.php:73
 msgid "You have made no change"
 msgstr "Vous n'avez fait aucun changement"
 
-#: application/controllers/IdxController.php:32
-#: application/controllers/IdxController.php:84
+#: application/controllers/IdxController.php:26
+#: application/controllers/IdxController.php:78
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "tracé par <strong>%s</strong>"
 
-#: application/controllers/IdxController.php:54
+#: application/controllers/IdxController.php:48
 msgid "route has been deleted"
 msgstr "l'itinéraire a été supprimé"
 
-#: application/controllers/IdxController.php:57
+#: application/controllers/IdxController.php:51
 msgid "route does not exist"
 msgstr "L'itinéraire n'existe pas"
 
-#: application/controllers/IdxController.php:116
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:110
+#: application/controllers/IdxController.php:136
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Carte par <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:116
 msgid "save took place successfully"
 msgstr "La sauvegarde s'est déroulée correctement"
 
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:119
 msgid "similar path seems to already exist. Please do not create two exactly identical paths"
 msgstr "Il semble qu'il y ait déjà un chemin similaire. Veuillez ne pas créer deux chemins exactement identiques"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:124
 msgid "Login correct"
 msgstr "Vous êtes connecté"
 
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:125
 msgid "Wrong login/password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:126
 msgid "you must enter a password"
 msgstr "vous devez entrer un mot de passe"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:128
 msgid "You must accept terms of use"
 msgstr "Vous devez accepter les conditions d'utilisation"
 
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:129
 msgid "you must enter an email"
 msgstr "vous devez entrer un email"
 
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:130
 msgid "invalid email"
 msgstr "email invalide"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:132
 msgid "Account created"
 msgstr "Compte créé"
 
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:134
 msgid "Now, you can retry to save"
 msgstr "Maintenant, vous pouvez réessayer de sauvegarder"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:135
 msgid "route by"
 msgstr "tracé par"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:137
 msgid "checking availibilty"
 msgstr "vérification de la disponibilité"
 
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:138
 msgid "available pseudo"
 msgstr "pseudo disponible"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:139
 msgid "unavailable pseudo"
 msgstr "pseudo non disponible"
 
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:141
 msgid "create"
 msgstr "créér"
 
-#: application/controllers/IdxController.php:149
+#: application/controllers/IdxController.php:143
 msgid "You have an unsaved route"
 msgstr "Vous avez un itinéraire non sauvegardé"
 
-#: application/controllers/IdxController.php:151
+#: application/controllers/IdxController.php:145
 msgid "no result"
 msgstr "pas de résultat"
 
-#: application/controllers/IdxController.php:152
+#: application/controllers/IdxController.php:146
 msgid "could not analyze file content"
 msgstr "impossible d'analyser le contenu du fichier"
 
diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index 95535d3..a6d2760 100644
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -14,7 +14,7 @@
 <?php if (!$this->path and !$this->loggedUser) {?>
 <?php echo $this->translate('Welcome on Syj.')?>
 <br/>
-<?php echo $this->translate('To create a journey, just click on the map to add points to your route. You can zoom and move map with controls upper left.')?>
+<?php echo $this->translate('To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner')?>
 <br/>
 <?php echo $this->translate('When you have finished a path, press "save", button.')?>
 <?php }?>
-- 
2.39.2


From d46d626700669a4c9a1e9ffc407fa89e6d6c7e21 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Wed, 15 Sep 2010 16:49:12 +0200
Subject: [PATCH 02/16] lighttpd.conf

---
 .gitignore            |  1 +
 scripts/lighttpd.conf | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 scripts/lighttpd.conf

diff --git a/.gitignore b/.gitignore
index 18a3bfb..a4b58c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ application/languages/*.po~
 scripts/jslint.js
 generated/mails.txt
 build/
+scripts/lighttpd.conf
diff --git a/scripts/lighttpd.conf b/scripts/lighttpd.conf
new file mode 100644
index 0000000..d4c0368
--- /dev/null
+++ b/scripts/lighttpd.conf
@@ -0,0 +1,39 @@
+server.document-root = "/data/project/syj/public"
+server.port               = 10000
+
+server.modules = (
+            "mod_rewrite",
+            "mod_compress",
+            "mod_fastcgi",
+        "mod_accesslog",
+)
+
+fastcgi.server += ( ".php" =>
+    ((
+        "bin-path" => "/usr/bin/php5-cgi",
+        "socket" => "/tmp/php.socket",
+        "max-procs" => 1,
+        "idle-timeout" => 20,
+        "bin-environment" => (
+            "PHP_FCGI_CHILDREN" => "4",
+            "PHP_FCGI_MAX_REQUESTS" => "10000"
+        ),
+        "bin-copy-environment" => (
+            "PATH", "SHELL", "USER"
+        ),
+        "broken-scriptfilename" => "enable"
+    ))
+)
+url.rewrite-if-not-file = ("/[^\?]*(\?.*)?$" => "/index.php$1" )
+
+index-file.names           = ( "index.php" )
+
+server.pid-file            = "/data/work/syj/lighttpd/lighttpd.pid"
+server.errorlog            = "/data/work/syj/lighttpd/lighttpd-error.log"
+accesslog.filename     = "/data/work/syj/lighttpd/lighttpd-access.log"
+accesslog.format = "%{X-Forwarded-For}i %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
+
+include_shell "/usr/share/lighttpd/create-mime.assign.pl"
+
+compress.cache-dir = "/data/work/syj/lighttpd/lighttpd-cache"
+compress.filetype           = ( "application/javascript", "text/css")
-- 
2.39.2


From 03f49f88786c9eefcb850927958646266f11a86d Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Wed, 15 Sep 2010 16:19:09 +0200
Subject: [PATCH 03/16] vacuum tables manually

---
 scripts/crontab.syj       | 4 ++++
 scripts/updategeoip.sh    | 1 +
 scripts/updategeonames.sh | 1 +
 3 files changed, 6 insertions(+)

diff --git a/scripts/crontab.syj b/scripts/crontab.syj
index 78d48be..4dfe865 100644
--- a/scripts/crontab.syj
+++ b/scripts/crontab.syj
@@ -5,3 +5,7 @@ MAILTO=arno@renevier.net
 12 3 3 * * /data/project/syj/scripts/updategeoip.sh
 # every day, delete old sessions files
 47 4 * * * find /tmp/ -name "sess_*" -user syj  -ctime +45 -exec rm -f '{}' \;
+# every day, vacuum tables
+48 4 * * * psql syj syj -c "VACUUM ANALYZE users"
+48 4 * * * psql syj syj -c "VACUUM ANALYZE paths"
+48 4 * * * psql syj syj -c "VACUUM ANALYZE pending_actions"
diff --git a/scripts/updategeoip.sh b/scripts/updategeoip.sh
index eb9327e..1626bb3 100755
--- a/scripts/updategeoip.sh
+++ b/scripts/updategeoip.sh
@@ -81,3 +81,4 @@ unzip ${GEOIPDB##*/} $GEOIPCVS
 
 # insert all values from csv to database
 sed -e 's/"\([^"]\+\)","\([^"]\+\)","\([^"]\+\)","\([^"]\+\)","\([^"]\+\)","\([^"]\+\)"/INSERT INTO geoip (begin_ip, end_ip, country) VALUES ('\''\3'\'','\''\4'\'','\''\5'\'');/' $GEOIPCVS | psql --set "ON_ERROR_STOP=1" -f -
+psql --set "ON_ERROR_STOP=1" -c "VACUUM ANALYZE geoip;"
diff --git a/scripts/updategeonames.sh b/scripts/updategeonames.sh
index ff5c8cd..04712fe 100755
--- a/scripts/updategeonames.sh
+++ b/scripts/updategeonames.sh
@@ -72,4 +72,5 @@ for line in $(cat ${GEONAMESXML##*/}); do
 done
 echo "INSERT INTO geonames (country, minlon, minlat, maxlon, maxlat) VALUES ('EU', -26, 34, 40, 68);" >> $TMPFILE
 echo "INSERT INTO geonames (country, minlon, minlat, maxlon, maxlat) VALUES ('AP', 90, -20, -140, 68);" >> $TMPFILE
+echo "VACUUM ANALYZE geonames;" >> $TMPFILE
 psql --set "ON_ERROR_STOP=1" -f $TMPFILE
-- 
2.39.2


From 96d851254c810af41225f775caf7c6b98fce7de9 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Sun, 19 Sep 2010 10:36:19 +0200
Subject: [PATCH 04/16] do not mail vacuum output from crontab

---
 scripts/crontab.syj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/crontab.syj b/scripts/crontab.syj
index 4dfe865..0360fd4 100644
--- a/scripts/crontab.syj
+++ b/scripts/crontab.syj
@@ -6,6 +6,6 @@ MAILTO=arno@renevier.net
 # every day, delete old sessions files
 47 4 * * * find /tmp/ -name "sess_*" -user syj  -ctime +45 -exec rm -f '{}' \;
 # every day, vacuum tables
-48 4 * * * psql syj syj -c "VACUUM ANALYZE users"
-48 4 * * * psql syj syj -c "VACUUM ANALYZE paths"
-48 4 * * * psql syj syj -c "VACUUM ANALYZE pending_actions"
+48 4 * * * psql syj syj -c "VACUUM ANALYZE users" > /dev/null
+48 4 * * * psql syj syj -c "VACUUM ANALYZE paths" > /dev/null
+48 4 * * * psql syj syj -c "VACUUM ANALYZE pending_actions" > /dev/null
-- 
2.39.2


From dda857e1579fd92e7f6236c999f1d43a5d0e8a74 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Sun, 19 Sep 2010 20:54:58 +0200
Subject: [PATCH 05/16] fixes welcome popup wording

---
 application/languages/lang_en.po          | 7 ++++---
 application/languages/lang_fr.po          | 6 +++---
 application/views/scripts/idx/index.phtml | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index f7a5559..e12aa17 100644
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 13:05+0200\n"
+"POT-Creation-Date: 2010-09-19 20:54+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -55,8 +55,9 @@ msgid "Welcome on Syj."
 msgstr "Welcome on Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
-msgstr "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+#, fuzzy
+msgid "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+msgstr "To create a journey, just press \"start a route\" button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"save\", button."
diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po
index 30c4552..12bbc60 100644
--- a/application/languages/lang_fr.po
+++ b/application/languages/lang_fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-09 13:05+0200\n"
+"POT-Creation-Date: 2010-09-19 20:54+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -55,8 +55,8 @@ msgid "Welcome on Syj."
 msgstr "Bienvenue sur Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
-msgstr "Pour créer un trajet, cliquez simplement sur la carte pour ajouter des points à votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche."
+msgid "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+msgstr "Pour créer un trajet, pressez simplement le bouton <strong>\"commencer un itinéraire\"</strong> puis cliquez sur la carte pour ajouter des points à votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche."
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"save\", button."
diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index a6d2760..c4222f4 100644
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -14,7 +14,7 @@
 <?php if (!$this->path and !$this->loggedUser) {?>
 <?php echo $this->translate('Welcome on Syj.')?>
 <br/>
-<?php echo $this->translate('To create a journey, just click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner')?>
+<?php echo $this->translate('To create a journey, just press <strong>"start a route"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner')?>
 <br/>
 <?php echo $this->translate('When you have finished a path, press "save", button.')?>
 <?php }?>
-- 
2.39.2


From fb6f0c87d1bc16db8a2a444e421be44b2e813c18 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 20 Sep 2010 11:28:52 +0200
Subject: [PATCH 06/16] fixes welcome popup wording (bis)

---
 application/languages/lang_en.po          | 9 ++++-----
 application/languages/lang_fr.po          | 6 +++---
 application/views/scripts/idx/index.phtml | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index e12aa17..ddd2a01 100644
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-19 20:54+0200\n"
+"POT-Creation-Date: 2010-09-20 11:26+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -55,13 +55,12 @@ msgid "Welcome on Syj."
 msgstr "Welcome on Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-#, fuzzy
 msgid "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
-msgstr "To create a journey, just press \"start a route\" button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+msgstr "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
 
 #: application/views/scripts/idx/index.phtml:19
-msgid "When you have finished a path, press \"save\", button."
-msgstr "When you have finished a path, press \"save\", button."
+msgid "When you have finished a path, press \"create\", button."
+msgstr "When you have finished a path, press \"create\", button."
 
 #: application/views/scripts/idx/index.phtml:25
 msgid "route length"
diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po
index 12bbc60..0e5c9f0 100644
--- a/application/languages/lang_fr.po
+++ b/application/languages/lang_fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-19 20:54+0200\n"
+"POT-Creation-Date: 2010-09-20 11:26+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -59,8 +59,8 @@ msgid "To create a journey, just press <strong>\"start a route\"</strong> button
 msgstr "Pour créer un trajet, pressez simplement le bouton <strong>\"commencer un itinéraire\"</strong> puis cliquez sur la carte pour ajouter des points à votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche."
 
 #: application/views/scripts/idx/index.phtml:19
-msgid "When you have finished a path, press \"save\", button."
-msgstr "Lorsque vous avez fini votre tracé, pressez le bouton \"enregistrer\"."
+msgid "When you have finished a path, press \"create\", button."
+msgstr "Lorsque vous avez fini votre tracé, pressez le bouton \"créer\"."
 
 #: application/views/scripts/idx/index.phtml:25
 msgid "route length"
diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index c4222f4..a98f1d2 100644
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -16,7 +16,7 @@
 <br/>
 <?php echo $this->translate('To create a journey, just press <strong>"start a route"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner')?>
 <br/>
-<?php echo $this->translate('When you have finished a path, press "save", button.')?>
+<?php echo $this->translate('When you have finished a path, press "create", button.')?>
 <?php }?>
 </div>
 
-- 
2.39.2


From f5af9a431b30d4832a5eacb5bfff41ffcf9dfaee Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 20 Sep 2010 22:14:07 +0200
Subject: [PATCH 07/16] fixes strange phrase in english faq

---
 application/languages/lang_en.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index ddd2a01..b0d8e35 100644
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -248,7 +248,7 @@ msgstr "What's syj?"
 
 #: application/views/scripts/faq/index.phtml:7
 msgid "<acronym title=\"Show your journey\">Syj</acronym> is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
-msgstr "<acronym title=\"Show your journey\">Syj</acronym> est un site de partage d'itiis a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
+msgstr "<acronym title=\"Show your journey\">Syj</acronym> is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
 
 #: application/views/scripts/faq/index.phtml:9
 msgid "How do I modify a route?"
-- 
2.39.2


From 868eea06f69fbfdb361d5c9142ecce98918d927b Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Wed, 22 Sep 2010 15:07:15 +0200
Subject: [PATCH 08/16] fixes: ui is not correctly refreshed after account
 creation

---
 application/controllers/UserController.php |  4 +++-
 public/js/syj.js                           | 28 ++++++++++++++--------
 public/js/utils.js                         |  4 ++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index f802b16..1d4ed18 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -62,6 +62,8 @@ class UserController extends Zend_Controller_Action
         }
 
         $this->_helper->SyjSession->login($user->id);
-        $this->_helper->SyjApi->setCode(200);
+
+        $data = array('pseudo' => $user->pseudo);
+        $this->_helper->SyjApi->setBodyJson($data)->setCode(200);
     }
 }
diff --git a/public/js/syj.js b/public/js/syj.js
index 50184b2..3606cd0 100644
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -789,7 +789,14 @@ var SYJUserClass = Class.create(SYJModalClass, {
     },
 
     success: function(transport) {
-        LoginMgr.login();
+        if (!transport.responseJSON ||
+            typeof transport.responseJSON.pseudo !== "string"
+            ) {
+            this.messenger.setMessage(SyjStrings.unknownError, "error");
+            return;
+        }
+
+        LoginMgr.login(transport.responseJSON.pseudo);
         SYJView.messenger.setMessage(SyjStrings.userSuccess, "success");
         this.modalbox.hide();
         if (SYJView.needsFormResubmit) {
@@ -867,14 +874,8 @@ var SYJLoginClass = Class.create(SYJModalClass, {
             this.messenger.setMessage(SyjStrings.unknownError, "error");
             return;
         }
-        LoginMgr.login(transport.responseJSON.iscreator);
-        $$('.logged-pseudo').each(function(elt) {
-            $A(elt.childNodes).filter(function(node) {
-                return (node.nodeType === 3 || node.tagName.toLowerCase() === 'br');
-            }).each(function(node) {
-                node.nodeValue = node.nodeValue.replace('%s', transport.responseJSON.pseudo);
-            });
-        });
+        LoginMgr.login(transport.responseJSON.pseudo, transport.responseJSON.iscreator);
+
         SYJView.messenger.setMessage(SyjStrings.loginSuccess, "success");
         this.modalbox.hide();
         if (SYJView.needsFormResubmit) {
@@ -957,11 +958,18 @@ var LoginMgr = Object.extend(gLoggedInfo, {
         }
     },
 
-    login: function(aIsCreator) {
+    login: function(aPseudo, aIsCreator) {
         if (typeof aIsCreator === "boolean") {
             this.iscreator = aIsCreator;
         }
         this.logged = true;
+        $$('.logged-pseudo').each(function(elt) {
+            $A(elt.childNodes).filter(function(node) {
+                return (node.nodeType === 3 || node.tagName.toLowerCase() === 'br');
+            }).each(function(node) {
+                node.nodeValue = node.nodeValue.replace('%s', aPseudo);
+            });
+        });
         this.updateUI();
     }
 });
diff --git a/public/js/utils.js b/public/js/utils.js
index aba7b1d..b16a9c2 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -395,7 +395,7 @@ Element.addMethods('div', {
 
         while (node) {
             nextNode = node.nextSibling;
-            if (node.nodeType === 3 || node.tagName.toLowerCase() === 'br') {
+            if (node.nodeType === 3 || node.tagName.toLowerCase() === 'br' || node.textContent || node.innerText) {
                 div.removeChild(node);
             }
                 node = nextNode;
@@ -408,7 +408,7 @@ Element.addMethods('div', {
         var node = (div.ownerDocument || document).createTextNode(message);
 
         if ($A(div.childNodes).filter(function(node) {
-                return (node.nodeType === 3 || node.tagName.toLowerCase() === 'br');
+                return (node.nodeType === 3 || node.tagName.toLowerCase() === 'br' || node.textContent || node.innerText);
              }).length) {
             div.insert(new Element('br'));
         }
-- 
2.39.2


From 9a5d310cab86e08ac5091a98ba045d1df7a4f7ce Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Sun, 26 Sep 2010 19:05:02 +0200
Subject: [PATCH 09/16] define font

---
 public/css/generic.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/generic.css b/public/css/generic.css
index 40d156f..0c00184 100644
--- a/public/css/generic.css
+++ b/public/css/generic.css
@@ -4,6 +4,7 @@
 body, html {
     background-color: white;
     color: black;
+    font-family: Arial, Verdana, sans-serif;
 }
 
 /*
@@ -120,4 +121,7 @@ input {
     #footer, #other-language {
         display: none;
     }
+    html, body {
+        font-family: serif;
+    }
 }
-- 
2.39.2


From e1cf73aef18917982f7d748487871b4b266d94df Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 09:50:18 +0200
Subject: [PATCH 10/16] add japanese locale

---
 application/languages/lang_ja.po | 877 +++++++++++++++++++++++++++++++
 scripts/updatepo.sh              |   2 +-
 2 files changed, 878 insertions(+), 1 deletion(-)
 create mode 100644 application/languages/lang_ja.po

diff --git a/application/languages/lang_ja.po b/application/languages/lang_ja.po
new file mode 100644
index 0000000..6a6fc7b
--- /dev/null
+++ b/application/languages/lang_ja.po
@@ -0,0 +1,877 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: syj\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-20 11:26+0200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: S.Higashi <s_higash@mua.biglobe.ne.jp>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: application/views/scripts/error/error.phtml:5
+msgid "An error occurred"
+msgstr "エラーが発生しました"
+
+#: application/views/scripts/error/error.phtml:35
+msgid "Please try again later"
+msgstr "しばらくしてからやり直してください"
+
+#: application/views/scripts/error/error.phtml:37
+#: application/views/scripts/pending/password_cancel.phtml:15
+#: application/views/scripts/pending/creation_validate.phtml:15
+#: application/views/scripts/pending/creation_cancel.phtml:15
+#: application/views/helpers/Returnto.php:23
+#: application/views/helpers/Returnto.php:31
+msgid "go to main page"
+msgstr "メインページへ"
+
+#: application/views/scripts/contact/index.phtml:8
+#, php-format
+msgid ""
+"There was an unkwown message when sending the message. Please try again "
+"later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
+msgstr "メッセージ送信時に不明なメッセージがありました。しばらくしてからやり直してください"
+"もしくは<a href=\"mailto:%s\">%s</a>に直接メールしてください"
+
+#: application/views/scripts/contact/success.phtml:4
+msgid "Email was send successfully"
+msgstr "メール送信に成功しました"
+
+#: application/views/scripts/idx/index.phtml:8
+#: application/views/scripts/idx/raw.phtml:8
+#: application/views/scripts/list/index.phtml:8
+msgid "SYJ needs javascript. Please activate scripts in your browser."
+msgstr "SYJはjavascriptを使用します。あなたのブラウザでjavascriptを使えるように設定してください"
+
+#: application/views/scripts/idx/index.phtml:15
+msgid "Welcome on Syj."
+msgstr "Syjへようこそ。"
+
+#: application/views/scripts/idx/index.phtml:17
+msgid ""
+"To create a journey, just press <strong>\"start a route\"</strong> button, "
+"then click on the map to add points to your route. You can zoom and move the "
+"map with the controls in the top left corner"
+msgstr "旅の記録を作成するには、まず<strong>\"ルート開始\"</strong> ボタンを押してください。"
+"そしてマップをクリックしながらルートに沿ってポイントを追加してください。"
+"画面左上のコントロールでマップのズームや移動ができます"
+
+
+#: application/views/scripts/idx/index.phtml:19
+msgid "When you have finished a path, press \"create\", button."
+msgstr "パスを描き終わったら、\"作成\"ボタンを押してください"
+
+#: application/views/scripts/idx/index.phtml:25
+msgid "route length"
+msgstr "ルート長"
+
+#: application/views/scripts/idx/index.phtml:38
+#: application/controllers/LoginController.php:8
+#: application/layouts/scripts/footer.phtml:74 application/forms/Login.php:26
+msgid "login"
+msgstr "ログイン"
+
+#: application/views/scripts/idx/index.phtml:40
+#: application/views/scripts/idx/index.phtml:158
+msgid "create an account"
+msgstr "アカウントを作成"
+
+#: application/views/scripts/idx/index.phtml:41
+msgid "Whith an account, you can manage and modify your routes"
+msgstr "アカウントがあれば、自分のルートを管理、変更できます"
+
+#: application/views/scripts/idx/index.phtml:58
+msgid "route infos"
+msgstr "ルート情報"
+
+#: application/views/scripts/idx/index.phtml:62
+#: application/views/scripts/idx/index.phtml:71
+msgid "direct link"
+msgstr "ダイレクトリンク"
+
+#: application/views/scripts/idx/index.phtml:75
+msgid "export"
+msgstr "エクスポート"
+
+#: application/views/scripts/idx/index.phtml:80
+#: application/views/scripts/idx/index.phtml:81
+msgid "kml export"
+msgstr "kmlにエクスポート"
+
+#: application/views/scripts/idx/index.phtml:87
+#: application/views/scripts/idx/index.phtml:88
+msgid "gpx export"
+msgstr "gpxにエクスポート"
+
+#: application/views/scripts/idx/index.phtml:101
+#: application/controllers/IdxController.php:142
+msgid "duplicate"
+msgstr "複製"
+
+#: application/views/scripts/idx/index.phtml:103
+#: application/controllers/IdxController.php:140
+msgid "edit"
+msgstr "編集"
+
+#: application/views/scripts/idx/index.phtml:107
+msgid "Search a place"
+msgstr "場所をさがす"
+
+#: application/views/scripts/idx/index.phtml:111
+msgid "Ok"
+msgstr "OK"
+
+#: application/views/scripts/idx/index.phtml:117
+msgid "start a route"
+msgstr "ルート開始"
+
+#: application/views/scripts/idx/index.phtml:129
+msgid "more results"
+msgstr "もっと"
+
+#: application/views/scripts/termsofuse/index.phtml:5
+msgid ""
+"Show Your Journey is a site whose goal is to allow anyone to publish routes, "
+"for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
+msgstr "Show Your Journey のゴールは誰もがルートを公開できるようにすることです。"
+"例えば、ハイキング経路、自転車トリップ、旅行行程その他あらゆるものです。"
+
+#: application/views/scripts/termsofuse/index.phtml:9
+msgid ""
+"In order to publish a route, you must first create an account. A valid email "
+"is asked for, and ip address of account creation is stored on the server. "
+"Those informations will not be divulged to anyone without the user explicit "
+"permission."
+msgstr "ルートを公開するためには、最初にアカウントを作成してください。"
+"実在するメールアドレスが必要で、アカウントを作成時のIPアドレスはサーバの保存されます。"
+"これらの情報はユーザの明示的な許可が無い限り、誰にも漏らすことはありません。"
+
+
+#: application/views/scripts/termsofuse/index.phtml:13
+msgid ""
+"When you create a route, you accept that it's free for any use. This means "
+"you accept that anyone can reuse, reproduce, or republish your itinerary, or "
+"a modified version of it for any purpose. This also means you need to get "
+"appropriate permissions from the creator if you want to upload a route you "
+"didn't create yourself."
+msgstr "ルートを作成する場合は、いかなる用途でも自由に使えることに同意することになります。"
+"これはあなたの旅程やそれに手を加えたものを誰もがどのような目的にも再利用、再作成、再公開できるということを意味します。"
+"同時に、もしあなたが自分で作成したものでないルートをアップロードする場合には"
+"その作者から適切な許可をもらう必要がある、ということをも意味しています。"
+
+#: application/views/scripts/termsofuse/index.phtml:17
+msgid ""
+"Show Your Journey is not responsible for the accuracy of the routes "
+"published. It's the user responsibility to check that a route is accessible "
+"and safe."
+msgstr "Show Your Journeyは公開されたルートの正確さに責を負うものではありません。"
+"ルートが通行可能で安全であるということをチェックするのはユーザの責任です。"
+
+#: application/views/scripts/termsofuse/index.phtml:21
+msgid ""
+"Show Your Journey service is provided \"as is\" with no guarantee for "
+"accuracy or accessibility."
+msgstr "Show Your Journeyサービスは\"あるがまま\"に提供され、正確さやアクセシビリティを保証するものではありません。"
+
+#: application/views/scripts/termsofuse/index.phtml:25
+msgid ""
+"Sources of the software running the website are <a href=\"http://dev."
+"renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The "
+"map used to display the routes comes from <a href=\"http://www.openstreetmap."
+"org/\">openstreetmap</a>."
+msgstr "ウェブサイトで動作しているソフトウェアのソースコードはagplライセンスの下で"
+"<a href=\"http://dev.renevier.net/?p=syj.git\">誰でも利用可能</a>です。"
+"ルート表示に使用されているマップは<a href=\"http://www.openstreetmap.org/\">openstreetmap</a>です。"
+
+#: application/views/scripts/newpwd/success.phtml:4
+#: application/controllers/IdxController.php:133
+msgid "A link to reset your password has been emailed to you"
+msgstr "パスワードをリセットするためのURLがあなた宛に送られました"
+
+#: application/views/scripts/pending/password_cancel.phtml:12
+msgid "You have canceled the request."
+msgstr "リクエストをキャンセルしました。"
+
+#: application/views/scripts/pending/password_cancel.phtml:14
+#: application/views/scripts/pending/creation_validate.phtml:14
+#: application/views/scripts/pending/creation_cancel.phtml:14
+#: application/views/helpers/Returnto.php:22
+#: application/views/helpers/Returnto.php:25
+#: application/views/helpers/Returnto.php:28
+msgid "You can now"
+msgstr "以下のことができます"
+
+#: application/views/scripts/pending/creation_validate.phtml:12
+msgid "You have validated your account."
+msgstr "あなたのアカウントは認証されました。"
+
+#: application/views/scripts/pending/index.phtml:16
+msgid "If you need more informations, please"
+msgstr "詳細な情報が必要なら"
+
+#: application/views/scripts/pending/index.phtml:17
+msgid "contact us"
+msgstr "管理者に連絡してください"
+
+#: application/views/scripts/pending/creation_cancel.phtml:12
+msgid "You have canceled the account."
+msgstr "アカウントはキャンセルされました。"
+
+#: application/views/scripts/pending/password_validate.phtml:17
+msgid "log in"
+msgstr "ログイン"
+
+#: application/views/scripts/pending/password_validate.phtml:15
+#, php-format
+msgid ""
+"Your new password is now <strong>%s</strong>. You can %s with this new "
+"password. Don't forget to change it again to a personal password as soon as "
+"possible."
+msgstr "あなたの新しいパスワードは <strong>%s</strong> です。この新しいパスワードで"
+"%s できます。忘れずにできるだけ早く個人的なパスワードに再度変更してください。"
+
+
+#: application/views/scripts/account/success.phtml:4
+msgid "Your account was modified successfully"
+msgstr "アカウントの変更に成功しました"
+
+#: application/views/scripts/list/index.phtml:17
+#: application/layouts/scripts/footer.phtml:17
+msgid "create a route"
+msgstr "ルート作成"
+
+#: application/views/scripts/list/index.phtml:18
+#, php-format
+msgid "you have created no route yet, you may want to %s"
+msgstr "まだルートを作成していません、%s したいですか"
+
+#: application/views/scripts/list/index.phtml:29
+msgid "first page"
+msgstr "先頭ページ"
+
+#: application/views/scripts/list/index.phtml:33
+msgid "previous page"
+msgstr "前のページ"
+
+#: application/views/scripts/list/index.phtml:42
+msgid "next page"
+msgstr "次のページ"
+
+#: application/views/scripts/list/index.phtml:46
+msgid "last page"
+msgstr "最終ページ"
+
+#: application/views/scripts/list/index.phtml:67
+msgid "modify or duplicate"
+msgstr "変更または複製"
+
+#: application/views/scripts/list/index.phtml:68
+#: application/forms/Pending/ValidateCreation.php:23
+msgid "delete"
+msgstr "削除"
+
+#: application/views/scripts/faq/index.phtml:5
+#: application/controllers/FaqController.php:10
+msgid "Frequently asked questions"
+msgstr "FAQ"
+
+#: application/views/scripts/faq/index.phtml:6
+msgid "What's syj?"
+msgstr "Syjとは？"
+
+#: application/views/scripts/faq/index.phtml:7
+msgid ""
+"<acronym title=\"Show your journey\">Syj</acronym> is a website to share "
+"routes. You draw a route on a map background, and then, you get an link to "
+"share it. You can then show clever bicycle rides, your last hiking, or any "
+"route you want."
+msgstr "<acronym title=\"Show your journey\">Syj</acronym> はルートを共有するためのウェブサイトです。"
+"マップの背景にルートを描くと、それを共有するためのリンクURLを取得できます。"
+"これにより賢い自転車ルート、最近のハイキング、その他何でも好きなルートを取得することができます。"
+
+#: application/views/scripts/faq/index.phtml:9
+msgid "How do I modify a route?"
+msgstr "ルートはどうやって変更できますか？"
+
+#: application/views/scripts/faq/index.phtml:10
+#, php-format
+msgid ""
+"When you're editing a route, you can drag and drop a point to move it. If "
+"you want to delete it, you need to press the Shift key. While you hold the "
+"button, points will have an icon%s over them. Clicking that icon will delete "
+"the point."
+msgstr "ルートを編集する際には、ドラッグ＆ドロップでポイントを移動できます。"
+"削除したい場合には、シフトキーを押す必要があります。ボタンを押している間、"
+"ポイントの上にアイコン %s が現れます。そのアイコンをクリックするとポイントは削除されます。"
+
+#: application/views/scripts/faq/index.phtml:12
+msgid "Why should I create a account?"
+msgstr "なぜアカウントを作成する必要があるのですか？"
+
+#: application/views/scripts/faq/index.phtml:13
+msgid ""
+"You can create routes without a account. But if you want to modify your "
+"routes afterwards, you need to be registered when creating the route."
+msgstr "アカウントなしでもルートを作成できます。"
+"しかし、後から自分のルートを変更したい場合には、ルート作成時にユーザ登録している必要があります。"
+
+#: application/views/scripts/faq/index.phtml:15
+msgid "Is it possible to have my route \"attach\" nearby paths?"
+msgstr "私のルートをパスの近辺に\"添付\"できますか？"
+
+#: application/views/scripts/faq/index.phtml:16
+msgid ""
+"When you create a route with syj, you must draw each point on the map. If "
+"your route follows an existing path, you still need to draw the layer "
+"manually: syj will not try to attach nearby existing paths. There are three "
+"main reasons. One bad reason: it would a lot of work to implement. And two "
+"good reasons: syj uses OpenStreetMap as a background map, and the map is "
+"still unfinished in many areas. Also, depending on your route, you may wish "
+"to attach to motorways, footways, biycle lanes, railways, &hellip;. If you "
+"are in a place with lot of differents routes, it would be nearly impossible "
+"to always choose the right way."
+msgstr "Syjでルートを作成するには、各ポイントをマップ上に描かなければなりません。"
+"あなたのルートが既存のパスをフォローしている場合でも、あなたは手動でレイヤを描く"
+"必要があります： Syjは既存のパス近辺に添付しようとはしません。主な理由は３つ。"
+"悪い理由がひとつ: 実装には多くの労力がかかります。"
+"良い理由がふたつ: SyjはOpenStreetMapを背景マップとして使っており、そしてマップは"
+"多くのエリアで未完成です。また、あなたのルートによっては、あなたは自動車専用道路、"
+"歩道、自転車専用レーン、鉄道…などを添付したいと思うでしょう。"
+"あなたが多くの異なるルートがある場所にいるなら、常に正しい道を選ぶのは不可能に近いでしょう。"
+
+#: application/views/helpers/LogoutLink.php:10
+#: application/layouts/scripts/footer.phtml:67
+msgid "logout"
+msgstr "ログアウト"
+
+# This is language name. translate english to the name of your language. For example: "deutsch" or "fran軋is"
+#: application/views/helpers/LocaleSwitcher.php:17
+msgid "english"
+msgstr "日本語"
+
+#: application/views/helpers/Returnto.php:26
+#: application/views/helpers/Returnto.php:29
+#, php-format
+msgid "go back to %s"
+msgstr "%s に戻る"
+
+#: application/views/helpers/Returnto.php:30
+msgid "or you can"
+msgstr "または"
+
+#: application/models/Path.php:61
+#, php-format
+msgid "route number %d"
+msgstr "ルート番号 %d"
+
+#: application/models/Pending/ResetPassword.php:19
+msgid "[SYJ] Reset your password"
+msgstr "[SYJ] あなたのパスワードをリセット"
+
+#: application/models/Pending/ResetPassword.php:20
+msgid ""
+"Hi %user%,\n"
+"\n"
+"Someone, probably you, has asked to reset your password. If you want to "
+"reset\n"
+"your password, please follow this link:\n"
+"%hashurl%\n"
+"\n"
+"If you do not not confirm within 2 days, your password will not be reset.\n"
+"\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
+"contact at %contacturl%\n"
+"\n"
+"Thanks,\n"
+"\n"
+"Syj team"
+msgstr "こんにちは %user% さん\n"
+"\n"
+"誰か、おそらくあなた自身、があなたのパスワードリセットを要求しました。"
+"あなたのパスワードをリセット\n"
+"する場合には、このリンクに従ってください:\n"
+"%hashurl%\n"
+"\n"
+"２日以内に確認しなければ、あなたのパスワードはリセットされません。\n"
+"\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記"
+"フォームで\n"
+"連絡を %contacturl%\n"
+"\n"
+"ありがとうごいざいます、\n"
+"\n"
+"Syj チーム"
+
+
+#: application/models/Pending/ValidateCreation.php:15
+msgid "[SYJ] Validate your account"
+msgstr "[SYJ] あなたのアカウントを認証してください"
+
+#: application/models/Pending/ValidateCreation.php:16
+msgid ""
+"Hi %user%, and welcome on syj\n"
+"\n"
+"Your account is currently active, but you need to confirm your inscription "
+"by\n"
+"following this link:\n"
+"%hashurl%\n"
+"\n"
+"If you do not not confirm your inscription within 7 days, your account will "
+"be\n"
+"deleted.\n"
+"\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
+"contact at %contacturl%\n"
+"\n"
+"Thanks,\n"
+"\n"
+"Syj team"
+msgstr "こんにちは %user%さん、そしてようこそsyjへ\n"
+"\n"
+"あなたのアカウントは現在アクティブですが、次のリンクで\n"
+"署名に確認が必要です:\n"
+"%hashurl%\n"
+"\n"
+"７日以内にあなたの署名を確認しなければ、あなたのアカウントは"
+"\n"
+"削除されます。\n"
+"\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記"
+"フォームで\n"
+"連絡を %contacturl%\n"
+"\n"
+"ありがとうごいざいます、\n"
+"\n"
+"Syj チーム"
+
+
+#: application/models/Pending/ValidateCreation.php:34
+msgid "[SYJ] Reminder: Validate your account"
+msgstr "[SYJ] リマインダー: あなたのアカウントを確認してください"
+
+#: application/models/Pending/ValidateCreation.php:35
+msgid ""
+"Hi %user%,\n"
+"\n"
+"You need to validate your account on syj since 6 days. Otherwise, your\n"
+"account will be deleted tomorrow. Please follow this link:\n"
+"%hashurl%\n"
+"\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
+"contact at %contacturl%\n"
+"\n"
+"Thanks,\n"
+"\n"
+"Syj team"
+
+msgstr "こんにちは %user%さん\n"
+"\n"
+"あなたのアカウントは認証されずに６日間経っています。何もしなければ、あなたの\n"
+"アカウントは明日削除されます。次のリンクに従ってください:\n"
+"%hashurl%\n"
+"\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記"
+"フォームで\n"
+"連絡を %contacturl%\n"
+"\n"
+"ありがとうごいざいます、\n"
+"\n"
+"Syj チーム"
+
+
+#: application/models/Pending/ValidateCreation.php:51
+msgid "[SYJ] Account deactivated"
+msgstr "[SYJ] アカウント無効化"
+
+#: application/models/Pending/ValidateCreation.php:52
+msgid ""
+"Hi %user%,\n"
+"\n"
+"You have not validated your syj account on time. Therefore, your account "
+"have\n"
+"been deleted. Nevertheless, you can still create a new account.\n"
+"\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
+"contact at %contacturl%\n"
+"\n"
+"Regards,\n"
+"\n"
+"Syj team"
+msgstr "こんにちは %user%さん\n"
+"\n"
+"あなたは期限までにSyjのアカウントを認証しませんでした。このため、あなたのアカウントは"
+"\n"
+"削除されました。しかし、また新しいアカウントを作成することはできます。\n"
+"\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記"
+"フォームで\n"
+"連絡を %contacturl%\n"
+"\n"
+"ありがとうごいざいます、\n"
+"\n"
+"Syj チーム"
+
+
+#: application/controllers/LoginController.php:99
+#: application/controllers/IdxController.php:123
+msgid "you must enter a login name"
+msgstr "ログイン名を入力してください"
+
+#: application/controllers/PendingController.php:33
+msgid "account validated"
+msgstr "認証済みアカウント"
+
+#: application/controllers/PendingController.php:40
+msgid "account deleted"
+msgstr "削除済みアカウント"
+
+#: application/controllers/PendingController.php:44
+msgid "account creation validation"
+msgstr "アカウント作成認証"
+
+#: application/controllers/PendingController.php:54
+msgid "password changed"
+msgstr "変更済みパスワード"
+
+#: application/controllers/PendingController.php:62
+msgid "request canceled"
+msgstr "キャンセル済みリクエスト"
+
+#: application/controllers/PendingController.php:66
+msgid "password reset validation"
+msgstr "パスワードリセット認証"
+
+#: application/controllers/ContactController.php:13
+msgid "contact form"
+msgstr "連絡フォーム"
+
+#: application/controllers/ContactController.php:112
+msgid "Hi,"
+msgstr "こんにちは、"
+
+#: application/controllers/ContactController.php:121
+#: application/controllers/NewpwdController.php:68
+#: application/controllers/AccountController.php:70
+#: application/controllers/IdxController.php:144
+msgid "Value is required"
+msgstr "値が必要です"
+
+#: application/controllers/ContactController.php:122
+#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13
+msgid "Invalid email"
+msgstr "不正なメールアドレス"
+
+#: application/controllers/ErrorController.php:55
+msgid "Oups, something went wrong"
+msgstr "おや、何かがおかしいですね"
+
+#: application/controllers/TermsofuseController.php:10
+#: application/layouts/scripts/footer.phtml:87 application/forms/Geom.php:25
+#: application/forms/User.php:44
+msgid "terms of use"
+msgstr "利用条件"
+
+#: application/controllers/ListController.php:15
+#: application/layouts/scripts/footer.phtml:53
+msgid "my routes"
+msgstr "自分のルート"
+
+#: application/controllers/ListController.php:32
+msgid "There is no undo. Delete this route definitively ?"
+msgstr "やり直しはできません。本当にこのルートを削除しますか？"
+
+#: application/controllers/ListController.php:33
+#: application/controllers/IdxController.php:120
+msgid "server could not be reached"
+msgstr "サーバに届かなかったようです"
+
+#: application/controllers/ListController.php:34
+#: application/controllers/IdxController.php:117
+msgid ""
+"server did not understood request. That's probably caused by a bug in SYJ"
+msgstr "サーバはリクエストを理解できませんでした。おそらくSYJのバグでしょう"
+
+#: application/controllers/ListController.php:35
+#: application/controllers/IdxController.php:118
+msgid "route not referenced on the server. It has probably been deleted."
+msgstr "ルートはサーバ上で参照できませんでした。おそらく削除されています。"
+
+#: application/controllers/ListController.php:36
+#: application/controllers/IdxController.php:121
+msgid "there was a server error"
+msgstr "サーバのエラーがありました"
+
+#: application/controllers/ListController.php:37
+#: application/controllers/IdxController.php:122
+msgid "there was an unknown error"
+msgstr "不明なエラーがありました"
+
+#: application/controllers/ListController.php:38
+msgid "route was successfully deleted"
+msgstr "ルートは削除されました"
+
+#: application/controllers/AccountController.php:15
+#: application/layouts/scripts/footer.phtml:39
+msgid "my account"
+msgstr "自分のアカウント"
+
+#: application/controllers/AccountController.php:30
+msgid "Wrong password"
+msgstr "間違ったパスワード"
+
+#: application/controllers/AccountController.php:43
+#: application/controllers/IdxController.php:131
+msgid "an user is already registered with this email"
+msgstr "このメールアドレスのユーザが既に登録されています"
+
+#: application/controllers/AccountController.php:71
+#: application/controllers/IdxController.php:127
+#: application/forms/Account.php:40
+msgid "Password do not match"
+msgstr "パスワードが一致しません"
+
+#: application/controllers/AccountController.php:72
+#: application/forms/Account.php:33 application/forms/User.php:20
+#, php-format
+msgid "At least %d characters"
+msgstr "最低 %d 文字"
+
+#: application/controllers/AccountController.php:73
+msgid "You have made no change"
+msgstr "変更していません"
+
+#: application/controllers/IdxController.php:26
+#: application/controllers/IdxController.php:78
+#, php-format
+msgid "route by <strong>%s</strong>"
+msgstr "<strong>%s</strong>のルート"
+
+#: application/controllers/IdxController.php:48
+msgid "route has been deleted"
+msgstr "ルートは削除されました"
+
+#: application/controllers/IdxController.php:51
+msgid "route does not exist"
+msgstr "ルートはありません"
+
+#: application/controllers/IdxController.php:110
+#: application/controllers/IdxController.php:136
+msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
+msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
+
+#: application/controllers/IdxController.php:116
+msgid "save took place successfully"
+msgstr "保存されました"
+
+#: application/controllers/IdxController.php:119
+msgid ""
+"similar path seems to already exist. Please do not create two exactly "
+"identical paths"
+msgstr "類似のパスが既に存在します。全く同じパスをふたつ作成しないでください"
+
+#: application/controllers/IdxController.php:124
+msgid "Login correct"
+msgstr "正常ログイン"
+
+#: application/controllers/IdxController.php:125
+msgid "Wrong login/password"
+msgstr "誤ったログイン/パスワード"
+
+#: application/controllers/IdxController.php:126
+msgid "you must enter a password"
+msgstr "パスワードを入力してください"
+
+#: application/controllers/IdxController.php:128
+msgid "You must accept terms of use"
+msgstr "利用条件を承諾してください"
+
+#: application/controllers/IdxController.php:129
+msgid "you must enter an email"
+msgstr "メールアドレスを入力してください"
+
+#: application/controllers/IdxController.php:130
+msgid "invalid email"
+msgstr "不正なメールアドレス"
+
+#: application/controllers/IdxController.php:132
+msgid "Account created"
+msgstr "アカウントを作成しました"
+
+#: application/controllers/IdxController.php:134
+msgid "Now, you can retry to save"
+msgstr "今は、保存をやり直すことができます"
+
+#: application/controllers/IdxController.php:135
+msgid "route by"
+msgstr "ルート作成者"
+
+#: application/controllers/IdxController.php:137
+msgid "checking availibilty"
+msgstr "利用可能かチェック中"
+
+#: application/controllers/IdxController.php:138
+msgid "available pseudo"
+msgstr "利用出来るpseudo"
+
+#: application/controllers/IdxController.php:139
+msgid "unavailable pseudo"
+msgstr "利用できないpseudo"
+
+#: application/controllers/IdxController.php:141
+msgid "create"
+msgstr "作成"
+
+#: application/controllers/IdxController.php:143
+msgid "You have an unsaved route"
+msgstr "保存されていないルートがあります"
+
+#: application/controllers/IdxController.php:145
+msgid "no result"
+msgstr "結果がありません"
+
+#: application/controllers/IdxController.php:146
+msgid "could not analyze file content"
+msgstr "ファイル内容を分析できませんでした"
+
+#: application/layouts/scripts/footer.phtml:28
+msgid "contact"
+msgstr "連絡先"
+
+#: application/layouts/scripts/footer.phtml:97
+msgid "faq"
+msgstr "FAQ"
+
+#: application/forms/Login.php:9
+msgid "user"
+msgstr "ユーザ"
+
+#: application/forms/Login.php:10 application/forms/Account.php:35
+#: application/forms/User.php:23
+msgid "password"
+msgstr "パスワード"
+
+#: application/forms/Login.php:23
+msgid "I forgot my password"
+msgstr "パスワードを忘れた"
+
+#: application/forms/Contact.php:27
+msgid "Value is required and can't be empty"
+msgstr "値が必要です"
+
+#: application/forms/Contact.php:36
+msgid "Email:"
+msgstr "メールアドレス:"
+
+#: application/forms/Contact.php:40
+msgid "Subject must be %max% characters long or less"
+msgstr "件名欄は %max% 文字までです"
+
+#: application/forms/Contact.php:45
+msgid "Subject:"
+msgstr "件名"
+
+#: application/forms/Contact.php:49
+msgid "Message:"
+msgstr "メッセージ"
+
+#: application/forms/Contact.php:56
+msgid "Send"
+msgstr "送信"
+
+#: application/forms/Contact.php:64
+msgid "Send a message"
+msgstr "メッセージを送信"
+
+#: application/forms/Geom.php:18
+msgid "optional title for this journey"
+msgstr "この旅の任意の見出し"
+
+#: application/forms/Geom.php:27 application/forms/User.php:46
+#, php-format
+msgid "I've read and accepted %s"
+msgstr "私は %s を読んで承諾しました"
+
+#: application/forms/Geom.php:36
+#: application/forms/Pending/ValidateCreation.php:17
+msgid "save"
+msgstr "保存"
+
+#: application/forms/Account.php:27 application/forms/User.php:36
+#: application/forms/Newpwd.php:28
+msgid "email"
+msgstr "メールアドレス"
+
+#: application/forms/Account.php:42 application/forms/User.php:30
+msgid "confirm password"
+msgstr "パスワードを確認"
+
+#: application/forms/Account.php:48
+msgid "current password"
+msgstr "現在のパスワード"
+
+#: application/forms/Account.php:50
+msgid "modify my informations"
+msgstr "自分の情報を変更"
+
+#: application/forms/User.php:10
+msgid "only letters, numbers, underscores or dots"
+msgstr "文字、数字、アンダースコア、ドットのいずれかのみ"
+
+#: application/forms/User.php:12
+msgid "user name"
+msgstr "ユーザ名"
+
+#: application/forms/User.php:37
+msgid ""
+"After creating your account, you will receive a confirmation email. You have "
+"7 days to confirm otherwise, your account will be deleted."
+msgstr "アカウント作成後、確認メールが届きます。"
+"７日以内に認証してください、そうしなければアカウントは削除されます。"
+
+#: application/forms/User.php:59
+msgid "create account"
+msgstr "アカウント作成"
+
+#: application/forms/Pending/ResetPassword.php:11
+#, php-format
+msgid ""
+"Hi %s. Someone, probably you, has asked to reset password for your account. "
+"To get a new password, validate with following button."
+msgstr "こんにちは、 %s さん、誰か、おそらくあなた自身、がアカウントのパスワードリセットを要求しました"
+"新しいパスワードを取得するには、下記のボタンで認証してください。"
+#: application/forms/Pending/ResetPassword.php:16
+#: application/forms/Newpwd.php:33
+msgid "reset my password"
+msgstr "自分のパスワードをリセット"
+
+#: application/forms/Pending/ResetPassword.php:23
+msgid "cancel request"
+msgstr "リクエストをキャンセル"
+
+#: application/forms/Pending/ResetPassword.php:24
+msgid ""
+"To cancel this request, press following button. Your password will not "
+"change."
+msgstr "このリクエストをキャンセルするには、次のボタンを押してください。"
+"あなたのパスワードは変更されません。"
+
+#: application/forms/Pending/ValidateCreation.php:11
+#, php-format
+msgid ""
+"Someone, probably you, has registered an account %s with email address %s on "
+"syj. To confirm this account creation, validate with following button."
+msgstr "誰か、おそらくあなた自身、がアカウント %s を %s というメールアドレスで"
+"Syj 上に登録しました。このアカウント作成を確認するには、次のボタンを認証してください。"
+
+#: application/forms/Pending/ValidateCreation.php:24
+msgid ""
+"To cancel account creation, press following button. The account and all its "
+"data will be deleted."
+msgstr "アカウント作成をキャンセルするには、次のボタンを押してください。"
+"アカウントとそのデータは全て削除されます。"
diff --git a/scripts/updatepo.sh b/scripts/updatepo.sh
index be5ce1a..b93d99d 100755
--- a/scripts/updatepo.sh
+++ b/scripts/updatepo.sh
@@ -4,7 +4,7 @@ GITROOT=`git rev-parse --show-cdup`
 GITROOT=${GITROOT:-.}
 APPROOT=$GITROOT/application
 find $APPROOT -name '*.php' -o -name '*.phtml' | xgettext -L php --keyword=translate --keyword=__ --from-code=UTF-8 -o $POTFILE -f -
-for lang in en fr; do
+for lang in en fr ja; do
     echo $lang language
     msgmerge -U $APPROOT/languages/lang_${lang}.po $POTFILE
     msgfmt --statistics -o $APPROOT/languages/lang_${lang}.mo $APPROOT/languages/lang_${lang}.po
-- 
2.39.2


From 97f7f265fa12ab7bdc389b639fe73a19eb9f9394 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 09:59:04 +0200
Subject: [PATCH 11/16] update openlayers build file

---
 public/openlayers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/openlayers b/public/openlayers
index 477e4c8..665b2d1 160000
--- a/public/openlayers
+++ b/public/openlayers
@@ -1 +1 @@
-Subproject commit 477e4c8b4919e4650694a05eaeb022c7eedad303
+Subproject commit 665b2d16eb272283a3a4604e1d37178a7c5249e7
-- 
2.39.2


From e85f4874bb734d7b84cc2d10955db2065ac4f261 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 10:37:29 +0200
Subject: [PATCH 12/16] output error message only if error code is 400

---
 application/controllers/ErrorController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index fed3945..28f321b 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -41,7 +41,7 @@ class ErrorController extends Zend_Controller_Action
             $log->crit($this->view->message, $error->exception);
         }
 
-        if ($error_code != 404 and $error_code != 410 and $error->request->isXmlHttpRequest()) {
+        if ($error_code == 400 and $error->request->isXmlHttpRequest()) {
             return $this->_helper->json(array('message' => $error->exception->getMessage()));
         }
 
-- 
2.39.2


From a86eeac0ab678ea55307e1386c5f955f77d8ff73 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 10:46:03 +0200
Subject: [PATCH 13/16] do not fail when client uses a proxy

---
 application/controllers/IdxController.php  | 3 ++-
 application/controllers/PathController.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index ee1efb0..3996fa0 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -66,7 +66,8 @@ class IdxController extends Zend_Controller_Action
             $geomform->geom_title->setValue($path->title);
         } else {
             $geomform->setAction('path');
-            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
+            $clientip = trim(end(split(',', $this->getRequest()->getClientIp(true))));
+            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($clientip));
             $this->view->headScript()->prependScript((string) $extent);
             $title = "Show your journey";
         }
diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index bb969e8..48a22be 100644
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -13,7 +13,7 @@ class PathController extends Zend_Controller_Action
             throw new Syj_Exception_Request();
         }
         $path->creator = $user;
-        $path->creatorIp = $this->getRequest()->getClientIp(true);
+        $path->creatorIp = trim(end(split(',', $this->getRequest()->getClientIp(true))));
 
         $this->save($path, $formData);
         $data = array('redirect' => "idx/" . (string)$path->id);
-- 
2.39.2


From dfdbbefb4b79dd3d04123ccf3128172684721371 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 10:56:45 +0200
Subject: [PATCH 14/16] update japanese translation

---
 application/languages/lang_en.po | 348 ++++++++++++++++++++----------
 application/languages/lang_fr.po | 354 ++++++++++++++++++++++---------
 application/languages/lang_ja.po | 251 ++++++++++++----------
 3 files changed, 625 insertions(+), 328 deletions(-)

diff --git a/application/languages/lang_en.po b/application/languages/lang_en.po
index b0d8e35..56eb68b 100644
--- a/application/languages/lang_en.po
+++ b/application/languages/lang_en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-20 11:26+0200\n"
+"POT-Creation-Date: 2010-09-27 10:55+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -37,8 +37,12 @@ msgstr "go to main page"
 
 #: application/views/scripts/contact/index.phtml:8
 #, php-format
-msgid "There was an unkwown message when sending the message. Please try again later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
-msgstr "There was an unkwown message when sending the message. Please try again later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
+msgid ""
+"There was an unkwown message when sending the message. Please try again "
+"later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
+msgstr ""
+"There was an unkwown message when sending the message. Please try again "
+"later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
 
 #: application/views/scripts/contact/success.phtml:4
 msgid "Email was send successfully"
@@ -55,8 +59,14 @@ msgid "Welcome on Syj."
 msgstr "Welcome on Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
-msgstr "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
+msgid ""
+"To create a journey, just press <strong>\"start a route\"</strong> button, "
+"then click on the map to add points to your route. You can zoom and move the "
+"map with the controls in the top left corner"
+msgstr ""
+"To create a journey, just press <strong>\"start a route\"</strong> button, "
+"then click on the map to add points to your route. You can zoom and move the "
+"map with the controls in the top left corner"
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"create\", button."
@@ -68,8 +78,7 @@ msgstr "route length"
 
 #: application/views/scripts/idx/index.phtml:38
 #: application/controllers/LoginController.php:8
-#: application/layouts/scripts/footer.phtml:74
-#: application/forms/Login.php:26
+#: application/layouts/scripts/footer.phtml:74 application/forms/Login.php:26
 msgid "login"
 msgstr "login"
 
@@ -106,12 +115,12 @@ msgid "gpx export"
 msgstr "gpx export"
 
 #: application/views/scripts/idx/index.phtml:101
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:143
 msgid "duplicate"
 msgstr "duplicate"
 
 #: application/views/scripts/idx/index.phtml:103
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:141
 msgid "edit"
 msgstr "edit"
 
@@ -132,31 +141,71 @@ msgid "more results"
 msgstr "more results"
 
 #: application/views/scripts/termsofuse/index.phtml:5
-msgid "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
-msgstr "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
+msgid ""
+"Show Your Journey is a site whose goal is to allow anyone to publish routes, "
+"for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
+msgstr ""
+"Show Your Journey is a site whose goal is to allow anyone to publish routes, "
+"for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
 
 #: application/views/scripts/termsofuse/index.phtml:9
-msgid "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
-msgstr "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
+msgid ""
+"In order to publish a route, you must first create an account. A valid email "
+"is asked for, and ip address of account creation is stored on the server. "
+"Those informations will not be divulged to anyone without the user explicit "
+"permission."
+msgstr ""
+"In order to publish a route, you must first create an account. A valid email "
+"is asked for, and ip address of account creation is stored on the server. "
+"Those informations will not be divulged to anyone without the user explicit "
+"permission."
 
 #: application/views/scripts/termsofuse/index.phtml:13
-msgid "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
-msgstr "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
+msgid ""
+"When you create a route, you accept that it's free for any use. This means "
+"you accept that anyone can reuse, reproduce, or republish your itinerary, or "
+"a modified version of it for any purpose. This also means you need to get "
+"appropriate permissions from the creator if you want to upload a route you "
+"didn't create yourself."
+msgstr ""
+"When you create a route, you accept that it's free for any use. This means "
+"you accept that anyone can reuse, reproduce, or republish your itinerary, or "
+"a modified version of it for any purpose. This also means you need to get "
+"appropriate permissions from the creator if you want to upload a route you "
+"didn't create yourself."
 
 #: application/views/scripts/termsofuse/index.phtml:17
-msgid "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
-msgstr "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
+msgid ""
+"Show Your Journey is not responsible for the accuracy of the routes "
+"published. It's the user responsibility to check that a route is accessible "
+"and safe."
+msgstr ""
+"Show Your Journey is not responsible for the accuracy of the routes "
+"published. It's the user responsibility to check that a route is accessible "
+"and safe."
 
 #: application/views/scripts/termsofuse/index.phtml:21
-msgid "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
-msgstr "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
+msgid ""
+"Show Your Journey service is provided \"as is\" with no guarantee for "
+"accuracy or accessibility."
+msgstr ""
+"Show Your Journey service is provided \"as is\" with no guarantee for "
+"accuracy or accessibility."
 
 #: application/views/scripts/termsofuse/index.phtml:25
-msgid "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
-msgstr "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
+msgid ""
+"Sources of the software running the website are <a href=\"http://dev."
+"renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The "
+"map used to display the routes comes from <a href=\"http://www.openstreetmap."
+"org/\">openstreetmap</a>."
+msgstr ""
+"Sources of the software running the website are <a href=\"http://dev."
+"renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The "
+"map used to display the routes comes from <a href=\"http://www.openstreetmap."
+"org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:133
+#: application/controllers/IdxController.php:134
 msgid "A link to reset your password has been emailed to you"
 msgstr "A link to reset your password has been emailed to you"
 
@@ -195,8 +244,14 @@ msgstr "log in"
 
 #: application/views/scripts/pending/password_validate.phtml:15
 #, php-format
-msgid "Your new password is now <strong>%s</strong>. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible."
-msgstr "Your new password is now <strong>%s</strong>. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible."
+msgid ""
+"Your new password is now <strong>%s</strong>. You can %s with this new "
+"password. Don't forget to change it again to a personal password as soon as "
+"possible."
+msgstr ""
+"Your new password is now <strong>%s</strong>. You can %s with this new "
+"password. Don't forget to change it again to a personal password as soon as "
+"possible."
 
 #: application/views/scripts/account/success.phtml:4
 msgid "Your account was modified successfully"
@@ -247,8 +302,16 @@ msgid "What's syj?"
 msgstr "What's syj?"
 
 #: application/views/scripts/faq/index.phtml:7
-msgid "<acronym title=\"Show your journey\">Syj</acronym> is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
-msgstr "<acronym title=\"Show your journey\">Syj</acronym> is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
+msgid ""
+"<acronym title=\"Show your journey\">Syj</acronym> is a website to share "
+"routes. You draw a route on a map background, and then, you get an link to "
+"share it. You can then show clever bicycle rides, your last hiking, or any "
+"route you want."
+msgstr ""
+"<acronym title=\"Show your journey\">Syj</acronym> is a website to share "
+"routes. You draw a route on a map background, and then, you get an link to "
+"share it. You can then show clever bicycle rides, your last hiking, or any "
+"route you want."
 
 #: application/views/scripts/faq/index.phtml:9
 msgid "How do I modify a route?"
@@ -256,24 +319,54 @@ msgstr "How do I modify a route?"
 
 #: application/views/scripts/faq/index.phtml:10
 #, php-format
-msgid "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point."
-msgstr "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point."
+msgid ""
+"When you're editing a route, you can drag and drop a point to move it. If "
+"you want to delete it, you need to press the Shift key. While you hold the "
+"button, points will have an icon%s over them. Clicking that icon will delete "
+"the point."
+msgstr ""
+"When you're editing a route, you can drag and drop a point to move it. If "
+"you want to delete it, you need to press the Shift key. While you hold the "
+"button, points will have an icon%s over them. Clicking that icon will delete "
+"the point."
 
 #: application/views/scripts/faq/index.phtml:12
 msgid "Why should I create a account?"
 msgstr "Why should I create a account?"
 
 #: application/views/scripts/faq/index.phtml:13
-msgid "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route."
-msgstr "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route."
+msgid ""
+"You can create routes without a account. But if you want to modify your "
+"routes afterwards, you need to be registered when creating the route."
+msgstr ""
+"You can create routes without a account. But if you want to modify your "
+"routes afterwards, you need to be registered when creating the route."
 
 #: application/views/scripts/faq/index.phtml:15
 msgid "Is it possible to have my route \"attach\" nearby paths?"
 msgstr "Is it possible to have my route \"attach\" nearby paths?"
 
 #: application/views/scripts/faq/index.phtml:16
-msgid "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, &hellip;. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way."
-msgstr "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, &hellip;. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way."
+msgid ""
+"When you create a route with syj, you must draw each point on the map. If "
+"your route follows an existing path, you still need to draw the layer "
+"manually: syj will not try to attach nearby existing paths. There are three "
+"main reasons. One bad reason: it would a lot of work to implement. And two "
+"good reasons: syj uses OpenStreetMap as a background map, and the map is "
+"still unfinished in many areas. Also, depending on your route, you may wish "
+"to attach to motorways, footways, biycle lanes, railways, &hellip;. If you "
+"are in a place with lot of differents routes, it would be nearly impossible "
+"to always choose the right way."
+msgstr ""
+"When you create a route with syj, you must draw each point on the map. If "
+"your route follows an existing path, you still need to draw the layer "
+"manually: syj will not try to attach nearby existing paths. There are three "
+"main reasons. One bad reason: it would a lot of work to implement. And two "
+"good reasons: syj uses OpenStreetMap as a background map, and the map is "
+"still unfinished in many areas. Also, depending on your route, you may wish "
+"to attach to motorways, footways, biycle lanes, railways, &hellip;. If you "
+"are in a place with lot of differents routes, it would be nearly impossible "
+"to always choose the right way."
 
 #: application/views/helpers/LogoutLink.php:10
 #: application/layouts/scripts/footer.phtml:67
@@ -308,13 +401,15 @@ msgstr "[SYJ] Reset your password"
 msgid ""
 "Hi %user%,\n"
 "\n"
-"Someone, probably you, has asked to reset your password. If you want to reset\n"
+"Someone, probably you, has asked to reset your password. If you want to "
+"reset\n"
 "your password, please follow this link:\n"
 "%hashurl%\n"
 "\n"
 "If you do not not confirm within 2 days, your password will not be reset.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -323,13 +418,15 @@ msgid ""
 msgstr ""
 "Hi %user%,\n"
 "\n"
-"Someone, probably you, has asked to reset your password. If you want to reset\n"
+"Someone, probably you, has asked to reset your password. If you want to "
+"reset\n"
 "your password, please follow this link:\n"
 "%hashurl%\n"
 "\n"
 "If you do not not confirm within 2 days, your password will not be reset.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -344,14 +441,17 @@ msgstr "[SYJ] Validate your account"
 msgid ""
 "Hi %user%, and welcome on syj\n"
 "\n"
-"Your account is currently active, but you need to confirm your inscription by\n"
+"Your account is currently active, but you need to confirm your inscription "
+"by\n"
 "following this link:\n"
 "%hashurl%\n"
 "\n"
-"If you do not not confirm your inscription within 7 days, your account will be\n"
+"If you do not not confirm your inscription within 7 days, your account will "
+"be\n"
 "deleted.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -360,14 +460,17 @@ msgid ""
 msgstr ""
 "Hi %user%, and welcome on syj\n"
 "\n"
-"Your account is currently active, but you need to confirm your inscription by\n"
+"Your account is currently active, but you need to confirm your inscription "
+"by\n"
 "following this link:\n"
 "%hashurl%\n"
 "\n"
-"If you do not not confirm your inscription within 7 days, your account will be\n"
+"If you do not not confirm your inscription within 7 days, your account will "
+"be\n"
 "deleted.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -386,7 +489,8 @@ msgid ""
 "account will be deleted tomorrow. Please follow this link:\n"
 "%hashurl%\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -399,7 +503,8 @@ msgstr ""
 "account will be deleted tomorrow. Please follow this link:\n"
 "%hashurl%\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -414,10 +519,12 @@ msgstr "[SYJ] Account deactivated"
 msgid ""
 "Hi %user%,\n"
 "\n"
-"You have not validated your syj account on time. Therefore, your account have\n"
+"You have not validated your syj account on time. Therefore, your account "
+"have\n"
 "been deleted. Nevertheless, you can still create a new account.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Regards,\n"
@@ -426,10 +533,12 @@ msgid ""
 msgstr ""
 "Hi %user%,\n"
 "\n"
-"You have not validated your syj account on time. Therefore, your account have\n"
+"You have not validated your syj account on time. Therefore, your account "
+"have\n"
 "been deleted. Nevertheless, you can still create a new account.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Regards,\n"
@@ -437,7 +546,7 @@ msgstr ""
 "Syj team"
 
 #: application/controllers/LoginController.php:99
-#: application/controllers/IdxController.php:123
+#: application/controllers/IdxController.php:124
 msgid "you must enter a login name"
 msgstr "you must enter a login name"
 
@@ -476,13 +585,12 @@ msgstr "Hi,"
 #: application/controllers/ContactController.php:121
 #: application/controllers/NewpwdController.php:68
 #: application/controllers/AccountController.php:70
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:145
 msgid "Value is required"
 msgstr "Value is required"
 
 #: application/controllers/ContactController.php:122
-#: application/forms/Contact.php:32
-#: application/validate/EmailAddress.php:13
+#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13
 msgid "Invalid email"
 msgstr "Invalid email"
 
@@ -491,8 +599,7 @@ msgid "Oups, something went wrong"
 msgstr "Oups, something went wrong"
 
 #: application/controllers/TermsofuseController.php:10
-#: application/layouts/scripts/footer.phtml:87
-#: application/forms/Geom.php:25
+#: application/layouts/scripts/footer.phtml:87 application/forms/Geom.php:25
 #: application/forms/User.php:44
 msgid "terms of use"
 msgstr "terms of use"
@@ -507,27 +614,29 @@ msgid "There is no undo. Delete this route definitively ?"
 msgstr "There is no undo. Delete this route definitively ?"
 
 #: application/controllers/ListController.php:33
-#: application/controllers/IdxController.php:120
+#: application/controllers/IdxController.php:121
 msgid "server could not be reached"
 msgstr "server could not be reached"
 
 #: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:117
-msgid "server did not understood request. That's probably caused by a bug in SYJ"
-msgstr "server did not understood request. That's probably caused by a bug in SYJ"
+#: application/controllers/IdxController.php:118
+msgid ""
+"server did not understood request. That's probably caused by a bug in SYJ"
+msgstr ""
+"server did not understood request. That's probably caused by a bug in SYJ"
 
 #: application/controllers/ListController.php:35
-#: application/controllers/IdxController.php:118
+#: application/controllers/IdxController.php:119
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "route not referenced on the server. It has probably been deleted."
 
 #: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:121
+#: application/controllers/IdxController.php:122
 msgid "there was a server error"
 msgstr "there was a server error"
 
 #: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:123
 msgid "there was an unknown error"
 msgstr "there was an unknown error"
 
@@ -545,19 +654,18 @@ msgid "Wrong password"
 msgstr "Wrong password"
 
 #: application/controllers/AccountController.php:43
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:132
 msgid "an user is already registered with this email"
 msgstr "an user is already registered with this email"
 
 #: application/controllers/AccountController.php:71
-#: application/controllers/IdxController.php:127
+#: application/controllers/IdxController.php:128
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Password do not match"
 
 #: application/controllers/AccountController.php:72
-#: application/forms/Account.php:33
-#: application/forms/User.php:20
+#: application/forms/Account.php:33 application/forms/User.php:20
 #, php-format
 msgid "At least %d characters"
 msgstr "At least %d characters"
@@ -567,7 +675,7 @@ msgid "You have made no change"
 msgstr "You have made no change"
 
 #: application/controllers/IdxController.php:26
-#: application/controllers/IdxController.php:78
+#: application/controllers/IdxController.php:79
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "route by <strong>%s</strong>"
@@ -580,80 +688,84 @@ msgstr "route has been deleted"
 msgid "route does not exist"
 msgstr "route does not exist"
 
-#: application/controllers/IdxController.php:110
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:111
+#: application/controllers/IdxController.php:137
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:116
+#: application/controllers/IdxController.php:117
 msgid "save took place successfully"
 msgstr "save took place successfully"
 
-#: application/controllers/IdxController.php:119
-msgid "similar path seems to already exist. Please do not create two exactly identical paths"
-msgstr "similar path seems to already exist. Please do not create two exactly identical paths"
+#: application/controllers/IdxController.php:120
+msgid ""
+"similar path seems to already exist. Please do not create two exactly "
+"identical paths"
+msgstr ""
+"similar path seems to already exist. Please do not create two exactly "
+"identical paths"
 
-#: application/controllers/IdxController.php:124
+#: application/controllers/IdxController.php:125
 msgid "Login correct"
 msgstr "Login correct"
 
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:126
 msgid "Wrong login/password"
 msgstr "Wrong login/password"
 
-#: application/controllers/IdxController.php:126
+#: application/controllers/IdxController.php:127
 msgid "you must enter a password"
 msgstr "you must enter a password"
 
-#: application/controllers/IdxController.php:128
+#: application/controllers/IdxController.php:129
 msgid "You must accept terms of use"
 msgstr "You must accept terms of use"
 
-#: application/controllers/IdxController.php:129
+#: application/controllers/IdxController.php:130
 msgid "you must enter an email"
 msgstr "you must enter an email"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:131
 msgid "invalid email"
 msgstr "invalid email"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:133
 msgid "Account created"
 msgstr "Account created"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:135
 msgid "Now, you can retry to save"
 msgstr "Now, you can retry to save"
 
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:136
 msgid "route by"
 msgstr "route by"
 
-#: application/controllers/IdxController.php:137
+#: application/controllers/IdxController.php:138
 msgid "checking availibilty"
 msgstr "checking availibilty"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:139
 msgid "available pseudo"
 msgstr "available pseudo"
 
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:140
 msgid "unavailable pseudo"
 msgstr "unavailable pseudo"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:142
 msgid "create"
 msgstr "create"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:144
 msgid "You have an unsaved route"
 msgstr "You have an unsaved route"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:146
 msgid "no result"
 msgstr "no result"
 
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:147
 msgid "could not analyze file content"
 msgstr "could not analyze file content"
 
@@ -669,8 +781,7 @@ msgstr "faq"
 msgid "user"
 msgstr "user"
 
-#: application/forms/Login.php:10
-#: application/forms/Account.php:35
+#: application/forms/Login.php:10 application/forms/Account.php:35
 #: application/forms/User.php:23
 msgid "password"
 msgstr "password"
@@ -711,8 +822,7 @@ msgstr "Send a message"
 msgid "optional title for this journey"
 msgstr "optional title for this journey"
 
-#: application/forms/Geom.php:27
-#: application/forms/User.php:46
+#: application/forms/Geom.php:27 application/forms/User.php:46
 #, php-format
 msgid "I've read and accepted %s"
 msgstr "I've read and accepted %s"
@@ -722,14 +832,12 @@ msgstr "I've read and accepted %s"
 msgid "save"
 msgstr "save"
 
-#: application/forms/Account.php:27
-#: application/forms/User.php:36
+#: application/forms/Account.php:27 application/forms/User.php:36
 #: application/forms/Newpwd.php:28
 msgid "email"
 msgstr "email"
 
-#: application/forms/Account.php:42
-#: application/forms/User.php:30
+#: application/forms/Account.php:42 application/forms/User.php:30
 msgid "confirm password"
 msgstr "confirm password"
 
@@ -750,8 +858,12 @@ msgid "user name"
 msgstr "user name"
 
 #: application/forms/User.php:37
-msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will be deleted."
-msgstr "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will be deleted."
+msgid ""
+"After creating your account, you will receive a confirmation email. You have "
+"7 days to confirm otherwise, your account will be deleted."
+msgstr ""
+"After creating your account, you will receive a confirmation email. You have "
+"7 days to confirm otherwise, your account will be deleted."
 
 #: application/forms/User.php:59
 msgid "create account"
@@ -759,8 +871,12 @@ msgstr "create account"
 
 #: application/forms/Pending/ResetPassword.php:11
 #, php-format
-msgid "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button."
-msgstr "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button."
+msgid ""
+"Hi %s. Someone, probably you, has asked to reset password for your account. "
+"To get a new password, validate with following button."
+msgstr ""
+"Hi %s. Someone, probably you, has asked to reset password for your account. "
+"To get a new password, validate with following button."
 
 #: application/forms/Pending/ResetPassword.php:16
 #: application/forms/Newpwd.php:33
@@ -772,32 +888,50 @@ msgid "cancel request"
 msgstr "cancel request"
 
 #: application/forms/Pending/ResetPassword.php:24
-msgid "To cancel this request, press following button. Your password will not change."
-msgstr "To cancel this request, press following button. Your password will not change."
+msgid ""
+"To cancel this request, press following button. Your password will not "
+"change."
+msgstr ""
+"To cancel this request, press following button. Your password will not "
+"change."
 
 #: application/forms/Pending/ValidateCreation.php:11
 #, php-format
-msgid "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button."
-msgstr "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button."
+msgid ""
+"Someone, probably you, has registered an account %s with email address %s on "
+"syj. To confirm this account creation, validate with following button."
+msgstr ""
+"Someone, probably you, has registered an account %s with email address %s on "
+"syj. To confirm this account creation, validate with following button."
 
 #: application/forms/Pending/ValidateCreation.php:24
-msgid "To cancel account creation, press following button. The account and all its data will be deleted."
-msgstr "To cancel account creation, press following button. The account and all its data will be deleted."
+msgid ""
+"To cancel account creation, press following button. The account and all its "
+"data will be deleted."
+msgstr ""
+"To cancel account creation, press following button. The account and all its "
+"data will be deleted."
 
 #~ msgid "direct link to current path"
 #~ msgstr "direct link to current path"
+
 #~ msgid "modify"
 #~ msgstr "modify"
+
 #~ msgid "pseudo available"
 #~ msgstr "pseudo available"
+
 #~ msgid "pseudo not available"
 #~ msgstr "pseudo not available"
+
 #~ msgid "pseudo must only contain letters, digits, dots or underscores"
 #~ msgstr "pseudo must only contain letters, digits, dots or underscores"
+
 #~ msgid "You need to login before retrying to save"
 #~ msgstr "You need to login before retrying to save"
+
 #~ msgid "You need to have cookies enabled to login to SYJ"
 #~ msgstr "You need to have cookies enabled to login to SYJ"
+
 #~ msgid "reset password"
 #~ msgstr "reset password"
-
diff --git a/application/languages/lang_fr.po b/application/languages/lang_fr.po
index 0e5c9f0..4d699a1 100644
--- a/application/languages/lang_fr.po
+++ b/application/languages/lang_fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-20 11:26+0200\n"
+"POT-Creation-Date: 2010-09-27 10:55+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: arno <arno@renevier.net>\n"
 "Language-Team: arno <arno@renevier.net>\n"
@@ -37,8 +37,12 @@ msgstr "aller à la page d'accueil"
 
 #: application/views/scripts/contact/index.phtml:8
 #, php-format
-msgid "There was an unkwown message when sending the message. Please try again later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
-msgstr "Il s'est produit une erreur inconnue lors de l'envoi du message. Merci de réessayer plus tard, ou d'écrire directement à <a href=\"mailto:%s\">%s</a>"
+msgid ""
+"There was an unkwown message when sending the message. Please try again "
+"later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
+msgstr ""
+"Il s'est produit une erreur inconnue lors de l'envoi du message. Merci de "
+"réessayer plus tard, ou d'écrire directement à <a href=\"mailto:%s\">%s</a>"
 
 #: application/views/scripts/contact/success.phtml:4
 msgid "Email was send successfully"
@@ -48,15 +52,24 @@ msgstr "L'email a été envoyé avec succès"
 #: application/views/scripts/idx/raw.phtml:8
 #: application/views/scripts/list/index.phtml:8
 msgid "SYJ needs javascript. Please activate scripts in your browser."
-msgstr "SYJ a besoin de javascript pour fonctionner. Veuillez activer les scripts dans votre navigateur."
+msgstr ""
+"SYJ a besoin de javascript pour fonctionner. Veuillez activer les scripts "
+"dans votre navigateur."
 
 #: application/views/scripts/idx/index.phtml:15
 msgid "Welcome on Syj."
 msgstr "Bienvenue sur Syj."
 
 #: application/views/scripts/idx/index.phtml:17
-msgid "To create a journey, just press <strong>\"start a route\"</strong> button, then click on the map to add points to your route. You can zoom and move the map with the controls in the top left corner"
-msgstr "Pour créer un trajet, pressez simplement le bouton <strong>\"commencer un itinéraire\"</strong> puis cliquez sur la carte pour ajouter des points à votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut à gauche."
+msgid ""
+"To create a journey, just press <strong>\"start a route\"</strong> button, "
+"then click on the map to add points to your route. You can zoom and move the "
+"map with the controls in the top left corner"
+msgstr ""
+"Pour créer un trajet, pressez simplement le bouton <strong>\"commencer un "
+"itinéraire\"</strong> puis cliquez sur la carte pour ajouter des points à "
+"votre tracé. Vous pouvez zoomer et bouger la carte avec les boutons en haut "
+"à gauche."
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"create\", button."
@@ -68,8 +81,7 @@ msgstr "longueur du tracé"
 
 #: application/views/scripts/idx/index.phtml:38
 #: application/controllers/LoginController.php:8
-#: application/layouts/scripts/footer.phtml:74
-#: application/forms/Login.php:26
+#: application/layouts/scripts/footer.phtml:74 application/forms/Login.php:26
 msgid "login"
 msgstr "connexion"
 
@@ -106,12 +118,12 @@ msgid "gpx export"
 msgstr "export gpx"
 
 #: application/views/scripts/idx/index.phtml:101
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:143
 msgid "duplicate"
 msgstr "dupliquer"
 
 #: application/views/scripts/idx/index.phtml:103
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:141
 msgid "edit"
 msgstr "modifier"
 
@@ -132,33 +144,76 @@ msgid "more results"
 msgstr "plus de résultats"
 
 #: application/views/scripts/termsofuse/index.phtml:5
-msgid "Show Your Journey is a site whose goal is to allow anyone to publish routes, for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
-msgstr "Show Your Journey est un site dont le but est de permettre à quiconque de publier des itinéraires, par exemple, des itinéraires de randonnées, des trajets cyclistes, des itinéraires de voyages, ou n'importe quoi d'autre."
+msgid ""
+"Show Your Journey is a site whose goal is to allow anyone to publish routes, "
+"for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
+msgstr ""
+"Show Your Journey est un site dont le but est de permettre à quiconque de "
+"publier des itinéraires, par exemple, des itinéraires de randonnées, des "
+"trajets cyclistes, des itinéraires de voyages, ou n'importe quoi d'autre."
 
 #: application/views/scripts/termsofuse/index.phtml:9
-msgid "In order to publish a route, you must first create an account. A valid email is asked for, and ip address of account creation is stored on the server. Those informations will not be divulged to anyone without the user explicit permission."
-msgstr "Pour publier un itinéraire, vous devez tout d'abord créer un compte. Un email valide est demandé, et l'adresse ip de création du compte est enregistrée sur le serveur. Ces informations ne seront divulguées à personne sans la permission explicite de l'utilisateur."
+msgid ""
+"In order to publish a route, you must first create an account. A valid email "
+"is asked for, and ip address of account creation is stored on the server. "
+"Those informations will not be divulged to anyone without the user explicit "
+"permission."
+msgstr ""
+"Pour publier un itinéraire, vous devez tout d'abord créer un compte. Un "
+"email valide est demandé, et l'adresse ip de création du compte est "
+"enregistrée sur le serveur. Ces informations ne seront divulguées à personne "
+"sans la permission explicite de l'utilisateur."
 
 #: application/views/scripts/termsofuse/index.phtml:13
-msgid "When you create a route, you accept that it's free for any use. This means you accept that anyone can reuse, reproduce, or republish your itinerary, or a modified version of it for any purpose. This also means you need to get appropriate permissions from the creator if you want to upload a route you didn't create yourself."
-msgstr "Lorsque vous créez un itinéraire, vous acceptez qu'il soit utilisable sans restriction. Cela veut dire que n'importe qui peut réutiliser, reproduire ou redistribuer votre itinéraire, ou une version modifiée de celui-ci, et pour n'importe quel usage. Cela veut également dire que vous devez obtenir les autorisations nécessaires si vous voulez publier un itinéraire dont vous n'êtes pas l'auteur."
+msgid ""
+"When you create a route, you accept that it's free for any use. This means "
+"you accept that anyone can reuse, reproduce, or republish your itinerary, or "
+"a modified version of it for any purpose. This also means you need to get "
+"appropriate permissions from the creator if you want to upload a route you "
+"didn't create yourself."
+msgstr ""
+"Lorsque vous créez un itinéraire, vous acceptez qu'il soit utilisable sans "
+"restriction. Cela veut dire que n'importe qui peut réutiliser, reproduire ou "
+"redistribuer votre itinéraire, ou une version modifiée de celui-ci, et pour "
+"n'importe quel usage. Cela veut également dire que vous devez obtenir les "
+"autorisations nécessaires si vous voulez publier un itinéraire dont vous "
+"n'êtes pas l'auteur."
 
 #: application/views/scripts/termsofuse/index.phtml:17
-msgid "Show Your Journey is not responsible for the accuracy of the routes published. It's the user responsibility to check that a route is accessible and safe."
-msgstr "Show Your Journey n'est pas responsable de l'exactitude des itinéraires publiés. Il appartient à l'utilisateur de vérifier qu'un chemin est praticable et sécurisé."
+msgid ""
+"Show Your Journey is not responsible for the accuracy of the routes "
+"published. It's the user responsibility to check that a route is accessible "
+"and safe."
+msgstr ""
+"Show Your Journey n'est pas responsable de l'exactitude des itinéraires "
+"publiés. Il appartient à l'utilisateur de vérifier qu'un chemin est "
+"praticable et sécurisé."
 
 #: application/views/scripts/termsofuse/index.phtml:21
-msgid "Show Your Journey service is provided \"as is\" with no guarantee for accuracy or accessibility."
-msgstr "Show Your Journey est proposé sans garantie de fiabilité ou de disponibilité."
+msgid ""
+"Show Your Journey service is provided \"as is\" with no guarantee for "
+"accuracy or accessibility."
+msgstr ""
+"Show Your Journey est proposé sans garantie de fiabilité ou de disponibilité."
 
 #: application/views/scripts/termsofuse/index.phtml:25
-msgid "Sources of the software running the website are <a href=\"http://dev.renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The map used to display the routes comes from <a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
-msgstr "Les sources du logiciel qui fait tourner le site web sont <a href=\"http://dev.renevier.net/?p=syj.git\">disponibles publiquement</a> sous une licence agpl. La carte utilisée pour l'affichage des itinéraires vient d'<a href=\"http://www.openstreetmap.org/\">openstreetmap</a>."
+msgid ""
+"Sources of the software running the website are <a href=\"http://dev."
+"renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The "
+"map used to display the routes comes from <a href=\"http://www.openstreetmap."
+"org/\">openstreetmap</a>."
+msgstr ""
+"Les sources du logiciel qui fait tourner le site web sont <a href=\"http://"
+"dev.renevier.net/?p=syj.git\">disponibles publiquement</a> sous une licence "
+"agpl. La carte utilisée pour l'affichage des itinéraires vient d'<a href="
+"\"http://www.openstreetmap.org/\">openstreetmap</a>."
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:133
+#: application/controllers/IdxController.php:134
 msgid "A link to reset your password has been emailed to you"
-msgstr "Un email contenant un lien pour réinitialiser votre mot de passe vous a été envoyé"
+msgstr ""
+"Un email contenant un lien pour réinitialiser votre mot de passe vous a été "
+"envoyé"
 
 #: application/views/scripts/pending/password_cancel.phtml:12
 msgid "You have canceled the request."
@@ -195,8 +250,14 @@ msgstr "vous connecter"
 
 #: application/views/scripts/pending/password_validate.phtml:15
 #, php-format
-msgid "Your new password is now <strong>%s</strong>. You can %s with this new password. Don't forget to change it again to a personal password as soon as possible."
-msgstr "Votre nouveau mot de passe est <strong>%s</strong>. Vous pouvez %s avec le nouveau mot de passe. N'oubliez pas de le rechanger le plus tôt possible pour utiliser un mot de passe personnel."
+msgid ""
+"Your new password is now <strong>%s</strong>. You can %s with this new "
+"password. Don't forget to change it again to a personal password as soon as "
+"possible."
+msgstr ""
+"Votre nouveau mot de passe est <strong>%s</strong>. Vous pouvez %s avec le "
+"nouveau mot de passe. N'oubliez pas de le rechanger le plus tôt possible "
+"pour utiliser un mot de passe personnel."
 
 #: application/views/scripts/account/success.phtml:4
 msgid "Your account was modified successfully"
@@ -247,8 +308,17 @@ msgid "What's syj?"
 msgstr "Qu'est-ce que syj&nbsp;?"
 
 #: application/views/scripts/faq/index.phtml:7
-msgid "<acronym title=\"Show your journey\">Syj</acronym> is a website to share routes. You draw a route on a map background, and then, you get an link to share it. You can then show clever bicycle rides, your last hiking, or any route you want."
-msgstr "<acronym title=\"Show your journey\">Syj</acronym> est un site de partage d'itinéraires. Vous dessinez un itinéraire sur un fond de carte, et vous obtenez un lien pour le partager. Vous pouvez l'utiliser pour montrer des trajets de randonnée, des itinéraires cyclistes malins, ou n'importe quoi d'autre."
+msgid ""
+"<acronym title=\"Show your journey\">Syj</acronym> is a website to share "
+"routes. You draw a route on a map background, and then, you get an link to "
+"share it. You can then show clever bicycle rides, your last hiking, or any "
+"route you want."
+msgstr ""
+"<acronym title=\"Show your journey\">Syj</acronym> est un site de partage "
+"d'itinéraires. Vous dessinez un itinéraire sur un fond de carte, et vous "
+"obtenez un lien pour le partager. Vous pouvez l'utiliser pour montrer des "
+"trajets de randonnée, des itinéraires cyclistes malins, ou n'importe quoi "
+"d'autre."
 
 #: application/views/scripts/faq/index.phtml:9
 msgid "How do I modify a route?"
@@ -256,24 +326,57 @@ msgstr "Comment modifier un itinéraire&nbsp;?"
 
 #: application/views/scripts/faq/index.phtml:10
 #, php-format
-msgid "When you're editing a route, you can drag and drop a point to move it. If you want to delete it, you need to press the Shift key. While you hold the button, points will have an icon%s over them. Clicking that icon will delete the point."
-msgstr "Lorsque vous éditez un itinéraire, vous pouvez le bouger en le glissant-déposant. Si vous voulez le supprimer, vous devez appuyer sur la touche Shift. Lorsque la touche est enfoncée, une icône%s va apparaître au-dessus des points. Cliquez sur l'icône pour supprimer un point."
+msgid ""
+"When you're editing a route, you can drag and drop a point to move it. If "
+"you want to delete it, you need to press the Shift key. While you hold the "
+"button, points will have an icon%s over them. Clicking that icon will delete "
+"the point."
+msgstr ""
+"Lorsque vous éditez un itinéraire, vous pouvez le bouger en le glissant-"
+"déposant. Si vous voulez le supprimer, vous devez appuyer sur la touche "
+"Shift. Lorsque la touche est enfoncée, une icône%s va apparaître au-dessus "
+"des points. Cliquez sur l'icône pour supprimer un point."
 
 #: application/views/scripts/faq/index.phtml:12
 msgid "Why should I create a account?"
 msgstr "Pourquoi créer un compte&nbsp;?"
 
 #: application/views/scripts/faq/index.phtml:13
-msgid "You can create routes without a account. But if you want to modify your routes afterwards, you need to be registered when creating the route."
-msgstr "Vous pouvez créer des itinéraires sans avoir de compte. Mais si vous voulez modifier les itinéraires que vous avez créé, vous devez avoir un compte lors de leur création."
+msgid ""
+"You can create routes without a account. But if you want to modify your "
+"routes afterwards, you need to be registered when creating the route."
+msgstr ""
+"Vous pouvez créer des itinéraires sans avoir de compte. Mais si vous voulez "
+"modifier les itinéraires que vous avez créé, vous devez avoir un compte lors "
+"de leur création."
 
 #: application/views/scripts/faq/index.phtml:15
 msgid "Is it possible to have my route \"attach\" nearby paths?"
 msgstr "Est-ce que c'est possible d'&nbsp;«&nbsp;accrocher&nbsp;» les routes ?"
 
 #: application/views/scripts/faq/index.phtml:16
-msgid "When you create a route with syj, you must draw each point on the map. If your route follows an existing path, you still need to draw the layer manually: syj will not try to attach nearby existing paths. There are three main reasons. One bad reason: it would a lot of work to implement. And two good reasons: syj uses OpenStreetMap as a background map, and the map is still unfinished in many areas. Also, depending on your route, you may wish to attach to motorways, footways, biycle lanes, railways, &hellip;. If you are in a place with lot of differents routes, it would be nearly impossible to always choose the right way."
-msgstr "Lorsque vous créez un itinéraire avec syj, vous devez placer chaque point sur la carte. Si votre itinéraire suit un chemin, vous devez quand même dessiner la surcouche à la main&nbsp;: syj ne va pas chercher à accrocher les chemins proches. Il y a trois raisons principales à cela. Une mauvaise raison&nbsp;: cela demanderait beaucoup de travail à mettre en place. Et deux bonnes raisons&nbsp;: syj utilise OpenStreetMap comme fond de carte. Or, il y a beaucoup d'endroits où cette carte est incomplète. D'autre part, selon l'itinéraire, vous voudriez accrocher l'autoroute, ou bien les chemins piétons, ou les pistes cyclables, ou les rails de tramway, &hellip;. Si vous êtes dans un endroit avec différents types de routes, syj n'arrivera probablement pas à choisir la bonne route."
+msgid ""
+"When you create a route with syj, you must draw each point on the map. If "
+"your route follows an existing path, you still need to draw the layer "
+"manually: syj will not try to attach nearby existing paths. There are three "
+"main reasons. One bad reason: it would a lot of work to implement. And two "
+"good reasons: syj uses OpenStreetMap as a background map, and the map is "
+"still unfinished in many areas. Also, depending on your route, you may wish "
+"to attach to motorways, footways, biycle lanes, railways, &hellip;. If you "
+"are in a place with lot of differents routes, it would be nearly impossible "
+"to always choose the right way."
+msgstr ""
+"Lorsque vous créez un itinéraire avec syj, vous devez placer chaque point "
+"sur la carte. Si votre itinéraire suit un chemin, vous devez quand même "
+"dessiner la surcouche à la main&nbsp;: syj ne va pas chercher à accrocher "
+"les chemins proches. Il y a trois raisons principales à cela. Une mauvaise "
+"raison&nbsp;: cela demanderait beaucoup de travail à mettre en place. Et "
+"deux bonnes raisons&nbsp;: syj utilise OpenStreetMap comme fond de carte. "
+"Or, il y a beaucoup d'endroits où cette carte est incomplète. D'autre part, "
+"selon l'itinéraire, vous voudriez accrocher l'autoroute, ou bien les chemins "
+"piétons, ou les pistes cyclables, ou les rails de tramway, &hellip;. Si vous "
+"êtes dans un endroit avec différents types de routes, syj n'arrivera "
+"probablement pas à choisir la bonne route."
 
 #: application/views/helpers/LogoutLink.php:10
 #: application/layouts/scripts/footer.phtml:67
@@ -307,13 +410,15 @@ msgstr "[SYJ] Réinitialisation de votre mot de passe"
 msgid ""
 "Hi %user%,\n"
 "\n"
-"Someone, probably you, has asked to reset your password. If you want to reset\n"
+"Someone, probably you, has asked to reset your password. If you want to "
+"reset\n"
 "your password, please follow this link:\n"
 "%hashurl%\n"
 "\n"
 "If you do not not confirm within 2 days, your password will not be reset.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -329,7 +434,8 @@ msgstr ""
 "Si vous n'avez pas confirmé d'ici 2 jours, votre mot de passe ne sera pas\n"
 "réinitialisé.\n"
 "\n"
-"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n"
+"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous "
+"contacter,\n"
 "merci d'utiliser le formulaire à l'adresse suivante:\n"
 "%contacturl%\n"
 "\n"
@@ -345,14 +451,17 @@ msgstr "[SYJ] Validation de la création du compte"
 msgid ""
 "Hi %user%, and welcome on syj\n"
 "\n"
-"Your account is currently active, but you need to confirm your inscription by\n"
+"Your account is currently active, but you need to confirm your inscription "
+"by\n"
 "following this link:\n"
 "%hashurl%\n"
 "\n"
-"If you do not not confirm your inscription within 7 days, your account will be\n"
+"If you do not not confirm your inscription within 7 days, your account will "
+"be\n"
 "deleted.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -368,7 +477,8 @@ msgstr ""
 "Si vous ne confirmez pas votre inscription d'ici 7 jours, votre compte sera\n"
 "supprimé.\n"
 "\n"
-"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n"
+"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous "
+"contacter,\n"
 "merci d'utiliser le formulaire à l'adresse suivante:\n"
 "%contacturl%\n"
 "\n"
@@ -388,7 +498,8 @@ msgid ""
 "account will be deleted tomorrow. Please follow this link:\n"
 "%hashurl%\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Thanks,\n"
@@ -401,7 +512,8 @@ msgstr ""
 "validez pas, il sera supprimé demain. Merci de suivre ce lien:\n"
 "%hashurl%\n"
 "\n"
-"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n"
+"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous "
+"contacter,\n"
 "merci d'utiliser le formulaire à l'adresse suivante:\n"
 "%contacturl%\n"
 "\n"
@@ -417,10 +529,12 @@ msgstr "[SYJ] Compte désactivé"
 msgid ""
 "Hi %user%,\n"
 "\n"
-"You have not validated your syj account on time. Therefore, your account have\n"
+"You have not validated your syj account on time. Therefore, your account "
+"have\n"
 "been deleted. Nevertheless, you can still create a new account.\n"
 "\n"
-"Please do not reply this email. If you need to contact us, please use the form\n"
+"Please do not reply this email. If you need to contact us, please use the "
+"form\n"
 "contact at %contacturl%\n"
 "\n"
 "Regards,\n"
@@ -429,17 +543,19 @@ msgid ""
 msgstr ""
 "Bonjour %user%,\n"
 "\n"
-"Vous n'avez pas validé votre compte à temps. Votre compte a donc été supprimé.\n"
+"Vous n'avez pas validé votre compte à temps. Votre compte a donc été "
+"supprimé.\n"
 "Vous pouvez toujours recréer un nouveau compte.\n"
 "\n"
-"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous contacter,\n"
+"Veuillez ne pas répondre à cet email. Si vous avez besoin de nous "
+"contacter,\n"
 "merci d'utiliser le formulaire à l'adresse suivante:\n"
 "%contacturl%\n"
 "\n"
 "L'équipe de Syj"
 
 #: application/controllers/LoginController.php:99
-#: application/controllers/IdxController.php:123
+#: application/controllers/IdxController.php:124
 msgid "you must enter a login name"
 msgstr "vous devez entrer un nom d'utilisateur"
 
@@ -478,13 +594,12 @@ msgstr "Bonjour,"
 #: application/controllers/ContactController.php:121
 #: application/controllers/NewpwdController.php:68
 #: application/controllers/AccountController.php:70
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:145
 msgid "Value is required"
 msgstr "Le champ est requis"
 
 #: application/controllers/ContactController.php:122
-#: application/forms/Contact.php:32
-#: application/validate/EmailAddress.php:13
+#: application/forms/Contact.php:32 application/validate/EmailAddress.php:13
 msgid "Invalid email"
 msgstr "Email invalide"
 
@@ -493,8 +608,7 @@ msgid "Oups, something went wrong"
 msgstr "Oups, il y a eu un souci"
 
 #: application/controllers/TermsofuseController.php:10
-#: application/layouts/scripts/footer.phtml:87
-#: application/forms/Geom.php:25
+#: application/layouts/scripts/footer.phtml:87 application/forms/Geom.php:25
 #: application/forms/User.php:44
 msgid "terms of use"
 msgstr "conditions d'utilisation"
@@ -509,27 +623,30 @@ msgid "There is no undo. Delete this route definitively ?"
 msgstr "Vous ne pourrez pas annuler. Supprimer l'itinéraire définitivement ?"
 
 #: application/controllers/ListController.php:33
-#: application/controllers/IdxController.php:120
+#: application/controllers/IdxController.php:121
 msgid "server could not be reached"
 msgstr "serveur inaccessible"
 
 #: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:117
-msgid "server did not understood request. That's probably caused by a bug in SYJ"
-msgstr "Le serveur n'a pas compris la requête. Il s'agit probablement d'un bug dans SYJ"
+#: application/controllers/IdxController.php:118
+msgid ""
+"server did not understood request. That's probably caused by a bug in SYJ"
+msgstr ""
+"Le serveur n'a pas compris la requête. Il s'agit probablement d'un bug dans "
+"SYJ"
 
 #: application/controllers/ListController.php:35
-#: application/controllers/IdxController.php:118
+#: application/controllers/IdxController.php:119
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "chemin non référencé sur le serveur. Il a probablement été supprimé."
 
 #: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:121
+#: application/controllers/IdxController.php:122
 msgid "there was a server error"
 msgstr "Il s'est produit une erreur serveur"
 
 #: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:123
 msgid "there was an unknown error"
 msgstr "Il s'est produit une erreur inconnue"
 
@@ -547,19 +664,18 @@ msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
 #: application/controllers/AccountController.php:43
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:132
 msgid "an user is already registered with this email"
 msgstr "il y'a déjà un utilisateur enregistré avec cet email"
 
 #: application/controllers/AccountController.php:71
-#: application/controllers/IdxController.php:127
+#: application/controllers/IdxController.php:128
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
 #: application/controllers/AccountController.php:72
-#: application/forms/Account.php:33
-#: application/forms/User.php:20
+#: application/forms/Account.php:33 application/forms/User.php:20
 #, php-format
 msgid "At least %d characters"
 msgstr "Au moins %d caractères"
@@ -569,7 +685,7 @@ msgid "You have made no change"
 msgstr "Vous n'avez fait aucun changement"
 
 #: application/controllers/IdxController.php:26
-#: application/controllers/IdxController.php:78
+#: application/controllers/IdxController.php:79
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "tracé par <strong>%s</strong>"
@@ -582,80 +698,84 @@ msgstr "l'itinéraire a été supprimé"
 msgid "route does not exist"
 msgstr "L'itinéraire n'existe pas"
 
-#: application/controllers/IdxController.php:110
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:111
+#: application/controllers/IdxController.php:137
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Carte par <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:116
+#: application/controllers/IdxController.php:117
 msgid "save took place successfully"
 msgstr "La sauvegarde s'est déroulée correctement"
 
-#: application/controllers/IdxController.php:119
-msgid "similar path seems to already exist. Please do not create two exactly identical paths"
-msgstr "Il semble qu'il y ait déjà un chemin similaire. Veuillez ne pas créer deux chemins exactement identiques"
+#: application/controllers/IdxController.php:120
+msgid ""
+"similar path seems to already exist. Please do not create two exactly "
+"identical paths"
+msgstr ""
+"Il semble qu'il y ait déjà un chemin similaire. Veuillez ne pas créer deux "
+"chemins exactement identiques"
 
-#: application/controllers/IdxController.php:124
+#: application/controllers/IdxController.php:125
 msgid "Login correct"
 msgstr "Vous êtes connecté"
 
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:126
 msgid "Wrong login/password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: application/controllers/IdxController.php:126
+#: application/controllers/IdxController.php:127
 msgid "you must enter a password"
 msgstr "vous devez entrer un mot de passe"
 
-#: application/controllers/IdxController.php:128
+#: application/controllers/IdxController.php:129
 msgid "You must accept terms of use"
 msgstr "Vous devez accepter les conditions d'utilisation"
 
-#: application/controllers/IdxController.php:129
+#: application/controllers/IdxController.php:130
 msgid "you must enter an email"
 msgstr "vous devez entrer un email"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:131
 msgid "invalid email"
 msgstr "email invalide"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:133
 msgid "Account created"
 msgstr "Compte créé"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:135
 msgid "Now, you can retry to save"
 msgstr "Maintenant, vous pouvez réessayer de sauvegarder"
 
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:136
 msgid "route by"
 msgstr "tracé par"
 
-#: application/controllers/IdxController.php:137
+#: application/controllers/IdxController.php:138
 msgid "checking availibilty"
 msgstr "vérification de la disponibilité"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:139
 msgid "available pseudo"
 msgstr "pseudo disponible"
 
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:140
 msgid "unavailable pseudo"
 msgstr "pseudo non disponible"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:142
 msgid "create"
 msgstr "créér"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:144
 msgid "You have an unsaved route"
 msgstr "Vous avez un itinéraire non sauvegardé"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:146
 msgid "no result"
 msgstr "pas de résultat"
 
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:147
 msgid "could not analyze file content"
 msgstr "impossible d'analyser le contenu du fichier"
 
@@ -671,8 +791,7 @@ msgstr "faq"
 msgid "user"
 msgstr "utilisateur"
 
-#: application/forms/Login.php:10
-#: application/forms/Account.php:35
+#: application/forms/Login.php:10 application/forms/Account.php:35
 #: application/forms/User.php:23
 msgid "password"
 msgstr "mot de passe"
@@ -713,8 +832,7 @@ msgstr "Envoyer un message"
 msgid "optional title for this journey"
 msgstr "titre facultatif pour ce trajet"
 
-#: application/forms/Geom.php:27
-#: application/forms/User.php:46
+#: application/forms/Geom.php:27 application/forms/User.php:46
 #, php-format
 msgid "I've read and accepted %s"
 msgstr "J'ai lu et accepté les %s"
@@ -724,14 +842,12 @@ msgstr "J'ai lu et accepté les %s"
 msgid "save"
 msgstr "enregistrer"
 
-#: application/forms/Account.php:27
-#: application/forms/User.php:36
+#: application/forms/Account.php:27 application/forms/User.php:36
 #: application/forms/Newpwd.php:28
 msgid "email"
 msgstr "email"
 
-#: application/forms/Account.php:42
-#: application/forms/User.php:30
+#: application/forms/Account.php:42 application/forms/User.php:30
 msgid "confirm password"
 msgstr "confirmation du mot de passe"
 
@@ -752,8 +868,12 @@ msgid "user name"
 msgstr "nom d'utilisateur"
 
 #: application/forms/User.php:37
-msgid "After creating your account, you will receive a confirmation email. You have 7 days to confirm otherwise, your account will be deleted."
-msgstr "Après la création de votre compte, vous recevrez un mail de confirmation. Vous avez 7 jours pour confirmer, sinon votre compte sera supprimé."
+msgid ""
+"After creating your account, you will receive a confirmation email. You have "
+"7 days to confirm otherwise, your account will be deleted."
+msgstr ""
+"Après la création de votre compte, vous recevrez un mail de confirmation. "
+"Vous avez 7 jours pour confirmer, sinon votre compte sera supprimé."
 
 #: application/forms/User.php:59
 msgid "create account"
@@ -761,8 +881,13 @@ msgstr "créer le compte"
 
 #: application/forms/Pending/ResetPassword.php:11
 #, php-format
-msgid "Hi %s. Someone, probably you, has asked to reset password for your account. To get a new password, validate with following button."
-msgstr "Bonjour %s. Quelqu'un, probablement vous, a demandé de réinitialiser le mot de passe de votre compte. Pour avoir un nouveau mot de passe, validez avec le bouton suivant."
+msgid ""
+"Hi %s. Someone, probably you, has asked to reset password for your account. "
+"To get a new password, validate with following button."
+msgstr ""
+"Bonjour %s. Quelqu'un, probablement vous, a demandé de réinitialiser le mot "
+"de passe de votre compte. Pour avoir un nouveau mot de passe, validez avec "
+"le bouton suivant."
 
 #: application/forms/Pending/ResetPassword.php:16
 #: application/forms/Newpwd.php:33
@@ -774,34 +899,51 @@ msgid "cancel request"
 msgstr "annuler la requête"
 
 #: application/forms/Pending/ResetPassword.php:24
-msgid "To cancel this request, press following button. Your password will not change."
-msgstr "Pour annuler la requête, pressez le bouton suivant. Votre mot de passe ne sera pas changé."
+msgid ""
+"To cancel this request, press following button. Your password will not "
+"change."
+msgstr ""
+"Pour annuler la requête, pressez le bouton suivant. Votre mot de passe ne "
+"sera pas changé."
 
 #: application/forms/Pending/ValidateCreation.php:11
 #, php-format
-msgid "Someone, probably you, has registered an account %s with email address %s on syj. To confirm this account creation, validate with following button."
-msgstr "Quelqu'un, probablement vous, a enregistré un compte %s avec l'adresse email %s sur syj. Pour confirmer la création du compte, validez avec le bouton suivant."
+msgid ""
+"Someone, probably you, has registered an account %s with email address %s on "
+"syj. To confirm this account creation, validate with following button."
+msgstr ""
+"Quelqu'un, probablement vous, a enregistré un compte %s avec l'adresse email "
+"%s sur syj. Pour confirmer la création du compte, validez avec le bouton "
+"suivant."
 
 #: application/forms/Pending/ValidateCreation.php:24
-msgid "To cancel account creation, press following button. The account and all its data will be deleted."
-msgstr "Pour annuler la création du compte, pressez le bouton suivant. Le compte ainsi que toutes ses données seront supprimés."
+msgid ""
+"To cancel account creation, press following button. The account and all its "
+"data will be deleted."
+msgstr ""
+"Pour annuler la création du compte, pressez le bouton suivant. Le compte "
+"ainsi que toutes ses données seront supprimés."
 
 #~ msgid "modify"
 #~ msgstr "modifier"
+
 #~ msgid "pseudo available"
 #~ msgstr "pseudo disponible"
+
 #~ msgid "pseudo not available"
 #~ msgstr "pseudo non disponible"
+
 #~ msgid "pseudo must only contain letters, digits, dots or underscores"
 #~ msgstr ""
 #~ "le pseudo ne peut contenir que des lettres, des chiffres, des points ou "
 #~ "des soulignés"
+
 #~ msgid "You need to login before retrying to save"
 #~ msgstr "Vous devez vous connecter avant de réesayer de sauvegarder"
+
 #~ msgid "You need to have cookies enabled to login to SYJ"
 #~ msgstr "Vous devez activer les cookies pour pouvoir vous connecter à SYJ"
 
 #, fuzzy
 #~ msgid "reset password"
 #~ msgstr "Réinitialiser mon mot de passe"
-
diff --git a/application/languages/lang_ja.po b/application/languages/lang_ja.po
index 6a6fc7b..d005cc6 100644
--- a/application/languages/lang_ja.po
+++ b/application/languages/lang_ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: syj\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-20 11:26+0200\n"
+"POT-Creation-Date: 2010-09-27 10:55+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: S.Higashi <s_higash@mua.biglobe.ne.jp>\n"
 "Language: \n"
@@ -32,8 +32,9 @@ msgstr "メインページへ"
 msgid ""
 "There was an unkwown message when sending the message. Please try again "
 "later, or send a mail directly to <a href=\"mailto:%s\">%s</a>"
-msgstr "メッセージ送信時に不明なメッセージがありました。しばらくしてからやり直してください"
-"もしくは<a href=\"mailto:%s\">%s</a>に直接メールしてください"
+msgstr ""
+"メッセージ送信時に不明なメッセージがありました。しばらくしてからやり直してく"
+"ださいもしくは<a href=\"mailto:%s\">%s</a>に直接メールしてください"
 
 #: application/views/scripts/contact/success.phtml:4
 msgid "Email was send successfully"
@@ -43,7 +44,9 @@ msgstr "メール送信に成功しました"
 #: application/views/scripts/idx/raw.phtml:8
 #: application/views/scripts/list/index.phtml:8
 msgid "SYJ needs javascript. Please activate scripts in your browser."
-msgstr "SYJはjavascriptを使用します。あなたのブラウザでjavascriptを使えるように設定してください"
+msgstr ""
+"SYJはjavascriptを使用します。あなたのブラウザでjavascriptを使えるように設定し"
+"てください"
 
 #: application/views/scripts/idx/index.phtml:15
 msgid "Welcome on Syj."
@@ -54,10 +57,10 @@ msgid ""
 "To create a journey, just press <strong>\"start a route\"</strong> button, "
 "then click on the map to add points to your route. You can zoom and move the "
 "map with the controls in the top left corner"
-msgstr "旅の記録を作成するには、まず<strong>\"ルート開始\"</strong> ボタンを押してください。"
-"そしてマップをクリックしながらルートに沿ってポイントを追加してください。"
-"画面左上のコントロールでマップのズームや移動ができます"
-
+msgstr ""
+"旅の記録を作成するには、まず<strong>\"ルート開始\"</strong> ボタンを押してく"
+"ださい。そしてマップをクリックしながらルートに沿ってポイントを追加してくださ"
+"い。画面左上のコントロールでマップのズームや移動ができます"
 
 #: application/views/scripts/idx/index.phtml:19
 msgid "When you have finished a path, press \"create\", button."
@@ -106,12 +109,12 @@ msgid "gpx export"
 msgstr "gpxにエクスポート"
 
 #: application/views/scripts/idx/index.phtml:101
-#: application/controllers/IdxController.php:142
+#: application/controllers/IdxController.php:143
 msgid "duplicate"
 msgstr "複製"
 
 #: application/views/scripts/idx/index.phtml:103
-#: application/controllers/IdxController.php:140
+#: application/controllers/IdxController.php:141
 msgid "edit"
 msgstr "編集"
 
@@ -135,8 +138,9 @@ msgstr "もっと"
 msgid ""
 "Show Your Journey is a site whose goal is to allow anyone to publish routes, "
 "for example, hiking itinerary, bicycle trip, travel itinerary or whatever."
-msgstr "Show Your Journey のゴールは誰もがルートを公開できるようにすることです。"
-"例えば、ハイキング経路、自転車トリップ、旅行行程その他あらゆるものです。"
+msgstr ""
+"Show Your Journey のゴールは誰もがルートを公開できるようにすることです。例え"
+"ば、ハイキング経路、自転車トリップ、旅行行程その他あらゆるものです。"
 
 #: application/views/scripts/termsofuse/index.phtml:9
 msgid ""
@@ -144,10 +148,10 @@ msgid ""
 "is asked for, and ip address of account creation is stored on the server. "
 "Those informations will not be divulged to anyone without the user explicit "
 "permission."
-msgstr "ルートを公開するためには、最初にアカウントを作成してください。"
-"実在するメールアドレスが必要で、アカウントを作成時のIPアドレスはサーバの保存されます。"
-"これらの情報はユーザの明示的な許可が無い限り、誰にも漏らすことはありません。"
-
+msgstr ""
+"ルートを公開するためには、最初にアカウントを作成してください。実在するメール"
+"アドレスが必要で、アカウントを作成時のIPアドレスはサーバの保存されます。これ"
+"らの情報はユーザの明示的な許可が無い限り、誰にも漏らすことはありません。"
 
 #: application/views/scripts/termsofuse/index.phtml:13
 msgid ""
@@ -156,24 +160,29 @@ msgid ""
 "a modified version of it for any purpose. This also means you need to get "
 "appropriate permissions from the creator if you want to upload a route you "
 "didn't create yourself."
-msgstr "ルートを作成する場合は、いかなる用途でも自由に使えることに同意することになります。"
-"これはあなたの旅程やそれに手を加えたものを誰もがどのような目的にも再利用、再作成、再公開できるということを意味します。"
-"同時に、もしあなたが自分で作成したものでないルートをアップロードする場合には"
-"その作者から適切な許可をもらう必要がある、ということをも意味しています。"
+msgstr ""
+"ルートを作成する場合は、いかなる用途でも自由に使えることに同意することになり"
+"ます。これはあなたの旅程やそれに手を加えたものを誰もがどのような目的にも再利"
+"用、再作成、再公開できるということを意味します。同時に、もしあなたが自分で作"
+"成したものでないルートをアップロードする場合にはその作者から適切な許可をもら"
+"う必要がある、ということをも意味しています。"
 
 #: application/views/scripts/termsofuse/index.phtml:17
 msgid ""
 "Show Your Journey is not responsible for the accuracy of the routes "
 "published. It's the user responsibility to check that a route is accessible "
 "and safe."
-msgstr "Show Your Journeyは公開されたルートの正確さに責を負うものではありません。"
-"ルートが通行可能で安全であるということをチェックするのはユーザの責任です。"
+msgstr ""
+"Show Your Journeyは公開されたルートの正確さに責を負うものではありません。ルー"
+"トが通行可能で安全であるということをチェックするのはユーザの責任です。"
 
 #: application/views/scripts/termsofuse/index.phtml:21
 msgid ""
 "Show Your Journey service is provided \"as is\" with no guarantee for "
 "accuracy or accessibility."
-msgstr "Show Your Journeyサービスは\"あるがまま\"に提供され、正確さやアクセシビリティを保証するものではありません。"
+msgstr ""
+"Show Your Journeyサービスは\"あるがまま\"に提供され、正確さやアクセシビリティ"
+"を保証するものではありません。"
 
 #: application/views/scripts/termsofuse/index.phtml:25
 msgid ""
@@ -181,12 +190,14 @@ msgid ""
 "renevier.net/?p=syj.git\">publicly available</a> under a agpl license. The "
 "map used to display the routes comes from <a href=\"http://www.openstreetmap."
 "org/\">openstreetmap</a>."
-msgstr "ウェブサイトで動作しているソフトウェアのソースコードはagplライセンスの下で"
-"<a href=\"http://dev.renevier.net/?p=syj.git\">誰でも利用可能</a>です。"
-"ルート表示に使用されているマップは<a href=\"http://www.openstreetmap.org/\">openstreetmap</a>です。"
+msgstr ""
+"ウェブサイトで動作しているソフトウェアのソースコードはagplライセンスの下で<a "
+"href=\"http://dev.renevier.net/?p=syj.git\">誰でも利用可能</a>です。ルート表"
+"示に使用されているマップは<a href=\"http://www.openstreetmap.org/"
+"\">openstreetmap</a>です。"
 
 #: application/views/scripts/newpwd/success.phtml:4
-#: application/controllers/IdxController.php:133
+#: application/controllers/IdxController.php:134
 msgid "A link to reset your password has been emailed to you"
 msgstr "パスワードをリセットするためのURLがあなた宛に送られました"
 
@@ -229,9 +240,10 @@ msgid ""
 "Your new password is now <strong>%s</strong>. You can %s with this new "
 "password. Don't forget to change it again to a personal password as soon as "
 "possible."
-msgstr "あなたの新しいパスワードは <strong>%s</strong> です。この新しいパスワードで"
-"%s できます。忘れずにできるだけ早く個人的なパスワードに再度変更してください。"
-
+msgstr ""
+"あなたの新しいパスワードは <strong>%s</strong> です。この新しいパスワード"
+"で%s できます。忘れずにできるだけ早く個人的なパスワードに再度変更してくださ"
+"い。"
 
 #: application/views/scripts/account/success.phtml:4
 msgid "Your account was modified successfully"
@@ -287,9 +299,11 @@ msgid ""
 "routes. You draw a route on a map background, and then, you get an link to "
 "share it. You can then show clever bicycle rides, your last hiking, or any "
 "route you want."
-msgstr "<acronym title=\"Show your journey\">Syj</acronym> はルートを共有するためのウェブサイトです。"
-"マップの背景にルートを描くと、それを共有するためのリンクURLを取得できます。"
-"これにより賢い自転車ルート、最近のハイキング、その他何でも好きなルートを取得することができます。"
+msgstr ""
+"<acronym title=\"Show your journey\">Syj</acronym> はルートを共有するための"
+"ウェブサイトです。マップの背景にルートを描くと、それを共有するためのリンクURL"
+"を取得できます。これにより賢い自転車ルート、最近のハイキング、その他何でも好"
+"きなルートを取得することができます。"
 
 #: application/views/scripts/faq/index.phtml:9
 msgid "How do I modify a route?"
@@ -302,9 +316,11 @@ msgid ""
 "you want to delete it, you need to press the Shift key. While you hold the "
 "button, points will have an icon%s over them. Clicking that icon will delete "
 "the point."
-msgstr "ルートを編集する際には、ドラッグ＆ドロップでポイントを移動できます。"
-"削除したい場合には、シフトキーを押す必要があります。ボタンを押している間、"
-"ポイントの上にアイコン %s が現れます。そのアイコンをクリックするとポイントは削除されます。"
+msgstr ""
+"ルートを編集する際には、ドラッグ＆ドロップでポイントを移動できます。削除した"
+"い場合には、シフトキーを押す必要があります。ボタンを押している間、ポイントの"
+"上にアイコン %s が現れます。そのアイコンをクリックするとポイントは削除されま"
+"す。"
 
 #: application/views/scripts/faq/index.phtml:12
 msgid "Why should I create a account?"
@@ -314,8 +330,9 @@ msgstr "なぜアカウントを作成する必要があるのですか？"
 msgid ""
 "You can create routes without a account. But if you want to modify your "
 "routes afterwards, you need to be registered when creating the route."
-msgstr "アカウントなしでもルートを作成できます。"
-"しかし、後から自分のルートを変更したい場合には、ルート作成時にユーザ登録している必要があります。"
+msgstr ""
+"アカウントなしでもルートを作成できます。しかし、後から自分のルートを変更した"
+"い場合には、ルート作成時にユーザ登録している必要があります。"
 
 #: application/views/scripts/faq/index.phtml:15
 msgid "Is it possible to have my route \"attach\" nearby paths?"
@@ -332,14 +349,15 @@ msgid ""
 "to attach to motorways, footways, biycle lanes, railways, &hellip;. If you "
 "are in a place with lot of differents routes, it would be nearly impossible "
 "to always choose the right way."
-msgstr "Syjでルートを作成するには、各ポイントをマップ上に描かなければなりません。"
-"あなたのルートが既存のパスをフォローしている場合でも、あなたは手動でレイヤを描く"
-"必要があります： Syjは既存のパス近辺に添付しようとはしません。主な理由は３つ。"
-"悪い理由がひとつ: 実装には多くの労力がかかります。"
-"良い理由がふたつ: SyjはOpenStreetMapを背景マップとして使っており、そしてマップは"
-"多くのエリアで未完成です。また、あなたのルートによっては、あなたは自動車専用道路、"
-"歩道、自転車専用レーン、鉄道…などを添付したいと思うでしょう。"
-"あなたが多くの異なるルートがある場所にいるなら、常に正しい道を選ぶのは不可能に近いでしょう。"
+msgstr ""
+"Syjでルートを作成するには、各ポイントをマップ上に描かなければなりません。あな"
+"たのルートが既存のパスをフォローしている場合でも、あなたは手動でレイヤを描く"
+"必要があります： Syjは既存のパス近辺に添付しようとはしません。主な理由は３"
+"つ。悪い理由がひとつ: 実装には多くの労力がかかります。良い理由がふたつ: Syjは"
+"OpenStreetMapを背景マップとして使っており、そしてマップは多くのエリアで未完成"
+"です。また、あなたのルートによっては、あなたは自動車専用道路、歩道、自転車専"
+"用レーン、鉄道…などを添付したいと思うでしょう。あなたが多くの異なるルートがあ"
+"る場所にいるなら、常に正しい道を選ぶのは不可能に近いでしょう。"
 
 #: application/views/helpers/LogoutLink.php:10
 #: application/layouts/scripts/footer.phtml:67
@@ -388,24 +406,23 @@ msgid ""
 "Thanks,\n"
 "\n"
 "Syj team"
-msgstr "こんにちは %user% さん\n"
+msgstr ""
+"こんにちは %user% さん\n"
 "\n"
-"誰か、おそらくあなた自身、があなたのパスワードリセットを要求しました。"
-"あなたのパスワードをリセット\n"
+"誰か、おそらくあなた自身、があなたのパスワードリセットを要求しました。あなた"
+"のパスワードをリセット\n"
 "する場合には、このリンクに従ってください:\n"
 "%hashurl%\n"
 "\n"
 "２日以内に確認しなければ、あなたのパスワードはリセットされません。\n"
 "\n"
-"このメールに返信しないでください。管理者に連絡を取りたければ下記"
-"フォームで\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n"
 "連絡を %contacturl%\n"
 "\n"
 "ありがとうごいざいます、\n"
 "\n"
 "Syj チーム"
 
-
 #: application/models/Pending/ValidateCreation.php:15
 msgid "[SYJ] Validate your account"
 msgstr "[SYJ] あなたのアカウントを認証してください"
@@ -430,25 +447,23 @@ msgid ""
 "Thanks,\n"
 "\n"
 "Syj team"
-msgstr "こんにちは %user%さん、そしてようこそsyjへ\n"
+msgstr ""
+"こんにちは %user%さん、そしてようこそsyjへ\n"
 "\n"
 "あなたのアカウントは現在アクティブですが、次のリンクで\n"
 "署名に確認が必要です:\n"
 "%hashurl%\n"
 "\n"
-"７日以内にあなたの署名を確認しなければ、あなたのアカウントは"
-"\n"
+"７日以内にあなたの署名を確認しなければ、あなたのアカウントは\n"
 "削除されます。\n"
 "\n"
-"このメールに返信しないでください。管理者に連絡を取りたければ下記"
-"フォームで\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n"
 "連絡を %contacturl%\n"
 "\n"
 "ありがとうごいざいます、\n"
 "\n"
 "Syj チーム"
 
-
 #: application/models/Pending/ValidateCreation.php:34
 msgid "[SYJ] Reminder: Validate your account"
 msgstr "[SYJ] リマインダー: あなたのアカウントを確認してください"
@@ -468,22 +483,21 @@ msgid ""
 "Thanks,\n"
 "\n"
 "Syj team"
-
-msgstr "こんにちは %user%さん\n"
+msgstr ""
+"こんにちは %user%さん\n"
 "\n"
-"あなたのアカウントは認証されずに６日間経っています。何もしなければ、あなたの\n"
+"あなたのアカウントは認証されずに６日間経っています。何もしなければ、あなた"
+"の\n"
 "アカウントは明日削除されます。次のリンクに従ってください:\n"
 "%hashurl%\n"
 "\n"
-"このメールに返信しないでください。管理者に連絡を取りたければ下記"
-"フォームで\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n"
 "連絡を %contacturl%\n"
 "\n"
 "ありがとうごいざいます、\n"
 "\n"
 "Syj チーム"
 
-
 #: application/models/Pending/ValidateCreation.php:51
 msgid "[SYJ] Account deactivated"
 msgstr "[SYJ] アカウント無効化"
@@ -503,23 +517,22 @@ msgid ""
 "Regards,\n"
 "\n"
 "Syj team"
-msgstr "こんにちは %user%さん\n"
-"\n"
-"あなたは期限までにSyjのアカウントを認証しませんでした。このため、あなたのアカウントは"
+msgstr ""
+"こんにちは %user%さん\n"
 "\n"
+"あなたは期限までにSyjのアカウントを認証しませんでした。このため、あなたのアカ"
+"ウントは\n"
 "削除されました。しかし、また新しいアカウントを作成することはできます。\n"
 "\n"
-"このメールに返信しないでください。管理者に連絡を取りたければ下記"
-"フォームで\n"
+"このメールに返信しないでください。管理者に連絡を取りたければ下記フォームで\n"
 "連絡を %contacturl%\n"
 "\n"
 "ありがとうごいざいます、\n"
 "\n"
 "Syj チーム"
 
-
 #: application/controllers/LoginController.php:99
-#: application/controllers/IdxController.php:123
+#: application/controllers/IdxController.php:124
 msgid "you must enter a login name"
 msgstr "ログイン名を入力してください"
 
@@ -553,12 +566,12 @@ msgstr "連絡フォーム"
 
 #: application/controllers/ContactController.php:112
 msgid "Hi,"
-msgstr "こんにちは、"
+msgstr "Hi,"
 
 #: application/controllers/ContactController.php:121
 #: application/controllers/NewpwdController.php:68
 #: application/controllers/AccountController.php:70
-#: application/controllers/IdxController.php:144
+#: application/controllers/IdxController.php:145
 msgid "Value is required"
 msgstr "値が必要です"
 
@@ -587,28 +600,28 @@ msgid "There is no undo. Delete this route definitively ?"
 msgstr "やり直しはできません。本当にこのルートを削除しますか？"
 
 #: application/controllers/ListController.php:33
-#: application/controllers/IdxController.php:120
+#: application/controllers/IdxController.php:121
 msgid "server could not be reached"
 msgstr "サーバに届かなかったようです"
 
 #: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:117
+#: application/controllers/IdxController.php:118
 msgid ""
 "server did not understood request. That's probably caused by a bug in SYJ"
 msgstr "サーバはリクエストを理解できませんでした。おそらくSYJのバグでしょう"
 
 #: application/controllers/ListController.php:35
-#: application/controllers/IdxController.php:118
+#: application/controllers/IdxController.php:119
 msgid "route not referenced on the server. It has probably been deleted."
 msgstr "ルートはサーバ上で参照できませんでした。おそらく削除されています。"
 
 #: application/controllers/ListController.php:36
-#: application/controllers/IdxController.php:121
+#: application/controllers/IdxController.php:122
 msgid "there was a server error"
 msgstr "サーバのエラーがありました"
 
 #: application/controllers/ListController.php:37
-#: application/controllers/IdxController.php:122
+#: application/controllers/IdxController.php:123
 msgid "there was an unknown error"
 msgstr "不明なエラーがありました"
 
@@ -626,12 +639,12 @@ msgid "Wrong password"
 msgstr "間違ったパスワード"
 
 #: application/controllers/AccountController.php:43
-#: application/controllers/IdxController.php:131
+#: application/controllers/IdxController.php:132
 msgid "an user is already registered with this email"
 msgstr "このメールアドレスのユーザが既に登録されています"
 
 #: application/controllers/AccountController.php:71
-#: application/controllers/IdxController.php:127
+#: application/controllers/IdxController.php:128
 #: application/forms/Account.php:40
 msgid "Password do not match"
 msgstr "パスワードが一致しません"
@@ -647,7 +660,7 @@ msgid "You have made no change"
 msgstr "変更していません"
 
 #: application/controllers/IdxController.php:26
-#: application/controllers/IdxController.php:78
+#: application/controllers/IdxController.php:79
 #, php-format
 msgid "route by <strong>%s</strong>"
 msgstr "<strong>%s</strong>のルート"
@@ -660,82 +673,82 @@ msgstr "ルートは削除されました"
 msgid "route does not exist"
 msgstr "ルートはありません"
 
-#: application/controllers/IdxController.php:110
-#: application/controllers/IdxController.php:136
+#: application/controllers/IdxController.php:111
+#: application/controllers/IdxController.php:137
 msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
 
-#: application/controllers/IdxController.php:116
+#: application/controllers/IdxController.php:117
 msgid "save took place successfully"
 msgstr "保存されました"
 
-#: application/controllers/IdxController.php:119
+#: application/controllers/IdxController.php:120
 msgid ""
 "similar path seems to already exist. Please do not create two exactly "
 "identical paths"
 msgstr "類似のパスが既に存在します。全く同じパスをふたつ作成しないでください"
 
-#: application/controllers/IdxController.php:124
+#: application/controllers/IdxController.php:125
 msgid "Login correct"
 msgstr "正常ログイン"
 
-#: application/controllers/IdxController.php:125
+#: application/controllers/IdxController.php:126
 msgid "Wrong login/password"
 msgstr "誤ったログイン/パスワード"
 
-#: application/controllers/IdxController.php:126
+#: application/controllers/IdxController.php:127
 msgid "you must enter a password"
 msgstr "パスワードを入力してください"
 
-#: application/controllers/IdxController.php:128
+#: application/controllers/IdxController.php:129
 msgid "You must accept terms of use"
 msgstr "利用条件を承諾してください"
 
-#: application/controllers/IdxController.php:129
+#: application/controllers/IdxController.php:130
 msgid "you must enter an email"
 msgstr "メールアドレスを入力してください"
 
-#: application/controllers/IdxController.php:130
+#: application/controllers/IdxController.php:131
 msgid "invalid email"
 msgstr "不正なメールアドレス"
 
-#: application/controllers/IdxController.php:132
+#: application/controllers/IdxController.php:133
 msgid "Account created"
 msgstr "アカウントを作成しました"
 
-#: application/controllers/IdxController.php:134
+#: application/controllers/IdxController.php:135
 msgid "Now, you can retry to save"
 msgstr "今は、保存をやり直すことができます"
 
-#: application/controllers/IdxController.php:135
+#: application/controllers/IdxController.php:136
 msgid "route by"
 msgstr "ルート作成者"
 
-#: application/controllers/IdxController.php:137
+#: application/controllers/IdxController.php:138
 msgid "checking availibilty"
 msgstr "利用可能かチェック中"
 
-#: application/controllers/IdxController.php:138
+#: application/controllers/IdxController.php:139
 msgid "available pseudo"
-msgstr "利用出来るpseudo"
+msgstr "利用出来るID"
 
-#: application/controllers/IdxController.php:139
+#: application/controllers/IdxController.php:140
 msgid "unavailable pseudo"
-msgstr "利用できないpseudo"
+msgstr "利用できないID"
 
-#: application/controllers/IdxController.php:141
+#: application/controllers/IdxController.php:142
 msgid "create"
 msgstr "作成"
 
-#: application/controllers/IdxController.php:143
+#: application/controllers/IdxController.php:144
 msgid "You have an unsaved route"
 msgstr "保存されていないルートがあります"
 
-#: application/controllers/IdxController.php:145
+#: application/controllers/IdxController.php:146
 msgid "no result"
 msgstr "結果がありません"
 
-#: application/controllers/IdxController.php:146
+#: application/controllers/IdxController.php:147
 msgid "could not analyze file content"
 msgstr "ファイル内容を分析できませんでした"
 
@@ -774,11 +787,11 @@ msgstr "件名欄は %max% 文字までです"
 
 #: application/forms/Contact.php:45
 msgid "Subject:"
-msgstr "件名"
+msgstr "件名(英語で)"
 
 #: application/forms/Contact.php:49
 msgid "Message:"
-msgstr "メッセージ"
+msgstr "メッセージ(英語で)"
 
 #: application/forms/Contact.php:56
 msgid "Send"
@@ -831,8 +844,9 @@ msgstr "ユーザ名"
 msgid ""
 "After creating your account, you will receive a confirmation email. You have "
 "7 days to confirm otherwise, your account will be deleted."
-msgstr "アカウント作成後、確認メールが届きます。"
-"７日以内に認証してください、そうしなければアカウントは削除されます。"
+msgstr ""
+"アカウント作成後、確認メールが届きます。７日以内に認証してください、そうしな"
+"ければアカウントは削除されます。"
 
 #: application/forms/User.php:59
 msgid "create account"
@@ -843,8 +857,11 @@ msgstr "アカウント作成"
 msgid ""
 "Hi %s. Someone, probably you, has asked to reset password for your account. "
 "To get a new password, validate with following button."
-msgstr "こんにちは、 %s さん、誰か、おそらくあなた自身、がアカウントのパスワードリセットを要求しました"
-"新しいパスワードを取得するには、下記のボタンで認証してください。"
+msgstr ""
+"こんにちは、 %s さん、誰か、おそらくあなた自身、がアカウントのパスワードリ"
+"セットを要求しました新しいパスワードを取得するには、下記のボタンで認証してく"
+"ださい。"
+
 #: application/forms/Pending/ResetPassword.php:16
 #: application/forms/Newpwd.php:33
 msgid "reset my password"
@@ -858,20 +875,24 @@ msgstr "リクエストをキャンセル"
 msgid ""
 "To cancel this request, press following button. Your password will not "
 "change."
-msgstr "このリクエストをキャンセルするには、次のボタンを押してください。"
-"あなたのパスワードは変更されません。"
+msgstr ""
+"このリクエストをキャンセルするには、次のボタンを押してください。あなたのパス"
+"ワードは変更されません。"
 
 #: application/forms/Pending/ValidateCreation.php:11
 #, php-format
 msgid ""
 "Someone, probably you, has registered an account %s with email address %s on "
 "syj. To confirm this account creation, validate with following button."
-msgstr "誰か、おそらくあなた自身、がアカウント %s を %s というメールアドレスで"
-"Syj 上に登録しました。このアカウント作成を確認するには、次のボタンを認証してください。"
+msgstr ""
+"誰か、おそらくあなた自身、がアカウント %s を %s というメールアドレスでSyj 上"
+"に登録しました。このアカウント作成を確認するには、次のボタンを認証してくださ"
+"い。"
 
 #: application/forms/Pending/ValidateCreation.php:24
 msgid ""
 "To cancel account creation, press following button. The account and all its "
 "data will be deleted."
-msgstr "アカウント作成をキャンセルするには、次のボタンを押してください。"
-"アカウントとそのデータは全て削除されます。"
+msgstr ""
+"アカウント作成をキャンセルするには、次のボタンを押してください。アカウントと"
+"そのデータは全て削除されます。"
-- 
2.39.2


From a3870411b5c5217e7b2f063d2929fc2e14daa962 Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Mon, 27 Sep 2010 19:53:34 +0200
Subject: [PATCH 15/16] revert a86eeac0ab678ea55307e1386c5f955f77d8ff73

---
 application/controllers/IdxController.php  | 3 +--
 application/controllers/PathController.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 3996fa0..ee1efb0 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -66,8 +66,7 @@ class IdxController extends Zend_Controller_Action
             $geomform->geom_title->setValue($path->title);
         } else {
             $geomform->setAction('path');
-            $clientip = trim(end(split(',', $this->getRequest()->getClientIp(true))));
-            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($clientip));
+            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
             $this->view->headScript()->prependScript((string) $extent);
             $title = "Show your journey";
         }
diff --git a/application/controllers/PathController.php b/application/controllers/PathController.php
index 48a22be..bb969e8 100644
--- a/application/controllers/PathController.php
+++ b/application/controllers/PathController.php
@@ -13,7 +13,7 @@ class PathController extends Zend_Controller_Action
             throw new Syj_Exception_Request();
         }
         $path->creator = $user;
-        $path->creatorIp = trim(end(split(',', $this->getRequest()->getClientIp(true))));
+        $path->creatorIp = $this->getRequest()->getClientIp(true);
 
         $this->save($path, $formData);
         $data = array('redirect' => "idx/" . (string)$path->id);
-- 
2.39.2


From 0fef3b481173d03eeb7b5bf4ab3b38e2bba12c3a Mon Sep 17 00:00:00 2001
From: arno <arno@renevier.net>
Date: Tue, 28 Sep 2010 21:15:10 +0200
Subject: [PATCH 16/16] fixes: file drag and drop did not work with gpx format

---
 public/js/syj.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/syj.js b/public/js/syj.js
index 3606cd0..8012d99 100644
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -388,7 +388,7 @@ var SYJView = {
                         } catch(e) {
                         }
                         if (results || results.length) {
-                            break;
+                            continue;
                         }
                     }
                     if (!results || !results.length) {
-- 
2.39.2