Add Transifex support

.travis.yml

@@ -25,6 +25,18 @@ before_install:
   - composer install
   - until netstat -atn 2>/dev/null | grep '8080.*LISTEN'; do sleep 1; done
 
+after_success:
+- |
+  if [ ! -z "$TRANSIFEX_PASSWORD" ]; then
+    pip install --user virtualenv
+    virtualenv ~/env
+    source ~/env/bin/activate
+    pip install transifex-client
+    echo -e "[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = api\npassword = ${TRANSIFEX_PASSWORD}\n" > ~/.transifexrc
+    tx push -s --no-interactive
+  fi
+
+
 script:
   - ./vendor/bin/phpunit  -c .tests/phpunit.xml
 

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[ulogger-android.strings-php]
+file_filter = ./lang/<lang>.php
+minimum_perc = 0
+source_file = ./lang/en.php
+source_lang = en
+type = PHP_ALT_ARRAY

README.md

@@ -68,6 +68,9 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews
 - track display filters (accurracy, provider)
 - improve interface on mobile devices
 
+## Translations
+- translations may be contributed via [Transifex](https://www.transifex.com/bfabiszewski/ulogger-android/).
+
 ## License
 - GPL
 - μlogger is a fork of phpTrackme - tracks viewer I wrote for TrackMe app

lang.php

@@ -40,7 +40,7 @@
   }
 
   // choose password messages based on config
-  $lang['passrules'] = isset($lang["passrules"][uConfig::$pass_strength]) ? $lang["passrules"][uConfig::$pass_strength] : "";
+  $lang['passrules'] = isset($lang["passrules_" . uConfig::$pass_strength]) ? $lang["passrules_" . uConfig::$pass_strength] : "";
   $lang['passlenmin'] = sprintf($lang["passlenmin"], uConfig::$pass_lenmin);
 
 ?>

lang/de.php

@@ -17,6 +17,35 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// default language for translations
+
+// strings only used in setup
+$langSetup["dbconnectfailed"] = "Database connection failed.";
+$langSetup["serversaid"] = "Server said: %s"; // substitutes server error message
+$langSetup["checkdbsettings"] = "Please check database settings in 'config.php' file.";
+$langSetup["dbqueryfailed"] = "Database query failed.";
+$langSetup["dbtablessuccess"] = "Database tables successfully created!";
+$langSetup["setupuser"] = "Now please set up your µlogger user.";
+$langSetup["congratulations"] = "Congratulations!";
+$langSetup["setupcomplete"] = "Setup is now complete. You may go to the <a href=\"../index.php\">main page</a> now and log in with your new user account.";
+$langSetup["disablewarn"] = "IMPORTANT! YOU MUST DISABLE 'setup.php' SCRIPT OR REMOVE IT FROM YOUR SERVER.";
+$langSetup["disabledesc"] = "Leaving the script accessible from browser is a major security risk. Anybody will be able to run it, delete your database and set up new user account. Delete the file or disable it by setting %s value back to %s."; // substitutes variable name and value
+$langSetup["setupfailed"] = "Unfortunately something has gone wrong. You may try to find more info in your webserver logs.";
+$langSetup["welcome"] = "Welcome to µlogger!";
+$langSetup["disabledwarn"] = "For security reasons this script is disabled by default. To enable it you must edit 'scripts/setup.php' file in text editor and set %s variable at the beginning of the file to %s."; // substitutes variable name and value
+$langSetup["lineshouldread"] = "Line: %s should read: %s";
+$langSetup["passfuncwarn"] = "Your PHP version does not support password functions that ship with PHP 5.5. You have to include password_compat library.";
+$langSetup["passfunchack"] = "Please edit 'helpers/user.php' file and uncomment line including 'helpers/password.php'.";
+$langSetup["dorestart"] = "Please restart this script when you are done.";
+$langSetup["createconfig"] = "Please create 'config.php' file in root folder. You may start by copying it from 'config.default.php'. Make sure that you adjust config values to match your needs and your database setup.";
+$langSetup["nodbsettings"] = "You must provide your database credentials in 'config.php' file (%s)."; // substitutes variable names
+$langSetup["scriptdesc"] = "This script will set up tables needed for µlogger (%s). They will be created in your database named %s. Warning, if the tables already exist they will be dropped and recreated, their content will be destroyed."; // substitutes table names and db name
+$langSetup["scriptdesc2"] = "When done the script will ask you to provide user name and password for your µlogger user.";
+$langSetup["startbutton"] = "Press to start";
+$langSetup["restartbutton"] = "Restart";
+
+
+// application strings
 $lang["title"] = "• μlogger •";
 $lang["private"] = "Sie müssen Benutzernamen und Kennwort eingeben, um auf diese Seite zuzugreifen.";
 $lang["authfail"] = "Falscher Benutzername oder Passwort";
@@ -35,7 +64,7 @@ $lang["altitude"] = "Höhe";
 $lang["ttime"] = "Gesamte Zeit";
 $lang["aspeed"] = "Durchschnittstempo";
 $lang["tdistance"] = "Gesamt Entfernung";
-$lang["pointof"] = "Punkt %d von %d";
+$lang["pointof"] = "Punkt %d von %d"; // e.g. Point 3 of 10
 $lang["summary"] = "Streckenzusammenfassung";
 $lang["suser"] = "Wähle Benutzer";
 $lang["logout"] = "Abmelden";
@@ -50,5 +79,46 @@ $lang["metric"] = "Metrisches";
 $lang["imperial"] = "Angloamerikanisches";
 $lang["nautical"] = "Nautisch";
 $lang["adminmenu"] = "Verwaltung";
