Re: Bug#646747: [BTS#646747] templates://spotweb/{spotweb.templates} : Final update for English review
Jan-Pascal van Best wrote:
> Christian and others,
The others being on debian-l10n-english, CC restored - luckily I also
spotted the bug traffic at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646747#45
> Thanks you for your work on finding the proper wording for the debconf
> templates for spotweb.
I hope Christian doesn't shout at you for missing Friday's Last Call
For Comments - he's had a stressful couple of days for things like
this. But you're quite right, and as it happens I've belatedly
noticed another problem myself... there was a reference to the
"headers" server when it meant the "post" server. So here's a revised
patch.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
Template: spotweb/nntpserver
Type: string
Default: news.ziggo.nl
_Description: NNTP server:
Please enter the news (NNTP) server that should be used for SpotWeb.
Template: spotweb/nntpuser
Type: string
_Description: NNTP server username:
Please enter the username to use on the news server.
Template: spotweb/nntppass
Type: password
_Description: NNTP server password:
Please enter the password to use on the news server.
Template: spotweb/nntpenc
Type: select
Choices-C: false, ssl, tls
__Choices: No encryption, SSL, TLS
_Description: NNTP server encryption:
Please choose the encryption type for communication with the
news server.
Template: spotweb/nntpport
Type: string
Default: 119
_Description: NNTP server port:
Please enter the port to use on the news server. Port 563 should generally
be used when encryption is activated.
Template: spotweb/useheaderserver
Type: boolean
Default: false
_Description: Use separate "headers" news server?
Please choose this option if you use a separate news server to fetch headers.
Template: spotweb/headerserver
Type: string
Default:
_Description: NNTP "headers" server:
Please enter the news server that should be used for headers fetching
with SpotWeb.
Template: spotweb/headeruser
Type: string
_Description: NNTP "headers" server username:
Please enter the username to use on the "headers" news server.
Template: spotweb/headerpass
Type: password
_Description: NNTP "headers" server password:
Please enter the password to use on the "headers" news server.
Template: spotweb/headerenc
Type: select
Choices-C: false, ssl, tls
__Choices: No encryption, SSL, TLS
Choices-C: No encryption, SSL, TLS
_Description: NNTP "headers" server encryption:
Please choose the encryption type for communication with the
"headers" news server.
Template: spotweb/headerport
Type: string
Default: 119
_Description: NNTP "headers" server port:
Please enter the port to use on the "header" news server. Port 563 should generally
be used when encryption is activated.
Template: spotweb/usepostserver
Type: boolean
Default: false
_Description: Use separate "post" (upload) news server?
Please choose this option if you use a separate news server for posting
spots.
Template: spotweb/postserver
Type: string
Default:
_Description: NNTP "post" server:
Please enter the news server that should be used for posting spots
with SpotWeb.
Template: spotweb/postuser
Type: string
_Description: NNTP "post" server username:
Please enter the username to use on the "post" news server.
Template: spotweb/postpass
Type: password
_Description: NNTP "post" server password:
Please enter the password to use on the "post" news server.
Template: spotweb/postenc
Type: select
Choices-C: false, ssl, tls
__Choices: No encryption, SSL, TLS
_Description: NNTP "post" server encryption:
Please choose the encryption type for communication with the
"post" news server.
Template: spotweb/postport
Type: string
Default: 119
_Description: NNTP "post" server port:
Please enter the port to use on the "post" news server. Port 563 should generally
be used when encryption is activated.
Source: spotweb
Section: web
Priority: optional
Maintainer: Jan-Pascal van Best <janpascal@vanbest.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8.0.0), po-debconf, yui-compressor (>= 2.4.2)
Standards-Version: 3.9.2
Homepage: https://github.com/spotweb/spotweb
Vcs-Git: git://anonscm.debian.org/users/janpascal-guest/spotweb.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/janpascal-guest/spotweb.git
Package: spotweb
Architecture: all
Depends: ${misc:Depends}, dbconfig-common, ucf,
apache2, libapache2-mod-php5,
php5-mysql, php5-curl, php-net-nntp (>= 1.5.0~rc1), php5-gmp,
php5-gd, msttcorefonts,
libjs-jquery (>= 1.6.2), libjs-jquery-fancybox, libjs-jquery-cookie,
libjs-jquery-mousewheel, libjs-jquery-easing, libjs-jquery-ui (>= 1.8.ooops.14)
Recommends: mysql-client, mysql-server
Suggests: sabnzbdplus, nzbget
Description: web interface to search and filter Usenet spots
SpotWeb is a web-based version of the decentralized news-indexing system
SpotNet, which fetches Usenet "spots" - postings that contain information
about uploaded binaries. SpotWeb allows searching, filtering, and viewing
of the spots and comments. It integrates with NZB downloaders such as
NZBget and SABnzbd+ to download the binaries from Usenet.
diff -ru old/control new/control
--- old/control 2011-10-26 21:12:17.564216532 +0100
+++ new/control 2011-10-31 19:31:34.484548275 +0000
@@ -19,8 +19,9 @@
libjs-jquery-mousewheel, libjs-jquery-easing, libjs-jquery-ui (>= 1.8.ooops.14)
Recommends: mysql-client, mysql-server
Suggests: sabnzbdplus, nzbget
-Description: Web application to search and filter usenet spots
- Spotweb is a web-based version of SpotNet. Spotweb downloads spot posting from
- Usenet, that contain information about uploaded binaries. Spotweb allows you
- to search, filter and view the spots and comments. It integrates with NZB
- downloaders such as NZBGet and sabnzb+ to download the binaries from Usenet.
+Description: web interface to search and filter Usenet spots
+ SpotWeb is a web-based version of the decentralized news-indexing system
+ SpotNet, which fetches Usenet "spots" - postings that contain information
+ about uploaded binaries. SpotWeb allows searching, filtering, and viewing
+ of the spots and comments. It integrates with NZB downloaders such as
+ NZBget and SABnzbd+ to download the binaries from Usenet.
diff -ru old/spotweb.templates new/spotweb.templates
--- old/spotweb.templates 2011-10-26 21:12:16.260214847 +0100
+++ new/spotweb.templates 2011-11-15 21:46:11.603175664 +0000
@@ -2,95 +2,108 @@
Type: string
Default: news.ziggo.nl
_Description: NNTP server:
- The NNTP (news) server to use for Spotweb.
+ Please enter the news (NNTP) server that should be used for SpotWeb.
Template: spotweb/nntpuser
Type: string
-_Description: NNTP user name:
- The user name op the NNTP server.
+_Description: NNTP server username:
+ Please enter the username to use on the news server.
Template: spotweb/nntppass
Type: password
-_Description: NNTP password:
- The password on the NNTP server.
+_Description: NNTP server password:
+ Please enter the password to use on the news server.
Template: spotweb/nntpenc
Type: select
-Choices: false, ssl, tls
+Choices-C: false, ssl, tls
+__Choices: No encryption, SSL, TLS
_Description: NNTP server encryption:
- Use encryption on the NNTP server.
+ Please choose the encryption type for communication with the
+ news server.
Template: spotweb/nntpport
Type: string
Default: 119
_Description: NNTP server port:
- The port to use on the NNTP server (use 563 when encryption is used).
+ Please enter the port to use on the news server. Port 563 should generally
+ be used when encryption is activated.
Template: spotweb/useheaderserver
Type: boolean
Default: false
-_Description: Use separate 'headers' news server?
- Select if you use a separate new server to fetch headers.
+_Description: Use separate "headers" news server?
+ Please choose this option if you use a separate news server to fetch headers.
Template: spotweb/headerserver
Type: string
Default:
-_Description: 'headers' server name:
- The 'headers' server to use for Spotweb.
+_Description: NNTP "headers" server:
+ Please enter the news server that should be used for headers fetching
+ with SpotWeb.
Template: spotweb/headeruser
Type: string
-_Description: 'headers' user name:
- The user name on the 'headers' server.
+_Description: NNTP "headers" server username:
+ Please enter the username to use on the "headers" news server.
Template: spotweb/headerpass
Type: password
-_Description: 'headers' password:
- The password on the 'headers' server.
+_Description: NNTP "headers" server password:
+ Please enter the password to use on the "headers" news server.
Template: spotweb/headerenc
Type: select
-Choices: false, ssl, tls
-_Description: 'headers' server encryption:
- Use encryption on the 'headers' server.
+Choices-C: false, ssl, tls
+__Choices: No encryption, SSL, TLS
+Choices-C: No encryption, SSL, TLS
+_Description: NNTP "headers" server encryption:
+ Please choose the encryption type for communication with the
+ "headers" news server.
Template: spotweb/headerport
Type: string
Default: 119
-_Description: 'headers' server port:
- The port on the 'headers' server (use 563 when encryption is used).
+_Description: NNTP "headers" server port:
+ Please enter the port to use on the "header" news server. Port 563 should generally
+ be used when encryption is activated.
Template: spotweb/usepostserver
Type: boolean
Default: false
-_Description: Use separate 'post' (upload) news server?
- Choose 'true' if you use a separate new server to posts.
+_Description: Use separate "post" (upload) news server?
+ Please choose this option if you use a separate news server for posting
+ spots.
Template: spotweb/postserver
Type: string
Default:
-_Description: 'post' server name:
- The 'post' server to use for Spotweb.
+_Description: NNTP "post" server:
+ Please enter the news server that should be used for posting spots
+ with SpotWeb.
Template: spotweb/postuser
Type: string
-_Description: 'post' user name:
- The user name on the 'post' server.
+_Description: NNTP "post" server username:
+ Please enter the username to use on the "post" news server.
Template: spotweb/postpass
Type: password
-_Description: 'post' password:
- The password on the 'post' server.
+_Description: NNTP "post" server password:
+ Please enter the password to use on the "post" news server.
Template: spotweb/postenc
Type: select
-Choices: false, ssl, tls
-_Description: 'post' server encryption:
- Use encryption on the 'post' server.
+Choices-C: false, ssl, tls
+__Choices: No encryption, SSL, TLS
+_Description: NNTP "post" server encryption:
+ Please choose the encryption type for communication with the
+ "post" news server.
Template: spotweb/postport
Type: string
Default: 119
-_Description: 'post' server port:
- The port on the 'post' server (use 563 when encryption is used).
+_Description: NNTP "post" server port:
+ Please enter the port to use on the "post" news server. Port 563 should generally
+ be used when encryption is activated.
Reply to: