From 5c3bb419eb4f9728849969fe7cff84f0260066c8 Mon Sep 17 00:00:00 2001
From: Sebastian Klemm <osm /at/ erlkoenigkabale /dot/ eu>
Date: Mon, 24 Aug 2009 22:17:52 +0200
Subject: [PATCH] better english phrasing

---
 inc/html/admin.php  |  8 ++++----
 inc/html/index.php  |  2 +-
 inc/i10n/en/syp.php | 13 +++++--------
 inc/i10n/fr/syp.php | 10 +++++-----
 js/syp.js           |  2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/inc/html/admin.php b/inc/html/admin.php
index a96a470..ca2dd4d 100644
--- a/inc/html/admin.php
+++ b/inc/html/admin.php
@@ -68,16 +68,16 @@ if (!$usrtblexists || !$itemstblexists) {
             UnauthorizedError: "<?php ptrans('Password is not correct.')?>",
             NotimageError: "<?php ptrans('File does not look like an image.')?>",
             UnconsistentError: "<?php ptrans('Server reply was inconsistent.')?>",
-            DelSucces: "<?php ptrans('Removal took place correctly.')?>",
+            DelSucces: "<?php ptrans('Successfully removed.')?>",
             UpdateSucces: "<?php ptrans('Save took place correctly.')?>",
             emptyPasswordError: "<?php ptrans('Password cannot be empty')?>",
             userPasswordmatchError: "<?php ptrans('Passwords do not match.')?>",
             changeSamePass: "<?php ptrans('New password is the same as old password.')?>",
             changePassBadPass: "<?php ptrans('Bad password.')?>",
-            changePassSuccess: "<?php ptrans('Password changed correctly.')?>",
+            changePassSuccess: "<?php ptrans('Password successfully changed.')?>",
             newUserNonameError: "<?php ptrans('User name has not been set.')?>",
             newUserExistsError: "<?php ptrans('User already exists in database.')?>",
-            newUserSuccess: "<?php ptrans('User added correctly.')?>"
+            newUserSuccess: "<?php ptrans('User successfully added.')?>"
         };
 
         var sypSettings =  {
@@ -221,7 +221,7 @@ if (!$usrtblexists || !$itemstblexists) {
                 </tr>
             </table>
             <p class="center">
-                <input id="login_submit" type="submit" value="<?php ptrans('Connection')?>">
+                <input id="login_submit" type="submit" value="<?php ptrans('Login')?>">
                 <input type="hidden" name="request" value="auth">
             </p>
             <p id="pwd_throbber" class="throbber center">
diff --git a/inc/html/index.php b/inc/html/index.php
index 8c4aa3c..696b299 100644
--- a/inc/html/index.php
+++ b/inc/html/index.php
@@ -52,7 +52,7 @@ if (defined ("POPUPPOS")) {
     <script type="text/javascript">
         var SypStrings = {
             language: "<?php echo $lang ?>",
-            propulsedByLink: "<?php ptrans('propulsed by <a href=\"http://syp.renevier.net\">syp</a>')?>",
+            poweredByLink: "<?php ptrans('powered by <a href=\"http://syp.renevier.net\">syp</a>')?>",
             noImageRegistered: "<?php ptrans('There is no image registered on this site.')?>"
         };
         var sypSettings =  {
diff --git a/inc/i10n/en/syp.php b/inc/i10n/en/syp.php
index fab5ee9..df80f51 100644
--- a/inc/i10n/en/syp.php
+++ b/inc/i10n/en/syp.php
@@ -155,7 +155,7 @@
         "SYP needs javascript. Please activate scripts in your browser."
           => "",
 
-        "propulsed by <a href=\\\"http://syp.renevier.net\\\">syp</a>"
+        "powered by <a href=\\\"http://syp.renevier.net\\\">syp</a>"
           => "",
 
         "There is no image registered on this site."
@@ -207,7 +207,7 @@
         "Server reply was inconsistent."
           => "",
 
-        "Removal took place correctly."
+        "Successfully removed."
           => "",
 
         "Save took place correctly."
@@ -225,7 +225,7 @@
         "Bad password."
           => "",
 
-        "Password changed correctly."
+        "Password successfully changed."
           => "",
 
         "User name has not been set."
@@ -234,13 +234,10 @@
         "User already exists in database."
           => "",
 
-        "User added correctly."
-          => "",
-
         "User already exists in database."
           => "",
 
-        "User added correctly."
+        "User successfully added."
           => "",
 
         "Logout"
@@ -306,7 +303,7 @@
         "password"
           => "",
 
-        "Connection"
+        "Login"
           => "",
 
         "Connecting"
diff --git a/inc/i10n/fr/syp.php b/inc/i10n/fr/syp.php
index a277e28..a98d2d6 100644
--- a/inc/i10n/fr/syp.php
+++ b/inc/i10n/fr/syp.php
@@ -248,7 +248,7 @@
         "SYP a besoin de javascript pour fonctionner. Veuillez activer les scripts dans votre navigateur."
           ,
 
-        "propulsed by <a href=\\\"http://syp.renevier.net\\\">syp</a>"
+        "powered by <a href=\\\"http://syp.renevier.net\\\">syp</a>"
           =>
         "propulsé par <a href=\\\"http://syp.renevier.net\\\">syp</a>"
           ,
@@ -336,7 +336,7 @@
         "Le serveur a fait une réponse incohérente"
           ,
 
-        "Removal took place correctly."
+        "Successfully removed."
           =>
         "La suppression s'est déroulée correctement."
           ,
@@ -366,7 +366,7 @@
         "Mauvais mot de passe"
           ,
 
-        "Password changed correctly."
+        "Password successfully changed."
           =>
         "Mot de passe modifié correctement."
           ,
@@ -376,7 +376,7 @@
         "L'utilisateur existe déjà."
           ,
 
-        "User added correctly."
+        "User successfully added."
           =>
         "Utilisateur ajouté correctement."
           ,
@@ -486,7 +486,7 @@
         "mot de passe"
           ,
 
-        "Connection"
+        "Login"
           =>
         "Connexion"
           ,
diff --git a/js/syp.js b/js/syp.js
index ddd47c9..1f4d632 100644
--- a/js/syp.js
+++ b/js/syp.js
@@ -3,7 +3,7 @@
 
 OpenLayers.Control.SypAttribution = OpenLayers.Class (OpenLayers.Control.Attribution, {
     updateAttribution: function() {
-        var attributions = [SypStrings.propulsedByLink];
+        var attributions = [SypStrings.poweredByLink];
         if (this.map && this.map.layers) {
             for(var i=0, len=this.map.layers.length; i<len; i++) {
                 var layer = this.map.layers[i];
-- 
2.39.2