[sword-cvs] icu-sword/source/extra/uconv/resources fr.txt,1.1,1.2 root.txt,1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Tue, 6 Apr 2004 03:10:51 -0700
- Previous message: [sword-cvs] icu-sword/source/tools/gentest genres32.c,NONE,1.1 gentest.h,NONE,1.1 Makefile.in,1.4,1.5 gentest.c,1.3,1.4 gentest.dsp,1.3,1.4 gentest.vcproj,1.1,1.2
- Next message: [sword-cvs] icu-sword/source/samples/layout FontMap.GDI,1.3,1.4 GDIFontInstance.cpp,1.3,1.4 GDIFontMap.cpp,1.3,1.4 GnomeFontInstance.cpp,1.3,1.4 GnomeFontMap.cpp,1.3,1.4 LayoutSample.rc,1.1,1.2 Sample.txt,1.3,1.4 ScriptCompositeFontInstance.cpp,1.1,1.2 gnomelayout.cpp,1.3,1.4 layout.cpp,1.3,1.4 paragraph.cpp,1.3,1.4 paragraph.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/core/icu-sword/source/extra/uconv/resources
In directory www:/tmp/cvs-serv8911/source/extra/uconv/resources
Modified Files:
fr.txt root.txt
Log Message:
ICU 2.8 sync
Index: fr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/extra/uconv/resources/fr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr.txt 10 Sep 2003 02:42:20 -0000 1.1
+++ fr.txt 6 Apr 2004 10:08:42 -0000 1.2
@@ -1,5 +1,5 @@
// -*- Coding: utf-8; -*- [all uconv resource files]
-// Copyright (c) 2000 IBM, Inc. and Others.
+// Copyright (c) 2000-2003 IBM, Inc. and Others.
// $Revision$
//
// Root translation file for uconv messages.
@@ -28,8 +28,21 @@
lcUsageWord { "usage" }
ucUsageWord { "Usage" }
- usage { "{0} : {1} [ -h, -?, --help ] [ -V, --version ] [ -s, --silent ] [ -v, --verbose ] [ -l, --list | --list-code code | --default-code | -L, --list-transliterators ] [ --canon ] [ -x translitération ] [ --to-callback callback | -c ] [ --from-callback callback | -i ] [ --callback callback ] [ --fallback | --no-fallback ] [ -b, --block-size taille ] [ -f, --from-code code ] [ -t, --to-code code ] [ -o, --output fichier ] [ fichier ... ]\n" }
+ usage {
+ "{0}: {1} "
+ "[ -h, -?, --help ] [ -V, --version ] [ -s, --silent ] [ -v, --verbose ] "
+ "[ -l, --list | --list-code code | --default-code | -L, --list-transliterators ] "
+ "[ --canon ] [ -x translitération ] "
+ "[ --to-callback callback | -c ] [ --from-callback callback | -i ] [ --callback callback ] "
+ "[ --fallback | --no-fallback ] "
+ "[ -b, --block-size taille ] "
+ "[ -f, --from-code code ] [ -t, --to-code code ] "
+ "[ --add-signature ] [ --remove-signature ] "
+ "[ -o, --output fichier ] "
+ "[ fichier ... ]\n"
+ }
+ // TODO there is some English in here
help { "Options : -h, --help affiche ce message\n"
" -V, --version affiche la version du programme\n"
" -s, --silent supprime les messages\n"
@@ -50,6 +63,8 @@
" --no-fallback n''utilise pas les correspondances de secours\n"
" -f, --from-code code fixe l''encodage d''origine\n"
" -t, --to-code code fixe l''encodage de destination\n"
+" --add-signature add a U+FEFF Unicode signature character (BOM)\n"
+" --remove-signature remove a U+FEFF Unicode signature character (BOM)\n"
" -o, --output fichier écrit la sortie dans fichier\n"
"\n"
"Callbacks :" }
@@ -82,10 +97,8 @@
cantWrite { "Le texte converti ne peut pas être écrit : {0}.\n" } // 0: OS error string
cantRead { "Erreur de lecture du fichier d''entrée : {0}.\n" } // 0: OS error string
- premEnd { "Fin prématurée de la conversion d''Unicode vers l''encodage de destination à la position {0}.\n" } // 0: position
- premEndInput { "Fin prématurée de l''entrée durant la conversion de l''encodage original vers Unicode à la position {0}.\n" } // 0: position
-
- problemCvtToU { "La conversion d''Unicode vers l''encodage de destination a échoué à la position {0} : {1}.\n" } // 0: position, 1: err
- problemCvtFromU { "La conversion de l''encodage original vers Unicode a échoué à la position {0} : {1}.\n" } // 0: position, 1: err
- problemCvtFromUOut { "La conversion de l''encodage original vers Unicode a échoué à la position {0} de la sortie : {1}.\n" } // 0: position, 1: err
+ // TODO retranslate the problemCvt... messages because their format changed
+ //problemCvtToU { "La conversion d''Unicode vers l''encodage de destination a échoué à la position {0} : {1}.\n" } // 0: position, 1: err
+ //problemCvtFromU { "La conversion de l''encodage original vers Unicode a échoué à la position {0} : {1}.\n" } // 0: position, 1: err
+ //problemCvtFromUOut { "La conversion de l''encodage original vers Unicode a échoué à la position {0} de la sortie : {1}.\n" } // 0: position, 1: err
}
Index: root.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/extra/uconv/resources/root.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- root.txt 10 Sep 2003 02:42:20 -0000 1.1
+++ root.txt 6 Apr 2004 10:08:42 -0000 1.2
@@ -1,5 +1,5 @@
// -*- Coding: utf-8; -*- [all uconv resource files]
-// Copyright (c) 2000 IBM, Inc. and Others.
+// Copyright (c) 2000-2003 IBM, Inc. and Others.
// $Revision$
//
// Root translation file for uconv messages.
@@ -28,31 +28,44 @@
lcUsageWord { "usage" }
ucUsageWord { "Usage" }
- usage { "{0}: {1} [ -h, -?, --help ] [ -V, --version ] [ -s, --silent ] [ -v, --verbose ] [ -l, --list | --list-code code | --default-code | -L, --list-transliterators ] [ --canon ] [ -x transliteration ] [ --to-callback callback | -c ] [ --from-callback callback | -i ] [ --callback callback ] [ --fallback | --no-fallback ] [ -b, --block-size size ] [ -f, --from-code code ] [ -t, --to-code code ] [ -o, --output file ] [ file ... ]\n" }
+ usage {
+ "{0}: {1} "
+ "[ -h, -?, --help ] [ -V, --version ] [ -s, --silent ] [ -v, --verbose ] "
+ "[ -l, --list | --list-code code | --default-code | -L, --list-transliterators ] "
+ "[ --canon ] [ -x transliteration ] "
+ "[ --to-callback callback | -c ] [ --from-callback callback | -i ] [ --callback callback ] "
+ "[ --fallback | --no-fallback ] "
+ "[ -b, --block-size size ] "
+ "[ -f, --from-code code ] [ -t, --to-code code ] "
+ "[ --add-signature ] [ --remove-signature ] "
+ "[ -o, --output file ] "
+ "[ file ... ]\n" }
help { "Options: -h, --help print this message\n"
" -V, --version print the program version\n"
" -s, --silent suppress messages\n"
" -v, --verbose display progress information\n"
- " -l, --list list all available encodings\n"
- " --list-code code list only the given encoding\n"
- " --default-code list only the default encoding\n"
- " -L, --list-transliterators list all available transliterators\n"
+ " -l, --list list all available encodings\n"
+ " --list-code code list only the given encoding\n"
+ " --default-code list only the default encoding\n"
+ " -L, --list-transliterators list all available transliterators\n"
" --canon print list in cnvrtrs.txt(5) format\n"
- " -x transliteration run everything through transliteration\n"
- " --to-callback callback use callback on destination encoding\n"
- " -c omit invalid characters from the output\n"
- " --from-callback callback use callback on original encoding\n"
- " -i ignore invalid sequences in the input\n"
+ " -x transliteration run everything through transliteration\n"
+ " --to-callback callback use callback on destination encoding\n"
+ " -c omit invalid characters from the output\n"
+ " --from-callback callback use callback on original encoding\n"
+ " -i ignore invalid sequences in the input\n"
" --callback callback use callback on both encodings\n"
- " -b, --block-size size read size bytes blocks (default: 4096)\n"
- " --fallback use fallback mapping\n"
- " --no-fallback do not use fallback mapping\n"
- " -f, --from-code code set the original encoding\n"
- " -t, --to-code code set the destination encoding\n"
+ " -b, --block-size size read size bytes blocks (default: 4096)\n"
+ " --fallback use fallback mapping\n"
+ " --no-fallback do not use fallback mapping\n"
+ " -f, --from-code code set the original encoding\n"
+ " -t, --to-code code set the destination encoding\n"
+ " --add-signature add a U+FEFF Unicode signature character (BOM)\n"
+ " --remove-signature remove a U+FEFF Unicode signature character (BOM)\n"
" -o, --output file write output to file\n"
- "\n"
- "Callbacks:"
+ "\n"
+ "Callbacks:"
}
cantGetNames { "Couldn''t get available converter names.\n" } // 0: err
@@ -62,7 +75,7 @@
noFromCodeset { "No original encoding set (use -f).\n" }
noToCodeset { "No destination encoding set (use -t).\n" }
- badBlockSize { "Bad block size: {0}.\n" } // 0: size of the block
+ badBlockSize { "Bad block size: {0}.\n" } // 0: size of the block
cantSetInBinMode { "Couldn't set standard input to binary mode." }
cantSetOutBinMode { "Couldn't set standard output to binary mode." }
@@ -83,12 +96,9 @@
cantWrite { "The converted text couldn't be written: {0}.\n" } // 0: OS error string
cantRead { "Error reading from input file: {0}.\n" } // 0: OS error string
- premEnd { "Premature end of Unicode to destination encoding conversion at position {0}.\n" } // 0: position
- premEndInput { "Premature end of input when converting from original encoding to Unicode at position {0}.\n" } // 0: position
-
- problemCvtToU { "Conversion to Unicode from codepage failed at position {0}: {1}.\n" } // 0: position, 1: err
- problemCvtFromU { "Conversion from Unicode to codepage failed at position {0}: {1}.\n"} // 0: position, 1: err
- problemCvtFromUOut { "Conversion from Unicode to codepage failed at position {0} in output: {1}.\n"} // 0: position, 1: err
+ problemCvtToU { "Conversion to Unicode from codepage failed at input byte position {0}. Bytes: {1} Error: {2}\n" } // 0: position, 1: bytes, 2: err
+ problemCvtFromU { "Conversion from Unicode to codepage failed at input byte position {0}. Unicode: {1} Error: {2}\n"} // 0: position, 1: Unicode, 2: err
+ problemCvtFromUOut { "Conversion from Unicode to codepage failed at output byte position {0}. Unicode: {1} Error: {2}\n"} // 0: position, 1: Unicode, 2: err
// ICU errors - used by u_wmsg_errorName()
- Previous message: [sword-cvs] icu-sword/source/tools/gentest genres32.c,NONE,1.1 gentest.h,NONE,1.1 Makefile.in,1.4,1.5 gentest.c,1.3,1.4 gentest.dsp,1.3,1.4 gentest.vcproj,1.1,1.2
- Next message: [sword-cvs] icu-sword/source/samples/layout FontMap.GDI,1.3,1.4 GDIFontInstance.cpp,1.3,1.4 GDIFontMap.cpp,1.3,1.4 GnomeFontInstance.cpp,1.3,1.4 GnomeFontMap.cpp,1.3,1.4 LayoutSample.rc,1.1,1.2 Sample.txt,1.3,1.4 ScriptCompositeFontInstance.cpp,1.1,1.2 gnomelayout.cpp,1.3,1.4 layout.cpp,1.3,1.4 paragraph.cpp,1.3,1.4 paragraph.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]