Made a few strings easier to translate.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@349 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 2d6e39c979dfcb285d2e1da9e1d92655a22bc043..ca4c2837ff1d91859d2599eb774ac9b462d32743 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2000-03-25 18:20+0100\n"
+"POT-Creation-Date: 2000-03-28 14:21+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -16,45 +16,35 @@ msgstr ""
 
 #: ../src/addrbook_popup.php:10 ../src/addrbook_search.php:10
 #: ../src/right_main.php:11
 
 #: ../src/addrbook_popup.php:10 ../src/addrbook_search.php:10
 #: ../src/right_main.php:11

-msgid "You must "
+msgid "You must login first."

 msgstr ""
 
 msgstr ""
 

-#: ../src/addrbook_popup.php:11 ../src/addrbook_search.php:11
-#: ../src/right_main.php:13
-msgid "login"
-msgstr ""
-
-#: ../src/addrbook_popup.php:12 ../src/addrbook_search.php:12
-#: ../src/right_main.php:15
-msgid " first."
-msgstr ""
-
-#: ../src/addrbook_popup.php:16 ../src/addrbook_search.php:16
-#: ../src/right_main.php:19 ../src/webmail.php:10
+#: ../src/addrbook_popup.php:14 ../src/addrbook_search.php:14
+#: ../src/right_main.php:15 ../src/webmail.php:10

 msgid "You need a valid user and password to access this page!"
 msgstr ""
 
 msgid "You need a valid user and password to access this page!"
 msgstr ""
 

-#: ../src/addrbook_popup.php:32 ../src/addrbook_search.php:45
+#: ../src/addrbook_popup.php:30 ../src/addrbook_search.php:43

 msgid "Address Book"
 msgstr ""
 
 msgid "Address Book"
 msgstr ""
 

-#: ../src/addrbook_search.php:63
+#: ../src/addrbook_search.php:61

 msgid "Search results will display here"
 msgstr ""
 
 msgid "Search results will display here"
 msgstr ""
 

-#: ../src/addrbook_search.php:74
+#: ../src/addrbook_search.php:72

 msgid "Search for"
 msgstr ""
 
 msgid "Search for"
 msgstr ""
 

-#: ../src/addrbook_search.php:79
+#: ../src/addrbook_search.php:77

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: ../src/addrbook_search.php:82
+#: ../src/addrbook_search.php:80

 msgid "Close window"
 msgstr ""
 
 msgid "Close window"
 msgstr ""
 

-#: ../src/addrbook_search.php:148
+#: ../src/addrbook_search.php:146

 msgid "No persons matching your search was found"
 msgstr ""
 
 msgid "No persons matching your search was found"
 msgstr ""
 


@@ -79,7 +69,7 @@ msgid "BCC:"
 msgstr ""
 
 #: ../src/compose.php:196
 msgstr ""
 
 #: ../src/compose.php:196

-msgid "Lookup recipients in addressbook.<BR>"
+msgid "Lookup recipients in addressbook."

 msgstr ""
 
 #: ../src/compose.php:202 ../src/read_body.php:129
 msgstr ""
 
 #: ../src/compose.php:202 ../src/read_body.php:129


@@ -178,9 +168,11 @@ msgid "Subscribe"
 msgstr ""
 
 #: ../src/folders_create.php:21
 msgstr ""
 
 #: ../src/folders_create.php:21

-msgid ""
-"Illegal folder name.  Please select a different name.<BR><A "
-"HREF=\"../src/folders.php\">Click here to go back</A>."
+msgid "Illegal folder name.  Please select a different name."
+msgstr ""
+
+#: ../src/folders_create.php:21
+msgid "Click here to go back"

 msgstr ""
 
 #: ../src/folders_create.php:41
 msgstr ""
 
 #: ../src/folders_create.php:41


@@ -395,10 +387,6 @@ msgstr ""
 msgid "log back in."
 msgstr ""
 
 msgid "log back in."
 msgstr ""
 

-#: ../functions/abook_ldap_server.php:56 ../functions/abook_local_file.php:51
-msgid "Invalid argument to constructor"
-msgstr ""
-

 #: ../functions/abook_local_file.php:32
 msgid "Personal address book"
 msgstr ""
 #: ../functions/abook_local_file.php:32
 msgid "Personal address book"
 msgstr ""


@@ -416,6 +404,7 @@ msgid "Open failed"
 msgstr ""
 
 #: ../functions/abook_local_file.php:189 ../functions/abook_local_file.php:209
 msgstr ""
 
 #: ../functions/abook_local_file.php:189 ../functions/abook_local_file.php:209

+#: ../functions/addressbook.php:204

 msgid "Addressbook is read-only"
 msgstr ""
 
 msgid "Addressbook is read-only"
 msgstr ""
 


@@ -428,8 +417,9 @@ msgstr ""
 msgid "Write to addressbook failed"
 msgstr ""
 
 msgid "Write to addressbook failed"
 msgstr ""
 