-
+$lang["passwordrepeat"] = "Repeat password";
+$lang["passwordenter"] = "Enter password";
+$lang["usernameenter"] = "Enter username";
+$lang["adduser"] = "Add user";
+$lang["userexists"] = "User exists";
+$lang["cancel"] ="Cancel";
+$lang["submit"] = "Submit";
+$lang["oldpassword"] = "Old password";
+$lang["newpassword"] = "New password";
+$lang["newpasswordrepeat"] = "Repeat new password";
+$lang["changepass"] = "Change password";
+$lang["gps"] = "GPS";
+$lang["network"] = "Network";
+$lang["deluser"] = "Remove user";
+$lang["edituser"] = "Edit user";
+$lang["servererror"] = "Server error";
+$lang["allrequired"] = "All fields are required";
+$lang["passnotmatch"] = "Passwords don't match";
+$lang["actionsuccess"] = "Action completed successfully";
+$lang["actionfailure"] = "Something went wrong";
+$lang["userdelwarn"] = "Warning!\n\nYou are going to permanently delete user %s, together with all their routes and positions.\n\nAre you sure?"; // substitutes user login
+$lang["editinguser"] = "You are editing user %s"; // substitutes user login
+$lang["selfeditwarn"] = "Your can't edit your own user with this tool";
+$lang["apifailure"] = "Sorry, can't load %s API"; // substitures api name (gmaps or openlayers)
+$lang["trackdelwarn"] = "Warning!\n\nYou are going to permanently delete track %s and all its positions.\n\nAre you sure?"; // substitutes track name
+$lang["editingtrack"] = "You are editing track %s"; // substitutes track name
+$lang["deltrack"] = "Remove track";
+$lang["trackname"] = "Track name";
+$lang["edittrack"] = "Edit track";
+$lang["passlenmin"] = "Password must be at least %d characters"; // substitutes password minimum length
+$lang["passrules_1"] = "It should contain at least one lower case letter, one upper case letter";
+$lang["passrules_2"] = "It should contain at least one lower case letter, one upper case letter and one digit";
+$lang["passrules_3"] = "It should contain at least one lower case letter, one upper case letter, one digit and one non-alphanumeric character";
+$lang["owntrackswarn"] = "Your can only edit your own tracks";
+$lang["gmauthfailure"] = "There may be problem with Google Maps API key on this page";
+$lang["gmapilink"] = "You may find more information about API keys on <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";
+$lang["import"] = "Import track";
+$lang["iuploadfailure"] = "Uploading failed";
+$lang["iparsefailure"] = "Parsing failed";
+$lang["idatafailure"] = "No track data in imported file";
+$lang["isizefailure"] = "The uploaded file size should not exceed %d bytes"; // substitutes number of bytes
+$lang["imultiple"] = "Notice, multiple tracks imported (%d)"; // substitutes number of imported tracks
 ?>

lang/en.php

@@ -109,9 +109,9 @@ $lang["deltrack"] = "Remove track";
 $lang["trackname"] = "Track name";
 $lang["edittrack"] = "Edit track";
 $lang["passlenmin"] = "Password must be at least %d characters"; // substitutes password minimum length
-$lang["passrules"][1] = "It should contain at least one lower case letter, one upper case letter";
+$lang["passrules_1"] = "It should contain at least one lower case letter, one upper case letter";
-$lang["passrules"][2] = "It should contain at least one lower case letter, one upper case letter and one digit";
+$lang["passrules_2"] = "It should contain at least one lower case letter, one upper case letter and one digit";
-$lang["passrules"][3] = "It should contain at least one lower case letter, one upper case letter, one digit and one non-alphanumeric character";
+$lang["passrules_3"] = "It should contain at least one lower case letter, one upper case letter, one digit and one non-alphanumeric character";
 $lang["owntrackswarn"] = "Your can only edit your own tracks";
 $lang["gmauthfailure"] = "There may be problem with Google Maps API key on this page";
 $lang["gmapilink"] = "You may find more information about API keys on <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";

lang/es.php

@@ -17,6 +17,35 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// default language for translations
+
+// strings only used in setup
+$langSetup["dbconnectfailed"] = "Database connection failed.";
+$langSetup["serversaid"] = "Server said: %s"; // substitutes server error message
+$langSetup["checkdbsettings"] = "Please check database settings in 'config.php' file.";
+$langSetup["dbqueryfailed"] = "Database query failed.";
+$langSetup["dbtablessuccess"] = "Database tables successfully created!";
+$langSetup["setupuser"] = "Now please set up your µlogger user.";
+$langSetup["congratulations"] = "Congratulations!";
+$langSetup["setupcomplete"] = "Setup is now complete. You may go to the <a href=\"../index.php\">main page</a> now and log in with your new user account.";
+$langSetup["disablewarn"] = "IMPORTANT! YOU MUST DISABLE 'setup.php' SCRIPT OR REMOVE IT FROM YOUR SERVER.";
+$langSetup["disabledesc"] = "Leaving the script accessible from browser is a major security risk. Anybody will be able to run it, delete your database and set up new user account. Delete the file or disable it by setting %s value back to %s."; // substitutes variable name and value
+$langSetup["setupfailed"] = "Unfortunately something has gone wrong. You may try to find more info in your webserver logs.";
+$langSetup["welcome"] = "Welcome to µlogger!";
+$langSetup["disabledwarn"] = "For security reasons this script is disabled by default. To enable it you must edit 'scripts/setup.php' file in text editor and set %s variable at the beginning of the file to %s."; // substitutes variable name and value
+$langSetup["lineshouldread"] = "Line: %s should read: %s";
+$langSetup["passfuncwarn"] = "Your PHP version does not support password functions that ship with PHP 5.5. You have to include password_compat library.";
+$langSetup["passfunchack"] = "Please edit 'helpers/user.php' file and uncomment line including 'helpers/password.php'.";
+$langSetup["dorestart"] = "Please restart this script when you are done.";
+$langSetup["createconfig"] = "Please create 'config.php' file in root folder. You may start by copying it from 'config.default.php'. Make sure that you adjust config values to match your needs and your database setup.";
+$langSetup["nodbsettings"] = "You must provide your database credentials in 'config.php' file (%s)."; // substitutes variable names
+$langSetup["scriptdesc"] = "This script will set up tables needed for µlogger (%s). They will be created in your database named %s. Warning, if the tables already exist they will be dropped and recreated, their content will be destroyed."; // substitutes table names and db name
+$langSetup["scriptdesc2"] = "When done the script will ask you to provide user name and password for your µlogger user.";
+$langSetup["startbutton"] = "Press to start";
+$langSetup["restartbutton"] = "Restart";
+
+
+// application strings
 $lang["title"] = "• μlogger •";
 $lang["private"] = "Necesitas un nombre de usuario y contraseña para acceder a esta página.";
 $lang["authfail"] = "Nombre de usuasrio o contraseña erroneos";
