$this->_strToBytes(ini_get('upload_max_filesize'))));
$errorMsg = __('File too large. File size must not exceed %s', $maxsize);
} else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
- if ($error->exception->getMessage() === 'uniquepath') {
- $errorMsg = __("similar path seems to already exist. Please do not create two exactly identical paths");
- } else {
- $errorMsg = __("Invalid file");
- }
+ $errorMsg = __("Invalid file");
}
$this->view->errorMsg = $errorMsg;
}
'saveSuccess' => __("save took place successfully"),
'requestError' => __("server did not understood request. That's probably caused by a bug in SYJ"),
'gonePathError' => __("route not referenced on the server. It has probably been deleted."),
- 'uniquePathError' => __("similar path seems to already exist. Please do not create two exactly identical paths"),
'notReachedError' => __("server could not be reached"),
'serverError' => __("there was a server error"),
'unknownError' => __("there was an unknown error"),
/* now, saving !*/
$pathMapper = new Syj_Model_PathMapper();
- try {
- $pathMapper->save ($path);
- } catch(Zend_Db_Statement_Exception $e) {
- if ($e->getCode() == 23505) { // 23505: Unique violation throw new Syj_Exception_Request();
- $message = $e->getMessage();
- if (strpos($message, 'paths_geom_key') !== false) {
- throw new Syj_Exception_InvalidGeomUpload("uniquepath");
- } else {
- throw $e;
- }
- } else {
- throw $e;
- }
- }
+ $pathMapper->save ($path);
}
}
msgstr ""
"Project-Id-Version: syj\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 14:22+0100\n"
+"POT-Creation-Date: 2011-03-20 20:25+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: arno <arno@renevier.net>\n"
"Language-Team: arno <arno@renevier.net>\n"
#: 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"
msgstr "Welcome on Syj."
#: application/views/scripts/idx/index.phtml:23
-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:25
msgid "When you have finished a path, press \"create\", button."
#: application/views/scripts/idx/index.phtml:48
#: application/controllers/LoginController.php:8
-#: application/layouts/scripts/footer.phtml:74
-#: application/forms/Login.php:23
+#: application/layouts/scripts/footer.phtml:74 application/forms/Login.php:23
msgid "login"
msgstr "login"
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:170
#: 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"
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?"
#: 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, …. 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, …. 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, …. 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, …. 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:9
#: application/layouts/scripts/footer.phtml:67
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"
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"
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"
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"
"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"
"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"
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"
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"
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"
-#: application/controllers/ErrorController.php:59
+#: application/controllers/ErrorController.php:60
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:39
+#: application/layouts/scripts/footer.phtml:87 application/forms/Geom.php:39
#: application/forms/User.php:44
msgid "terms of use"
msgstr "terms of use"
msgstr "server could not be reached"
#: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:154
-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:155
+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:155
+#: application/controllers/IdxController.php:156
msgid "route not referenced on the server. It has probably been deleted."
msgstr "route not referenced on the server. It has probably been deleted."
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"
msgid "Invalid file"
msgstr "Invalid file"
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:148
#: application/controllers/IdxController.php:173
msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
-#: application/controllers/IdxController.php:153
+#: application/controllers/IdxController.php:154
msgid "save took place successfully"
msgstr "save took place successfully"
-#: application/controllers/IdxController.php:156
-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:161
msgid "Login correct"
msgstr "Login correct"
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"
msgid "optional title for this journey"
msgstr "optional title for this journey"
-#: application/forms/Geom.php:41
-#: application/forms/User.php:46
+#: application/forms/Geom.php:41 application/forms/User.php:46
#, php-format
msgid "I've read and accepted %s"
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"
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"
#: 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
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."
msgstr ""
"Project-Id-Version: syj\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 14:22+0100\n"
+"POT-Creation-Date: 2011-03-20 20:25+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: arno <arno@renevier.net>\n"
"Language-Team: arno <arno@renevier.net>\n"
#: 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"
#: 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:21
msgid "Welcome on Syj."
msgstr "Bienvenue sur Syj."
#: application/views/scripts/idx/index.phtml:23
-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:25
msgid "When you have finished a path, press \"create\", button."
#: application/views/scripts/idx/index.phtml:48
#: application/controllers/LoginController.php:8
-#: application/layouts/scripts/footer.phtml:74
-#: application/forms/Login.php:23
+#: application/layouts/scripts/footer.phtml:74 application/forms/Login.php:23
msgid "login"
msgstr "connexion"
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:170
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."
#: 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"
msgstr "Qu'est-ce que 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'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?"
#: 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 ?"
#: 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' « accrocher » 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, …. 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 : syj ne va pas chercher à accrocher les chemins proches. Il y a trois raisons principales à cela. Une mauvaise raison : cela demanderait beaucoup de travail à mettre en place. Et deux bonnes raisons : 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, …. 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, …. 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 : syj ne va pas chercher à accrocher "
+"les chemins proches. Il y a trois raisons principales à cela. Une mauvaise "
+"raison : cela demanderait beaucoup de travail à mettre en place. Et "
+"deux bonnes raisons : 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, …. 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:9
#: application/layouts/scripts/footer.phtml:67
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"
"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"
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"
"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"
"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"
"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"
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"
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"
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"
-#: application/controllers/ErrorController.php:59
+#: application/controllers/ErrorController.php:60
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:39
+#: application/layouts/scripts/footer.phtml:87 application/forms/Geom.php:39
#: application/forms/User.php:44
msgid "terms of use"
msgstr "conditions d'utilisation"
msgstr "serveur inaccessible"
#: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:154
-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:155
+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:155
+#: application/controllers/IdxController.php:156
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é."
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"
msgid "Invalid file"
msgstr "Fichier invalide"
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:148
#: application/controllers/IdxController.php:173
msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
msgstr "Carte par <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
-#: application/controllers/IdxController.php:153
+#: application/controllers/IdxController.php:154
msgid "save took place successfully"
msgstr "La sauvegarde s'est déroulée correctement"
-#: application/controllers/IdxController.php:156
-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:161
msgid "Login correct"
msgstr "Vous êtes connecté"
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"
msgid "optional title for this journey"
msgstr "titre facultatif pour ce trajet"
-#: application/forms/Geom.php:41
-#: application/forms/User.php:46
+#: application/forms/Geom.php:41 application/forms/User.php:46
#, php-format
msgid "I've read and accepted %s"
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"
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"
#: 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
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."
msgstr ""
"Project-Id-Version: syj\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 14:22+0100\n"
+"POT-Creation-Date: 2011-03-20 20:25+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: S.Higashi <s_higash@mua.biglobe.ne.jp>\n"
"Language: \n"
msgid "Invalid email"
msgstr "不正なメールアドレス"
-#: application/controllers/ErrorController.php:59
+#: application/controllers/ErrorController.php:60
msgid "Oups, something went wrong"
msgstr "おや、何かがおかしいですね"
msgstr "サーバに届かなかったようです"
#: application/controllers/ListController.php:34
-#: application/controllers/IdxController.php:154
+#: application/controllers/IdxController.php:155
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:155
+#: application/controllers/IdxController.php:156
msgid "route not referenced on the server. It has probably been deleted."
msgstr "ルートはサーバ上で参照できませんでした。おそらく削除されています。"
msgid "Invalid file"
msgstr "不正なメールアドレス"
-#: application/controllers/IdxController.php:147
+#: application/controllers/IdxController.php:148
#: application/controllers/IdxController.php:173
msgid "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
msgstr "Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"
-#: application/controllers/IdxController.php:153
+#: application/controllers/IdxController.php:154
msgid "save took place successfully"
msgstr "保存されました"
-#: application/controllers/IdxController.php:156
-msgid ""
-"similar path seems to already exist. Please do not create two exactly "
-"identical paths"
-msgstr "類似のパスが既に存在します。全く同じパスをふたつ作成しないでください"
-
#: application/controllers/IdxController.php:161
msgid "Login correct"
msgstr "正常ログイン"
case 400:
case 404:
message = SyjStrings.requestError;
- if (transport.responseJSON) {
- switch (transport.responseJSON.message) {
- case "uniquepath":
- message = SyjStrings.uniquePathError;
- break;
- default:
- break;
- }
- }
break;
case 403:
message = "";
urlcomp VARCHAR(20) UNIQUE CHECK (urlcomp ~ '^[a-z][a-zA-Z0-9_]*$') -- ~: matches regular expression; case sensitive
);
-CREATE OR REPLACE FUNCTION tg_paths_bu() RETURNS TRIGGER AS $$
-DECLARE res INTEGER;
-BEGIN
- SELECT INTO res COUNT(*) FROM paths WHERE ST_AsBinary(geom) = ST_AsBinary(NEW.geom) AND creator = NEW.creator AND id != NEW.id;
- -- unique (geom, creator) constraint will not work: first because of postgis
- -- #541; then because equality is checked by comparing bbox instead of real
- -- geometries. So, we implement that constraint in a trigger
- IF res >= 1 THEN
- RAISE 'duplicate key paths_geom_key' using ERRCODE = 'unique_violation';
- ELSE
- -- update last_update TIMESTAMP
- NEW.last_update = NOW();
- RETURN NEW;
- END IF;
-END;
-$$ LANGUAGE PLPGSQL;
-
-DROP TRIGGER IF EXISTS tg_paths_bu ON paths;
-CREATE TRIGGER tg_paths_bu BEFORE INSERT OR UPDATE ON paths FOR EACH ROW EXECUTE PROCEDURE tg_paths_bu();
-
COMMIT;
projects / syj.git / commitdiff