Package: rpncalc
Severity: normal
Tags: patch l10n
Hi,
There is a lot of problems in the po/ directory of rpncalc. What I will
suggest here may not be perfect, but will solve the problems. Please
* remove the *.gmo files (these are binary files)
* apply the attached patch.
* force the rebuild of rpncalc.pot (for example by removing it and
running "make rpncalc.pot")
Here is an explanation of what the patch does:
* de.po:
apply de.po.diff
set the charset to utf-8 instead of utf8 to avoid warnings
* de.po.diff:
file removed (I don't know why this file has been included)
* es.po, fi.po, fr.po:
these files are encoded in iso-8859-15, but utf-8 is specified. Please
do not edit the files sent by the translators
* LINGUAS:
file removed (a wildcard in a Makefile is much more useful)
* Makefile.in.in:
this file was very very complicated, using old stuffs such as Suffix
Rules, and not working (the rpncalc.pot was out of date and couldn't
be regenerated properly). I have cleaned everything, but maybe to
much. I don't want to take the time to explain everything, but if you
want more details, do not hesitate to ask me. If I have removed too
much, please tell me and I will have a look at it.
* mkinstalldirs, remove-potcdate.sin, stamp-po
files removed (no longer used by the Makefile)
Once everything is done, rpncalc.pot will have 28 strings instead of 15
strings, and therefore all translations will be out of date.
I hope it helps.
Cheers,
--
Thomas Huriaux
diff -Nur po.orig/de.po po/de.po
--- po.orig/de.po 2005-10-04 13:04:38.0 +0200
+++ po/de.po2005-10-04 13:12:41.0 +0200
@@ -1,4 +1,4 @@
-# deutsche Uebersetzung fÃŒr rpncalc.
+# deutsche Ãbersetzung fÃŒr rpncalc.
# Copyright (C) 1999, 2005 David Frey
# David Frey <[EMAIL PROTECTED]>, 1999, 2005
# GPL'ed
@@ -12,7 +12,7 @@
"Last-Translator: David Frey <[EMAIL PROTECTED]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmds.c:151
diff -Nur po.orig/de.po.diff po/de.po.diff
--- po.orig/de.po.diff 2005-10-04 13:04:38.0 +0200
+++ po/de.po.diff 1970-01-01 01:00:00.0 +0100
@@ -1,30 +0,0 @@
de.po.gz.orig/rpncalc_1.34_de.po 2005-06-11 16:42:51.0 +0200
-+++ de.po.gz/rpncalc_1.34_de.po2005-06-14 00:16:18.0 +0200
-@@ -1,4 +1,4 @@
--# deutsche Uebersetzung für rpncalc.
-+# deutsche Übersetzung für rpncalc.
- # Copyright (C) 1999 David Frey
- # David Frey <[EMAIL PROTECTED]>, 1999
- # GPL'ed
-@@ -261,10 +261,10 @@
- #~ msgstr "Exponentialfunktion: e^x"
-
- #~ msgid "largest integral value not greater than x"
--#~ msgstr "Grösste Ganzzahl nicht grösser als x"
-+#~ msgstr "Größte Ganzzahl nicht größer als x"
-
- #~ msgid "greatest common divisor"
--#~ msgstr "Grösster gemeinsamer Teiler"
-+#~ msgstr "Größter gemeinsamer Teiler"
-
- #~ msgid "switch to hexadecimal base"
- #~ msgstr "I/O auf Hexadezimalsystem wechseln"
-@@ -300,7 +300,7 @@
- #~ msgstr "natürlicher Logarithmus (Basis e)"
-
- #~ msgid "largest real number"
--#~ msgstr "grösste reelle Zahl"
-+#~ msgstr "größte reelle Zahl"
-
- #~ msgid "smallest real number"
- #~ msgstr "kleinste, positive reelle Zahl"
diff -Nur po.orig/es.po po/es.po
--- po.orig/es.po 2005-10-04 13:04:38.0 +0200
+++ po/es.po2005-10-04 13:13:46.0 +0200
@@ -12,7 +12,7 @@
"Last-Translator: Claudio S. Suárez Sánchez <[EMAIL PROTECTED]>\n"
"Language-Team: Spanish <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmds.c:151
diff -Nur po.orig/fi.po po/fi.po
--- po.orig/fi.po 2005-10-04 13:04:38.0 +0200
+++ po/fi.po2005-10-04 13:14:20.0 +0200
@@ -11,7 +11,7 @@
"Last-Translator: Antti-Juhani Kaijanaho <[EMAIL PROTECTED]>\n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmds.c:151
diff -Nur po.orig/fr.po po/fr.po
--- po.orig/fr.po 2005-10-04 13:04:38.0 +0200
+++ po/fr.po2005-10-04 13:14:04.0 +0200
@@ -10,7 +10,7 @@
"Last-Translator: Nicolas Bertolissio <[EMAIL PROTECTED]>\n"
"Language-Team: French \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmds.c:151
diff -Nur po.orig/LINGUAS po/LINGUAS
--- po.orig/LINGUAS 2005-10-04 13:04:38.0 +0200
+++ po/LINGUAS 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-de es fi fr
diff -Nur po.orig/Makefile.in.in po/Makefile.in.in
--- po.orig/Makefile.in.in 2005-10-04 13:04:38.0 +0200
+++ po/Makefile.in.in 2005-10-04 13:01:42.0 +0200
@@ -16,20 +16,12 @@
SHELL = /bin/