@@ -35,7 +64,7 @@ $lang["altitude"] = "Altitud";
 $lang["ttime"] = "Tiempo total";
 $lang["aspeed"] = "Velocidad media";
 $lang["tdistance"] = "Distancia total";
-$lang["pointof"] = "Punto %d de %d";
+$lang["pointof"] = "Punto %d de %d"; // e.g. Point 3 of 10
 $lang["summary"] = "Resumen del viaje";
 $lang["suser"] = "seleccione usuario";
 $lang["logout"] = "Cerrar sesión";
@@ -48,6 +77,7 @@ $lang["api"] = "Mapa API";
 $lang["units"] = "Unidades";
 $lang["metric"] = "Metricas";
 $lang["imperial"] = "Imperiales/US";
+$lang["nautical"] = "Nautical";
 $lang["adminmenu"] = "Administración";
 $lang["passwordrepeat"] = "Repita contraseña";
 $lang["passwordenter"] = "Introduzca contraseña";
@@ -62,4 +92,33 @@ $lang["newpasswordrepeat"] = "Repita nueva contraseña";
 $lang["changepass"] = "Cambiar contraseña";
 $lang["gps"] = "GPS";
 $lang["network"] = "Red";
+$lang["deluser"] = "Remove user";
+$lang["edituser"] = "Edit user";
+$lang["servererror"] = "Server error";
+$lang["allrequired"] = "All fields are required";
+$lang["passnotmatch"] = "Passwords don't match";
+$lang["actionsuccess"] = "Action completed successfully";
+$lang["actionfailure"] = "Something went wrong";
+$lang["userdelwarn"] = "Warning!\n\nYou are going to permanently delete user %s, together with all their routes and positions.\n\nAre you sure?"; // substitutes user login
+$lang["editinguser"] = "You are editing user %s"; // substitutes user login
+$lang["selfeditwarn"] = "Your can't edit your own user with this tool";
+$lang["apifailure"] = "Sorry, can't load %s API"; // substitures api name (gmaps or openlayers)
+$lang["trackdelwarn"] = "Warning!\n\nYou are going to permanently delete track %s and all its positions.\n\nAre you sure?"; // substitutes track name
+$lang["editingtrack"] = "You are editing track %s"; // substitutes track name
+$lang["deltrack"] = "Remove track";
+$lang["trackname"] = "Track name";
+$lang["edittrack"] = "Edit track";
+$lang["passlenmin"] = "Password must be at least %d characters"; // substitutes password minimum length
+$lang["passrules_1"] = "It should contain at least one lower case letter, one upper case letter";
+$lang["passrules_2"] = "It should contain at least one lower case letter, one upper case letter and one digit";
+$lang["passrules_3"] = "It should contain at least one lower case letter, one upper case letter, one digit and one non-alphanumeric character";
+$lang["owntrackswarn"] = "Your can only edit your own tracks";
+$lang["gmauthfailure"] = "There may be problem with Google Maps API key on this page";
+$lang["gmapilink"] = "You may find more information about API keys on <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";
+$lang["import"] = "Import track";
+$lang["iuploadfailure"] = "Uploading failed";
+$lang["iparsefailure"] = "Parsing failed";
+$lang["idatafailure"] = "No track data in imported file";
+$lang["isizefailure"] = "The uploaded file size should not exceed %d bytes"; // substitutes number of bytes
+$lang["imultiple"] = "Notice, multiple tracks imported (%d)"; // substitutes number of imported tracks
 ?>

lang/fr.php

