Index: pykota/trunk/po/zh_TW/pykota.po
===================================================================
--- pykota/trunk/po/zh_TW/pykota.po (revision 2308)
+++ pykota/trunk/po/zh_TW/pykota.po (revision 2344)
@@ -39,5 +39,5 @@
 #, python-format
 msgid ""
-"autopykota v%s (c) %s %s\n"
+"autopykota v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "A tool to automate user account creation and initial balance setting.\n"
@@ -60,21 +60,4 @@
 "                       If the user already exists, actual balance is left\n"
 "                       unmodified. If unset, the default value is 0.\n"
-"                       \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -145,5 +128,5 @@
 #, python-format
 msgid ""
-"dumpykota v%s (c) %s %s\n"
+"dumpykota v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Dumps PyKota database's content.\n"
@@ -169,4 +152,5 @@
 "                         - pmembers : dumps printer groups members.\n"
 "                         - umembers : dumps user groups members.\n"
+"                         - billingcodes : dumps billing codes.\n"
 "                         \n"
 "                       NB : the -d | --data command line option   \n"
@@ -234,21 +218,4 @@
 "  Dumps all jobs printed between March 1st 2005 at midnight and\n"
 "  July 30th 2005 at 23 hours 46 minutes and 15 secondes included.\n"
-"  \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -258,5 +225,5 @@
 #, python-format
 msgid ""
-"edpykota v%s (c) %s %s\n"
+"edpykota v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "A Print Quota editor for PyKota.\n"
@@ -456,21 +423,4 @@
 "  cost of each print job will be multiplied by zero before charging\n"
 "  his account.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -583,5 +533,5 @@
 #, python-format
 msgid ""
-"pkbanner v%s (c) %s %s\n"
+"pkbanner v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Generates banners.\n"
@@ -627,21 +577,4 @@
 "  You'll find more examples in the sample configuration file included    \n"
 "  in PyKota.\n"
-"      \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -708,5 +641,5 @@
 #, python-format
 msgid ""
-"pkhint v%s (c) %s %s\n"
+"pkhint v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "A tool to give hints on what accounting method is best for each printer.\n"
@@ -731,21 +664,4 @@
 "  If you don't pass any argument on the command line, all\n"
 "  printers will be analyzed.\n"
-"  \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -783,5 +699,5 @@
 #, python-format
 msgid ""
-"pkmail v%s (c) %s %s\n"
+"pkmail v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Email gateway for PyKota.\n"
@@ -822,26 +738,9 @@
 "  \n"
 "  Use at your own risk !\n"
-"  \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
-msgstr ""
-
-#, python-format
-msgid ""
-"pkprinters v%s (c) %s %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"pkprinters v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "A Printers Manager for PyKota.\n"
@@ -925,21 +824,4 @@
 "  \n"
 "  This will remove the hp2200 printer from the LexMark printer group.\n"
-"  \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -963,5 +845,5 @@
 #, python-format
 msgid ""
-"pykosd v%s (c) %s %s\n"
+"pykosd v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "An OSD quota monitor for PyKota.\n"
@@ -1001,21 +883,4 @@
 "  and will last for 3 seconds (the default) each time. After five\n"
 "  iterations, the program will exit.\n"
-"  \n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -1050,5 +915,5 @@
 #, python-format
 msgid ""
-"pykotme v%s (c) %s %s\n"
+"pykotme v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Gives print quotes to users.\n"
@@ -1090,21 +955,4 @@
 "  input. The quote will list the job size, and the price the job\n"
 "  would cost on each printer.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -1123,5 +971,5 @@
 #, python-format
 msgid ""
-"repykota v%s (c) %s %s\n"
+"repykota v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Generates print quota reports.\n"
@@ -1167,26 +1015,9 @@
 "  arguments representing users or groups names are ignored, and only the\n"
 "  current user/group is reported.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
-msgstr ""
-
-#, python-format
-msgid ""
-"warnpykota v%s (c) %s %s\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"warnpykota v%(__version__)s (c) %(__years__)s %(__author__)s\n"
 "\n"
 "Sends mail to users over print quota.\n"
@@ -1234,21 +1065,4 @@
 "  arguments representing users or groups names are ignored, and only the\n"
 "  current user/group is reported.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
-"\n"
-"Please e-mail bugs to: %s"
 msgstr ""
 
@@ -1889,4 +1703,7 @@
 
 msgid "Job is a duplicate. Printing is allowed by subprocess."
+msgstr ""
+
+msgid "Please report bugs to :"
 msgstr ""
 
