Attachment 16592 Details for Bug 30375 – file.diff

[patch] file.diff

file.diff (text/plain), 23.37 KB, created by clefevre on 2001-09-06 11:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clefevre

Created: 2001-09-06 11:40:01 UTC

Size: 23.37 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- Makefile	2001/05/21 11:05:17	1.14
>+++ Makefile	2001/09/06 10:10:21
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	recode
>-PORTVERSION=	3.5
>-PORTREVISION=	1
>+PORTVERSION=	3.6
> CATEGORIES=	converters
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	recode
>@@ -18,13 +17,36 @@
> 
> USE_LIBTOOL=	yes
> INSTALLS_SHLIB=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
>+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
>+		LDFLAGS=-L${LOCALBASE}/lib \
>+		LIBS=-lintl
> 
> MAN1=		recode.1
> 
>-pre-patch:
>-	@${CP} ${FILESDIR}/ru.po ${WRKSRC}/po/
>-	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
>+post-extract: copy-po-files remove-info-files
>+
>+copy-po-files:
>+	@${CP} ${FILESDIR}/ru.po ${WRKSRC}/i18n
>+
>+remove-info-files:
>+	@${RM} -f ${WRKSRC}/doc/${PORTNAME}.info*
>+
>+post-patch: patch-po-files patch-configure patch-makeinfo
>+
>+patch-po-files:
>+	@${PERL} -pi -e '\
>+		if (/Project-Id-Version/) { \
>+			s/3\.[45](r|\.[0-9])?/3.6/; \
>+			s/: (Free )?recode/: GNU recode/; \
>+		} \
>+	' ${WRKSRC}/i18n/*.po
>+
>+patch-configure:
>+	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
>+		${WRKSRC}/configure
>+
>+patch-makeinfo:
>+	@${PERL} -pi.fbsd -e 's|\@MAKEINFO\@|\@MAKEINFO\@ --no-split|g' \
>+		${WRKSRC}/doc/Makefile.in
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	1999/12/29 08:13:11	1.2
>+++ distinfo	2001/09/06 07:46:33
>@@ -1 +1 @@
>-MD5 (recode-3.5.tar.gz) = 5f2c54592e9f7af31a11e62c7babc81c
>+MD5 (recode-3.6.tar.gz) = be3f40ad2e93dae5cd5f628264bf1877
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/pkg-descr,v
>retrieving revision 1.5
>diff -u -r1.5 pkg-descr
>--- pkg-descr	2001/02/24 17:41:36	1.5
>+++ pkg-descr	2001/09/06 09:16:53
>@@ -1,21 +1,11 @@
>-GNU `recode' converts files between character sets and usages.  When
>-exact transliterations are not possible, it may get rid of the
>-offending characters or fall back on approximations.  This program
>-recognizes or produces nearly 150 different character sets and is able
>-to transliterate files between almost any pair.  Most RFC 1345
>-character sets are supported.
>+GNU `recode' has the purpose of converting files between various
>+character sets and usages. When exact transliterations are not
>+possible, as it is often the case, the program may get rid of the
>+offending characters or fall back on approximations.
> 
>-----------------------------------------------------------------
>-There is also a patch avaliable for the bibliographic
>-character sets: 
>+This program recognizes or produces around 150 different character
>+sets and is able to transliterate files between almost any pair.
> 
>-	ISO 5426:1983
>-	Extension of the Latin alphabet coded character set for bibliographic
>-	information interchange.
>+Most RFC 1345 character sets are supported.
> 
>-	Z39.47-1993 Extended Latin Alphabet Coded Character Set for
>-	Bibliographic Use (ANSEL)
>-	[also known as 8-Bit ANSEL, used by USMARC]
>-
>-See http://www.de.freebsd.org/~wosch/src/recode/
>-Extract the archive and follow the instructions in README.bib.
>+WWW: http://www.gnu.org/software/recode/recode.html
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/pkg-plist,v
>retrieving revision 1.5
>diff -u -r1.5 pkg-plist
>--- pkg-plist	2001/07/05 11:40:51	1.5
>+++ pkg-plist	2001/09/06 09:44:22
>@@ -1,22 +1,19 @@
> bin/recode
>+include/recode.h
>+include/recodext.h
> @unexec install-info --delete %D/info/recode.info %D/info/dir
> info/recode.info
>-info/recode.info-1
>-info/recode.info-2
>-info/recode.info-3
>-info/recode.info-4
>-info/recode.info-5
>-info/recode.info-6
>-@exec install-info --delete %D/info/recode.info %D/info/dir
>+@exec install-info %D/info/recode.info %D/info/dir
> lib/librecode.a
> lib/librecode.so
> lib/librecode.so.3
>-include/recode.h
>-include/recodext.h
> share/locale/da/LC_MESSAGES/recode.mo
> share/locale/de/LC_MESSAGES/recode.mo
>+share/locale/el/LC_MESSAGES/recode.mo
> share/locale/es/LC_MESSAGES/recode.mo
> share/locale/fr/LC_MESSAGES/recode.mo
>+share/locale/gl/LC_MESSAGES/recode.mo
>+share/locale/it/LC_MESSAGES/recode.mo
> share/locale/nl/LC_MESSAGES/recode.mo
> share/locale/pl/LC_MESSAGES/recode.mo
> share/locale/pt/LC_MESSAGES/recode.mo
>Index: files/patch-aa
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/files/patch-aa,v
>retrieving revision 1.1
>diff -u -r1.1 patch-aa
>--- files/patch-aa	1999/12/29 08:13:14	1.1
>+++ files/patch-aa	2001/09/06 09:22:01
>@@ -1,11 +1,11 @@
>---- src/Makefile.in.orig	Fri Jul 30 22:43:08 1999
>-+++ src/Makefile.in	Fri Jul 30 22:43:21 1999
>-@@ -149,7 +149,7 @@
>+--- src/Makefile.in.orig	Mon Jan 22 19:14:16 2001
>++++ src/Makefile.in	Thu Sep  6 11:21:43 2001
>+@@ -131,7 +131,7 @@
>  
>- librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c merged.c names.c outer.c recode.c request.c strip-pool.c task.c $(C_STEPS)
>+ librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
>  
> -librecode_la_LDFLAGS = -version-info 0:0:0
>-+librecode_la_LDFLAGS = -version-info 3:5:0
>++librecode_la_LDFLAGS = -version-info 3:6:0
>  
>- INCLUDES = -I.. -I../intl -I$(srcdir) -I$(top_srcdir)/lib
>- 
>+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
>+ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
>Index: files/patch-configure
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/files/patch-configure,v
>retrieving revision 1.1
>diff -u -r1.1 patch-configure
>--- files/patch-configure	2001/05/21 11:05:18	1.1
>+++ files/patch-configure	2001/09/06 09:23:11
>@@ -1,11 +1,11 @@
>---- configure.orig	Mon May 21 14:57:16 2001
>-+++ configure	Mon May 21 14:57:24 2001
>+--- configure.orig	Wed Jan  3 17:40:32 2001
>++++ configure	Thu Sep  6 11:22:53 2001
> @@ -825,7 +825,7 @@
>  esac
>  
>  
>--ALL_LINGUAS="da de es fr nl pl pt sl sv"
>-+ALL_LINGUAS="da de es fr nl pl pt ru sl sv"
>+-ALL_LINGUAS="da de el es fr gl it nl pl pt sl sv"
>++ALL_LINGUAS="da de el es fr gl it nl pl pt ru sl sv"
>  
>- for ac_prog in mawk gawk nawk awk
>- do
>+ # Extract the first word of "gcc", so it can be a program name with args.
>+ set dummy gcc; ac_word=$2
>Index: files/ru.po
>===================================================================
>RCS file: /home/ncvs/ports/converters/recode/files/ru.po,v
>retrieving revision 1.1
>diff -u -r1.1 ru.po
>--- files/ru.po	2001/05/21 11:05:18	1.1
>+++ files/ru.po	2001/09/06 10:26:12
>@@ -4,62 +4,48 @@
> #
> msgid ""
> msgstr ""
>-"Project-Id-Version: recode 3.5\n"
>+"Project-Id-Version: GNU recode 3.6\n"
> "POT-Creation-Date: 1999-05-18 08:46-0400\n"
>-"PO-Revision-Date: 2000-10-16 19:18+04:00\n"
>+"PO-Revision-Date: 2001-09-06 11:26-02:00\n"
> "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
> "Language-Team: Russian <ru@li.org>\n"
> "MIME-Version: 1.0\n"
> "Content-Type: text/plain; charset=koi8-r\n"
> "Content-Transfer-Encoding: 8bit\n"
> 
>-#. Dump all characters.
>-#: src/debug.c:287
>-msgid "UCS2   Mne   Description\n\n"
>-msgstr "UCS2   Mne   ïÐÉÓÁÎÉÅ\n\n"
>-
>-# src/main.c:157
>-#: src/main.c:140
>+#: src/main.c:142
> msgid "No error"
> msgstr "ïÛÉÂËÉ ÎÅÔ"
> 
>-# src/main.c:160
>-#: src/main.c:143
>+#: src/main.c:145
> msgid "Non canonical input"
> msgstr "îÅËÁÎÏÎÉÞÅÓËÉÊ ××ÏÄ"
> 
>-# src/main.c:163
>-#: src/main.c:146
>+#: src/main.c:148
> msgid "Ambiguous output"
> msgstr "îÅÏÄÎÏÚÎÁÞÎÙÊ ×Ù×ÏÄ"
> 
>-# src/main.c:166
>-#: src/main.c:149
>+#: src/main.c:151
> msgid "Untranslatable input"
> msgstr "îÅÔÒÁÎÓÌÉÒÕÅÍÙÊ ××ÏÄ"
> 
>-# src/main.c:169
>-#: src/main.c:152
>+#: src/main.c:154
> msgid "Invalid input"
> msgstr "îÅ×ÅÒÎÙÊ ××ÏÄ"
> 
>-# src/main.c:172
>-#: src/main.c:155
>+#: src/main.c:157
> msgid "System detected problem"
> msgstr "óÉÓÔÅÍÎÏ ÏÂÎÁÒÕÖÅÎÎÁÑ ÏÛÉÂËÁ"
> 
>-# src/main.c:175
>-#: src/main.c:158
>+#: src/main.c:160
> msgid "Misuse of recoding library"
> msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÂÉÂÌÉÏÔÅËÉ ÐÅÒÅËÏÄÉÒÏ×ËÉ"
> 
>-# src/main.c:178
>-#: src/main.c:161
>+#: src/main.c:163
> msgid "Internal recoding bug"
> msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÅÒÅËÏÄÉÒÏ×ËÉ"
> 
>-# src/main.c:454
>-#: src/main.c:206
>+#: src/main.c:208
> msgid ""
> "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"
>@@ -89,27 +75,28 @@
> "ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ, ÅÓÌÉ ÎÅÔ, ÎÁÐÉÛÉÔÅ Free Software Foundation, Inc., 59 Temple\n"
> "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
> 
>-# src/main.c:479
>-#: src/main.c:231
>+#: src/main.c:233
> #, c-format
> msgid "Try `%s %s' for more information.\n"
> msgstr "ðÏÐÒÏÂÕÊÔÅ `%s %s' ÄÌÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
> 
>-# src/main.c:483
>-#: src/main.c:235
>-msgid "Free `recode' converts files between various character sets and surfaces.\n"
>+#: src/main.c:237
>+msgid ""
>+"Free `recode' converts files between various character sets and surfaces.\n"
> msgstr ""
> "Free `recode' ÐÒÅÏÂÒÁÚÕÅÔ ÆÁÊÌÙ ÍÅÖÄÕ ÒÁÚÌÉÞÎÙÍÉ ÎÁÂÏÒÁÍÉ ÓÉÍ×ÏÌÏ×\n"
> "É ÐÒÅÄÓÔÁ×ÌÅÎÉÑÍÉ.\n"
> 
>-# src/main.c:486
>-#: src/main.c:239
>+#: src/main.c:241
> #, c-format
>-msgid "\nUsage: %s [OPTION]... [ [CHARSET] | REQUEST [FILE]... ]\n"
>-msgstr "\néÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [ [îáâïò-óéí÷ïìï÷] | úáðòïó [æáêì]... ]\n"
>+msgid ""
>+"\n"
>+"Usage: %s [OPTION]... [ [CHARSET] | REQUEST [FILE]... ]\n"
>+msgstr ""
>+"\n"
>+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [ [îáâïò-óéí÷ïìï÷] | úáðòïó [æáêì]... ]\n"
> 
>-# src/main.c:489
>-#: src/main.c:242
>+#: src/main.c:244
> msgid ""
> "\n"
> "If a long option shows an argument as mandatory, then it is mandatory\n"
>@@ -120,8 +107,8 @@
> "ÏÂÑÚÁÔÅÌÅÎ ÔÁËÖÅ ÄÌÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ËÏÒÏÔËÏÇÏ ËÌÀÞÁ.  áÎÁÌÏÇÉÞÎÏ ÄÌÑ\n"
> "ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ËÌÀÞÅÊ.\n"
> 
>-# src/main.c:494
>-#: src/main.c:248
>+#: src/main.c:250
>+#, fuzzy
> msgid ""
> "\n"
> "Listings:\n"
>@@ -149,8 +136,7 @@
> "      --help                 ×Ù×ÅÓÔÉ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
> "      --version              ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
> 
>-# src/main.c:506
>-#: src/main.c:261
>+#: src/main.c:263
> msgid ""
> "\n"
> "Operation modes:\n"
>@@ -173,20 +159,17 @@
> "      --sequence=memory   ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÅÒÁÔÉ×ÎÕÀ ÐÁÍÑÔØ ÄÌÑ\n"
> "                          ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÈ ÐÒÏÈÏÄÏ×\n"
> 
>-# src/main.c:517
>-#: src/main.c:273
>+#: src/main.c:275
> msgid "  -p, --sequence=pipe     use pipe machinery for sequencing passes\n"
> msgstr ""
> "  -p, --sequence=pipe     ÉÓÐÏÌØÚÏ×ÁÔØ ÍÅÈÁÎÉÚÍ ËÁÎÁÌÏ× ÄÌÑ\n"
> "                          ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÈ ÐÒÏÈÏÄÏ×\n"
> 
>-# src/main.c:521
>-#: src/main.c:278
>+#: src/main.c:280
> msgid "  -p, --sequence=pipe     same as -i (on this system)\n"
> msgstr "  -p, --sequence=pipe     ÔÏ ÖÅ, ÞÔÏ  -i (ÎÁ ÜÔÏÊ ÓÉÓÔÅÍÅ)\n"
> 
>-# src/main.c:525
>-#: src/main.c:283
>+#: src/main.c:285
> msgid ""
> "\n"
> "Fine tuning:\n"
>@@ -211,8 +194,7 @@
> "  -x, --ignore=îáâ-óéí÷  ÉÇÎÏÒÉÒÏ×ÁÔØ îáâ-óéí÷ ÐÒÉ ×ÙÂÏÒÅ\n"
> "                         ÓÐÏÓÏÂÁ ÐÅÒÅËÏÄÉÒÏ×ËÉ\n"
> 
>-# src/main.c:535
>-#: src/main.c:294
>+#: src/main.c:296
> msgid ""
> "\n"
> "Option -l with no FORMAT nor CHARSET list available charsets and surfaces.\n"
>@@ -224,19 +206,18 @@
> "`full' (ÉÌÉ ÏÄÎÏ ÉÚ `dohf').\n"
> 
> #: src/main.c:302
>-#, c-format
>-msgid "Unless DEFAULT_CHARSET is set in environment, CHARSET defaults to `%s'.\n"
>-msgstr "åÓÌÉ × ÓÒÅÄÅ ÏÔÓÕÔÓÔ×ÕÅÔ ÐÅÒÅÍÅÎÎÁÑ DEFAULT_CHARSET, îáâïò-óéí÷ïìï÷ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × `%s'.\n"
>-
>-#: src/main.c:308
>-msgid "CHARSET has no default, define DEFAULT_CHARSET in the environment.\n"
>-msgstr "îáâïò-óéí÷ïìï÷ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÏÐÒÅÄÅÌÉÔÅ DEFAULT_CHARSET × ÓÒÅÄÅ.\n"
>+#, fuzzy
>+msgid ""
>+"Unless DEFAULT_CHARSET is set in environment, CHARSET defaults to the "
>+"locale\n"
>+"dependent encoding, determined by LC_ALL, LC_CTYPE, LANG.\n"
>+msgstr "åÓÌÉ × ÓÒÅÄÅ ÏÔÓÕÔÓÔ×ÕÅÔ ÐÅÒÅÍÅÎÎÁÑ DEFAULT_CHARSET, îáâïò-óéí÷ïìï÷ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × \n***FIXME***.\n"
> 
>-# src/main.c:540
>-#: src/main.c:313
>+#: src/main.c:307
> msgid ""
> "With -k, possible before charsets are listed for the given after CHARSET,\n"
>-"both being tabular charsets, with PAIRS of the form `BEF1:AFT1,BEF2:AFT2,...'\n"
>+"both being tabular charsets, with PAIRS of the form "
>+"`BEF1:AFT1,BEF2:AFT2,...'\n"
> "and BEFs and AFTs being codes are given as decimal numbers.\n"
> msgstr ""
> "ó ËÌÀÞÅÍ -k ×Ù×ÏÄÑÔÓÑ ×ÏÚÍÏÖÎÙÅ ×ÁÒÉÁÎÔÙ ÉÓÈÏÄÎÏÇÏ îáâïòá-óéí÷ïìï÷ ÄÌÑ\n"
>@@ -244,21 +225,23 @@
> "`äï1:ðïóìå1,äï2:ðïóìå2,...'\n"
> "ÐÒÉÞÅÍ äïn É ðïóìån Ñ×ÌÑÀÔÓÑ ËÏÄÁÍÉ, ÚÁÄÁÎÎÙÍÉ × ×ÉÄÅ ÄÅÓÑÔÉÞÎÙÈ ÞÉÓÅÌ.\n"
> 
>-# src/main.c:545
>-#: src/main.c:318
>-msgid "LN is some language, it may be `c', `perl' or `po'; `c' is the default.\n"
>+#: src/main.c:312
>+msgid ""
>+"LN is some language, it may be `c', `perl' or `po'; `c' is the default.\n"
> msgstr ""
> "ñúùë ÐÒÅÄÓÔÁ×ÌÑÅÔ ÑÚÙË ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ; ÜÔÏ ÍÏÖÅÔ ÂÙÔØ `c', `perl' ÉÌÉ `po'.\n"
> "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ `c'.\n"
> 
>-# src/main.c:548
>-#: src/main.c:321
>+#: src/main.c:315
> msgid ""
> "\n"
>-"REQUEST is SUBREQUEST[,SUBREQUEST]...; SUBREQUEST is ENCODING[..ENCODING]...\n"
>-"ENCODING is [CHARSET][/[SURFACE]]...; REQUEST often looks like BEFORE..AFTER,\n"
>+"REQUEST is SUBREQUEST[,SUBREQUEST]...; SUBREQUEST is "
>+"ENCODING[..ENCODING]...\n"
>+"ENCODING is [CHARSET][/[SURFACE]]...; REQUEST often looks like "
>+"BEFORE..AFTER,\n"
> "with BEFORE and AFTER being charsets.  An omitted CHARSET implies the usual\n"
>-"charset; an omitted [/SURFACE]... means the implied surfaces for CHARSET; a /\n"
>+"charset; an omitted [/SURFACE]... means the implied surfaces for CHARSET; a "
>+"/\n"
> "with an empty surface name means no surfaces at all.  See the manual.\n"
> msgstr ""
> "\n"
>@@ -271,8 +254,7 @@
> "ÄÌÑ ÄÁÎÎÏÇÏ îáâïòá-óéí÷ïìï÷; / ÂÅÚ ÉÍÅÎÉ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ ÏÚÎÁÞÁÅÔ ÅÇÏ ÏÔÓÕÔÓÔ×ÉÅ.\n"
> "óÍÏÔÒÉÔÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
> 
>-# src/main.c:556
>-#: src/main.c:329
>+#: src/main.c:323
> msgid ""
> "\n"
> "If none of -i and -p are given, presume -p if no FILE, else -i.\n"
>@@ -285,56 +267,61 @@
> "æáêì ÎÅ ÚÁÄÁÎ, ÔÏ ÐÒÏÇÒÁÍÍÁ ÒÁÂÏÔÁÅÔ ËÁË ÆÉÌØÔÒ, ÐÅÒÅËÏÄÉÒÕÑ ÓÔÁÎÄÁÒÔÎÙÊ ×ÈÏÄ\n"
> "ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×ÙÈÏÄ.\n"
> 
>-# src/main.c:562
>-#: src/main.c:335
>+#: src/main.c:329
> msgid "\nReport bugs to <recode-bugs@iro.umontreal.ca>.\n"
> msgstr "\nï ÚÁÍÅÞÅÎÎÙÈ ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <recode-bugs@iro.umontreal.ca>.\n"
> 
>-# src/main.c:659
>-#: src/main.c:431
>+#: src/main.c:430
> #, c-format
>-msgid "Ambiguous sequence `%s'"
>+#~ ***FIXME***
>+msgid "Sequence `%s' is ambigous"
> msgstr "îÅÏÄÎÏÚÎÁÞÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `%s'"
> 
>-# src/main.c:663
>-#: src/main.c:435
>+#: src/main.c:434
> #, c-format
>-msgid "Unknown sequence `%s'"
>+#~ ***FIXME***
>+msgid "Sequence `%s' is unknown"
> msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `%s'"
> 
>-# src/main.c:693 src/main.c:747
>-#: src/main.c:465 src/main.c:523
>+#: src/main.c:464 src/main.c:522
> #, c-format
>-msgid "Ambiguous language `%s'"
>+#~ ***FIXME***
>+msgid "Language `%s' is ambigous"
> msgstr "îÅÏÄÎÏÚÎÁÞÎÙÊ ÑÚÙË `%s'"
> 
>-# src/main.c:697 src/main.c:751
> #. -1
>-#: src/main.c:469 src/main.c:527
>+#: src/main.c:468 src/main.c:526
> #, c-format
>-msgid "Unknown language `%s'"
>+#~ ***FIXME***
>+msgid "Language `%s' is unknown"
> msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÑÚÙË `%s'"
> 
>-# src/main.c:785
>-#: src/main.c:561
>+#: src/main.c:560
> #, c-format
>-msgid "Ambiguous format `%s'"
>+#~ ***FIXME***
>+msgid "Format `%s' is ambigous"
> msgstr "îÅÏÄÎÏÚÎÁÞÎÙÊ ÆÏÒÍÁÔ `%s'"
> 
>-# src/main.c:789
>-#: src/main.c:565
>+#: src/main.c:564
> #, c-format
>-msgid "Unknown format `%s'"
>+#~ ***FIXME***
>+msgid "Format `%s' is unknown"
> msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÆÏÒÍÁÔ `%s'"
> 
>-# src/main.c:846
>-#: src/main.c:622
>-msgid "\nCopyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
>-msgstr "\nCopyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
>+#: src/main.c:621
>+msgid "Written by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
>+msgstr "ðÒÏÇÒÁÍÍÁ ÎÁÐÉÓÁÎÁ æÒÁÎÓÕÁ ðÉÎÁÒÄÏÍ <pinard@iro.umontreal.ca>.\n"
> 
>-# src/main.c:850
>-#: src/main.c:626
>+#: src/main.c:624
> msgid ""
>+"\n"
>+"Copyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
>+msgstr ""
>+"\n"
>+"Copyright (C) 1990, 92, 93, 94, 96, 97, 99 Free Software Foundation, Inc.\n"
>+
>+#: src/main.c:628
>+msgid ""
> "This is free software; see the source for copying conditions.  There is NO\n"
> "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
> msgstr ""
>@@ -342,225 +329,224 @@
> "ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ.  îÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ îéëáëéè ÇÁÒÁÎÔÉÊ, ÄÁÖÅ ÇÁÒÁÎÔÉÉ ðïìåúîïóôé\n"
> "ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
> 
>-# src/main.c:854
>-#: src/main.c:630
>-msgid "\nWritten by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
>-msgstr "\nðÒÏÇÒÁÍÍÁ ÎÁÐÉÓÁÎÁ æÒÁÎÓÕÁ ðÉÎÁÒÄÏÍ <pinard@iro.umontreal.ca>.\n"
>+#: src/main.c:669
>+#, c-format
>+#~ ***FIXME***
>+msgid "Symbol `%s' is unknown"
>+msgstr ""
> 
>-# src/main.c:999
>-#: src/main.c:775
>+#: src/main.c:709 src/main.c:723
> #, c-format
>-msgid "Deprecated syntax, please prefer `%s'"
>+#~ ***FIXME***
>+msgid "Charset `%s' is unknown or ambiguous"
>+msgstr ""
>+    
>+#: src/main.c:754
>+#~ ***FIXME***
>+msgid "Required argument is missing"
>+msgstr ""
>+
>+#: src/main.c:797
>+#, fuzzy, c-format
>+#~ ***FIXME***
>+msgid "Syntax is deprecated , please prefer `%s'"
> msgstr "îÅÒÅËÏÍÅÎÄÏ×ÁÎÎÙÊ ÓÉÎÔÁËÓÉÓ, ÉÓÐÏÌØÚÕÊÔÅ, ÐÏÖÁÌÕÊÓÔÁ, `%s'"
> 
>-# src/main.c:1005
>-#: src/main.c:781
>+#: src/main.c:803
> #, c-format
>-msgid "Erroneous request `%s'"
>+#~ ***FIXME***
>+msgid "Request is `%s' erroneous"
> msgstr "ïÛÉÂÏÞÎÙÊ ÚÁÐÒÏÓ `%s'"
> 
>-# src/main.c:1098
>-#: src/main.c:878
>+#: src/main.c:903
> #, c-format
> msgid "Recoding %s..."
> msgstr "ðÅÒÅËÏÄÉÒÏ×ËÁ %s..."
> 
>-# src/main.c:1108
>-#: src/main.c:888
>+#: src/main.c:913
> msgid " done\n"
> msgstr " ÇÏÔÏ×Ï\n"
> 
>-# src/main.c:1142
>-#: src/main.c:924
>-#, c-format
>-msgid " failed: %s in %s..%s\n"
>+#: src/main.c:954
>+#, fuzzy, c-format
>+#~ ***FIXME***
>+msgid " failed: %s in step `%s..%s'\n"
> msgstr " ÏÛÉÂËÁ: %s × %s..%s\n"
> 
>-# src/main.c:1149
>-#: src/main.c:931
>-#, c-format
>-msgid "%s failed: %s in %s..%s"
>+#: src/main.c:961
>+#, fuzzy, c-format
>+#~ ***FIXME***
>+msgid "%s failed: %s in step `%s..%s'"
> msgstr "%s ÚÁËÏÎÞÉÌÏÓØ ÎÅÕÄÁÞÅÊ: %s × %s..%s"
> 
>-# src/main.c:1172
>-#: src/main.c:954
>-#, c-format
>-msgid "%s in %s..%s"
>+#: src/main.c:984
>+#, fuzzy, c-format
>+msgid "%s in step `%s..%s'"
> msgstr "%s × %s..%s"
> 
>-# src/names.c:259
>-#: src/names.c:317
>+#: src/names.c:335
> #, c-format
> msgid "Charset %s already exists and is not %s"
> msgstr "îÁÂÏÒ ÓÉÍ×ÏÌÏ× %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ É ÎÅ Ñ×ÌÑÅÔÓÑ %s"
> 
>-# src/names.c:754
>-#: src/names.c:819
>+#: src/names.c:831
> #, c-format
> msgid "Cannot list `%s', no names available for this charset"
> msgstr "îÅ×ÏÚÍÏÖÎÏ ×Ù×ÅÓÔÉ `%s', ÄÌÑ ÜÔÏÊ ÎÁÂÏÒÁ ÓÉÍ×ÏÌÏ× ÎÅÔ ÄÏÓÔÕÐÎÙÈ ÉÍÅÎ"
> 
>-# src/names.c:854
> #. code counter
> #. expected value for code counter
> #. UCS-2 translation
> #. insert a while line before printing
> #. Print the long table according to explode data.
>-#: src/names.c:974 src/names.c:1020
>+#: src/names.c:984 src/names.c:1030
> #, c-format
> msgid "Dec  Oct Hex   UCS2  Mne  %s\n"
> msgstr "Dec  Oct Hex   UCS2  Mne  %s\n"
> 
>-# src/names.c:847
>-#: src/names.c:1039
>+#: src/names.c:1049
> #, c-format
> msgid "Sorry, no names available for `%s'"
> msgstr "éÚ×ÉÎÉÔÅ, ÄÌÑ `%s' ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ ÉÍÅÎÉ"
> 
>-#: src/outer.c:95
>+#: src/outer.c:125
> #, c-format
> msgid "Resurfacer set more than once for `%s'"
> msgstr "éÚÍÅÎÅÎÉÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ ÄÌÑ `%s' ÕÓÔÁÎÏ×ÌÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÁ"
> 
>-#: src/outer.c:102
>+#: src/outer.c:133
> #, c-format
>+#~ ***FIXME***
> msgid "Unsurfacer set more than once for `%s'"
> msgstr ""
> 
>-# src/recode.c:117 src/recode.c:129
> #: src/recode.c:115 src/recode.c:127
> msgid "Virtual memory exhausted"
> msgstr "÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
> 
>-# src/recode.c:157
> #: src/recode.c:155
>-#, c-format
>+#, c-format, ycp-format
> msgid "Codes %3d and %3d both recode to %3d"
> msgstr "ëÏÄÙ %3d É %3d ÏÂÁ ÐÅÒÅÈÏÄÑÔ × %3d"
> 
>-# src/recode.c:171
> #: src/recode.c:169
>-#, c-format
>+#, c-format, ycp-format
> msgid "No character recodes to %3d"
> msgstr "îÅÔ ÓÉÍ×ÏÌÁ, ÐÅÒÅ×ÏÄÑÝÅÇÏÓÑ × %3d"
> 
>-# src/recode.c:172
> #: src/recode.c:170
> msgid "Cannot invert given one-to-one table"
> msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÔÉÔØ ÄÁÎÎÕÀ ×ÚÁÉÍÎÏÏÄÎÏÚÎÁÞÎÕÀ ÔÁÂÌÉÃÕ"
> 
>-# src/recode.c:226 src/recode.c:238
> #: src/recode.c:224 src/recode.c:236
> #, c-format
> msgid "Following diagnostics for `%s' to `%s'"
> msgstr "äÁÌÅÅ ÓÌÅÄÕÅÔ ÄÉÁÇÎÏÓÔÉËÁ ÄÌÑ `%s' × `%s'"
> 
>-# src/recode.c:231 src/recode.c:243
> #: src/recode.c:229 src/recode.c:241
> #, c-format
> msgid "Pair no. %d: <%3d, %3d> conflicts with <%3d, %3d>"
> msgstr "ðÁÒÁ ÎÏÍÅÒ %d: <%3d, %3d> ËÏÎÆÌÉËÔÕÅÔ Ó <%3d, %3d>"
> 
>-# src/recode.c:274
> #: src/recode.c:272
> msgid "Cannot complete table from set of known pairs"
> msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁËÏÎÞÉÔØ ÔÁÂÌÉÃÕ ÉÚ ÎÁÂÏÒÁ ÉÚ×ÅÓÔÎÙÈ ÐÁÒ"
> 
>-# src/recode.c:504
>-#: src/recode.c:492
>+#: src/recode.c:497
> msgid "Identity recoding, not worth a table"
> msgstr "ôÏÖÄÅÓÔ×ÅÎÎÁÑ ÐÅÒÅËÏÄÉÒÏ×ËÁ, ÎÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ × ÔÁÂÌÉÃÅ"
> 
>-# src/recode.c:512
>-#: src/recode.c:499
>+#: src/recode.c:504
> msgid "Recoding is too complex for a mere table"
> msgstr "ðÅÒÅËÏÄÉÒÏ×ËÁ ÓÌÉÛËÏÍ ÓÌÏÖÎÁ ÄÌÑ ÐÒÏÓÔÏÊ ÔÁÂÌÉÃÙ"
> 
>-# src/recode.c:544
> #. Print the header of the header file.
>-#: src/recode.c:531
>+#: src/recode.c:536
> #, c-format
> msgid "%sConversion table generated mechanically by Free `%s' %s"
> msgstr "%sôÁÂÌÉÃÁ ÐÅÒÅËÏÄÉÒÏ×ËÉ ÓÏÚÄÁÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ Ó ÐÏÍÏÝØÀ Free `%s' %s"
> 
>-# src/recode.c:546
>-#: src/recode.c:533
>+#: src/recode.c:538
> #, c-format
> msgid "%sfor sequence %s.%s"
> msgstr "%sÄÌÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ %s.%s"
> 
>-# src/recode.c:736
>-#: src/recode.c:724
>+#: src/recode.c:744
> msgid "No table to print"
> msgstr "îÅÔ ÔÁÂÌÉÃÙ ÄÌÑ ÐÅÞÁÔÉ"
> 
>-#: src/request.c:35
>+#: src/request.c:34
> msgid "reversible"
> msgstr "ÏÂÒÁÔÉÍÙÊ"
> 
>-#: src/request.c:37
>+#: src/request.c:36
> #, c-format
> msgid "%s to %s"
> msgstr "%s × %s"
> 
>-#: src/request.c:38 src/request.c:40
>+#: src/request.c:37 src/request.c:39
> msgid "byte"
> msgstr "ÂÁÊÔ"
> 
>-#: src/request.c:39 src/request.c:41
>+#: src/request.c:38 src/request.c:40
> msgid "ucs2"
> msgstr "ucs2"
> 
>-#: src/request.c:39 src/request.c:41
>+#: src/request.c:38 src/request.c:40
> msgid "variable"
> msgstr "ÐÅÒÅÍÅÎÎÁÑ"
> 
>-#: src/request.c:112
>+#: src/request.c:111
> msgid "*Unachievable*"
> msgstr "*îÅÄÏÓÔÕÐÎÙÊ*"
> 
>-#: src/request.c:114
>+#: src/request.c:113
> msgid "*mere copy*"
> msgstr "*ÐÒÏÓÔÏ ËÏÐÉÑ*"
> 
>-# src/recode.c:117 src/recode.c:129
>-#: src/request.c:244
>+#: src/request.c:246
> msgid "Virtual memory exhausted!"
> msgstr "÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!"
> 
>-#: src/request.c:263
>+#: src/request.c:265
> msgid "Step initialisation failed"
> msgstr "ïÛÉÂËÁ ÛÁÇÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ"
> 
>-#: src/request.c:270
>+#: src/request.c:272
> msgid "Step initialisation failed (unprocessed options)"
> msgstr "ïÛÉÂËÁ ÛÁÇÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ (ÎÅÏÂÒÁÂÏÔÁÎÎÙÊ ËÌÀÞ)"
> 
>-#: src/request.c:566
>+#: src/request.c:568
> #, c-format
> msgid "Request: %s\n"
> msgstr "úÁÐÒÏÓ: %s\n"
> 
>-#: src/request.c:702
>+#: src/request.c:720
> #, c-format
> msgid "Shrunk to: %s\n"
> msgstr "óÖÁÔØ ÄÏ: %s\n"
> 
>-#: src/request.c:806 src/request.c:912
>+#: src/request.c:823 src/request.c:932
> #, c-format
> msgid "Unrecognised surface name `%s'"
> msgstr "îÅÒÁÓÐÏÚÎÁÎÎÏÅ ÉÍÑ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ `%s'"
> 
>-#: src/request.c:884
>+#: src/request.c:903
> #, c-format
> msgid "No way to recode from `%s' to `%s'"
> msgstr "îÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÐÅÒÅËÏÄÉÒÏ×ÁÔØ ÉÚ `%s' × `%s'"
> 
>-#: src/request.c:992
>+#: src/request.c:1013
> msgid "Expecting `..' in request"
> msgstr "÷ ÚÁÐÒÏÓÅ ÏÖÉÄÁÅÔÓÑ `..'"
> 
>-#: src/task.c:751 src/task.c:915
>+#: src/task.c:826 src/task.c:1002
> #, c-format
> msgid "Child process wait status is 0x%0.2x"
> msgstr "óÔÁÔÕÓ ÏÖÉÄÁÎÉÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÒÁ×ÅÎ 0x%0.2x"
>+
>+#: src/testdump.c:298
>+msgid ""
>+"UCS2   Mne   Description\n"
>+msgstr ""
>+"UCS2   Mne   ïÐÉÓÁÎÉÅ\n"

Actions: View | Diff

Attachments on bug 30375: 16592