@@ -17,6 +17,35 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// default language for translations
+
+// strings only used in setup
+$langSetup["dbconnectfailed"] = "Database connection failed.";
+$langSetup["serversaid"] = "Server said: %s"; // substitutes server error message
+$langSetup["checkdbsettings"] = "Please check database settings in 'config.php' file.";
+$langSetup["dbqueryfailed"] = "Database query failed.";
+$langSetup["dbtablessuccess"] = "Database tables successfully created!";
+$langSetup["setupuser"] = "Now please set up your µlogger user.";
+$langSetup["congratulations"] = "Congratulations!";
+$langSetup["setupcomplete"] = "Setup is now complete. You may go to the <a href=\"../index.php\">main page</a> now and log in with your new user account.";
+$langSetup["disablewarn"] = "IMPORTANT! YOU MUST DISABLE 'setup.php' SCRIPT OR REMOVE IT FROM YOUR SERVER.";
+$langSetup["disabledesc"] = "Leaving the script accessible from browser is a major security risk. Anybody will be able to run it, delete your database and set up new user account. Delete the file or disable it by setting %s value back to %s."; // substitutes variable name and value
+$langSetup["setupfailed"] = "Unfortunately something has gone wrong. You may try to find more info in your webserver logs.";
+$langSetup["welcome"] = "Welcome to µlogger!";
+$langSetup["disabledwarn"] = "For security reasons this script is disabled by default. To enable it you must edit 'scripts/setup.php' file in text editor and set %s variable at the beginning of the file to %s."; // substitutes variable name and value
+$langSetup["lineshouldread"] = "Line: %s should read: %s";
+$langSetup["passfuncwarn"] = "Your PHP version does not support password functions that ship with PHP 5.5. You have to include password_compat library.";
+$langSetup["passfunchack"] = "Please edit 'helpers/user.php' file and uncomment line including 'helpers/password.php'.";
+$langSetup["dorestart"] = "Please restart this script when you are done.";
+$langSetup["createconfig"] = "Please create 'config.php' file in root folder. You may start by copying it from 'config.default.php'. Make sure that you adjust config values to match your needs and your database setup.";
+$langSetup["nodbsettings"] = "You must provide your database credentials in 'config.php' file (%s)."; // substitutes variable names
+$langSetup["scriptdesc"] = "This script will set up tables needed for µlogger (%s). They will be created in your database named %s. Warning, if the tables already exist they will be dropped and recreated, their content will be destroyed."; // substitutes table names and db name
+$langSetup["scriptdesc2"] = "When done the script will ask you to provide user name and password for your µlogger user.";
+$langSetup["startbutton"] = "Press to start";
+$langSetup["restartbutton"] = "Restart";
+
+
+// application strings
 $lang["title"] = "• μlogger •";
 $lang["private"] = "Il faut un nom d'utilisateur et un mot de passe pour accéder à cette page.";
 $lang["authfail"] = "Nom d'utilisateur ou mot de passe erroné.";
@@ -35,7 +64,7 @@ $lang["altitude"] = "Altitude";
 $lang["ttime"] = "Temps total";
 $lang["aspeed"] = "Vitesse moyenne";
 $lang["tdistance"] = "Dist. totale";
-$lang["pointof"] = "Point %d de %d";
+$lang["pointof"] = "Point %d de %d"; // e.g. Point 3 of 10
 $lang["summary"] = "Résumé du trajet";
 $lang["suser"] = "Sélectionner un utilisateur";
 $lang["logout"] = "Déconnexion";
@@ -80,8 +109,16 @@ $lang["deltrack"] = "Supprimer la piste";
 $lang["trackname"] = "Nom de la piste";
 $lang["edittrack"] = "Modifier la piste";
 $lang["passlenmin"] = "Le mot de passe doit contenir au moins %d caractères"; // substitutes password minimum length
-$lang["passrules"][1] = "Il doit contenir au moins une lettre minuscule et une lettre majuscule";
+$lang["passrules_1"] = "Il doit contenir au moins une lettre minuscule et une lettre majuscule";
-$lang["passrules"][2] = "Il doit contenir au moins une lettre minuscule, une lettre majuscule et un chiffre";
+$lang["passrules_2"] = "Il doit contenir au moins une lettre minuscule, une lettre majuscule et un chiffre";
-$lang["passrules"][3] = "Il doit contenir au moins une lettre minuscule, une lettre majuscule, un chiffre et un caractère spécial";
+$lang["passrules_3"] = "Il doit contenir au moins une lettre minuscule, une lettre majuscule, un chiffre et un caractère spécial";
 $lang["owntrackswarn"] = "Vous pouvez uniquement modifier vos propres pistes";
+$lang["gmauthfailure"] = "There may be problem with Google Maps API key on this page";
+$lang["gmapilink"] = "You may find more information about API keys on <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";
+$lang["import"] = "Import track";
+$lang["iuploadfailure"] = "Uploading failed";
+$lang["iparsefailure"] = "Parsing failed";
+$lang["idatafailure"] = "No track data in imported file";
+$lang["isizefailure"] = "The uploaded file size should not exceed %d bytes"; // substitutes number of bytes
+$lang["imultiple"] = "Notice, multiple tracks imported (%d)"; // substitutes number of imported tracks
 ?>

lang/hu.php

