"Why do we need file extensions, when we have Unix" fix.

po - gettext message catalog
pot - gettext message catalog template
Gettext v.0.10.x does not care, but v.0.12.1 starts complaining during
string extraction or merge.

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

diff --git a/po/mergepo b/po/mergepo
index 4672d4f168d92c09479ec2dc1d2e4de72ab32ce9..0f73571b87600e0f2cae48df52133f9ad807633b 100755 (executable)
--- a/po/mergepo
+++ b/po/mergepo
@@ -39,7 +39,7 @@ fi
 echo "Merging $LOCALEDIR/LC_MESSAGES/squirrelmail.po"
 mv $LOCALEDIR/LC_MESSAGES/squirrelmail.po \
      $LOCALEDIR/LC_MESSAGES/squirrelmail.po.bak 
 echo "Merging $LOCALEDIR/LC_MESSAGES/squirrelmail.po"
 mv $LOCALEDIR/LC_MESSAGES/squirrelmail.po \
      $LOCALEDIR/LC_MESSAGES/squirrelmail.po.bak 

-msgmerge $LOCALEDIR/LC_MESSAGES/squirrelmail.po.bak ../po/squirrelmail.po > \
+msgmerge $LOCALEDIR/LC_MESSAGES/squirrelmail.po.bak ../po/squirrelmail.pot > \

      $LOCALEDIR/LC_MESSAGES/squirrelmail.po
 
 # msgmerge will split long lines, such as the RCS Id line. If it did split
      $LOCALEDIR/LC_MESSAGES/squirrelmail.po
 
 # msgmerge will split long lines, such as the RCS Id line. If it did split

diff --git a/po/squirrelmail.po b/po/squirrelmail.pot
similarity index 97%
rename from po/squirrelmail.po
rename to po/squirrelmail.pot
index dc7df8c6844cd3bde51b9c3029e439d68c69803c..b900ff4ace174b9f606b00c5c2e610bda7686761 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.pot
@@ -1,12 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # SOME DESCRIPTIVE TITLE.

-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2003-08-24 15:06+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-20 12:22+0300\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"


@@ -1250,9 +1252,6 @@ msgstr ""
 msgid "(no subject)"
 msgstr ""
 
 msgid "(no subject)"
 msgstr ""
 

-msgid "Unknown Sender"
-msgstr ""
-

 msgid "Unknown response from IMAP server: "
 msgstr ""
 
 msgid "Unknown response from IMAP server: "
 msgstr ""
 


@@ -1311,6 +1310,9 @@ msgstr ""
 msgid "Thread View"
 msgstr ""
 
 msgid "Thread View"
 msgstr ""
 

+msgid "Bypass Trash"
+msgstr ""
+

 msgid "Click here to change the sorting of the message list"
 msgstr ""
 
 msgid "Click here to change the sorting of the message list"
 msgstr ""
 


@@ -1500,6 +1502,12 @@ msgstr ""
 msgid "Length of From/To Field (0 for full)"
 msgstr ""
 
 msgid "Length of From/To Field (0 for full)"
 msgstr ""
 

+msgid "Length of Subject Field (0 for full)"
+msgstr ""
+
+msgid "Show recipient name if the message is from your default identity"
+msgstr ""
+

 msgid "Message Display and Composition"
 msgstr ""
 
 msgid "Message Display and Composition"
 msgstr ""
 


@@ -1683,6 +1691,12 @@ msgstr ""
 msgid "Long: "
 msgstr ""
 
 msgid "Long: "
 msgstr ""
 

+msgid "Folder"
+msgstr ""
+
+msgid "Subfolder"
+msgstr ""
+

 msgid "Indented: "
 msgstr ""
 
 msgid "Indented: "
 msgstr ""
 


@@ -2212,44 +2226,6 @@ msgstr ""
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 

-msgid ""
-"FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
-"include servers used by abuse@uunet.net auto-replies too."
-msgstr ""
-
-msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
-msgstr ""
-
-msgid ""
-"FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
-"have been manually added after multiple nominations. Use with caution. Seems "
-"to catch abuse auto-replies from some ISPs."
-msgstr ""
-
-msgid ""
-"FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
-"other mail servers that are not secure."
-msgstr ""
-
-msgid ""
-"FREE - Osirusoft Spamware Developers - It is believed that these are IP "
-"ranges of companies that are known to produce spam software. Seems to catch "
-"abuse auto-replies from some ISPs."
-msgstr ""
-
-msgid ""
-"FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
-"users in without confirmation."
-msgstr ""
-
-msgid ""
-"FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
-"cgi scripts. (planned)."
-msgstr ""
-
-msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
-msgstr ""
-

 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."

diff --git a/po/xgetpo b/po/xgetpo
index 968e3c109f6b4992870fa21654aa8b10768edc1c..5a4530cb3a5dc388d2fc3a858d0931f19475c42d 100755 (executable)
--- a/po/xgetpo
+++ b/po/xgetpo
@@ -8,61 +8,61 @@
 # **  $Id$ 
 cd ../..
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail \
 # **  $Id$ 
 cd ../..
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail \

-    --no-location -C squirrelmail/src/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/src/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/functions/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/functions/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/class/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/class/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/class/mime/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/class/mime/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/class/deliver/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/class/deliver/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/class/helper/*.php --output-dir=squirrelmail/po/    
+    --no-location -C squirrelmail/class/helper/*.php --output=squirrelmail/po/squirrelmail.pot    

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/include/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/include/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/include/options/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/include/options/*.php --output=squirrelmail/po/squirrelmail.pot

     
 # ** Plugins
     
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     
 # ** Plugins
     
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/abook_take/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/abook_take/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/administrator/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/administrator/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/bug_report/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/bug_report/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/calendar/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/calendar/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/delete_move_next/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/delete_move_next/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/filters/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/filters/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/fortune/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/fortune/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/info/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/info/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/listcommands/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/listcommands/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/mail_fetch/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/mail_fetch/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/message_details/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/message_details/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/newmail/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/newmail/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/sent_subfolders/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/sent_subfolders/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-   --no-location  -C squirrelmail/plugins/spamcop/*.php --output-dir=squirrelmail/po/
+   --no-location  -C squirrelmail/plugins/spamcop/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/squirrelspell/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/squirrelspell/*.php --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     --no-location -C squirrelmail/plugins/squirrelspell/modules/*.mod \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     --no-location -C squirrelmail/plugins/squirrelspell/modules/*.mod \

-    --output-dir=squirrelmail/po/
+    --output=squirrelmail/po/squirrelmail.pot

 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/plugins/translate/*.php --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/plugins/translate/*.php --output=squirrelmail/po/squirrelmail.pot

 
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
 
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \

-    --no-location -C squirrelmail/po/independent_strings.txt --output-dir=squirrelmail/po/
+    --no-location -C squirrelmail/po/independent_strings.txt --output=squirrelmail/po/squirrelmail.pot

 
 cd squirrelmail/po
 
 cd squirrelmail/po