diff options
61 files changed, 668 insertions, 565 deletions
@@ -1,3 +1,10 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * NEWS: Quote 'like this', not `like this', as per the recent change + to the GNU coding standards. + * INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g" + 2011-10-18 Bruno Haible <bruno@clisp.org> * m4/libtool.m4: Update from libtool-2.4.2, with modifications. @@ -4,56 +4,56 @@ Prerequisites ============= This package depends on a few other packages. They are listed in -the file `DEPENDENCIES'. It is recommended to install the listed +the file ‘DEPENDENCIES’. It is recommended to install the listed packages before installing this package. Basic Installation ================== - The `configure' shell script attempts to guess correct values for + The ‘configure’ shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a ‘Makefile’ in each directory of the package. +It may also create one or more ‘.h’ files containing system-dependent +definitions. Finally, it creates a shell script ‘config.status’ that you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +‘config.cache’ that saves the results of its tests to speed up +reconfiguring, and a file ‘config.log’ containing compiler output +(useful mainly for debugging ‘configure’). If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' +to figure out how ‘configure’ could check whether to do them, and mail +diffs or instructions to the address given in the ‘README’ so they can +be considered for the next release. If at some point ‘config.cache’ contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file ‘configure.ac’ is used to create ‘configure’ by a program +called ‘autoconf’. You only need ‘configure.ac’ if you want to change +it or regenerate ‘configure’ using a newer version of ‘autoconf’. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + 1. ‘cd’ to the directory containing the package's source code and type + ‘./configure’ to configure the package for your system. If you're + using ‘csh’ on an old version of System V, you might need to type + ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute + ‘configure’ itself. - Running `configure' takes awhile. While running, it prints some + Running ‘configure’ takes awhile. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type ‘make’ to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type ‘make check’ to run any self-tests that come with the package. - 4. Type `make install' to install the programs and any data files and + 4. Type ‘make install’ to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing ‘make clean’. To also remove the + files that ‘configure’ created (so you can compile the package for + a different kind of computer), type ‘make distclean’. There is + also a ‘make maintainer-clean’ target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. @@ -62,7 +62,7 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' +the ‘configure’ script does not know about. You can give ‘configure’ initial values for variables as arguments. You can do it like this: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix @@ -71,16 +71,16 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you must use a version of ‘make’ that +supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +the ‘configure’ script. ‘configure’ automatically checks for the +source code in the directory that ‘configure’ is in and in ‘..’. - If you have to use a `make' that does not supports the `VPATH' + If you have to use a ‘make’ that does not supports the ‘VPATH’ variable, you have to compile the package for one architecture at a time in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another +one architecture, use ‘make distclean’ before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and @@ -100,25 +100,25 @@ using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, ‘make install’ will install the package's files in +‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an +installation prefix other than ‘/usr/local’ by giving ‘configure’ the +option ‘--prefix=PATH’. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use +give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories +options like ‘--bindir=PATH’ to specify different values for particular +kinds of files. Run ‘configure --help’ for a list of the directories you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving ‘configure’ the +option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. Enabling Relocatability ======================= @@ -127,12 +127,12 @@ Enabling Relocatability that packages are not relocatable. It means a user cannot copy a program, installed by another user on the same machine, to his home directory, and have it work correctly (including i18n). So many users -need to go through `configure; make; make install' with all its +need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. Red Hat, Debian, and similar package systems solve the "ease of -installation" problem, but they hardwire path names, usually to `/usr' -or `/usr/local'. This means that users need root privileges to install +installation" problem, but they hardwire path names, usually to ‘/usr’ +or ‘/usr/local’. This means that users need root privileges to install a binary package, and prevents installing two different versions of the same binary package. @@ -142,24 +142,24 @@ and moved programs, and invoke them through the symlink. It is possible to do the same thing with a hard link _only_ if the hard link file is in the same directory as the real program. - To configure a program to be relocatable, add `--enable-relocatable' -to the `configure' command line. + To configure a program to be relocatable, add ‘--enable-relocatable’ +to the ‘configure’ command line. On some OSes the executables remember the location of shared libraries and prefer them over any other search path. Therefore, such an executable will look for its shared libraries first in the original installation directory and only then in the current installation -directory. Thus, for reliability, it is best to also give a `--prefix' +directory. Thus, for reliability, it is best to also give a ‘--prefix’ option pointing to a directory that does not exist now and which never -will be created, e.g. `--prefix=/nonexistent'. You may use -`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into +will be created, e.g. ‘--prefix=/nonexistent’. You may use +‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into that directory. We do not recommend using a prefix writable by unprivileged users -(e.g. `/tmp/inst$$') because such a directory can be recreated by an +(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an unprivileged user after the original directory has been removed. We also do not recommend prefixes that might be behind an automounter -(e.g. `$HOME/inst$$') because of the performance impact of directory +(e.g. ‘$HOME/inst$$’) because of the performance impact of directory searching. Here's a sample installation run that takes into account all these @@ -169,10 +169,10 @@ recommendations: make make install DESTDIR=/tmp/inst$$ - Installation with `--enable-relocatable' will not work for setuid or + Installation with ‘--enable-relocatable’ will not work for setuid or setgid executables, because such executables search only system library paths for security reasons. Also, installation with -`--enable-relocatable' might not work on OpenBSD, when the package +‘--enable-relocatable’ might not work on OpenBSD, when the package contains shared libraries and libtool versions 1.5.xx are used. The runtime penalty and size penalty are negligible on GNU/Linux @@ -183,25 +183,25 @@ and executes the real program). Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to ‘--enable-FEATURE’ options to +‘configure’, where FEATURE indicates an optional part of the package. +They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE +is something like ‘gnu-as’ or ‘x’ (for the X Window System). The +‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, ‘configure’ can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the ‘configure’ options ‘--x-includes=DIR’ and +‘--x-libraries=DIR’ to specify their locations. For packages that use the GNU libiconv library, you can use the -`configure' option `--with-libiconv-prefix' to specify the prefix you +‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you used while installing GNU libiconv. This option is not necessary if that other prefix is the same as the one now specified through --prefix. For packages that use the GNU libintl library, you can use the -`configure' option `--with-libintl-prefix' to specify the prefix you +‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you used while installing GNU gettext-runtime. This option is not necessary if that other prefix is the same as the one now specified through --prefix. @@ -217,7 +217,7 @@ to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as +parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try @@ -246,62 +246,62 @@ use the following options: Specifying the System Type ========================== - There may be some features `configure' can not figure out + There may be some features ‘configure’ can not figure out automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints +will run on. Usually ‘configure’ can figure that out, but if it prints a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +‘--host=TYPE’ option. TYPE can either be a short name for the system +type, such as ‘sun4’, or a canonical name with three fields: CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't +See the file ‘config.sub’ for the possible values of each field. If +‘config.sub’ isn't included in this package, then this package doesn't need to know the host type. If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of +use the ‘--target=TYPE’ option to select the type of system they will +produce code for and the ‘--build=TYPE’ option to select the type of system on which you are compiling the package. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for ‘configure’ scripts to share, +you can create a site shell script called ‘config.site’ that gives +default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +‘PREFIX/etc/config.site’ if it exists. Or, you can set the +‘CONFIG_SITE’ environment variable to the location of the site script. +A warning: not all ‘configure’ scripts look for a site script. Operation Controls ================== - `configure' recognizes the following options to control how it + ‘configure’ recognizes the following options to control how it operates. -`--cache-file=FILE' +‘--cache-file=FILE’ Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for + debugging ‘configure’. -`--help' - Print a summary of the options to `configure', and exit. +‘--help’ + Print a summary of the options to ‘configure’, and exit. -`--quiet' -`--silent' -`-q' +‘--quiet’ +‘--silent’ +‘-q’ Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to ‘/dev/null’ (any error messages will still be shown). -`--srcdir=DIR' +‘--srcdir=DIR’ Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + ‘configure’ can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' +‘--version’ + Print the version of Autoconf used to generate the ‘configure’ script, and exit. -`configure' also accepts some other, not widely useful, options. +‘configure’ also accepts some other, not widely useful, options. @@ -771,7 +771,7 @@ Version 0.10.35 - April 1998, by Ulrich Drepper * better C format string implementation. The xgettext will classify strings as being a format string, or not, in the .po file. The programmer can override the decision explicitly for each string - by specifying `xgettext:c-format' and `xgettext:no-c-format' + by specifying 'xgettext:c-format' and 'xgettext:no-c-format' respectively in a C comment preceding the string. * msgmerge program now always produces output. Fuzzy or non-existing @@ -781,8 +781,8 @@ Version 0.10.35 - April 1998, by Ulrich Drepper * Norwegian translation by Karl Anders �gard -* Configure command line option `--with-gnu-gettext' is renamed to - `--with-included-gettext' +* Configure command line option '--with-gnu-gettext' is renamed to + '--with-included-gettext' * gettextize now can determine whether the aclocal.m4 of the project is sufficent diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 3188d6e..c3e6e95 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,10 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g" + * Makefile.am (ABOUT-NLS): Likewise. Use --plaintext instead of + --no-header. + 2011-06-03 Bruno Haible <bruno@clisp.org> Copyright: Use LGPL 2.1 instead of LGPL 2.0. diff --git a/gettext-runtime/INSTALL b/gettext-runtime/INSTALL index cc6a29e..671b157 100644 --- a/gettext-runtime/INSTALL +++ b/gettext-runtime/INSTALL @@ -4,56 +4,56 @@ Prerequisites ============= This package depends on a few other packages. They are listed in -the file `DEPENDENCIES'. It is recommended to install the listed +the file ‘DEPENDENCIES’. It is recommended to install the listed packages before installing this package. Basic Installation ================== - The `configure' shell script attempts to guess correct values for + The ‘configure’ shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a ‘Makefile’ in each directory of the package. +It may also create one or more ‘.h’ files containing system-dependent +definitions. Finally, it creates a shell script ‘config.status’ that you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +‘config.cache’ that saves the results of its tests to speed up +reconfiguring, and a file ‘config.log’ containing compiler output +(useful mainly for debugging ‘configure’). If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' +to figure out how ‘configure’ could check whether to do them, and mail +diffs or instructions to the address given in the ‘README’ so they can +be considered for the next release. If at some point ‘config.cache’ contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file ‘configure.ac’ is used to create ‘configure’ by a program +called ‘autoconf’. You only need ‘configure.ac’ if you want to change +it or regenerate ‘configure’ using a newer version of ‘autoconf’. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + 1. ‘cd’ to the directory containing the package's source code and type + ‘./configure’ to configure the package for your system. If you're + using ‘csh’ on an old version of System V, you might need to type + ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute + ‘configure’ itself. - Running `configure' takes awhile. While running, it prints some + Running ‘configure’ takes awhile. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type ‘make’ to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type ‘make check’ to run any self-tests that come with the package. - 4. Type `make install' to install the programs and any data files and + 4. Type ‘make install’ to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing ‘make clean’. To also remove the + files that ‘configure’ created (so you can compile the package for + a different kind of computer), type ‘make distclean’. There is + also a ‘make maintainer-clean’ target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. @@ -62,7 +62,7 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' +the ‘configure’ script does not know about. You can give ‘configure’ initial values for variables as arguments. You can do it like this: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix @@ -71,16 +71,16 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you must use a version of ‘make’ that +supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +the ‘configure’ script. ‘configure’ automatically checks for the +source code in the directory that ‘configure’ is in and in ‘..’. - If you have to use a `make' that does not supports the `VPATH' + If you have to use a ‘make’ that does not supports the ‘VPATH’ variable, you have to compile the package for one architecture at a time in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another +one architecture, use ‘make distclean’ before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and @@ -100,25 +100,25 @@ using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, ‘make install’ will install the package's files in +‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an +installation prefix other than ‘/usr/local’ by giving ‘configure’ the +option ‘--prefix=PATH’. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use +give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories +options like ‘--bindir=PATH’ to specify different values for particular +kinds of files. Run ‘configure --help’ for a list of the directories you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving ‘configure’ the +option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. Enabling Relocatability ======================= @@ -127,12 +127,12 @@ Enabling Relocatability that packages are not relocatable. It means a user cannot copy a program, installed by another user on the same machine, to his home directory, and have it work correctly (including i18n). So many users -need to go through `configure; make; make install' with all its +need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. Red Hat, Debian, and similar package systems solve the "ease of -installation" problem, but they hardwire path names, usually to `/usr' -or `/usr/local'. This means that users need root privileges to install +installation" problem, but they hardwire path names, usually to ‘/usr’ +or ‘/usr/local’. This means that users need root privileges to install a binary package, and prevents installing two different versions of the same binary package. @@ -142,24 +142,24 @@ and moved programs, and invoke them through the symlink. It is possible to do the same thing with a hard link _only_ if the hard link file is in the same directory as the real program. - To configure a program to be relocatable, add `--enable-relocatable' -to the `configure' command line. + To configure a program to be relocatable, add ‘--enable-relocatable’ +to the ‘configure’ command line. On some OSes the executables remember the location of shared libraries and prefer them over any other search path. Therefore, such an executable will look for its shared libraries first in the original installation directory and only then in the current installation -directory. Thus, for reliability, it is best to also give a `--prefix' +directory. Thus, for reliability, it is best to also give a ‘--prefix’ option pointing to a directory that does not exist now and which never -will be created, e.g. `--prefix=/nonexistent'. You may use -`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into +will be created, e.g. ‘--prefix=/nonexistent’. You may use +‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into that directory. We do not recommend using a prefix writable by unprivileged users -(e.g. `/tmp/inst$$') because such a directory can be recreated by an +(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an unprivileged user after the original directory has been removed. We also do not recommend prefixes that might be behind an automounter -(e.g. `$HOME/inst$$') because of the performance impact of directory +(e.g. ‘$HOME/inst$$’) because of the performance impact of directory searching. Here's a sample installation run that takes into account all these @@ -169,10 +169,10 @@ recommendations: make make install DESTDIR=/tmp/inst$$ - Installation with `--enable-relocatable' will not work for setuid or + Installation with ‘--enable-relocatable’ will not work for setuid or setgid executables, because such executables search only system library paths for security reasons. Also, installation with -`--enable-relocatable' might not work on OpenBSD, when the package +‘--enable-relocatable’ might not work on OpenBSD, when the package contains shared libraries and libtool versions 1.5.xx are used. The runtime penalty and size penalty are negligible on GNU/Linux @@ -183,25 +183,25 @@ and executes the real program). Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to ‘--enable-FEATURE’ options to +‘configure’, where FEATURE indicates an optional part of the package. +They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE +is something like ‘gnu-as’ or ‘x’ (for the X Window System). The +‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, ‘configure’ can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the ‘configure’ options ‘--x-includes=DIR’ and +‘--x-libraries=DIR’ to specify their locations. For packages that use the GNU libiconv library, you can use the -`configure' option `--with-libiconv-prefix' to specify the prefix you +‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you used while installing GNU libiconv. This option is not necessary if that other prefix is the same as the one now specified through --prefix. For packages that use the GNU libintl library, you can use the -`configure' option `--with-libintl-prefix' to specify the prefix you +‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you used while installing GNU gettext-runtime. This option is not necessary if that other prefix is the same as the one now specified through --prefix. @@ -217,7 +217,7 @@ to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as +parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try @@ -246,62 +246,62 @@ use the following options: Specifying the System Type ========================== - There may be some features `configure' can not figure out + There may be some features ‘configure’ can not figure out automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints +will run on. Usually ‘configure’ can figure that out, but if it prints a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +‘--host=TYPE’ option. TYPE can either be a short name for the system +type, such as ‘sun4’, or a canonical name with three fields: CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't +See the file ‘config.sub’ for the possible values of each field. If +‘config.sub’ isn't included in this package, then this package doesn't need to know the host type. If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of +use the ‘--target=TYPE’ option to select the type of system they will +produce code for and the ‘--build=TYPE’ option to select the type of system on which you are compiling the package. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for ‘configure’ scripts to share, +you can create a site shell script called ‘config.site’ that gives +default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +‘PREFIX/etc/config.site’ if it exists. Or, you can set the +‘CONFIG_SITE’ environment variable to the location of the site script. +A warning: not all ‘configure’ scripts look for a site script. Operation Controls ================== - `configure' recognizes the following options to control how it + ‘configure’ recognizes the following options to control how it operates. -`--cache-file=FILE' +‘--cache-file=FILE’ Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for + debugging ‘configure’. -`--help' - Print a summary of the options to `configure', and exit. +‘--help’ + Print a summary of the options to ‘configure’, and exit. -`--quiet' -`--silent' -`-q' +‘--quiet’ +‘--silent’ +‘-q’ Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to ‘/dev/null’ (any error messages will still be shown). -`--srcdir=DIR' +‘--srcdir=DIR’ Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + ‘configure’ can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' +‘--version’ + Print the version of Autoconf used to generate the ‘configure’ script, and exit. -`configure' also accepts some other, not widely useful, options. +‘configure’ also accepts some other, not widely useful, options. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 2a1427a..df5336f 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2006, 2010 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2006, 2010, 2012 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -44,8 +44,8 @@ all-local: ABOUT-NLS ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi rm -f $(srcdir)/ABOUT-NLS \ - && $(MAKEINFO) --output=$(srcdir)/ABOUT-NLS --no-header \ - -I $(srcdir)/doc --no-validate nls.texi + && $(MAKEINFO) --plaintext --no-validate -I $(srcdir)/doc nls.texi \ + | sed -e "s/\`\([^']*\)'/‘\1’/g" > $(srcdir)/ABOUT-NLS # Allow users to use "gnulib-tool --update". diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index a9f8496..16e4155 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,11 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * Makefile.in: Quote 'like this', not `like this', as per the recent + change to the GNU coding standards. + * libgnuintl.in.h: Likewise. + * vasnprintf.h: Likewise. + 2012-01-06 Paul Eggert <eggert@cs.ucla.edu> doc: C11 and C++11 are now official diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 7b6623d..4b35115 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling library of GNU gettext -# Copyright (C) 1995-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -377,7 +377,7 @@ check: all # system which has the GNU gettext() function in its C library or in a # separate library. # If you want to use the one which comes with this version of the -# package, you have to use `configure --with-included-gettext'. +# package, you have to use "configure --with-included-gettext". install: install-exec install-data install-exec: all if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ @@ -628,7 +628,7 @@ maintainer-clean: distclean @echo "it deletes files that may require special tools to rebuild." -# GNU gettext needs not contain the file `VERSION' but contains some +# GNU gettext needs not contain the file 'VERSION' but contains some # other files which should not be distributed in other packages. distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: Makefile diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h index d396df5..008f8b9 100644 --- a/gettext-runtime/intl/libgnuintl.in.h +++ b/gettext-runtime/intl/libgnuintl.in.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -176,7 +176,7 @@ extern char *dcgettext (const char *__domainname, const char *__msgid, #endif -/* Similar to `gettext' but select the plural form corresponding to the +/* Similar to 'gettext' but select the plural form corresponding to the number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, @@ -197,7 +197,7 @@ extern char *ngettext (const char *__msgid1, const char *__msgid2, _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2); #endif -/* Similar to `dgettext' but select the plural form corresponding to the +/* Similar to 'dgettext' but select the plural form corresponding to the number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, @@ -219,7 +219,7 @@ extern char *dngettext (const char *__domainname, _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3); #endif -/* Similar to `dcgettext' but select the plural form corresponding to the +/* Similar to 'dcgettext' but select the plural form corresponding to the number N. */ #ifdef _INTL_REDIRECT_INLINE extern char *libintl_dcngettext (const char *__domainname, diff --git a/gettext-runtime/intl/vasnprintf.h b/gettext-runtime/intl/vasnprintf.h index 9240dbe..9e6c362 100644 --- a/gettext-runtime/intl/vasnprintf.h +++ b/gettext-runtime/intl/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -28,7 +28,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 0c7fc53..ef28735 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,12 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * autosprintf.in.h: Quote 'like this', not `like this', as per the + recent change to the GNU coding standards. + * vasnprintf.h: Likewise. + * vasprintf.h: Likewise. + * INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g" + 2012-01-04 Bruno Haible <bruno@clisp.org> Talk about "native Windows API", not "Win32". diff --git a/gettext-runtime/libasprintf/INSTALL b/gettext-runtime/libasprintf/INSTALL index cc6a29e..671b157 100644 --- a/gettext-runtime/libasprintf/INSTALL +++ b/gettext-runtime/libasprintf/INSTALL @@ -4,56 +4,56 @@ Prerequisites ============= This package depends on a few other packages. They are listed in -the file `DEPENDENCIES'. It is recommended to install the listed +the file ‘DEPENDENCIES’. It is recommended to install the listed packages before installing this package. Basic Installation ================== - The `configure' shell script attempts to guess correct values for + The ‘configure’ shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a ‘Makefile’ in each directory of the package. +It may also create one or more ‘.h’ files containing system-dependent +definitions. Finally, it creates a shell script ‘config.status’ that you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +‘config.cache’ that saves the results of its tests to speed up +reconfiguring, and a file ‘config.log’ containing compiler output +(useful mainly for debugging ‘configure’). If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' +to figure out how ‘configure’ could check whether to do them, and mail +diffs or instructions to the address given in the ‘README’ so they can +be considered for the next release. If at some point ‘config.cache’ contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file ‘configure.ac’ is used to create ‘configure’ by a program +called ‘autoconf’. You only need ‘configure.ac’ if you want to change +it or regenerate ‘configure’ using a newer version of ‘autoconf’. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + 1. ‘cd’ to the directory containing the package's source code and type + ‘./configure’ to configure the package for your system. If you're + using ‘csh’ on an old version of System V, you might need to type + ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute + ‘configure’ itself. - Running `configure' takes awhile. While running, it prints some + Running ‘configure’ takes awhile. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type ‘make’ to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type ‘make check’ to run any self-tests that come with the package. - 4. Type `make install' to install the programs and any data files and + 4. Type ‘make install’ to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing ‘make clean’. To also remove the + files that ‘configure’ created (so you can compile the package for + a different kind of computer), type ‘make distclean’. There is + also a ‘make maintainer-clean’ target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. @@ -62,7 +62,7 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' +the ‘configure’ script does not know about. You can give ‘configure’ initial values for variables as arguments. You can do it like this: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix @@ -71,16 +71,16 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you must use a version of ‘make’ that +supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +the ‘configure’ script. ‘configure’ automatically checks for the +source code in the directory that ‘configure’ is in and in ‘..’. - If you have to use a `make' that does not supports the `VPATH' + If you have to use a ‘make’ that does not supports the ‘VPATH’ variable, you have to compile the package for one architecture at a time in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another +one architecture, use ‘make distclean’ before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and @@ -100,25 +100,25 @@ using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, ‘make install’ will install the package's files in +‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an +installation prefix other than ‘/usr/local’ by giving ‘configure’ the +option ‘--prefix=PATH’. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use +give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories +options like ‘--bindir=PATH’ to specify different values for particular +kinds of files. Run ‘configure --help’ for a list of the directories you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving ‘configure’ the +option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. Enabling Relocatability ======================= @@ -127,12 +127,12 @@ Enabling Relocatability that packages are not relocatable. It means a user cannot copy a program, installed by another user on the same machine, to his home directory, and have it work correctly (including i18n). So many users -need to go through `configure; make; make install' with all its +need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. Red Hat, Debian, and similar package systems solve the "ease of -installation" problem, but they hardwire path names, usually to `/usr' -or `/usr/local'. This means that users need root privileges to install +installation" problem, but they hardwire path names, usually to ‘/usr’ +or ‘/usr/local’. This means that users need root privileges to install a binary package, and prevents installing two different versions of the same binary package. @@ -142,24 +142,24 @@ and moved programs, and invoke them through the symlink. It is possible to do the same thing with a hard link _only_ if the hard link file is in the same directory as the real program. - To configure a program to be relocatable, add `--enable-relocatable' -to the `configure' command line. + To configure a program to be relocatable, add ‘--enable-relocatable’ +to the ‘configure’ command line. On some OSes the executables remember the location of shared libraries and prefer them over any other search path. Therefore, such an executable will look for its shared libraries first in the original installation directory and only then in the current installation -directory. Thus, for reliability, it is best to also give a `--prefix' +directory. Thus, for reliability, it is best to also give a ‘--prefix’ option pointing to a directory that does not exist now and which never -will be created, e.g. `--prefix=/nonexistent'. You may use -`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into +will be created, e.g. ‘--prefix=/nonexistent’. You may use +‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into that directory. We do not recommend using a prefix writable by unprivileged users -(e.g. `/tmp/inst$$') because such a directory can be recreated by an +(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an unprivileged user after the original directory has been removed. We also do not recommend prefixes that might be behind an automounter -(e.g. `$HOME/inst$$') because of the performance impact of directory +(e.g. ‘$HOME/inst$$’) because of the performance impact of directory searching. Here's a sample installation run that takes into account all these @@ -169,10 +169,10 @@ recommendations: make make install DESTDIR=/tmp/inst$$ - Installation with `--enable-relocatable' will not work for setuid or + Installation with ‘--enable-relocatable’ will not work for setuid or setgid executables, because such executables search only system library paths for security reasons. Also, installation with -`--enable-relocatable' might not work on OpenBSD, when the package +‘--enable-relocatable’ might not work on OpenBSD, when the package contains shared libraries and libtool versions 1.5.xx are used. The runtime penalty and size penalty are negligible on GNU/Linux @@ -183,25 +183,25 @@ and executes the real program). Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to ‘--enable-FEATURE’ options to +‘configure’, where FEATURE indicates an optional part of the package. +They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE +is something like ‘gnu-as’ or ‘x’ (for the X Window System). The +‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, ‘configure’ can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the ‘configure’ options ‘--x-includes=DIR’ and +‘--x-libraries=DIR’ to specify their locations. For packages that use the GNU libiconv library, you can use the -`configure' option `--with-libiconv-prefix' to specify the prefix you +‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you used while installing GNU libiconv. This option is not necessary if that other prefix is the same as the one now specified through --prefix. For packages that use the GNU libintl library, you can use the -`configure' option `--with-libintl-prefix' to specify the prefix you +‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you used while installing GNU gettext-runtime. This option is not necessary if that other prefix is the same as the one now specified through --prefix. @@ -217,7 +217,7 @@ to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as +parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try @@ -246,62 +246,62 @@ use the following options: Specifying the System Type ========================== - There may be some features `configure' can not figure out + There may be some features ‘configure’ can not figure out automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints +will run on. Usually ‘configure’ can figure that out, but if it prints a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +‘--host=TYPE’ option. TYPE can either be a short name for the system +type, such as ‘sun4’, or a canonical name with three fields: CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't +See the file ‘config.sub’ for the possible values of each field. If +‘config.sub’ isn't included in this package, then this package doesn't need to know the host type. If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of +use the ‘--target=TYPE’ option to select the type of system they will +produce code for and the ‘--build=TYPE’ option to select the type of system on which you are compiling the package. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for ‘configure’ scripts to share, +you can create a site shell script called ‘config.site’ that gives +default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +‘PREFIX/etc/config.site’ if it exists. Or, you can set the +‘CONFIG_SITE’ environment variable to the location of the site script. +A warning: not all ‘configure’ scripts look for a site script. Operation Controls ================== - `configure' recognizes the following options to control how it + ‘configure’ recognizes the following options to control how it operates. -`--cache-file=FILE' +‘--cache-file=FILE’ Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for + debugging ‘configure’. -`--help' - Print a summary of the options to `configure', and exit. +‘--help’ + Print a summary of the options to ‘configure’, and exit. -`--quiet' -`--silent' -`-q' +‘--quiet’ +‘--silent’ +‘-q’ Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to ‘/dev/null’ (any error messages will still be shown). -`--srcdir=DIR' +‘--srcdir=DIR’ Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + ‘configure’ can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' +‘--version’ + Print the version of Autoconf used to generate the ‘configure’ script, and exit. -`configure' also accepts some other, not widely useful, options. +‘configure’ also accepts some other, not widely useful, options. diff --git a/gettext-runtime/libasprintf/autosprintf.in.h b/gettext-runtime/libasprintf/autosprintf.in.h index efa29f8..74f946c 100644 --- a/gettext-runtime/libasprintf/autosprintf.in.h +++ b/gettext-runtime/libasprintf/autosprintf.in.h @@ -1,5 +1,5 @@ /* Class autosprintf - formatted output to an ostream. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -22,7 +22,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-runtime/libasprintf/vasnprintf.h b/gettext-runtime/libasprintf/vasnprintf.h index 9240dbe..9e6c362 100644 --- a/gettext-runtime/libasprintf/vasnprintf.h +++ b/gettext-runtime/libasprintf/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -28,7 +28,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-runtime/libasprintf/vasprintf.h b/gettext-runtime/libasprintf/vasprintf.h index 850fa29..0ed89f2 100644 --- a/gettext-runtime/libasprintf/vasprintf.h +++ b/gettext-runtime/libasprintf/vasprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2003 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -25,7 +25,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index 479108d..2ad4fac 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,11 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * envsubst.c (usage): Quote 'like this', not `like this', as per the + recent change to the GNU coding standards. + * gettext.c (usage): Likewise. + * ngettext.c (usage): Likewise. + 2011-06-03 Bruno Haible <bruno@clisp.org> Copyright: Use LGPL 2.1 instead of LGPL 2.0. diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index 511c1d9..ddf3c43 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -1,5 +1,5 @@ /* Substitution of environment variables in shell format strings. - Copyright (C) 2003-2007 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2012 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify @@ -168,7 +168,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c index 1453479..b7961a6 100644 --- a/gettext-runtime/src/gettext.c +++ b/gettext-runtime/src/gettext.c @@ -1,5 +1,5 @@ /* gettext - retrieve text string from message catalog and print it. - Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995. This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ #define _(str) gettext (str) /* If true, add newline after last string. This makes only sense in - the `echo' emulation mode. */ + the 'echo' emulation mode. */ static bool add_newline; /* If true, expand escape sequences in strings before looking in the @@ -145,7 +145,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\ usage (EXIT_SUCCESS); /* We have two major modes: use following Uniforum spec and as - internationalized `echo' program. */ + internationalized 'echo' program. */ if (!do_shell) { /* We have to write a single strings translation to stdout. */ @@ -201,7 +201,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\ if (domaindir != NULL && domaindir[0] != '\0') bindtextdomain (domain, domaindir); - /* We have to simulate `echo'. All arguments are strings. */ + /* We have to simulate 'echo'. All arguments are strings. */ do { msgid = argv[optind++]; @@ -235,7 +235,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -266,7 +266,7 @@ If the TEXTDOMAIN parameter is not given, the domain is determined from the\n\ environment variable TEXTDOMAIN. If the message catalog is not found in the\n\ regular directory, another location can be specified with the environment\n\ variable TEXTDOMAINDIR.\n\ -When used with the -s option the program behaves like the `echo' command.\n\ +When used with the -s option the program behaves like the 'echo' command.\n\ But it does not simply copy its arguments to stdout. Instead those messages\n\ found in the selected catalog are translated.\n\ Standard search directory: %s\n"), diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c index 8a8ecb5..3730c80 100644 --- a/gettext-runtime/src/ngettext.c +++ b/gettext-runtime/src/ngettext.c @@ -204,7 +204,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 703ed32..b405056 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * INSTALL: Process through sed -e "s/\`\([^']*\)'/‘\1’/g" + 2012-01-15 Bruno Haible <bruno@clisp.org> Support for MSVC 9. diff --git a/gettext-tools/INSTALL b/gettext-tools/INSTALL index cc6a29e..671b157 100644 --- a/gettext-tools/INSTALL +++ b/gettext-tools/INSTALL @@ -4,56 +4,56 @@ Prerequisites ============= This package depends on a few other packages. They are listed in -the file `DEPENDENCIES'. It is recommended to install the listed +the file ‘DEPENDENCIES’. It is recommended to install the listed packages before installing this package. Basic Installation ================== - The `configure' shell script attempts to guess correct values for + The ‘configure’ shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a ‘Makefile’ in each directory of the package. +It may also create one or more ‘.h’ files containing system-dependent +definitions. Finally, it creates a shell script ‘config.status’ that you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +‘config.cache’ that saves the results of its tests to speed up +reconfiguring, and a file ‘config.log’ containing compiler output +(useful mainly for debugging ‘configure’). If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' +to figure out how ‘configure’ could check whether to do them, and mail +diffs or instructions to the address given in the ‘README’ so they can +be considered for the next release. If at some point ‘config.cache’ contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file ‘configure.ac’ is used to create ‘configure’ by a program +called ‘autoconf’. You only need ‘configure.ac’ if you want to change +it or regenerate ‘configure’ using a newer version of ‘autoconf’. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + 1. ‘cd’ to the directory containing the package's source code and type + ‘./configure’ to configure the package for your system. If you're + using ‘csh’ on an old version of System V, you might need to type + ‘sh ./configure’ instead to prevent ‘csh’ from trying to execute + ‘configure’ itself. - Running `configure' takes awhile. While running, it prints some + Running ‘configure’ takes awhile. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type ‘make’ to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type ‘make check’ to run any self-tests that come with the package. - 4. Type `make install' to install the programs and any data files and + 4. Type ‘make install’ to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing ‘make clean’. To also remove the + files that ‘configure’ created (so you can compile the package for + a different kind of computer), type ‘make distclean’. There is + also a ‘make maintainer-clean’ target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. @@ -62,7 +62,7 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' +the ‘configure’ script does not know about. You can give ‘configure’ initial values for variables as arguments. You can do it like this: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix @@ -71,16 +71,16 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you must use a version of ‘make’ that +supports the ‘VPATH’ variable, such as GNU ‘make’. ‘cd’ to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +the ‘configure’ script. ‘configure’ automatically checks for the +source code in the directory that ‘configure’ is in and in ‘..’. - If you have to use a `make' that does not supports the `VPATH' + If you have to use a ‘make’ that does not supports the ‘VPATH’ variable, you have to compile the package for one architecture at a time in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another +one architecture, use ‘make distclean’ before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and @@ -100,25 +100,25 @@ using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, ‘make install’ will install the package's files in +‘/usr/local/bin’, ‘/usr/local/man’, etc. You can specify an +installation prefix other than ‘/usr/local’ by giving ‘configure’ the +option ‘--prefix=PATH’. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use +give ‘configure’ the option ‘--exec-prefix=PATH’, the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories +options like ‘--bindir=PATH’ to specify different values for particular +kinds of files. Run ‘configure --help’ for a list of the directories you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving ‘configure’ the +option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. Enabling Relocatability ======================= @@ -127,12 +127,12 @@ Enabling Relocatability that packages are not relocatable. It means a user cannot copy a program, installed by another user on the same machine, to his home directory, and have it work correctly (including i18n). So many users -need to go through `configure; make; make install' with all its +need to go through ‘configure; make; make install’ with all its dependencies, options, and hurdles. Red Hat, Debian, and similar package systems solve the "ease of -installation" problem, but they hardwire path names, usually to `/usr' -or `/usr/local'. This means that users need root privileges to install +installation" problem, but they hardwire path names, usually to ‘/usr’ +or ‘/usr/local’. This means that users need root privileges to install a binary package, and prevents installing two different versions of the same binary package. @@ -142,24 +142,24 @@ and moved programs, and invoke them through the symlink. It is possible to do the same thing with a hard link _only_ if the hard link file is in the same directory as the real program. - To configure a program to be relocatable, add `--enable-relocatable' -to the `configure' command line. + To configure a program to be relocatable, add ‘--enable-relocatable’ +to the ‘configure’ command line. On some OSes the executables remember the location of shared libraries and prefer them over any other search path. Therefore, such an executable will look for its shared libraries first in the original installation directory and only then in the current installation -directory. Thus, for reliability, it is best to also give a `--prefix' +directory. Thus, for reliability, it is best to also give a ‘--prefix’ option pointing to a directory that does not exist now and which never -will be created, e.g. `--prefix=/nonexistent'. You may use -`DESTDIR=DEST-DIR' on the `make' command line to avoid installing into +will be created, e.g. ‘--prefix=/nonexistent’. You may use +‘DESTDIR=DEST-DIR’ on the ‘make’ command line to avoid installing into that directory. We do not recommend using a prefix writable by unprivileged users -(e.g. `/tmp/inst$$') because such a directory can be recreated by an +(e.g. ‘/tmp/inst$$’) because such a directory can be recreated by an unprivileged user after the original directory has been removed. We also do not recommend prefixes that might be behind an automounter -(e.g. `$HOME/inst$$') because of the performance impact of directory +(e.g. ‘$HOME/inst$$’) because of the performance impact of directory searching. Here's a sample installation run that takes into account all these @@ -169,10 +169,10 @@ recommendations: make make install DESTDIR=/tmp/inst$$ - Installation with `--enable-relocatable' will not work for setuid or + Installation with ‘--enable-relocatable’ will not work for setuid or setgid executables, because such executables search only system library paths for security reasons. Also, installation with -`--enable-relocatable' might not work on OpenBSD, when the package +‘--enable-relocatable’ might not work on OpenBSD, when the package contains shared libraries and libtool versions 1.5.xx are used. The runtime penalty and size penalty are negligible on GNU/Linux @@ -183,25 +183,25 @@ and executes the real program). Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to ‘--enable-FEATURE’ options to +‘configure’, where FEATURE indicates an optional part of the package. +They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE +is something like ‘gnu-as’ or ‘x’ (for the X Window System). The +‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, ‘configure’ can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the ‘configure’ options ‘--x-includes=DIR’ and +‘--x-libraries=DIR’ to specify their locations. For packages that use the GNU libiconv library, you can use the -`configure' option `--with-libiconv-prefix' to specify the prefix you +‘configure’ option ‘--with-libiconv-prefix’ to specify the prefix you used while installing GNU libiconv. This option is not necessary if that other prefix is the same as the one now specified through --prefix. For packages that use the GNU libintl library, you can use the -`configure' option `--with-libintl-prefix' to specify the prefix you +‘configure’ option ‘--with-libintl-prefix’ to specify the prefix you used while installing GNU gettext-runtime. This option is not necessary if that other prefix is the same as the one now specified through --prefix. @@ -217,7 +217,7 @@ to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as +parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try @@ -246,62 +246,62 @@ use the following options: Specifying the System Type ========================== - There may be some features `configure' can not figure out + There may be some features ‘configure’ can not figure out automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints +will run on. Usually ‘configure’ can figure that out, but if it prints a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +‘--host=TYPE’ option. TYPE can either be a short name for the system +type, such as ‘sun4’, or a canonical name with three fields: CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't +See the file ‘config.sub’ for the possible values of each field. If +‘config.sub’ isn't included in this package, then this package doesn't need to know the host type. If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of +use the ‘--target=TYPE’ option to select the type of system they will +produce code for and the ‘--build=TYPE’ option to select the type of system on which you are compiling the package. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for ‘configure’ scripts to share, +you can create a site shell script called ‘config.site’ that gives +default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +‘PREFIX/etc/config.site’ if it exists. Or, you can set the +‘CONFIG_SITE’ environment variable to the location of the site script. +A warning: not all ‘configure’ scripts look for a site script. Operation Controls ================== - `configure' recognizes the following options to control how it + ‘configure’ recognizes the following options to control how it operates. -`--cache-file=FILE' +‘--cache-file=FILE’ Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ‘./config.cache’. Set FILE to ‘/dev/null’ to disable caching, for + debugging ‘configure’. -`--help' - Print a summary of the options to `configure', and exit. +‘--help’ + Print a summary of the options to ‘configure’, and exit. -`--quiet' -`--silent' -`-q' +‘--quiet’ +‘--silent’ +‘-q’ Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to ‘/dev/null’ (any error messages will still be shown). -`--srcdir=DIR' +‘--srcdir=DIR’ Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + ‘configure’ can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' +‘--version’ + Print the version of Autoconf used to generate the ‘configure’ script, and exit. -`configure' also accepts some other, not widely useful, options. +‘configure’ also accepts some other, not widely useful, options. diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 5a32942..8cfa78d 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,13 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * FAQ.html: Quote 'like this', not `like this', as per the recent + change to the GNU coding standards. + * ISO_3166: Likewise. + * ISO_3166_de: Likewise. + * tutorial.html: Process through + sed -e "s/\`\`\([^']*\)''/“\1”/g" | sed -e "s/\`\([^']*\)'/‘\1’/g" + 2011-07-08 Bruno Haible <bruno@clisp.org> * gettext.texi (aclocal): Recommend the use of aclocal's --install diff --git a/gettext-tools/doc/FAQ.html b/gettext-tools/doc/FAQ.html index c93c185..ad0dfeb 100644 --- a/gettext-tools/doc/FAQ.html +++ b/gettext-tools/doc/FAQ.html @@ -52,7 +52,7 @@ environment variable doesn't have any effect</a></li> </ul> <h3>Other</h3> <ul> - <li><a href="#newline">What does this mean: “`msgid' and `msgstr' + <li><a href="#newline">What does this mean: “'msgid' and 'msgstr' entries do not both end with '\n'”</a></li> <li><a href="#translit">German umlauts are displayed like “ge"andert” @@ -698,7 +698,7 @@ ENOMEM */</code><br> </li> </ul> <h3>Other</h3> -<h4><a name="newline"></a>What does this mean: “`msgid' and `msgstr' +<h4><a name="newline"></a>What does this mean: “'msgid' and 'msgstr' entries do not both end with '\n'”</h4> It means that when the original string ends in a newline, your diff --git a/gettext-tools/doc/ISO_3166 b/gettext-tools/doc/ISO_3166 index 4f21440..c0ace90 100644 --- a/gettext-tools/doc/ISO_3166 +++ b/gettext-tools/doc/ISO_3166 @@ -16,7 +16,7 @@ # Columns are separated by a single tab. # The table is sorted by country code. # -# Lines beginning with `#' are comments. +# Lines beginning with '#' are comments. # #country- #code country name diff --git a/gettext-tools/doc/ISO_3166_de b/gettext-tools/doc/ISO_3166_de index 1f0b833..b95cd8a 100644 --- a/gettext-tools/doc/ISO_3166_de +++ b/gettext-tools/doc/ISO_3166_de @@ -10,7 +10,7 @@ # Columns are separated by a single tab. # The table is sorted by 2-letter country code. # -# Lines beginning with `#' are comments. +# Lines beginning with '#' are comments. # AD AND Andorra AE ARE Vereinigte Arabische Emirate diff --git a/gettext-tools/doc/tutorial.html b/gettext-tools/doc/tutorial.html index 45e80ce..d2f3be3 100644 --- a/gettext-tools/doc/tutorial.html +++ b/gettext-tools/doc/tutorial.html @@ -89,7 +89,7 @@ Portability Guide, is also in use, but we shall not discuss that here. A simple example</A> </H1> <A NAME="sec:simple"></A>Our first example of using <TT>gettext</TT> will be the good old Hello World program, -whose sole function is to print the phrase ``Hello, world!'' to the terminal. +whose sole function is to print the phrase “Hello, world!” to the terminal. The internationalized version of this program might be saved in hello.c as: <PRE> 1 #include <libintl.h> @@ -116,7 +116,7 @@ using glibc. The programmer's viewpoint</A> </H2> As expected, when the <TT>hello</TT> executable is run under the default locale -(usually the C locale) it prints ``Hello, world!'' in the terminal. Besides +(usually the C locale) it prints “Hello, world!” in the terminal. Besides some initial setup work, the only additional burden faced by the programmer is to replace any string to be printed with <TT>gettext(string)</TT>, i.e., to instead pass the string as an argument to the <TT>gettext</TT> function. For lazy @@ -140,24 +140,24 @@ Let us dissect the program line-by-line. and an empty string as the second one, initializes the entire current locale of the program as per environment variables set by the user. In other words, the program locale is initialized to match that of the user. For details see - ``man <TT>setlocale</TT>.'' + “man <TT>setlocale</TT>.” </LI> <LI>The <TT>bindtextdomain</TT> function on line 8 sets the base directory for the message catalogs for a given message domain. A message domain is a set of translatable messages, with every software package typically having its own - domain. Here, we have used ``hello'' as the name of the message domain for + domain. Here, we have used “hello” as the name of the message domain for our toy program. As the second argument, /usr/share/locale, is the default system location for message catalogs, what we are saying here is that we are going to place the message catalog in the default system directory. Thus, we could have dispensed with the call to <TT>bindtextdomain</TT> here, and this function is useful only if the message catalogs are installed in a non-standard place, e.g., a packaged software distribution might have - the catalogs under a po/ directory under its own main directory. See ``man - <TT>bindtextdomain</TT>'' for details. + the catalogs under a po/ directory under its own main directory. See “man + <TT>bindtextdomain</TT>” for details. </LI> <LI>The <TT>textdomain</TT> call on line 9 sets the message domain of the current - program to ``hello,'' i.e., the name that we are using for our example - program. ``man textdomain'' will give usage details for the function. + program to “hello,” i.e., the name that we are using for our example + program. “man textdomain” will give usage details for the function. </LI> <LI>Finally, on line 10, we have replaced what would normally have been, <PRE> @@ -192,7 +192,7 @@ argument to the -o option). The message domain for the program should be specified as the argument to the -d option, and should match the domain specified in the call to <TT>textdomain</TT> (on line 9 of the program source). Other details on how to use -<TT>gettext</TT> can be found from ``man gettext.'' +<TT>gettext</TT> can be found from “man gettext.” <P> A .pot (portable object template) file is used as the basis for translating @@ -279,14 +279,14 @@ work consists of typing the Oriya text that is to serve as translations for the corresponding English string. For the <TT>msgstr</TT> line in each of the remaining entries, add the translated Oriya text between the double quotes; the translation corresponding to the English phrase in the <TT>msgid</TT> string -for the entry. For example, for the phrase ``Hello world!<!-- MATH +for the entry. For example, for the phrase “Hello world!<!-- MATH $\backslash$ --> -<SPAN CLASS="MATH">\</SPAN>n'' in -oriya.po, we could enter ``ନମସ୍କାର<!-- MATH +<SPAN CLASS="MATH">\</SPAN>n” in +oriya.po, we could enter “ନମସ୍କାର<!-- MATH $\backslash$ --> -<SPAN CLASS="MATH">\</SPAN>n''. The final +<SPAN CLASS="MATH">\</SPAN>n”. The final oriya.po file might look like: <PRE> # Oriya translations for hello example package. @@ -346,8 +346,8 @@ given by the second argument to <TT>bindtextdomain</TT>. The final location of t file will be in the sub-directory LL/LC_MESSAGES or LL_CC/LC_MESSAGES under the base directory, where LL stands for a language, and CC for a country. For example, as we have chosen the standard location, /usr/share/locale, for our -base directory, and for us the language and country strings are ``or'' and -``IN,'' respectively, we will place hello.mo in /usr/share/locale/or_IN. Note +base directory, and for us the language and country strings are “or” and +“IN,” respectively, we will place hello.mo in /usr/share/locale/or_IN. Note that you will need super-user privilege to copy hello.mo to this system directory. Thus, <PRE><FONT color="red"> @@ -376,30 +376,30 @@ terminal emulator) are Unicode-aware. I will focus on gnome-terminal as it seems to have better support for internationalization. gnome-terminal needs to be told that the bytes arriving are UTF-8 encoded multibyte sequences. This can be done by (a) choosing Terminal <TT>-></TT> Character Coding <TT>-></TT> -Unicode (UTF-8), or (b) typing ``/bin/echo -n -e +Unicode (UTF-8), or (b) typing “/bin/echo -n -e '<!-- MATH $\backslash$ --> <SPAN CLASS="MATH">\</SPAN>033%<!-- MATH $\backslash$ --> -<SPAN CLASS="MATH">\</SPAN>G''' in the terminal, or (c) by running +<SPAN CLASS="MATH">\</SPAN>G'” in the terminal, or (c) by running /bin/unicode_start. Likewise, you can revert to the default locale by (a) choosing Terminal <TT>-></TT> Character Coding <TT>-></TT> Current Locale -(ISO-8859-1), or (b) ``/bin/echo -n -e '<!-- MATH +(ISO-8859-1), or (b) “/bin/echo -n -e '<!-- MATH $\backslash$ --> <SPAN CLASS="MATH">\</SPAN>033%<!-- MATH $\backslash$ --> -<SPAN CLASS="MATH">\</SPAN>@','' or +<SPAN CLASS="MATH">\</SPAN>@',” or (c) by running /bin/unicode_stop. Now, running the example program (after compiling with gcc as described in Sec. <A HREF="#sec:simple">2</A>) with, <PRE><FONT color="red"> ./hello </FONT></PRE> should give you output in Oriya. Please note that conjuncts will most likely -be displayed with a ``halant'' as the terminal probably does not render Indian +be displayed with a “halant” as the terminal probably does not render Indian language fonts correctly. Also, as most terminal emulators assume fixed-width fonts, the results are hardly likely to be aesthetically appealing. @@ -469,7 +469,7 @@ translations into the new template file, viz., </FONT></PRE> The -U option updates the existing .po file, oriya.po. We could have chosen to instead create a new .po file by -using ``-o <SPAN CLASS="MATH"><</SPAN>filename<SPAN CLASS="MATH">></SPAN>'' instead of -U. The updated .po file will still +using “-o <SPAN CLASS="MATH"><</SPAN>filename<SPAN CLASS="MATH">></SPAN>” instead of -U. The updated .po file will still have the old translations embedded in it, and new entries with untranslated <TT>msgid</TT> lines. For us, the new lines in oriya.po will look like, <PRE> @@ -477,9 +477,9 @@ have the old translations embedded in it, and new entries with untranslated msgid "How are you?\n" msgstr "" </PRE> -For the new translation, we could use, ``ଆପଣ -କିପରି ଅଛନ୍ତି?'' in -place of the English phrase ``How are you?'' The updated oriya.po file, +For the new translation, we could use, “ଆପଣ +କିପରି ଅଛନ୍ତି?” in +place of the English phrase “How are you?” The updated oriya.po file, including the translation might look like: <PRE> # Oriya translations for hello example package. @@ -572,21 +572,21 @@ A. Nayak, and M. Chand is much appreciated. <H1><A NAME="SECTION00070000000000000000"> The Emacs info browser</A> </H1> -<A NAME="sec:emacs-info"></A>You can start up Emacs from the command-line by typing ``emacs,'' or ``emacs -<SPAN CLASS="MATH"><</SPAN>filename<SPAN CLASS="MATH">></SPAN>.'' It can be started from the menu in some desktops, e.g., on +<A NAME="sec:emacs-info"></A>You can start up Emacs from the command-line by typing “emacs,” or “emacs +<SPAN CLASS="MATH"><</SPAN>filename<SPAN CLASS="MATH">></SPAN>.” It can be started from the menu in some desktops, e.g., on my GNOME desktop, it is under Main Menu <TT>-></TT> Programming <TT>-></TT> Emacs. If you are unfamiliar with Emacs, a tutorial can be started by typing -``C-h t'' in an Emacs window, or from the Help item in the menubar at the -top. Emacs makes extensive use of the Control (sometimes labelled as ``CTRL'' -or ``CTL'') and Meta (sometimes labelled as ``Edit'' or ``Alt'') keys. In -Emacs parlance, a hyphenated sequence, such as ``C-h'' means to press the -Control and `h' key simultaneously, while ``C-h t'' would mean to press the -Control and `h' key together, release them, and press the `t' key. Similarly, -``M-x'' is used to indicate that the Meta and `x' keys should be pressed at +“C-h t” in an Emacs window, or from the Help item in the menubar at the +top. Emacs makes extensive use of the Control (sometimes labelled as “CTRL” +or “CTL”) and Meta (sometimes labelled as “Edit” or “Alt”) keys. In +Emacs parlance, a hyphenated sequence, such as “C-h” means to press the +Control and ‘h’ key simultaneously, while “C-h t” would mean to press the +Control and ‘h’ key together, release them, and press the ‘t’ key. Similarly, +“M-x” is used to indicate that the Meta and ‘x’ keys should be pressed at the same time. <P> -The info browser can be started by typing ``C-h i'' in Emacs. The first time +The info browser can be started by typing “C-h i” in Emacs. The first time you do this, it will briefly list some commands available inside the info browser, and present you with a menu of major topics. Each menu item, or cross-reference is hyperlinked to the appropriate node, and you can visit that @@ -597,26 +597,26 @@ you can either scroll down to the line, * gettext: (gettext). GNU gettext utilities. </PRE> and visit that node. Or, as it is several pages down, you can locate it using -``I-search.'' Type ``C-s'' to enter ``I-search'' which will then prompt you +“I-search.” Type “C-s” to enter “I-search” which will then prompt you for a string in the mini-buffer at the bottom of the window. This is an incremental search, so that Emacs will keep moving you forward through the buffer as you are entering your search string. If you have reached the last occurrence of the search string in the current buffer, you will get a message -saying ``Failing I-search: ...'' on pressing ``C-s.'' At that point, press -``C-s'' again to resume the search at the beginning of the buffer. Likewise, -``C-r'' incrementally searches backwards from the present location. +saying “Failing I-search: ...” on pressing “C-s.” At that point, press +“C-s” again to resume the search at the beginning of the buffer. Likewise, +“C-r” incrementally searches backwards from the present location. <P> -Info nodes are listed in this document with a ``::'' separator, so +Info nodes are listed in this document with a “::” separator, so that one can go to the gettext::Creating::Header Entry:: by visiting the -``gettext'' node from the main info menu, navigating to the ``Creating'' -node, and following that to the ``Header Entry'' node. +“gettext” node from the main info menu, navigating to the “Creating” +node, and following that to the “Header Entry” node. <P> A stand-alone info browser, independent of Emacs, is also available on many systems. Thus, the <TT>gettext</TT> info page can also be accessed by typing -``info gettext'' in a terminal. <TT>xinfo</TT> is an X application serving as an -info browser, so that if it is installed, typing ``xinfo gettext'' from the +“info gettext” in a terminal. <TT>xinfo</TT> is an X application serving as an +info browser, so that if it is installed, typing “xinfo gettext” from the command line will open a new browser window with the <TT>gettext</TT> info page. <P> @@ -636,10 +636,10 @@ settling on one. The ones considered here are: Emacs in po-mode, <TT>poedit</TT> Emacs PO mode</A> </H2> Emacs should automatically enter po-mode when you load a .po file, as -indicated by ``PO'' in the modeline at the bottom. The window is made +indicated by “PO” in the modeline at the bottom. The window is made read-only, so that you can edit the .po file only through special commands. A description of Emacs po-mode can be found under the gettext::Basics info node, -or type `h' or `?' in a po-mode window for a list of available commands. While +or type ‘h’ or ‘?’ in a po-mode window for a list of available commands. While I find Emacs po-mode quite restrictive, this is probably due to unfamiliarity with it. Its main advantage is that it imposes rigid conformance to the PO file format, and checks the file format when closing the .po file diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index e2ed7bb..775e33d 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,36 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * hostname.c (usage): Quote 'like this', not `like this', as per the + recent change to the GNU coding standards. + * msgattrib.c (usage): Likewise. + * msgcat.c (usage): Likewise. + * msgcmp.c (usage): Likewise. + * msgcomm.c (usage): Likewise. + * msgconv.c (usage): Likewise. + * msgen.c (usage): Likewise. + * msgexec.c (usage): Likewise. + * msgfilter.c (usage): Likewise. + * msgfmt.c (usage, msgfmt_set_domain, msgfmt_frob_new_message): + Likewise. + * msggrep.c (usage): Likewise. + * msginit.c (usage): Likewise. + * msgl-cat.c (catenate_msgdomain_list): Likewise. + * msgl-check.c (check_pair, check_header_entry): Likewise. + * msgmerge.c (usage): Likewise. + * msgunfmt.c (usage): Likewise. + * msguniq.c (usage): Likewise. + * recode-sr-latin.c (usage): Likewise. + * urlget.c (usage): Likewise. + * write-po.c (wrap): Likewise. + * xgettext.c (main, usage, remember_a_message, construct_header, + language_to_extractor): Likewise. + * po-gram-gen.y: Likewise. + * po-error.h: Likewise. + * po-lex.h: Likewise. + * read-catalog-abstract.h: Likewise. + * x-c.c: Likewise. + 2011-10-04 Bruno Haible <bruno@clisp.org> xgettext for Scheme: Understand guile 2.0 comment syntax, part 2. diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index bbfbd0c..76558e0 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -1,5 +1,5 @@ /* Display hostname in various forms. - Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2007, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -204,7 +204,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c index 5c24656..75a9785 100644 --- a/gettext-tools/src/msgattrib.c +++ b/gettext-tools/src/msgattrib.c @@ -1,5 +1,5 @@ /* Manipulates attributes of messages in translation catalogs. - Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -400,7 +400,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index 948cbb0..7c36730 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -1,5 +1,5 @@ /* Concatenates several translation catalogs. - Copyright (C) 2001-2007, 2009-2011 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -359,7 +359,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index 9166b11..f82131d 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> This program is free software: you can redistribute it and/or modify @@ -206,7 +206,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c index ac5e6f9..e965dba 100644 --- a/gettext-tools/src/msgcomm.c +++ b/gettext-tools/src/msgcomm.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1997-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> @@ -351,7 +351,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -449,7 +449,7 @@ Output details:\n")); printf (_("\ -F, --sort-by-file sort output by file location\n")); printf (_("\ - --omit-header don't write header with `msgid \"\"' entry\n")); + --omit-header don't write header with 'msgid \"\"' entry\n")); printf ("\n"); printf (_("\ Informative output:\n")); diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c index b6df3f2..af1361a 100644 --- a/gettext-tools/src/msgconv.c +++ b/gettext-tools/src/msgconv.c @@ -1,5 +1,5 @@ /* Converts a translation catalog to a different character encoding. - Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -295,7 +295,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c index 7a6ce2b..2ec3d5e 100644 --- a/gettext-tools/src/msgen.c +++ b/gettext-tools/src/msgen.c @@ -1,5 +1,5 @@ /* Creates an English translation catalog. - Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -291,7 +291,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index 466d3f6..c46ca7f 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -1,5 +1,5 @@ /* Pass translations to a subprocess. - Copyright (C) 2001-2011 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -250,7 +250,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index e29ad02..c414140 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -1,5 +1,5 @@ /* Edit translations using a subprocess. - Copyright (C) 2001-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -381,7 +381,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 447163d..0a5956e 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -1,5 +1,5 @@ /* Converts Uniforum style .po files to binary .mo files - Copyright (C) 1995-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995. This program is free software: you can redistribute it and/or modify @@ -647,7 +647,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -917,7 +917,7 @@ warning: older versions of msgfmt will give an error on this\n"))); static void msgfmt_set_domain (default_catalog_reader_ty *this, char *name) { - /* If no output file was given, we change it with each `domain' + /* If no output file was given, we change it with each 'domain' directive. */ if (!java_mode && !csharp_mode && !csharp_resources_mode && !tcl_mode && !qt_mode && output_file_name == NULL) @@ -949,7 +949,7 @@ domain name \"%s\" not suitable as file name: will use prefix"), name); { if (check_domain) po_gram_error_at_line (&gram_pos, - _("`domain %s' directive ignored"), name); + _("'domain %s' directive ignored"), name); /* NAME was allocated in po-gram-gen.y but is not used anywhere. */ free (name); @@ -1009,8 +1009,8 @@ msgfmt_frob_new_message (default_catalog_reader_ty *that, message_ty *mp, error_with_progname = false; error_at_line (0, 0, mp->pos.file_name, mp->pos.line_number, (mp->msgstr[0] == '\0' - ? _("empty `msgstr' entry ignored") - : _("fuzzy `msgstr' entry ignored"))); + ? _("empty 'msgstr' entry ignored") + : _("fuzzy 'msgstr' entry ignored"))); error_with_progname = true; } @@ -1043,7 +1043,7 @@ msgfmt_frob_new_message (default_catalog_reader_ty *that, message_ty *mp, } -/* Test for `#, fuzzy' comments and warn. */ +/* Test for '#, fuzzy' comments and warn. */ static void msgfmt_comment_special (abstract_catalog_reader_ty *that, const char *s) { diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index dae0197..3b12e93 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -1,5 +1,5 @@ /* Extract some translations of a translation catalog. - Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -504,7 +504,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 218c278..abcddf0 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -1,5 +1,5 @@ /* Initializes a new PO file. - Copyright (C) 2001-2011 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -355,7 +355,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c index 4e24341..0bd58d4 100644 --- a/gettext-tools/src/msgl-cat.c +++ b/gettext-tools/src/msgl-cat.c @@ -1,5 +1,5 @@ /* Message list concatenation and duplicate handling. - Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2008, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -201,11 +201,11 @@ two different charsets \"%s\" and \"%s\" in input file"), { if (k == 0) error (EXIT_FAILURE, 0, _("\ -input file `%s' doesn't contain a header entry with a charset specification"), +input file '%s' doesn't contain a header entry with a charset specification"), files[n]); else error (EXIT_FAILURE, 0, _("\ -domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"), +domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"), mdlp->item[k]->domain, files[n]); } } diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c index 017ea0a..3aa526d 100644 --- a/gettext-tools/src/msgl-check.c +++ b/gettext-tools/src/msgl-check.c @@ -1,5 +1,5 @@ /* Checking of messages in PO files. - Copyright (C) 1995-1998, 2000-2008, 2010-2011 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2008, 2010-2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995. This program is free software: you can redistribute it and/or modify @@ -609,7 +609,7 @@ check_pair (const message_ty *mp, po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, _("\ -`msgid' and `msgid_plural' entries do not both begin with '\\n'")); +'msgid' and 'msgid_plural' entries do not both begin with '\\n'")); seen_errors++; } for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++) @@ -617,7 +617,7 @@ check_pair (const message_ty *mp, { char *msg = xasprintf (_("\ -`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"), j); +'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"), j); po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, msg); @@ -632,7 +632,7 @@ check_pair (const message_ty *mp, po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, _("\ -`msgid' and `msgstr' entries do not both begin with '\\n'")); +'msgid' and 'msgstr' entries do not both begin with '\\n'")); seen_errors++; } } @@ -650,7 +650,7 @@ check_pair (const message_ty *mp, po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, _("\ -`msgid' and `msgid_plural' entries do not both end with '\\n'")); +'msgid' and 'msgid_plural' entries do not both end with '\\n'")); seen_errors++; } for (p = msgstr, j = 0; p < msgstr + msgstr_len; p += strlen (p) + 1, j++) @@ -658,7 +658,7 @@ check_pair (const message_ty *mp, { char *msg = xasprintf (_("\ -`msgid' and `msgstr[%u]' entries do not both end with '\\n'"), j); +'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"), j); po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, msg); @@ -673,7 +673,7 @@ check_pair (const message_ty *mp, po_xerror (PO_SEVERITY_ERROR, mp, msgid_pos->file_name, msgid_pos->line_number, (size_t)(-1), false, _("\ -`msgid' and `msgstr' entries do not both end with '\\n'")); +'msgid' and 'msgstr' entries do not both end with '\\n'")); seen_errors++; } } @@ -782,7 +782,7 @@ check_header_entry (const message_ty *mp, const char *msgstr_string) if (endp == NULL) { char *msg = - xasprintf (_("header field `%s' missing in header\n"), + xasprintf (_("header field '%s' missing in header\n"), required_fields[cnt]); po_xerror (severity, mp, NULL, 0, 0, true, msg); free (msg); @@ -791,7 +791,7 @@ check_header_entry (const message_ty *mp, const char *msgstr_string) { char *msg = xasprintf (_("\ -header field `%s' should start at beginning of line\n"), +header field '%s' should start at beginning of line\n"), required_fields[cnt]); po_xerror (severity, mp, NULL, 0, 0, true, msg); free (msg); @@ -832,7 +832,7 @@ some header fields still have the initial default value\n")); int severity = (initial < nrequiredfields ? PO_SEVERITY_ERROR : PO_SEVERITY_WARNING); char *msg = - xasprintf (_("header field `%s' still has the initial default value\n"), + xasprintf (_("header field '%s' still has the initial default value\n"), required_fields[initial]); po_xerror (severity, mp, NULL, 0, 0, true, msg); free (msg); diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index 6fe5fdb..3f96d3e 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> This program is free software: you can redistribute it and/or modify @@ -473,7 +473,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -539,7 +539,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n")); printf (_("\ -The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n\ +The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n\ environment variable.\n\ ")); printf ("\n"); diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c index f101d7f..1e6dbd2 100644 --- a/gettext-tools/src/msgunfmt.c +++ b/gettext-tools/src/msgunfmt.c @@ -1,5 +1,5 @@ /* msgunfmt - converts binary .mo files to Uniforum style .po files - Copyright (C) 1995-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995. This program is free software: you can redistribute it and/or modify @@ -420,7 +420,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c index c58f2ab..9f1add6 100644 --- a/gettext-tools/src/msguniq.c +++ b/gettext-tools/src/msguniq.c @@ -1,5 +1,5 @@ /* Remove, select or merge duplicate translations. - Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -318,7 +318,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/po-error.h b/gettext-tools/src/po-error.h index 2cae338..036a69b 100644 --- a/gettext-tools/src/po-error.h +++ b/gettext-tools/src/po-error.h @@ -1,5 +1,5 @@ /* Error handling during reading and writing of PO files. - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2012 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2004. This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y index fcb7f2d..bdc568a 100644 --- a/gettext-tools/src/po-gram-gen.y +++ b/gettext-tools/src/po-gram-gen.y @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <pmiller@agso.gov.au> @@ -237,7 +237,7 @@ message { check_obsolete ($1, $2); check_obsolete ($1, $3); - po_gram_error_at_line (&$1.pos, _("missing `msgstr[]' section")); + po_gram_error_at_line (&$1.pos, _("missing 'msgstr[]' section")); free_message_intro ($1); string_list_destroy (&$2.stringlist); free ($3.string); @@ -246,7 +246,7 @@ message { check_obsolete ($1, $2); check_obsolete ($1, $3); - po_gram_error_at_line (&$1.pos, _("missing `msgid_plural' section")); + po_gram_error_at_line (&$1.pos, _("missing 'msgid_plural' section")); free_message_intro ($1); string_list_destroy (&$2.stringlist); free ($3.rhs.msgstr); @@ -254,7 +254,7 @@ message | message_intro string_list { check_obsolete ($1, $2); - po_gram_error_at_line (&$1.pos, _("missing `msgstr' section")); + po_gram_error_at_line (&$1.pos, _("missing 'msgstr' section")); free_message_intro ($1); string_list_destroy (&$2.stringlist); } diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h index df8276e..da05f38 100644 --- a/gettext-tools/src/po-lex.h +++ b/gettext-tools/src/po-lex.h @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2006, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> @@ -32,7 +32,7 @@ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ # define __attribute__(Spec) /* empty */ # endif -/* The __-protected variants of `format' and `printf' attributes +/* The __-protected variants of 'format' and 'printf' attributes are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) # define __format__ format diff --git a/gettext-tools/src/read-catalog-abstract.h b/gettext-tools/src/read-catalog-abstract.h index 318fa68..c3fc84f 100644 --- a/gettext-tools/src/read-catalog-abstract.h +++ b/gettext-tools/src/read-catalog-abstract.h @@ -1,5 +1,5 @@ /* Reading PO files, abstract class. - Copyright (C) 1995-1996, 1998, 2000-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 1998, 2000-2003, 2005-2006, 2008-2009, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> @@ -112,7 +112,7 @@ struct abstract_catalog_reader_class_ty /* This next structure defines the base class passed to the methods. Derived methods will often need to cast their first argument before - using it (this corresponds to the implicit ``this'' argument in C++). + using it (this corresponds to the implicit 'this' argument in C++). When declaring derived classes, use the ABSTRACT_CATALOG_READER_TY define at the start of the structure, to declare inherited instance variables, diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index 43b3382..25b88f6 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -1,5 +1,5 @@ /* Recode Serbian text from Cyrillic to Latin script. - Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify @@ -140,7 +140,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index db5a3bd..f3243e1 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -1,5 +1,5 @@ /* Get the contents of an URL. - Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2010, 2012 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -169,7 +169,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c index dd516f2..8cfd7c4 100644 --- a/gettext-tools/src/write-po.c +++ b/gettext-tools/src/write-po.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2010, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> @@ -801,7 +801,7 @@ wrap (const message_ty *mp, ostream_t stream, { char *error_message = xasprintf (_("\ -internationalized messages should not contain the `\\%c' escape sequence"), +internationalized messages should not contain the '\\%c' escape sequence"), c); po_xerror (PO_SEVERITY_WARNING, mp, NULL, 0, 0, false, error_message); diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c index 08a40b5..ea0a874 100644 --- a/gettext-tools/src/x-c.c +++ b/gettext-tools/src/x-c.c @@ -1,5 +1,5 @@ /* xgettext C/C++/ObjectiveC backend. - Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2009, 2012 Free Software Foundation, Inc. This file was written by Peter Miller <millerp@canb.auug.org.au> @@ -880,16 +880,16 @@ phase7_getc () between the user requesting a newline in the string (e.g. using "\n" or "\012") from the user failing to terminate the string or character constant. The ANSI C standard says: 3.1.3.4 Character - Constants contain ``any character except single quote, backslash or - newline; or an escape sequence'' and 3.1.4 String Literals contain - ``any character except double quote, backslash or newline; or an - escape sequence''. + Constants contain "any character except single quote, backslash or + newline; or an escape sequence" and 3.1.4 String Literals contain + "any character except double quote, backslash or newline; or an + escape sequence". Most compilers give a fatal error in this case, however gcc is stupidly silent, even though this is a very common typo. OK, so - gcc --pedantic will tell me, but that gripes about too much other - stuff. Could I have a ``gcc -Wnewline-in-string'' option, or - better yet a ``gcc -fno-newline-in-string'' option, please? Gcc is + "gcc --pedantic" will tell me, but that gripes about too much other + stuff. Could I have a "gcc -Wnewline-in-string" option, or + better yet a "gcc -fno-newline-in-string" option, please? Gcc is also inconsistent between string literals and character constants: you may not embed newlines in character constants; try it, you get a useful diagnostic. --PMiller */ diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 3388820..eb3271f 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -1,5 +1,5 @@ /* Extracts strings from C source file to Uniforum style .po file. - Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995. This program is free software: you can redistribute it and/or modify @@ -768,7 +768,7 @@ This version was built without iconv()."), if (language == NULL) { error (0, 0, _("\ -warning: file `%s' extension `%s' is unknown; will try C"), filename, extension); +warning: file '%s' extension '%s' is unknown; will try C"), filename, extension); language = "C"; } this_file_extractor = language_to_extractor (language); @@ -810,7 +810,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -960,7 +960,7 @@ Output details:\n")); printf (_("\ -F, --sort-by-file sort output by file location\n")); printf (_("\ - --omit-header don't write header with `msgid \"\"' entry\n")); + --omit-header don't write header with 'msgid \"\"' entry\n")); printf (_("\ --copyright-holder=STRING set copyright holder in output\n")); printf (_("\ @@ -2256,7 +2256,7 @@ meta information, not the empty string.\n"))); CONVERT_STRING (s, lc_comment); /* To reduce the possibility of unwanted matches we do a two - step match: the line must contain `xgettext:' and one of + step match: the line must contain 'xgettext:' and one of the possible format description strings. */ if ((t = c_strstr (s, "xgettext:")) != NULL) { @@ -3016,7 +3016,7 @@ construct_header () multiline_warning (xasprintf (_("warning: ")), xstrdup (_("\ The option --msgid-bugs-address was not specified.\n\ -If you are using a `Makevars' file, please specify\n\ +If you are using a 'Makevars' file, please specify\n\ the MSGID_BUGS_ADDRESS variable there; otherwise please\n\ specify an --msgid-bugs-address command line option.\n\ "))); @@ -3224,7 +3224,7 @@ language_to_extractor (const char *name) return result; } - error (EXIT_FAILURE, 0, _("language `%s' unknown"), name); + error (EXIT_FAILURE, 0, _("language '%s' unknown"), name); /* NOTREACHED */ { extractor_ty result = { NULL, NULL, NULL, NULL }; diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index f5062e0..56650b2 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,10 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * tstgettext.c (usage): Quote 'like this', not `like this', as per the + recent change to the GNU coding standards. + * tstngettext.c (usage): Likewise. + 2012-01-15 Bruno Haible <bruno@clisp.org> Avoid test failure on Solaris 11. diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c index 2fe52ea..8c2020e 100644 --- a/gettext-tools/tests/tstgettext.c +++ b/gettext-tools/tests/tstgettext.c @@ -1,5 +1,5 @@ /* gettext - retrieve text string from message catalog and print it. - Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995. This program is free software: you can redistribute it and/or modify @@ -43,7 +43,7 @@ #define _(str) gettext (str) /* If true, add newline after last string. This makes only sense in - the `echo' emulation mode. */ + the 'echo' emulation mode. */ static bool add_newline; /* If true, expand escape sequences in strings before looking in the @@ -171,7 +171,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\ usage (EXIT_SUCCESS); /* We have two major modes: use following Uniforum spec and as - internationalized `echo' program. */ + internationalized 'echo' program. */ if (!do_shell) { /* We have to write a single strings translation to stdout. */ @@ -227,7 +227,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\ if (domaindir != NULL && domaindir[0] != '\0') bindtextdomain (domain, domaindir); - /* We have to simulate `echo'. All arguments are strings. */ + /* We have to simulate 'echo'. All arguments are strings. */ do { msgid = argv[optind++]; @@ -261,7 +261,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -292,7 +292,7 @@ If the TEXTDOMAIN parameter is not given, the domain is determined from the\n\ environment variable TEXTDOMAIN. If the message catalog is not found in the\n\ regular directory, another location can be specified with the environment\n\ variable TEXTDOMAINDIR.\n\ -When used with the -s option the program behaves like the `echo' command.\n\ +When used with the -s option the program behaves like the 'echo' command.\n\ But it does not simply copy its arguments to stdout. Instead those messages\n\ found in the selected catalog are translated.\n\ Standard search directory: %s\n"), diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c index 8bf2913..097748b 100644 --- a/gettext-tools/tests/tstngettext.c +++ b/gettext-tools/tests/tstngettext.c @@ -1,5 +1,5 @@ /* ngettext - retrieve plural form strings from message catalog and print them. - Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2007, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -200,7 +200,7 @@ static void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index ec25bf0..6080b2d 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,12 @@ +2012-01-26 Bruno Haible <bruno@clisp.org> + + Modernize quoting. + * lib/backupfile.c: Quote 'like this', not `like this', as per the + recent change to the GNU coding standards. + * lib/basename.c: Likewise. + * lib/closeout.c: Likewise. + * lib/xmalloc.c: Likewise. + 2012-01-06 Bruno Haible <bruno@clisp.org> Update after gnulib changed. diff --git a/gnulib-local/lib/backupfile.c b/gnulib-local/lib/backupfile.c index d8fb0b6..9d75b02 100644 --- a/gnulib-local/lib/backupfile.c +++ b/gnulib-local/lib/backupfile.c @@ -1,5 +1,5 @@ /* backupfile.c -- make Emacs style backup file names - Copyright (C) 1990-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 1990-1999, 2000-2003, 2005-2006, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ - It's typically faster. Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that only '0' through '9' are digits. Prefer ISDIGIT to isdigit unless - it's important to use the locale's definition of `digit' even when the + it's important to use the locale's definition of 'digit' even when the host does not conform to Posix. */ #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) @@ -90,7 +90,7 @@ find_backup_file_name (const char *file, enum backup_type backup_type) char *s; const char *suffix = simple_backup_suffix; - /* Allow room for simple or `.~N~' backups. */ + /* Allow room for simple or '.~N~' backups. */ backup_suffix_size_max = strlen (simple_backup_suffix) + 1; if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max) backup_suffix_size_max = numbered_suffix_size_max; diff --git a/gnulib-local/lib/basename.c b/gnulib-local/lib/basename.c index dcab5e7..5874420 100644 --- a/gnulib-local/lib/basename.c +++ b/gnulib-local/lib/basename.c @@ -1,5 +1,5 @@ /* Return the name-within-directory of a file name. - Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 1996-1999, 2000-2002, 2004, 2006, 2010, 2012 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -45,16 +45,16 @@ #endif #ifndef _LIBC -/* We cannot generally use the name `basename' since XPG defines an unusable +/* We cannot generally use the name 'basename' since XPG defines an unusable variant of the function but we cannot use it. */ # undef basename # define basename gnu_basename #endif -/* In general, we can't use the builtin `basename' function if available, +/* In general, we can't use the builtin 'basename' function if available, since it has different meanings in different environments. - In some environments the builtin `basename' modifies its argument. - If NAME is all slashes, be sure to return `/'. */ + In some environments the builtin 'basename' modifies its argument. + If NAME is all slashes, be sure to return '/'. */ char * basename (char const *name) @@ -71,7 +71,7 @@ basename (char const *name) all_slashes = 0; } - /* If NAME is all slashes, arrange to return `/'. */ + /* If NAME is all slashes, arrange to return '/'. */ if (*base == '\0' && ISSLASH (*name) && all_slashes) --base; diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c index 18080e7..20b021d 100644 --- a/gnulib-local/lib/closeout.c +++ b/gnulib-local/lib/closeout.c @@ -1,5 +1,5 @@ /* closeout.c - close standard output and standard error - Copyright (C) 1998-2007 Free Software Foundation, Inc. + Copyright (C) 1998-2007, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ Likewise for standard error. It's important to detect such failures and exit nonzero because many - tools (most notably `make' and other build-management systems) depend + tools (most notably 'make' and other build-management systems) depend on being able to detect failure in other tools via their exit status. */ /* Close standard output and standard error, exiting with status EXIT_FAILURE diff --git a/gnulib-local/lib/xmalloc.c b/gnulib-local/lib/xmalloc.c index d2a1214..223f994 100644 --- a/gnulib-local/lib/xmalloc.c +++ b/gnulib-local/lib/xmalloc.c @@ -1,5 +1,5 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-1996, 2000-2003, 2005-2007 Free Software Foundation, Inc. + Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ void xalloc_die () { error (xmalloc_exit_failure, 0, _("memory exhausted")); - /* The `noreturn' cannot be given to error, since it may return if + /* _Noreturn cannot be given to error, since it may return if its first argument is 0. To help compilers understand the xalloc_die does terminate, call exit. */ exit (EXIT_FAILURE); |