@@ -17,6 +17,35 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// default language for translations
+
+// strings only used in setup
+$langSetup["dbconnectfailed"] = "Database connection failed.";
+$langSetup["serversaid"] = "Server said: %s"; // substitutes server error message
+$langSetup["checkdbsettings"] = "Please check database settings in 'config.php' file.";
+$langSetup["dbqueryfailed"] = "Database query failed.";
+$langSetup["dbtablessuccess"] = "Database tables successfully created!";
+$langSetup["setupuser"] = "Now please set up your µlogger user.";
+$langSetup["congratulations"] = "Congratulations!";
+$langSetup["setupcomplete"] = "Setup is now complete. You may go to the <a href=\"../index.php\">main page</a> now and log in with your new user account.";
+$langSetup["disablewarn"] = "IMPORTANT! YOU MUST DISABLE 'setup.php' SCRIPT OR REMOVE IT FROM YOUR SERVER.";
+$langSetup["disabledesc"] = "Leaving the script accessible from browser is a major security risk. Anybody will be able to run it, delete your database and set up new user account. Delete the file or disable it by setting %s value back to %s."; // substitutes variable name and value
+$langSetup["setupfailed"] = "Unfortunately something has gone wrong. You may try to find more info in your webserver logs.";
+$langSetup["welcome"] = "Welcome to µlogger!";
+$langSetup["disabledwarn"] = "For security reasons this script is disabled by default. To enable it you must edit 'scripts/setup.php' file in text editor and set %s variable at the beginning of the file to %s."; // substitutes variable name and value
+$langSetup["lineshouldread"] = "Line: %s should read: %s";
+$langSetup["passfuncwarn"] = "Your PHP version does not support password functions that ship with PHP 5.5. You have to include password_compat library.";
+$langSetup["passfunchack"] = "Please edit 'helpers/user.php' file and uncomment line including 'helpers/password.php'.";
+$langSetup["dorestart"] = "Please restart this script when you are done.";
+$langSetup["createconfig"] = "Please create 'config.php' file in root folder. You may start by copying it from 'config.default.php'. Make sure that you adjust config values to match your needs and your database setup.";
+$langSetup["nodbsettings"] = "You must provide your database credentials in 'config.php' file (%s)."; // substitutes variable names
+$langSetup["scriptdesc"] = "This script will set up tables needed for µlogger (%s). They will be created in your database named %s. Warning, if the tables already exist they will be dropped and recreated, their content will be destroyed."; // substitutes table names and db name
+$langSetup["scriptdesc2"] = "When done the script will ask you to provide user name and password for your µlogger user.";
+$langSetup["startbutton"] = "Press to start";
+$langSetup["restartbutton"] = "Restart";
+
+
+// application strings
 $lang["title"] = "• μlogger •";
 $lang["private"] = "Felhasználónév és jelszó szükséges a belépéshez";
 $lang["authfail"] = "Hibás név vagy jelszó";
@@ -35,9 +64,9 @@ $lang["altitude"] = "Magasság";
 $lang["ttime"] = "Menetidő";
 $lang["aspeed"] = "Átlagsebesség";
 $lang["tdistance"] = "Megtett út";
-$lang["suser"] = "Felhasználónév";
+$lang["pointof"] = "Rögzített pontok száma %d / %d"; // e.g. Point 3 of 10
-$lang["pointof"] = "Rögzített pontok száma %d / %d";
 $lang["summary"] = "Utazás adatai";
+$lang["suser"] = "Felhasználónév";
 $lang["logout"] = "Kilépés";
 $lang["login"] = "Belépés";
 $lang["username"] = "Felhasználó";
@@ -48,6 +77,48 @@ $lang["api"] = "Map API";
 $lang["units"] = "Mértékegység";
 $lang["metric"] = "Metrikus";
 $lang["imperial"] = "Imperal/US";
+$lang["nautical"] = "Nautical";
 $lang["adminmenu"] = "Adminisztráció";
-
+$lang["passwordrepeat"] = "Repeat password";
+$lang["passwordenter"] = "Enter password";
+$lang["usernameenter"] = "Enter username";
+$lang["adduser"] = "Add user";
+$lang["userexists"] = "User exists";
+$lang["cancel"] ="Cancel";
+$lang["submit"] = "Submit";
+$lang["oldpassword"] = "Old password";
+$lang["newpassword"] = "New password";
+$lang["newpasswordrepeat"] = "Repeat new password";
+$lang["changepass"] = "Change password";
+$lang["gps"] = "GPS";
+$lang["network"] = "Network";
+$lang["deluser"] = "Remove user";
+$lang["edituser"] = "Edit user";
+$lang["servererror"] = "Server error";
+$lang["allrequired"] = "All fields are required";
+$lang["passnotmatch"] = "Passwords don't match";
+$lang["actionsuccess"] = "Action completed successfully";
+$lang["actionfailure"] = "Something went wrong";
+$lang["userdelwarn"] = "Warning!\n\nYou are going to permanently delete user %s, together with all their routes and positions.\n\nAre you sure?"; // substitutes user login
+$lang["editinguser"] = "You are editing user %s"; // substitutes user login
+$lang["selfeditwarn"] = "Your can't edit your own user with this tool";
+$lang["apifailure"] = "Sorry, can't load %s API"; // substitures api name (gmaps or openlayers)
+$lang["trackdelwarn"] = "Warning!\n\nYou are going to permanently delete track %s and all its positions.\n\nAre you sure?"; // substitutes track name
+$lang["editingtrack"] = "You are editing track %s"; // substitutes track name
+$lang["deltrack"] = "Remove track";
+$lang["trackname"] = "Track name";
+$lang["edittrack"] = "Edit track";
+$lang["passlenmin"] = "Password must be at least %d characters"; // substitutes password minimum length
+$lang["passrules_1"] = "It should contain at least one lower case letter, one upper case letter";
+$lang["passrules_2"] = "It should contain at least one lower case letter, one upper case letter and one digit";
+$lang["passrules_3"] = "It should contain at least one lower case letter, one upper case letter, one digit and one non-alphanumeric character";
+$lang["owntrackswarn"] = "Your can only edit your own tracks";
+$lang["gmauthfailure"] = "There may be problem with Google Maps API key on this page";
+$lang["gmapilink"] = "You may find more information about API keys on <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";
+$lang["import"] = "Import track";
+$lang["iuploadfailure"] = "Uploading failed";
+$lang["iparsefailure"] = "Parsing failed";
+$lang["idatafailure"] = "No track data in imported file";
+$lang["isizefailure"] = "The uploaded file size should not exceed %d bytes"; // substitutes number of bytes
+$lang["imultiple"] = "Notice, multiple tracks imported (%d)"; // substitutes number of imported tracks
 ?>

