Quoting Christian Perrier (bubu...@debian.org): > The attached patch should replace the one sent originally. A double > question mark was indeed left in the rewritten debconf > templates. Sorry for the trouble.
Another error was found. One of the questions had many trailing spaces. Please use the attached patch for templates. Please note that ALL translations that were sent are fuzzied by this change. I will send fixed PO files alongs with the final patch that will be sent at the end of the call for translations step.
--- canna.old/debian/templates 2009-02-14 12:20:04.323869668 +0100
+++ canna/debian/templates 2009-05-03 07:53:05.972745748 +0200
@@ -1,46 +1,51 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
Template: canna/run_cannaserver
Type: boolean
Default: true
-_Description: Do you want to run the Canna server ?
+_Description: Should the Canna server run automatically?
This package contains the Canna server and server-related
utilities. If you are only interested in these utilities,
- you can disable the Canna server here.
+ you can disable the Canna server now.
Template: canna/run_with_inet
Type: boolean
Default: false
-_Description: Do you want to connect to the Canna server from a remote host?
- The Canna server only allows connections via UNIX domain
- sockets when the `-inet' option is not specified. This
- means that when the Canna server is started without the `-inet' option,
- only clients which run on the same host can connect to the server.
- Some clients such as, `egg' and `yc-el', do not support
- UNIX domain socket and require the `-inet' option, even if they run on
- the same host.
+_Description: Should the Canna server run in network mode?
+ By default the Canna server will run without support for network
+ connections, and will only accept connections on UNIX domain sockets,
+ from clients running on the same host.
.
- If you want to connect to this Canna server from remote hosts, or
- if you want to use INET-domain-only software, you should run
- the server with the `-inet' option.
+ If you choose this option, network support will be activated, and the
+ Canna server will accept connections on TCP sockets from clients that
+ may be on remote hosts. Some clients (such as egg and yc-el) require
+ this mode even if they run on the local host.
Template: canna/manage_allow_hosts_with_debconf
Type: boolean
Default: true
-_Description: Manage /etc/hosts.canna with debconf ?
- /etc/hosts.canna controls which hosts can connect to this server.
+_Description: Manage /etc/hosts.canna automatically?
+ The /etc/hosts.canna file lists hosts allowed to connect to the
+ Canna server.
.
- By default /etc/hosts.canna will be managed with debconf.
- Refuse here if you want to manage /etc/hosts.canna yourself.
+ You should not accept this option if you prefer managing the
+ file's contents manually.
Template: canna/allow_hosts
Type: string
Default: unix localhost
-_Description: Please enter the name of each host allowed to connect to this
server
+_Description: Hosts allowed to connect to this Canna server:
Please enter the names of the hosts allowed to connect to this Canna server,
separated by spaces.
.
- `unix' is a special notation for allowing access
- via UNIX domain sockets.
-
+ You can use "unix" to allow access via UNIX domain sockets.
--- canna.old/debian/libcanna1g.templates 2009-02-14 12:20:04.323869668
+0100
+++ canna/debian/libcanna1g.templates 2009-04-14 07:27:19.167323447 +0200
@@ -1,20 +1,27 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
Template: canna/default_style
Type: select
Choices: verbose, 1.1, 1.2, jdaemin, just, lan5, matsu, skk, tut, unix, vje,
wx2+
Default: verbose
-_Description: Canna input style
- Please choose the default canna input style below, which will be installed if
- there is no previous configuration:
- .
- verbose - Canna3.5 default style with verbose comments
- 1.1 - old Canna style (ver. 1.1)
- 1.2 - old Canna style (ver. 1.2)
- jdaemon - jdaemon style
- just - Justsystem ATOK like style
- lan5 - LAN5 like style
- matsu - MATSU word processor like style
- skk - SKK like style
- tut - for TUT-Code
- unix - UNIX style
- vje - vje like style
- wx2+ - WX2+ style
+_Description: Canna input style:
+ Please choose the default Canna input style:
+ verbose: Canna3.5 default style with verbose comments;
+ 1.1 : old Canna style (ver. 1.1);
+ 1.2 : old Canna style (ver. 1.2);
+ jdaemon: jdaemon style;
+ just : JustSystems ATOK style;
+ lan5 : LAN5 style;
+ matsu : Matsu word processor style;
+ skk : SKK style;
+ tut : TUT-Code style;
+ unix : UNIX style;
+ vje : vje style;
+ wx2+ : WX2+ style.
--- canna.old/debian/control 2009-02-14 12:20:04.323869668 +0100
+++ canna/debian/control 2009-04-05 17:08:13.327985238 +0200
@@ -11,36 +11,44 @@
Conflicts: canna-server, libcanna1g (<= 3.5b2-33)
Replaces: canna-server
Suggests: canna-shion
-Description: Japanese input system (server and dictionary)
- Canna is a Japanese input system available in Free Software.
- Canna provides a unified user interface for inputting Japanese.
- .
- Canna supports Nemacs, Mule, kinput2 and canuum. All of these
- tools can be used by a single customization file, romaji-to-kana
- conversion rules and conversion dictionaries, and input Japanese in
- the same way.
+Description: input system for Japanese - server and dictionary
+ Canna provides a unified user interface for Japanese input. It is based
+ on a client-server model and supports automatic kana-to-kanji conversion.
.
- Canna converts kana to kanji based on a client-server model and
- supports automatic kana-to-kanji conversion.
+ It supports multiple clients (including kinput2 and canuum), and allows
+ them all to work in the same way, sharing customization files,
+ romaji-to-kana conversion rules and conversion dictionaries.
.
- This package includes the cannaserver program and dictionary files.
+ This package provides the Canna server program and dictionary files.
Package: canna-utils
Architecture: any
Depends: ${shlibs:Depends}
Conflicts: canna (<= 3.5b2-33), libcanna1g (<= 3.5b2-33)
-Description: Japanese input system (utility)
- Canna is a Japanese input system available in Free Software.
- This package includes canna client programs.
+Description: input system for Japanese - utilities
+ Canna provides a unified user interface for Japanese input. It is based
+ on a client-server model and supports automatic kana-to-kanji conversion.
+ .
+ It supports multiple clients (including kinput2 and canuum), and allows
+ them all to work in the same way, sharing customization files,
+ romaji-to-kana conversion rules and conversion dictionaries.
+ .
+ This package provides client programs for Canna.
Package: libcanna1g
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, debconf
Conflicts: canna (<= 3.5b2-33)
-Description: Canna Runtime Library
- Canna is a Japanese input system available in Free Software.
- This package includes canna shared libraries.
+Description: input system for Japanese - runtime library
+ Canna provides a unified user interface for Japanese input. It is based
+ on a client-server model and supports automatic kana-to-kanji conversion.
+ .
+ It supports multiple clients (including kinput2 and canuum), and allows
+ them all to work in the same way, sharing customization files,
+ romaji-to-kana conversion rules and conversion dictionaries.
+ .
+ This package provides shared libraries for Canna.
Package: libcanna1g-dev
Section: libdevel
@@ -48,6 +56,13 @@
Depends: libcanna1g
Conflicts: canna-dev, libcanna1-dev, canna (<= 3.5b2-23)
Replaces: canna-dev
-Description: Canna Static Library and Headers
- Canna is a Japanese input system available in Free Software.
- This package includes header and static libraries.
+Description: input system for Japanese - development files
+ Canna provides a unified user interface for Japanese input. It is based
+ on a client-server model and supports automatic kana-to-kanji conversion.
+ .
+ It supports multiple clients (including kinput2 and canuum), and allows
+ them all to work in the same way, sharing customization files,
+ romaji-to-kana conversion rules and conversion dictionaries.
+ .
+ This package provides the headers and static libraries needed to develop
+ software based on Canna.
--- canna.old/debian/changelog 2009-02-14 12:20:04.323869668 +0100
+++ canna/debian/changelog 2009-05-03 07:51:30.504745152 +0200
@@ -1,3 +1,17 @@
+canna (3.7p3-6.2) UNRELEASED; urgency=low
+
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #523990
+ * [Debconf translation updates]
+ * Galician. Closes: #524763
+ * Japanese. Closes: #524782
+ * Swedish. Closes: #524788
+ * Italian. Closes: #525164
+ * Finnish. Closes: #526186
+ * Portuguese. Closes: #526711
+
+ -- Christian Perrier <bubu...@debian.org> Tue, 14 Apr 2009 17:55:30 +0200
+
canna (3.7p3-6.1) unstable; urgency=low
* Non-maintainer upload to fix pending l10n issues.
signature.asc
Description: Digital signature
