[phpBB] svn: r77 - in trunk/phpbb2: . po

jeroen at wolffelaar.nl jeroen at wolffelaar.nl
Mon Mar 15 18:41:01 CET 2004


Author: jeroen
Date: 2004-03-15 18:40:45 +0100 (Mon, 15 Mar 2004)
New Revision: 77

Added:
   trunk/phpbb2/po/
   trunk/phpbb2/po/POTFILES.in
   trunk/phpbb2/po/templates.pot
Modified:
   trunk/phpbb2/TODO
   trunk/phpbb2/changelog
   trunk/phpbb2/config
   trunk/phpbb2/control
   trunk/phpbb2/phpbb2-conf-mysql.templates
   trunk/phpbb2/phpbb2.templates
   trunk/phpbb2/rules
Log:
Now use po-debconf for debconf templates, patch generously provided by
Martin Quinson (thanks!), who in progress also fixed my language a bit
(Closes: #236863)


Modified: trunk/phpbb2/TODO
===================================================================
--- trunk/phpbb2/TODO	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/TODO	2004-03-15 17:40:45 UTC (rev 77)
@@ -25,7 +25,6 @@
 - Download and apply some useful mods (there are quite some)
 - Provide a way to reset passwords, in case the admin looses control over the
   board.
-- use po-debconf
 - What's the doc-base stuff... probably need to do something with it?
 - Translations: Translaters can ask subversion access, so they can check in
   translations themselves.

Modified: trunk/phpbb2/changelog
===================================================================
--- trunk/phpbb2/changelog	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/changelog	2004-03-15 17:40:45 UTC (rev 77)
@@ -2,7 +2,9 @@
 
   * New upstream release, fixes minor cross-site scripting issue
     (Closes: #237869)
-  * 
+  * Now use po-debconf for debconf templates, patch generously provided by
+    Martin Quinson (thanks!), who in progress also fixed my language a bit
+    (Closes: #236863)
 
  -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon, 15 Mar 2004 17:49:13 +0100
 

Modified: trunk/phpbb2/config
===================================================================
--- trunk/phpbb2/config	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/config	2004-03-15 17:40:45 UTC (rev 77)
@@ -35,7 +35,7 @@
 	db_input high phpbb2/redodb || true
 	db_go # fail config if cancelling
 	db_get phpbb2/redodb
-	if [ "$RET" = Yes ]; then
+	if [ "$RET" = true ]; then
 		mv /etc/phpbb2/config.php /etc/phpbb2/config.php.debconf-backup
 	fi
 fi

Modified: trunk/phpbb2/control
===================================================================
--- trunk/phpbb2/control	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/control	2004-03-15 17:40:45 UTC (rev 77)
@@ -2,12 +2,12 @@
 Section: web
 Priority: optional
 Maintainer: Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends-Indep: debhelper (>= 4), bzip2
+Build-Depends-Indep: debhelper (>= 4.1.16), bzip2
 Standards-Version: 3.6.0
 
 Package: phpbb2
 Architecture: all
-Depends: ${misc:Depends}, php4 (>= 4.1.0) | php4-cgi (>= 4.0.6), php4-mysql | php4-pgsql | php4-odbc, apache | httpd
+Depends: ${misc:Depends}, php4 (>= 4.1.0) | php4-cgi (>= 4.0.6), php4-mysql | php4-pgsql | php4-odbc, apache | httpd, debconf (>= 1.2.0)
 Recommends: phpbb2-conf-mysql
 Suggests: phpbb2-languages
 Provides: phpbb
@@ -22,7 +22,7 @@
 
 Package: phpbb2-conf-mysql
 Architecture: all
-Depends: phpbb2, ${misc:Depends}, wwwconfig-common (>= 0.0.34), php4-mysql, mysql-client, makepasswd, ucf (>= 0.8)
+Depends: phpbb2, ${misc:Depends}, wwwconfig-common (>= 0.0.34), php4-mysql, mysql-client, makepasswd, ucf (>= 0.8), debconf (>= 1.2.0)
 Recommends: mysql-server
 Description: Automatic configurator for phpbb2 on MySQL database
  Install this package if you don't want to configure phpBB (package: phpbb2)

Modified: trunk/phpbb2/phpbb2-conf-mysql.templates
===================================================================
--- trunk/phpbb2/phpbb2-conf-mysql.templates	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/phpbb2-conf-mysql.templates	2004-03-15 17:40:45 UTC (rev 77)
@@ -1,50 +1,49 @@
 Template: phpbb2-conf-mysql/redodb
-Type: select
-Choices: Yes, No
-Default: No
-Description: Do you want to overwrite your current configuration?
+Type: boolean
+Default: false
+_Description: Overwrite your current configuration?
  An existing configuration file for the database has been found as
  /etc/phpbb2/config.php
  .
- Select `Yes' if you want to redo this setup. No database will be destroyed,
- but any customization of /etc/phpbb2/config.php will be lost.
+ Select this if you want to redo this setup. No database will be
+ destroyed, but any customization of /etc/phpbb2/config.php will be lost.
 
 Template: phpbb2-conf-mysql/dbsetup
 Type: select
-Choices: Create, Populate, None
+_Choices: Create, Populate, None
 Default: Create
-Description: Want configure to create the database?
- If you haven't created a database with user yet, and want configure to do so,
- choose `Create'.
+_Description: Want configure to create the database?
+ If you haven't created a database with user yet, and want configure to do
+ so, choose `Create'.
  .
- If you have a database, but it has no tables yet, and want configure
- to populate that database with tables, choose `Populate'.
+ If you have a database, but it has no tables yet, and want configure to
+ populate that database with tables, choose `Populate'.
  .
  In all other cases, choose `None'.
 
 Template: phpbb2-conf-mysql/dbserver
 Type: string
 Default: localhost
-Description: What is the hostname where your database is running?
- If your database is on another machine then you need to change this value to
- the fully qualified domain name for that system.
+_Description: What is the hostname where your database is running?
+ If your database is on another machine then you need to change this value
+ to the fully qualified domain name for that system.
 
 Template: phpbb2-conf-mysql/dbname
 Type: string
 Default: phpbb2
-Description: What name do you want for database?
- All users, posts, etc. are stored in one single database. How do you 
- want to call it?
+_Description: What name do you want for database?
+ All users, posts, etc. are stored in one single database. How do you want
+ to call it?
 
 Template: phpbb2-conf-mysql/dbuser
 Type: string
 Default: phpbb2
-Description: What database username do you want to use?
+_Description: What database username do you want to use?
  For maximum security, a user dedicated for phpBB will be created.
 
 Template: phpbb2-conf-mysql/dbpass
 Type: password
-Description: What database password do you want to use?
+_Description: What database password do you want to use?
  Choose a password for the databaseuser.
  .
  Leave this empty if you want to have a random password generated.
@@ -54,58 +53,55 @@
 Description: [Internal] makepasswd generated password
  No need to translate this.
  .
- Here the password generated by makepasswd is stored for later reference (for
- example, on upgrade). Only used if dbpass is empty.
+ Here the password generated by makepasswd is stored for later reference
+ (for example, on upgrade). Only used if dbpass is empty.
 
 Template: phpbb2-conf-mysql/dbrootpass
 Type: password
-Description: What is the MySQL root password?
- In order to create a user, the database and the tables, the
- MySQL root password is needed.
+_Description: What is the MySQL root password?
+ In order to create a user, the database and the tables, the MySQL root
+ password is needed.
  .
  This password will be temporarily stored by debconf until the configuring
- phase of this install.  If you do not trust debconf to securily manage this
- password, you need to create the database and user yourself, and fill in the
- exact same details during the installation of phpbb2-conf-mysql (and choose
- `Populate' rather than `Create').
+ phase of this install.  If you do not trust debconf to securily manage
+ this password, you need to create the database and user yourself, and fill
+ in the exact same details during the installation of phpbb2-conf-mysql
+ (and choose `Populate' rather than `Create').
 
 Template: phpbb2-conf-mysql/dbfailcreate
 Type: note
-Description: FAILURE: Database not created
- The configuration script failed to create the phpbb database.
- Please run dpkg-reconfigure phpbb2, to try with different options,
- possibly choose "Manual" and create the database yourself.
+_Description: FAILURE: Database not created
+ The configuration script failed to create the phpbb database. Please run
+ dpkg-reconfigure phpbb2, to try with different options, possibly choose
+ "Manual" and create the database yourself.
  .
- Error:
- ${error}
+ Error: ${error}
 
 Template: phpbb2-conf-mysql/dbfailcreateuser
 Type: note
-Description: FAILURE: Database user not created
- The configuration script failed to create the phpbb database user.
- Please run dpkg-reconfigure phpbb2, to try with different options,
- possibly choose "Manual" and create the database user yourself.
+_Description: FAILURE: Database user not created
+ The configuration script failed to create the phpbb database user. Please
+ run dpkg-reconfigure phpbb2, to try with different options, possibly
+ choose "Manual" and create the database user yourself.
  .
- Error:
- ${error}
+ Error: ${error}
 
 Template: phpbb2-conf-mysql/dbfailcreatetables
 Type: note
-Description: FAILURE: Tables not created
- The configuration script failed to create the phpbb tables.
- Please run dpkg-reconfigure phpbb2, to try with different options,
- possibly choose "Manual" and create the tables yourself.
+_Description: FAILURE: Tables not created
+ The configuration script failed to create the phpbb tables. Please run
+ dpkg-reconfigure phpbb2, to try with different options, possibly choose
+ "Manual" and create the tables yourself.
  .
- Error:
- ${error}
+ Error: ${error}
 
 Template: phpbb2-conf-mysql/db_created
 Type: select
 Choices: true, false
 Default: false
 Description: [internal] Whether the DB plus user is created
- phpbb maintainer scripts will not ask for the DB admin password
- once the db and an accessing user is created
+ phpbb maintainer scripts will not ask for the DB admin password once the
+ db and an accessing user is created
 
 Template: phpbb2-conf-mysql/db_version
 Type: string
@@ -115,8 +111,7 @@
 
 Template: phpbb2-conf-mysql/nodbpurge
 Type: note
-Description: Database not purged
+_Description: Database not purged
  The purge script did not drop the database for phpbb, nor the user created
- for it. You will need to do so yourself (but only if you do not want
- to loose all data and board configuration).
-
+ for it. You will need to do so yourself (but only if you do not want to
+ loose all data and board configuration).

Modified: trunk/phpbb2/phpbb2.templates
===================================================================
--- trunk/phpbb2/phpbb2.templates	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/phpbb2.templates	2004-03-15 17:40:45 UTC (rev 77)
@@ -2,10 +2,9 @@
 Type: multiselect
 Choices: apache, apache-ssl, apache-perl, apache2
 Default: apache
-Description: What webserver(s) do you want to be configured?
+_Description: Webserver(s) to configure:
  phpBB runs on any webserver supporting PHP4. This configuration-script
  only supports apache-variants. Whiche one(s) do you want to be configured?
  .
- Note: You will need to reload (/etc/init.d/apache-??? reload) the
- webserver(s) by yourself
-
+ Note: You will need to reload (running /etc/init.d/apache-??? reload) the
+ webserver(s) by yourself.

Added: trunk/phpbb2/po/POTFILES.in
===================================================================
--- trunk/phpbb2/po/POTFILES.in	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/po/POTFILES.in	2004-03-15 17:40:45 UTC (rev 77)
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] phpbb2-conf-mysql.templates
+[type: gettext/rfc822deb] phpbb2.templates

Added: trunk/phpbb2/po/templates.pot
===================================================================
--- trunk/phpbb2/po/templates.pot	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/po/templates.pot	2004-03-15 17:40:45 UTC (rev 77)
@@ -0,0 +1,330 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-08 09:54-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../phpbb2-conf-mysql.templates:3
+msgid "Yes, No"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:5
+msgid "Do you want to overwrite your current configuration?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:5
+msgid ""
+"An existing configuration file for the database has been found as /etc/"
+"phpbb2/config.php"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:5
+msgid ""
+"Select `Yes' if you want to redo this setup. No database will be destroyed, "
+"but any customization of /etc/phpbb2/config.php will be lost."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../phpbb2-conf-mysql.templates:14
+msgid "Create, Populate, None"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:16
+msgid "Want configure to create the database?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:16
+msgid ""
+"If you haven't created a database with user yet, and want configure to do "
+"so, choose `Create'."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:16
+msgid ""
+"If you have a database, but it has no tables yet, and want configure to "
+"populate that database with tables, choose `Populate'."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:16
+msgid "In all other cases, choose `None'."
+msgstr ""
+
+#. Type: string
+#. Default
+#: ../phpbb2-conf-mysql.templates:27
+msgid "localhost"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:28
+msgid "What is the hostname where your database is running?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:28
+msgid ""
+"If your database is on another machine then you need to change this value to "
+"the fully qualified domain name for that system."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:35
+msgid "What name do you want for database?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:35
+msgid ""
+"All users, posts, etc. are stored in one single database. How do you want to "
+"call it?"
+msgstr ""
+
+#. Type: string
+#. Default
+#: ../phpbb2-conf-mysql.templates:41
+msgid "phpbb2"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:42
+msgid "What database username do you want to use?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:42
+msgid "For maximum security, a user dedicated for phpBB will be created."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:47
+msgid "What database password do you want to use?"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:47
+msgid "Choose a password for the databaseuser."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:47
+msgid "Leave this empty if you want to have a random password generated."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:54
+msgid "[Internal] makepasswd generated password"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:54
+msgid "No need to translate this."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:54
+msgid ""
+"Here the password generated by makepasswd is stored for later reference (for "
+"example, on upgrade). Only used if dbpass is empty."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:62
+msgid "What is the MySQL root password?"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:62
+msgid ""
+"In order to create a user, the database and the tables, the MySQL root "
+"password is needed."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../phpbb2-conf-mysql.templates:62
+msgid ""
+"This password will be temporarily stored by debconf until the configuring "
+"phase of this install.  If you do not trust debconf to securily manage this "
+"password, you need to create the database and user yourself, and fill in the "
+"exact same details during the installation of phpbb2-conf-mysql (and choose "
+"`Populate' rather than `Create')."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:74
+msgid "FAILURE: Database not created"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:74
+msgid ""
+"The configuration script failed to create the phpbb database. Please run "
+"dpkg-reconfigure phpbb2, to try with different options, possibly choose "
+"\"Manual\" and create the database yourself."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:83
+msgid "FAILURE: Database user not created"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:83
+msgid ""
+"The configuration script failed to create the phpbb database user. Please "
+"run dpkg-reconfigure phpbb2, to try with different options, possibly choose "
+"\"Manual\" and create the database user yourself."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:92
+msgid "FAILURE: Tables not created"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:92
+msgid ""
+"The configuration script failed to create the phpbb tables. Please run dpkg-"
+"reconfigure phpbb2, to try with different options, possibly choose \"Manual"
+"\" and create the tables yourself."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:92
+msgid "Error: ${error}"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../phpbb2-conf-mysql.templates:101
+msgid "true, false"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:103
+msgid "[internal] Whether the DB plus user is created"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../phpbb2-conf-mysql.templates:103
+msgid ""
+"phpbb maintainer scripts will not ask for the DB admin password once the db "
+"and an accessing user is created"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:109
+msgid "[internal] what db_version is currently setup"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../phpbb2-conf-mysql.templates:109
+msgid ""
+"phpbb scripts will set this value to the current version, so to detect "
+"whether it is needed to change database layout, and based on what."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:115
+msgid "Database not purged"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../phpbb2-conf-mysql.templates:115
+msgid ""
+"The purge script did not drop the database for phpbb, nor the user created "
+"for it. You will need to do so yourself (but only if you do not want to "
+"loose all data and board configuration)."
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../phpbb2.templates:3
+msgid "apache, apache-ssl, apache-perl, apache2"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../phpbb2.templates:5
+msgid "What webserver(s) do you want to be configured?"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../phpbb2.templates:5
+msgid ""
+"phpBB runs on any webserver supporting PHP4. This configuration-script only "
+"supports apache-variants. Whiche one(s) do you want to be configured?"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../phpbb2.templates:5
+msgid ""
+"Note: You will need to reload (/etc/init.d/apache-??? reload) the webserver"
+"(s) by yourself"
+msgstr ""

Modified: trunk/phpbb2/rules
===================================================================
--- trunk/phpbb2/rules	2004-03-15 17:29:04 UTC (rev 76)
+++ trunk/phpbb2/rules	2004-03-15 17:40:45 UTC (rev 77)
@@ -11,7 +11,7 @@
 #
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 UPSTREAM_VERSION=2.0.7
 





More information about the phpBB-l mailing list