lang/it.php

@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-// italian translation
+// default language for translations
 
 // strings only used in setup
 $langSetup["dbconnectfailed"] = "Connessione al database fallita.";
@@ -64,7 +64,7 @@ $lang["altitude"] = "Altitudine";
 $lang["ttime"] = "Tempo totale";
 $lang["aspeed"] = "Velocità media";
 $lang["tdistance"] = "Distanza totale";
-$lang["point"] = "Punto %d di %d";
+$lang["pointof"] = "Point %d of %d"; // e.g. Point 3 of 10
 $lang["summary"] = "Sommario";
 $lang["suser"] = "scegli utente";
 $lang["logout"] = "Esci";
@@ -77,6 +77,7 @@ $lang["api"] = "API Mappe";
 $lang["units"] = "Unità";
 $lang["metric"] = "Metriche";
 $lang["imperial"] = "Imperiali";
+$lang["nautical"] = "Nautical";
 $lang["adminmenu"] = "Amministazione";
 $lang["passwordrepeat"] = "Ripeti password";
 $lang["passwordenter"] = "Immetti password";
@@ -85,7 +86,7 @@ $lang["adduser"] = "Aggiungi utente";
 $lang["userexists"] = "L'utente esiste già";
 $lang["cancel"] ="Annulla";
 $lang["submit"] = "Invia";
-$lang["oldpassword"] = "Vecchia password"; // new strings
+$lang["oldpassword"] = "Vecchia password";
 $lang["newpassword"] = "Nuova password";
 $lang["newpasswordrepeat"] = "Ripeti nuova password";
 $lang["changepass"] = "Cambia password";
@@ -108,9 +109,9 @@ $lang["deltrack"] = "Elimina traccia";
 $lang["trackname"] = "Nome traccia";
 $lang["edittrack"] = "Modifica traccia";
 $lang["passlenmin"] = "La password deve essere almeno di %d caratteri"; // substitutes password minimum length
-$lang["passrules"][1] = "Dovrebbe contenere almeno una lettera minuscola e una lettera maiuscola";
+$lang["passrules_1"] = "Dovrebbe contenere almeno una lettera minuscola e una lettera maiuscola";
-$lang["passrules"][2] = "Dovrebbe contenere almeno una lettera minuscola, una lettera maiuscola e un numero";
+$lang["passrules_2"] = "Dovrebbe contenere almeno una lettera minuscola, una lettera maiuscola e un numero";
-$lang["passrules"][3] = "Dovrebbe contenere almeno una lettera minuscola, una lettera maiuscola, un numero ed un carattere non alfanumerico";
+$lang["passrules_3"] = "Dovrebbe contenere almeno una lettera minuscola, una lettera maiuscola, un numero ed un carattere non alfanumerico";
 $lang["owntrackswarn"] = "Puoi modificare solo le tue tracce";
 $lang["gmauthfailure"] = "In questa pagina potrebbe esserci un problema con le API di Google Maps.";
 $lang["gmapilink"] = "Puoi trovare maggiori informazioni sulle chiavi API a <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">questo indirizzo</a>.";

lang/nl.php

@@ -77,6 +77,7 @@ $lang["api"] = "Map API";
 $lang["units"] = "Units";
 $lang["metric"] = "Metrisch";
 $lang["imperial"] = "Imperial/US";
+$lang["nautical"] = "Nautical";
 $lang["adminmenu"] = "Administratie";
 $lang["passwordrepeat"] = "Herhaal password";
 $lang["passwordenter"] = "Voer password in";
@@ -108,9 +109,9 @@ $lang["deltrack"] = "Verwijder track";
 $lang["trackname"] = "Track naam";
 $lang["edittrack"] = "Verander track";
 $lang["passlenmin"] = "Password moet minsten %d tekens hebben"; // substitutes password minimum length
-$lang["passrules"][1] = "Het moet minstens één kleine- en één grote-letter hebben";
+$lang["passrules_1"] = "Het moet minstens één kleine- en één grote-letter hebben";
-$lang["passrules"][2] = "Het moet minstens één kleine-letter, één grote-letter, en één cijfer hebben";
+$lang["passrules_2"] = "Het moet minstens één kleine-letter, één grote-letter, en één cijfer hebben";
-$lang["passrules"][3] = "Het moet minstens één kleine-letter, één grote-letter, één cijfer, en één ander teken hebben";
+$lang["passrules_3"] = "Het moet minstens één kleine-letter, één grote-letter, één cijfer, en één ander teken hebben";
 $lang["owntrackswarn"] = "Je kunt alleen je eigen tracks veranderen";
 $lang["gmauthfailure"] = "Er is een probleem met de Google Maps API key op deze pagina";
 $lang["gmapilink"] = "Je vindt meer info over API keys op <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">this Google webpage</a>";

lang/pl.php

@@ -17,8 +17,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// default language for translations
+
+// strings only used in setup
 $langSetup["dbconnectfailed"] = "Błąd połączenia z bazą danych.";
-$langSetup["serversaid"] = "Komunikat serwera: %s";
+$langSetup["serversaid"] = "Komunikat serwera: %s"; // substitutes server error message
 $langSetup["checkdbsettings"] = "Proszę sprawdzić konfigurację bazy danych w pliku 'config.php'.";
 $langSetup["dbqueryfailed"] = "Błąd zapytania do bazy danych.";
 $langSetup["dbtablessuccess"] = "Pomyślnie utworzono tablice w bazie danych!";