-#: ../functions/addressbook.php:29 ../functions/prefs.php:80
-msgid "Error opening "
+#: ../functions/addressbook.php:29
+#, c-format
+msgid "Error opening file %s"

 msgstr ""
 
 #: ../functions/addressbook.php:186
 msgstr ""
 
 #: ../functions/addressbook.php:186


@@ -444,10 +434,6 @@ msgstr ""
 msgid "E-mail address is missing"
 msgstr ""
 
 msgid "E-mail address is missing"
 msgstr ""
 

-#: ../functions/addressbook.php:204
-msgid "Addressbook is not writable"
-msgstr ""
-

 #: ../functions/display_messages.php:19 ../functions/imap_general.php:108
 msgid "Unknown user or password incorrect."
 msgstr ""
 #: ../functions/display_messages.php:19 ../functions/imap_general.php:108
 msgid "Unknown user or password incorrect."
 msgstr ""


@@ -604,6 +590,10 @@ msgid ""
 "file. "
 msgstr ""
 
 "file. "
 msgstr ""
 

+#: ../functions/prefs.php:80
+msgid "Error opening "
+msgstr ""
+

 #: ../functions/prefs.php:108
 msgid "Signature file not found."
 msgstr ""
 #: ../functions/prefs.php:108
 msgid "Signature file not found."
 msgstr ""

diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php
index 11b293e4ee84ad923813fb8ddd8d8ad02728c18c..b646a6955cf463f9734d6202ba16dd9e962a6c05 100644 (file)
--- a/src/addrbook_popup.php
+++ b/src/addrbook_popup.php
@@ -7,9 +7,7 @@
     **/
 
    if(!isset($logged_in)) {
     **/
 
    if(!isset($logged_in)) {

-      echo _("You must ");
-      echo _("login");
-      echo _(" first.");
+      echo _("You must login first.");

       exit;
    }
    if(!isset($username) || !isset($key)) {
       exit;
    }
    if(!isset($username) || !isset($key)) {

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 9202b1375ab8292b5a05725020d5c601fd8a1b71..d67bd619d025ceef9ecbbe0afeae2681a5901e78 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -7,9 +7,7 @@
     **/
 
    if(!isset($logged_in)) {
     **/
 
    if(!isset($logged_in)) {

-      echo _("You must ");
-      echo _("login");
-      echo _(" first.");
+      echo _("You must login first.");

       exit;
    }
    if(!isset($username) || !isset($key)) {
       exit;
    }
    if(!isset($username) || !isset($key)) {

diff --git a/src/compose.php b/src/compose.php
index c92d1d55bdb55f5bbf342fa75f8f13337538c194..e2188082098b854fd241abb80ec6d10cb83ee44c 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -193,7 +193,7 @@
       echo "<TR><TD BGCOLOR=\\\"$color[4]\\\">&nbsp;</TD>";
       echo "</TD><TD BGCOLOR=\\\"$color[4]\\\" ALIGN=LEFT>";
       printf("<A HREF=\\\"javascript:open_abook();\\\">%s</A>",
       echo "<TR><TD BGCOLOR=\\\"$color[4]\\\">&nbsp;</TD>";
       echo "</TD><TD BGCOLOR=\\\"$color[4]\\\" ALIGN=LEFT>";
       printf("<A HREF=\\\"javascript:open_abook();\\\">%s</A>",

-            _("Lookup recipients in addressbook.<BR>"));
+            _("Lookup recipients in addressbook.")."<BR>");

       echo "</TD></TR>\");\n";
       echo "// --></SCRIPT>\n";
 
       echo "</TD></TR>\");\n";
       echo "// --></SCRIPT>\n";
 

diff --git a/src/folders_create.php b/src/folders_create.php
index e7e55049c5bf5a3fc2cea15334e8fd7b5af736c5..31fe65f496c59176eaf716f323f71d4131e11632 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -18,7 +18,7 @@
    if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
        strpos($folder_name, "/") || strpos($folder_name, "\\") ||
        strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
    if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
        strpos($folder_name, "/") || strpos($folder_name, "\\") ||
        strpos($folder_name, "'") || strpos($folder_name, "$dm")) {

-      plain_error_message(_("Illegal folder name.  Please select a different name.<BR><A HREF=\"../src/folders.php\">Click here to go back</A>."), $color);
+      plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>."), $color);

       exit;
    }
 
       exit;
    }
 

diff --git a/src/right_main.php b/src/right_main.php
index 4379dc031a099c0ffe5deef70457bebc36f7991b..eaec8346a8e33286fc0da189fdf0525897dd0930 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -8,11 +8,7 @@
     **/
 
    if(!isset($logged_in)) {
     **/
 
    if(!isset($logged_in)) {

-      echo _("You must ");
-      echo "<a href=\"login.php\">";
-      echo _("login");
-      echo "</a>";
-      echo _(" first.");
+      echo _("You must login first.");

       exit;
    }
    if(!isset($username) || !isset($key)) {
       exit;
    }
    if(!isset($username) || !isset($key)) {