Changeset 1408 in ExiteCMS for branches/PLi-Fusion/administration/tools/language_pack_English.php

Timestamp:

05/15/08 22:25:54 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1342:1407 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/administration/tools/language_pack_English.php (modified) (10 diffs)

branches/PLi-Fusion/administration/tools/language_pack_English.php

@@ -969 +969 @@
         $localestrings['720'] = "Enable group messages for:";
         $localestrings['721'] = "Show all recipients of a message:";
+        $localestrings['722'] = "No Inbox message limit for:";
+        $localestrings['723'] = "No Outbox message limit for:";
+        $localestrings['724'] = "No Archive message limit for:";
+        $localestrings['725'] = "- no one -";
         $localestrings['750'] = "Save Settings";
         $localestrings['751'] = "<< Prev";
@@ -2125 +2129 @@
         $localestrings['412'] = "Page: ";
         $localestrings['413'] = "RSS Feed";
+        $localestrings['414'] = "View all posts";
         $localestrings['430'] = "download(s)";
         $localestrings['450'] = "View Forum";
@@ -2315 +2320 @@
         $localestrings['472']['12'] = "violet";
         $localestrings['472']['13'] = "black";
-        $localestrings['472']['14'] = "gray";
+        $localestrings['472']['14'] = "grey";
         $localestrings['472']['15'] = "silver";
         $localestrings['472']['16'] = "white";
@@ -2491 +2496 @@
         $localestrings['026'] = "My Recent Threads";
         $localestrings['027'] = "My Recent Posts";
+        $localestrings['027a'] = "All Posts";
         $localestrings['028'] = "New Posts";
         $localestrings['029'] = "Latest News";
@@ -2543 +2549 @@
         $localestrings['083'] = "CMS Administration";
         $localestrings['084'] = "Logout";
-        $localestrings['085'] = "%u private ";
-        $localestrings['086'] = "message";
-        $localestrings['087'] = "messages";
-        $localestrings['088'] = "post";
-        $localestrings['089'] = "posts";
-        $localestrings['090'] = "%u new forum ";
+        $localestrings['085'] = "%u private message";
+        $localestrings['086'] = "%u private messages";
+        $localestrings['087'] = "Downloads";
+        $localestrings['088'] = "%u new forum post";
+        $localestrings['089'] = "%u new forum posts";
+        $localestrings['090'] = "Posts";
         $localestrings['091'] = "Mark all read";
         $localestrings['100'] = "Member Poll";
@@ -2620 +2626 @@
         $localestrings['408'] = "Send me a new password";
         $localestrings['409'] = "New password for ";
-        $localestrings['410'] = "Hello [USER_NAME],\n\nYou have or someone has requested a new password to access your [SITENAME] account.\n\nTo change your password please click the following link:\n\n[NEW_PASS_LINK]\n\nRegards,\n[SITEUSERNAME]";
-        $localestrings['411'] = "Hello [USER_NAME],\n\nYour new password to access your [SITENAME] account is:\n\n[NEW_PASS]\n\nRegards,\n[SITEUSERNAME]";
+        $localestrings['410'] = "Hello [USERNAME],\n\nYou have or someone has requested a new password to access your [SITENAME] account.\n\nTo change your password please click the following link:\n\n[NEW_PASS_LINK]\n\nRegards,\n[SITEUSERNAME]";
+        $localestrings['411'] = "Hello [USERNAME],\n\nYour new password to access your [SITENAME] account is:\n\n[NEW_PASS]\n\nRegards,\n[SITEUSERNAME]";
         load_localestrings($localestrings, LP_LOCALE, "main.lostpassword", $step);
 
@@ -2867 +2873 @@
         $localestrings['414'] = "Email address %s does not exist<br>(according to the mailserver %s).";
         $localestrings['449'] = "Welcome to %s";
-        $localestrings['450'] = "Hello [USER_NAME],\n\nWelcome to [SITENAME]. Here are your login details:\n\nUsername: [USERNAME]\nFullname: [FULLNAME]\nPassword: [PASSWORD]\n\nPlease activate your account via the following link:\n";
+        $localestrings['450'] = "Hello [USERNAME],\n\nWelcome to [SITENAME]. Here are your login details:\n\nUsername: [USERNAME]\nFullname: [FULLNAME]\nPassword: [PASSWORD]\n\nPlease activate your account via the following link:\n";
         $localestrings['451'] = "Registration complete";
         $localestrings['452'] = "You can now log in.";
@@ -3135 +3141 @@
         $localestrings['u901'] = "Full Name";
         load_localestrings($localestrings, LP_LOCALE, "main.user_fields", $step);
-
-        $localestrings = array();
-        $localestrings['400'] = "Webshop";
-        $localestrings['410'] = "Select your shop. The shop currently selected is highlighted";
-        $localestrings['411'] = "<b>Note:</b><br />
-                <img src='".THEME."images/bullet.gif' /> If you don't live in these area's of the world, check out all shops to see which one has the best delivery fees for your country <br />
-                <img src='".THEME."images/bullet.gif' /> Sometimes the shop has session issues. If the shop doesn't display as expected, click on the 'Shop' button to reload the shop<br />
-                <img src='".THEME."images/bullet.gif' /> Every shop uses different suppliers. Not all products are available in all shops
-        ";
-        load_localestrings($localestrings, LP_LOCALE, "main.webshop", $step);
-
         return "";
     }
@@ -3182 +3177 @@
 if (!defined('LP_CHARSET')) define('LP_CHARSET', "iso-8859-1");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.10");
-if (!defined('LP_DATE')) define('LP_DATE', "1204579858");
-$lp_date = "1204579858";
+if (!defined('LP_DATE')) define('LP_DATE', "1210855263");
+$lp_date = "1210855263";
 
 /*---------------------------------------------------+
@@ -3241 +3236 @@
     // install the language pack
     if ($step == "install" || $step == "upgrade") {
-        if ($step == "install") {
+        if ($step == "install" || defined('CMS_SETUP_LOAD')) {
             $result = dbquery("INSERT INTO ".$db_prefix."locale (locale_code, locale_name, locale_locale, locale_charset, locale_active) VALUES ('".LP_LOCALE."', '".LP_LANGUAGE."', '".LP_LOCALES."', '".LP_CHARSET."', 1)");
         }