@@ -26,21 +29,23 @@ $langSetup["setupuser"] = "Skonfiguruj teraz swojego użytkownika w µloggerze."
 $langSetup["congratulations"] = "Gratulacje!";
 $langSetup["setupcomplete"] = "Konfiguracja zakończona. Możesz teraz przejść do <a href=\"../index.php\">strony głównej</a> i zalogować się na konto utworzonego użytkownika.";
 $langSetup["disablewarn"] = "WAŻNE! NAZLEŻY DEZAKTYWOWAĆ SKRYPT 'setup.php' ALBO USUNĄĆ GO Z SERWERA.";
-$langSetup["disabledesc"] = "Pozostawienie dostępu do skryptu z przeglądarki stanowi duże zagrożenie. Każdy będzie mógł go uruchomić, usunąć całą bazę danych i dodać nowego użytkownika. Usuń plik lub dezaktywuj go przywracając zmiennej %s wartość %s.";
+$langSetup["disabledesc"] = "Pozostawienie dostępu do skryptu z przeglądarki stanowi duże zagrożenie. Każdy będzie mógł go uruchomić, usunąć całą bazę danych i dodać nowego użytkownika. Usuń plik lub dezaktywuj go przywracając zmiennej %s wartość %s."; // substitutes variable name and value
 $langSetup["setupfailed"] = "Niestety coś poszło nie tak. Może znajdziesz więcej wskazówek w logach serwera www.";
 $langSetup["welcome"] = "Witaj w µloggerze!";
-$langSetup["disabledwarn"] = "Ze względów bezpieczeństwa ten skrypt jest domyślnie wyłączony. Aby go aktywować należy otworzyć plik 'scripts/setup.php' w edytorze tekstu i zmienić wartość zmiennej %s na początku pliku na %s.";
+$langSetup["disabledwarn"] = "Ze względów bezpieczeństwa ten skrypt jest domyślnie wyłączony. Aby go aktywować należy otworzyć plik 'scripts/setup.php' w edytorze tekstu i zmienić wartość zmiennej %s na początku pliku na %s."; // substitutes variable name and value
 $langSetup["lineshouldread"] = "Linia: %s powinna zostać zmieniona na: %s";
 $langSetup["passfuncwarn"] = "Zainstalowana wersja PHP nie zawiera funkcji obsługujących hasła, dostępnych od wersji PHP 5.5. Musisz włączyć bibliotekę 'password_compat'.";
 $langSetup["passfunchack"] = "Otwórz proszę plik 'helpers/user.php' w edytorze tekstu i odkomentuj linię włączającą 'helpers/password.php'.";
 $langSetup["dorestart"] = "Uruchom ten skrypt ponownie, kiedy zakończysz.";
 $langSetup["createconfig"] = "Utwórz proszę plik 'config.php' w głównym folderze. Możesz skopiować jego początkową zawartość z pliku 'config.default.php'. Pamiętaj, żeby dostosować konfiguracje do swoich potrzeb i ustawień bazy danych.";
-$langSetup["nodbsettings"] = "Musisz skonfigurować parametry dostępu do bazy danych w pliku 'config.php' (%s).";
+$langSetup["nodbsettings"] = "Musisz skonfigurować parametry dostępu do bazy danych w pliku 'config.php' (%s)."; // substitutes variable names
-$langSetup["scriptdesc"] = "Ten skrypt utworzy tablice niezbędne do działania aplikacji µlogger (%s). Zostaną one utworzone w bazie danych o nazwie %s. Uwaga, jeśli tablice już istnieją, zostaną usunięte i utworzone ponownie, ich zawartość zostanie skasowana.";
+$langSetup["scriptdesc"] = "Ten skrypt utworzy tablice niezbędne do działania aplikacji µlogger (%s). Zostaną one utworzone w bazie danych o nazwie %s. Uwaga, jeśli tablice już istnieją, zostaną usunięte i utworzone ponownie, ich zawartość zostanie skasowana."; // substitutes table names and db name
 $langSetup["scriptdesc2"] = "Następnie skrypt poprosi o utworzenie konta do logowania w aplikacji µlogger.";
 $langSetup["startbutton"] = "Naciśnij, aby rozpocząć";
 $langSetup["restartbutton"] = "Uruchom ponownie";
 
+
+// application strings
 $lang["title"] = "• μlogger •";
 $lang["private"] = "Aby się zalogować musisz podać login i hasło";
 $lang["authfail"] = "błędny login lub hasło";
@@ -59,9 +64,9 @@ $lang["altitude"] = "Wysokość";
 $lang["ttime"] = "Czas podróży";
 $lang["aspeed"] = "Średnia prędkość";
 $lang["tdistance"] = "Odległość";
-$lang["suser"] = "wybierz login";
+$lang["pointof"] = "Punkt %d z %d"; // e.g. Point 3 of 10
-$lang["pointof"] = "Punkt %d z %d";
 $lang["summary"] = "Podsumowanie";
+$lang["suser"] = "wybierz login";
 $lang["logout"] = "Wyloguj";
 $lang["login"] = "Zaloguj";
 $lang["username"] = "Login";
@@ -94,19 +99,19 @@ $lang["allrequired"] = "Wszystkie pola są wymagane";
 $lang["passnotmatch"] = "Hasła nie pasują do siebie";
 $lang["actionsuccess"] = "Operacja zakończona pomyślnie";
 $lang["actionfailure"] = "Wystąpił błąd";
-$lang["userdeletewarn"] = "Uwaga!\n\nZamierzasz całkowicie usunąć użytkownika %s, razem ze wszystkimi jego trasami i pozycjami.\n\nCzy na pewno?";
+$lang["userdelwarn"] = "Uwaga!\n\nTa operacja nieodwracalnie usunie użytkownika %s wraz ze wszystkimi jego trasami i pozycjami.\n\nCzy na pewno?"; // substitutes user login
-$lang["editinguser"] = "Edytujesz użytkownika %s";
+$lang["editinguser"] = "Edytujesz użytkownika %s"; // substitutes user login
 $lang["selfeditwarn"] = "Nie można edytować własnego użytkownika za pomocą tego narzędzia";
-$lang["apifailure"] = "Niestety ładowanie API %s nie powiodło się";
+$lang["apifailure"] = "Niestety ładowanie API %s nie powiodło się"; // substitures api name (gmaps or openlayers)
-$lang["trackdelwarn"] = "Uwaga!\n\nZamierzasz całkowicie usunąć trasę %s wraz ze wszystkimi pozycjami.\n\nCzy na pewno?";
+$lang["trackdelwarn"] = "Uwaga!\n\nZamierzasz całkowicie usunąć trasę %s wraz ze wszystkimi pozycjami.\n\nCzy na pewno?"; // substitutes track name
-$lang["editingtrack"] = "Edytujesz trasę %s";
+$lang["editingtrack"] = "Edytujesz trasę %s"; // substitutes track name
 $lang["deltrack"] = "Usuń trasę";
 $lang["trackname"] = "Nazwa trasy";
 $lang["edittrack"] = "Edytuj trasę";
-$lang["passlenmin"] = "Hasło musi się składać z minimum %d znaków";
+$lang["passlenmin"] = "Hasło musi się składać z minimum %d znaków"; // substitutes password minimum length
-$lang["passrules"][1] = "Powinno ono zawierać przynajmniej jedną małą i jedną wielką literę";
+$lang["passrules_1"] = "Powinno ono zawierać przynajmniej jedną małą i jedną wielką literę";
-$lang["passrules"][2] = "Powinno ono zawierać przynajmniej jedną małą, jedną wielką literę i jedną cyfrę";
+$lang["passrules_2"] = "Powinno ono zawierać przynajmniej jedną małą, jedną wielką literę i jedną cyfrę";
-$lang["passrules"][3] = "Powinno ono zawierać przynajmniej jedną małą, jedną wielką literę, jedną cyfrę i jeden znak specjalny (nie alfanumeryczny)";
+$lang["passrules_3"] = "Powinno ono zawierać przynajmniej jedną małą, jedną wielką literę, jedną cyfrę i jeden znak specjalny (nie alfanumeryczny)";
 $lang["owntrackswarn"] = "Możesz edytować tylko swoje własne trasy";
 $lang["gmauthfailure"] = "Prawdopodobnie na tej stronie występuje problem z kluczem API Google Maps";
 $lang["gmapilink"] = "Więcej informacji o kluczach API znajdziesz <a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">pod tym linkiem</a>";
@@ -114,6 +119,6 @@ $lang["import"] = "Importuj trasę";
 $lang["iuploadfailure"] = "Błąd przesyłania pliku";
 $lang["iparsefailure"] = "Błąd parsowania pliku";
 $lang["idatafailure"] = "Brak trasy w importowanym pliku";
-$lang["isizefailure"] = "Wielkość importowanego pliku nie może przekraczać %d bajtów";
+$lang["isizefailure"] = "Wielkość importowanego pliku nie może przekraczać %d bajtów"; // substitutes number of bytes
-$lang["imultiple"] = "Uwaga, zaimportowano kilka tras (%d)";
+$lang["imultiple"] = "Uwaga, zaimportowano kilka tras (%d)"; // substitutes number of imported tracks
 ?>

lang/zh.php

@@ -77,6 +77,7 @@ $lang["api"] = "地圖接口";
 $lang["units"] = "單位";
 $lang["metric"] = "公制";
 $lang["imperial"] = "英制/美國";
+$lang["nautical"] = "Nautical";
 $lang["adminmenu"] = "管理員";
 $lang["passwordrepeat"] = "請再次輸入密碼";
 $lang["passwordenter"] = "請輸入密碼";
@@ -108,9 +109,9 @@ $lang["deltrack"] = "刪除路徑";
 $lang["trackname"] = "路徑名稱";
 $lang["edittrack"] = "修改路徑";
 $lang["passlenmin"] = "密碼至少要有 %d 位哦"; // substitutes password minimum length
-$lang["passrules"][1] = "密碼至少有一個小寫字母和一個大寫字母哦";
+$lang["passrules_1"] = "密碼至少有一個小寫字母和一個大寫字母哦";
-$lang["passrules"][2] = "密碼至少有一個數字、一個小寫字母和一個大寫字母哦";
+$lang["passrules_2"] = "密碼至少有一個數字、一個小寫字母和一個大寫字母哦";
-$lang["passrules"][3] = "密碼至少有一個數字、一個小寫字母、一個大寫字母和一個符號哦";
+$lang["passrules_3"] = "密碼至少有一個數字、一個小寫字母、一個大寫字母和一個符號哦";
 $lang["owntrackswarn"] = "您只能編輯自己的路徑";
 $lang["gmauthfailure"] = "Google Maps API密鑰似乎有問題哦";
 $lang["gmapilink"] = "您可以在<a target=\"_blank\" href=\"https://developers.google.com/maps/documentation/javascript/get-api-key\">Google webpage</a>獲取Maps API密鑰的相關諮詢。";