diff -Nru goffice-0.10.53/ABOUT-NLS goffice-0.10.55/ABOUT-NLS --- goffice-0.10.53/ABOUT-NLS 2019-01-28 00:46:17.000000000 +0000 +++ goffice-0.10.55/ABOUT-NLS 2023-01-23 17:49:32.000000000 +0000 @@ -1,1348 +1,672 @@ -1 Notes on the Free Translation Project -*************************************** +Notes on the Free Translation Project +************************************* -Free software is going international! The Free Translation Project is a -way to get maintainers of free software, translators, and users all -together, so that free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. - If you found this 'ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU 'gettext' internally, + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, itself available at your nearest GNU archive site. But you do _not_ -need to install GNU 'gettext' prior to configuring, installing or using +need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and -work on translations can contact the appropriate team. +work at translations should contact the appropriate team. -1.1 INSTALL Matters -=================== + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +Quick configuration advice +========================== + +If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +INSTALL Matters +=============== Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such -packages use GNU 'gettext'. Other packages have their own ways to -internationalization, predating GNU 'gettext'. +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU 'gettext' functions. Installers may use special -options at configuration time for changing the default behaviour. The -command: +provides the GNU `gettext' functions. If not, the GNU `gettext' own +library will be used. This library is wholly contained within this +package, usually in the `intl/' subdirectory, so prior installation of +the GNU `gettext' package is _not_ required. Installers may use +special options at configuration time for changing the default +behaviour. The commands: + ./configure --with-included-gettext ./configure --disable-nls -will _totally_ disable translation of messages. - - When you already have GNU 'gettext' installed on your system and run -configure without an option for your new package, 'configure' will -probably detect the previously built and installed 'libintl' library and -will decide to use it. If not, you may have to to use the -'--with-libintl-prefix' option to tell 'configure' where to look for it. +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might be not what is desirable. You +should use the more recent version of the GNU `gettext' library. I.e. +if the file `intl/VERSION' shows that the library which comes with this +package is more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. - Internationalized packages usually have many 'po/LL.po' files, where + Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at 'configure' time by using the -'--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable 'LINGUAS' +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' may be set, prior to configuration, to limit the installed set. -'LINGUAS' should then contain a space separated list of two-letter +`LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.2 Using This Package -====================== +Using This Package +================== As a user, if your language has been installed for this package, you -only have to set the 'LANG' environment variable to the appropriate -'LL_CC' combination. If you happen to have the 'LC_ALL' or some other -'LC_xxx' environment variables set, you should unset them before setting -'LANG', otherwise the setting of 'LANG' will not have the desired -effect. Here 'LL' is an ISO 639 two-letter language code, and 'CC' is -an ISO 3166 two-letter country code. For example, let's suppose that -you speak German and live in Germany. At the shell prompt, merely -execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in -'sh') or 'export LANG=de_DE' (in 'bash'). This can be done from your -'.login' or '.profile' file, once and for all. +only have to set the `LANG' environment variable to the appropriate +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. You might think that the country code specification is redundant. But in fact, some languages have dialects in different countries. For -example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil. The +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. - The locale naming convention of 'LL_CC', with 'LL' denoting the -language and 'CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are used, -such as 'LL' or 'LL_CC.ENCODING'. You can get the list of locales -supported by your system for your language by running the command -'locale -a | grep '^LL''. + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your country by running the command +`locale -a | grep '^LL''. Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. This is done through a different environment variable, called -'LANGUAGE'. GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG' -for the purpose of message handling, but you still need to have 'LANG' +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather read -translations in German than English for when Swedish is not available, -set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from 'no' to 'nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under 'nb' and some older ones under 'no', it's recommended -for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and -older translations are used. - - In the 'LANGUAGE' environment variable, but not in the 'LANG' -environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to -denote the language's main dialect. For example, 'de' is equivalent to -'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese -as spoken in Portugal) in this context. +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. -1.3 Translating Teams -===================== +Translating Teams +================= For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -'http://translationproject.org/', in the "Teams" area. +`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" +area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. The subscribing address is _not_ the same as the list itself, it has -'-request' appended. For example, speakers of Swedish can send a -message to 'sv-request@li.org', having this message body: +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: subscribe - Keep in mind that team members are expected to participate _actively_ -in translations, or at solving translational difficulties, rather than -merely lurking around. If your team does not exist yet and you want to -start one, or if you are unsure about what to do or how to get started, -please write to 'coordinator@translationproject.org' to reach the + Keep in mind that team members are expected to participate +_actively_ in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `translation@iro.umontreal.ca' to reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skills are praised more than -programming skills, here. +the terminology in use. Proven linguistic skill are praised more than +programming skill, here. -1.4 Available Packages -====================== +Available Packages +================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of Jun 2014. -The matrix shows, in regard of each package, for which languages PO -files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of November +2003. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am an ar as ast az be bg bn bn_IN bs ca crh cs - +---------------------------------------------------+ - a2ps | [] [] [] | - aegis | | - anubis | | - aspell | [] [] [] | - bash | [] [] [] | - bfd | | - binutils | [] | - bison | | - bison-runtime | [] | - buzztrax | [] | - ccd2cue | | - ccide | | - cflow | | - clisp | | - coreutils | [] [] | - cpio | | - cppi | | - cpplib | [] | - cryptsetup | [] | - datamash | | - denemo | [] [] | - dfarc | [] | - dialog | [] [] [] | - dico | | - diffutils | [] | - dink | [] | - direvent | | - doodle | [] | - dos2unix | | - dos2unix-man | | - e2fsprogs | [] [] | - enscript | [] | - exif | [] | - fetchmail | [] [] | - findutils | [] | - flex | [] | - freedink | [] [] | - fusionforge | | - gas | | - gawk | [] | - gcal | [] | - gcc | | - gdbm | | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gjay | | - glunarclock | [] [] [] | - gnubiff | [] | - gnubik | [] | - gnucash | () () [] | - gnuchess | | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gold | | - gphoto2 | [] | - gprof | [] | - gramadoir | | - grep | [] [] [] | - grub | [] | - gsasl | | - gss | | - gst-plugins-bad | [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] | - gst-plugins-ugly | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] | - gtkam | [] [] | - gtkspell | [] [] [] [] [] | - guix | | - guix-packages | | - gutenprint | [] | - hello | [] | - help2man | | - help2man-texi | | - hylafax | | - idutils | | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] | - iso_639 | [] [] [] [] [] [] [] [] [] | - iso_639_3 | [] [] | - iso_639_5 | | - jwhois | | - kbd | [] | - klavaro | [] [] [] [] [] | - ld | [] | - leafpad | [] [] [] [] | - libc | [] [] [] | - libexif | () | - libextractor | | - libgnutls | [] | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | | - libiconv | [] [] | - libidn | [] | - liferea | [] [] [] [] | - lilypond | [] [] | - lordsawar | [] | - lprng | | - lynx | [] [] | - m4 | [] | - mailfromd | | - mailutils | | - make | [] | - man-db | [] [] | - man-db-manpages | | - midi-instruments | [] [] [] | - minicom | [] | - mkisofs | [] | - myserver | [] | - nano | [] [] [] | - opcodes | | - parted | [] | - pies | | - pnmixer | | - popt | [] | - procps-ng | | - procps-ng-man | | - psmisc | [] | - pspp | [] | - pushover | [] | - pwdutils | | - pyspread | | - radius | [] | - recode | [] [] [] | - recutils | | - rpm | | - rush | | - sarg | | - sed | [] [] [] [] | - sharutils | [] | - shishi | | - skribilo | | - solfege | [] [] | - solfege-manual | | - spotmachine | | - sudo | [] [] | - sudoers | [] [] | - sysstat | [] | - tar | [] [] [] | - texinfo | [] [] | - texinfo_document | [] [] | - tigervnc | [] | - tin | | - tin-man | | - tracgoogleappsa... | | - trader | | - util-linux | [] | - ve | | - vice | | - vmm | | - vorbis-tools | [] | - wastesedge | | - wcd | | - wcd-man | | - wdiff | [] [] | - wget | [] | - wyslij-po | | - xboard | | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - +---------------------------------------------------+ - af am an ar as ast az be bg bn bn_IN bs ca crh cs - 4 0 2 5 3 11 0 8 25 3 3 1 55 4 74 - - da de el en en_GB en_ZA eo es et eu fa fi fr - +--------------------------------------------------+ - a2ps | [] [] [] [] [] [] [] [] [] | - aegis | [] [] [] [] | - anubis | [] [] [] [] [] | - aspell | [] [] [] [] [] [] [] | - bash | [] [] [] | - bfd | [] [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] [] [] [] | - buzztrax | [] [] [] [] | - ccd2cue | [] [] [] [] | - ccide | [] [] [] [] [] [] | - cflow | [] [] [] [] [] | - clisp | [] [] [] [] [] | - coreutils | [] [] [] [] [] | - cpio | [] [] [] [] [] | - cppi | [] [] [] [] [] | - cpplib | [] [] [] [] [] [] | - cryptsetup | [] [] [] [] [] | - datamash | [] [] [] [] | - denemo | [] | - dfarc | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - dico | [] [] [] [] | - diffutils | [] [] [] [] [] [] | - dink | [] [] [] [] [] [] | - direvent | [] [] [] [] | - doodle | [] [] [] [] | - dos2unix | [] [] [] [] [] | - dos2unix-man | [] [] [] | - e2fsprogs | [] [] [] [] [] | - enscript | [] [] [] [] [] [] | - exif | [] [] [] [] [] [] | - fetchmail | [] () [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] [] [] [] [] [] | - freedink | [] [] [] [] [] [] [] [] | - fusionforge | [] [] [] | - gas | [] [] [] | - gawk | [] [] [] [] [] | - gcal | [] [] [] [] | - gcc | [] | - gdbm | [] [] [] [] [] | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] | - gjay | [] [] [] [] | - glunarclock | [] [] [] [] [] | - gnubiff | () [] [] () | - gnubik | [] [] [] [] [] | - gnucash | [] () () () () () () | - gnuchess | [] [] [] [] | - gnulib | [] [] [] [] [] [] [] | - gnunet | [] | - gnunet-gtk | [] | - gold | [] [] [] | - gphoto2 | [] () [] [] | - gprof | [] [] [] [] [] [] | - gramadoir | [] [] [] [] [] | - grep | [] [] [] [] [] [] [] | - grub | [] [] [] [] [] | - gsasl | [] [] [] [] [] | - gss | [] [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] [] [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | [] () [] [] [] | - gtkam | [] () [] [] [] [] | - gtkspell | [] [] [] [] [] [] [] [] | - guix | [] [] | - guix-packages | | - gutenprint | [] [] [] [] | - hello | [] [] [] [] [] [] [] [] | - help2man | [] [] [] [] [] [] [] | - help2man-texi | [] [] [] | - hylafax | [] [] | - idutils | [] [] [] [] [] | - iso_15924 | [] () [] [] () [] () | - iso_3166 | [] () [] [] [] [] () [] () | - iso_3166_2 | [] () () () | - iso_4217 | [] () [] [] [] () [] () | - iso_639 | [] () [] [] () [] () | - iso_639_3 | () () () | - iso_639_5 | () () () | - jwhois | [] [] [] [] [] | - kbd | [] [] [] [] [] [] | - klavaro | [] [] [] [] [] [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] [] () [] [] | - libextractor | [] | - libgnutls | [] [] [] [] | - libgphoto2 | [] () [] | - libgphoto2_port | [] () [] [] [] [] | - libgsasl | [] [] [] [] [] | - libiconv | [] [] [] [] [] [] [] | - libidn | [] [] [] [] [] | - liferea | [] () [] [] [] [] [] | - lilypond | [] [] [] [] [] [] | - lordsawar | [] [] | - lprng | | - lynx | [] [] [] [] [] [] | - m4 | [] [] [] [] [] [] | - mailfromd | [] | - mailutils | [] [] [] [] | - make | [] [] [] [] [] | - man-db | [] [] [] [] | - man-db-manpages | [] [] | - midi-instruments | [] [] [] [] [] [] [] [] [] | - minicom | [] [] [] [] [] | - mkisofs | [] [] [] | - myserver | [] [] [] [] | - nano | [] [] [] [] [] [] [] | - opcodes | [] [] [] [] [] | - parted | [] [] [] | - pies | [] | - pnmixer | [] [] | - popt | [] [] [] [] [] [] | - procps-ng | [] [] | - procps-ng-man | [] [] | - psmisc | [] [] [] [] [] [] [] | - pspp | [] [] [] | - pushover | () [] [] [] | - pwdutils | [] [] [] | - pyspread | [] [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - recutils | [] [] [] [] | - rpm | [] [] [] [] [] | - rush | [] [] [] | - sarg | [] [] | - sed | [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] [] [] | - skribilo | [] [] [] | - solfege | [] [] [] [] [] [] [] [] | - solfege-manual | [] [] [] [] [] | - spotmachine | [] [] [] [] [] | - sudo | [] [] [] [] [] [] | - sudoers | [] [] [] [] [] [] | - sysstat | [] [] [] [] [] [] | - tar | [] [] [] [] [] [] [] | - texinfo | [] [] [] [] [] | - texinfo_document | [] [] [] [] | - tigervnc | [] [] [] [] [] [] | - tin | [] [] [] [] | - tin-man | [] | - tracgoogleappsa... | [] [] [] [] [] | - trader | [] [] [] [] [] [] | - util-linux | [] [] [] [] | - ve | [] [] [] [] [] | - vice | () () () | - vmm | [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | [] | - wcd | [] [] [] [] | - wcd-man | [] | - wdiff | [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] | - wyslij-po | [] [] [] [] | - xboard | [] [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] [] [] [] | - +--------------------------------------------------+ - da de el en en_GB en_ZA eo es et eu fa fi fr - 119 131 32 1 6 0 94 95 22 13 4 102 139 - - ga gd gl gu he hi hr hu hy ia id is it ja ka kk - +-------------------------------------------------+ - a2ps | [] [] [] [] | - aegis | [] | - anubis | [] [] [] [] | - aspell | [] [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] | - binutils | [] [] [] | - bison | [] | - bison-runtime | [] [] [] [] [] [] [] [] | - buzztrax | | - ccd2cue | [] | - ccide | [] [] | - cflow | [] [] [] | - clisp | | - coreutils | [] [] | - cpio | [] [] [] [] [] [] | - cppi | [] [] [] [] [] | - cpplib | [] [] | - cryptsetup | [] | - datamash | | - denemo | [] | - dfarc | [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] [] | - dico | | - diffutils | [] [] [] [] | - dink | [] | - direvent | [] | - doodle | [] [] | - dos2unix | [] [] | - dos2unix-man | | - e2fsprogs | [] [] | - enscript | [] [] [] | - exif | [] [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] [] [] [] [] | - flex | [] | - freedink | [] [] [] [] | - fusionforge | | - gas | [] | - gawk | [] () [] | - gcal | | - gcc | | - gdbm | | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gjay | [] | - glunarclock | [] [] [] [] [] [] | - gnubiff | [] [] () | - gnubik | [] [] [] | - gnucash | () () () () () | - gnuchess | | - gnulib | [] [] [] [] [] | - gnunet | | - gnunet-gtk | | - gold | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] [] | - gramadoir | [] [] [] | - grep | [] [] [] [] [] [] [] | - grub | [] [] [] | - gsasl | [] [] [] [] [] | - gss | [] [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] [] [] | - gst-plugins-good | [] [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] | - gtick | [] [] [] [] [] | - gtkam | [] [] [] [] [] | - gtkspell | [] [] [] [] [] [] [] [] [] [] | - guix | | - guix-packages | | - gutenprint | [] [] [] | - hello | [] [] [] [] [] | - help2man | [] [] [] | - help2man-texi | | - hylafax | [] | - idutils | [] [] | - iso_15924 | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | [] [] | - iso_4217 | [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] [] [] [] | - iso_639_3 | [] [] | - iso_639_5 | | - jwhois | [] [] [] [] | - kbd | [] [] [] | - klavaro | [] [] [] [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] [] () | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | | - libgnutls | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] [] [] [] [] | - libidn | [] [] [] [] | - liferea | [] [] [] [] [] | - lilypond | [] | - lordsawar | | - lprng | [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | | - mailutils | | - make | [] [] [] [] | - man-db | [] [] | - man-db-manpages | [] [] | - midi-instruments | [] [] [] [] [] [] [] [] [] | - minicom | [] [] [] | - mkisofs | [] [] | - myserver | [] | - nano | [] [] [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] [] | - pies | | - pnmixer | [] [] | - popt | [] [] [] [] [] [] [] [] [] [] | - procps-ng | | - procps-ng-man | | - psmisc | [] [] [] [] | - pspp | [] [] | - pushover | [] | - pwdutils | [] | - pyspread | | - radius | [] | - recode | [] [] [] [] [] [] [] | - recutils | | - rpm | [] | - rush | [] | - sarg | | - sed | [] [] [] [] [] [] [] | - sharutils | | - shishi | | - skribilo | [] | - solfege | [] [] | - solfege-manual | | - spotmachine | | - sudo | [] [] [] [] | - sudoers | [] [] [] | - sysstat | [] [] [] [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] | - texinfo_document | [] [] [] | - tigervnc | | - tin | | - tin-man | | - tracgoogleappsa... | [] [] [] [] | - trader | [] [] | - util-linux | [] | - ve | [] | - vice | () () | - vmm | | - vorbis-tools | [] [] | - wastesedge | [] | - wcd | | - wcd-man | | - wdiff | [] [] [] | - wget | [] [] [] [] | - wyslij-po | [] [] [] | - xboard | | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] [] [] | - +-------------------------------------------------+ - ga gd gl gu he hi hr hu hy ia id is it ja ka kk - 35 2 47 4 8 2 60 71 2 6 81 11 87 57 0 3 - - kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl - +--------------------------------------------------+ - a2ps | [] [] | - aegis | [] | - anubis | [] [] [] | - aspell | [] [] | - bash | [] [] | - bfd | | - binutils | | - bison | [] | - bison-runtime | [] [] [] [] [] [] | - buzztrax | | - ccd2cue | | - ccide | [] [] | - cflow | [] | - clisp | [] | - coreutils | [] [] | - cpio | [] | - cppi | | - cpplib | [] | - cryptsetup | [] | - datamash | [] [] | - denemo | | - dfarc | [] [] | - dialog | [] [] [] [] [] [] | - dico | | - diffutils | [] [] [] | - dink | [] | - direvent | [] | - doodle | [] | - dos2unix | [] [] | - dos2unix-man | [] | - e2fsprogs | [] | - enscript | [] | - exif | [] [] [] | - fetchmail | [] | - findutils | [] [] | - flex | [] | - freedink | [] [] | - fusionforge | | - gas | | - gawk | [] | - gcal | | - gcc | | - gdbm | | - gettext-examples | [] [] [] [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] | - gjay | | - glunarclock | [] [] | - gnubiff | [] | - gnubik | [] [] | - gnucash | () () () () () () () [] | - gnuchess | [] [] | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gold | | - gphoto2 | [] | - gprof | [] [] | - gramadoir | [] | - grep | [] [] | - grub | [] [] [] | - gsasl | [] | - gss | | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] | - gtkspell | [] [] [] [] [] [] [] | - guix | | - guix-packages | | - gutenprint | [] | - hello | [] [] [] | - help2man | [] | - help2man-texi | | - hylafax | [] | - idutils | [] | - iso_15924 | () [] [] | - iso_3166 | [] [] [] () [] [] [] [] [] [] | - iso_3166_2 | () [] | - iso_4217 | () [] [] [] | - iso_639 | [] [] () [] [] [] [] | - iso_639_3 | [] () [] | - iso_639_5 | () | - jwhois | [] [] | - kbd | [] | - klavaro | [] [] | - ld | | - leafpad | [] [] [] [] [] | - libc | [] [] | - libexif | [] | - libextractor | [] | - libgnutls | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | [] [] | - libidn | [] | - liferea | [] [] [] | - lilypond | [] | - lordsawar | | - lprng | | - lynx | [] | - m4 | [] | - mailfromd | | - mailutils | | - make | [] [] | - man-db | [] | - man-db-manpages | [] | - midi-instruments | [] [] [] [] [] [] [] | - minicom | [] | - mkisofs | [] | - myserver | | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pies | | - pnmixer | [] | - popt | [] [] [] [] [] | - procps-ng | | - procps-ng-man | | - psmisc | [] | - pspp | [] [] | - pushover | | - pwdutils | [] | - pyspread | | - radius | [] | - recode | [] [] | - recutils | [] | - rpm | [] | - rush | [] | - sarg | | - sed | [] [] | - sharutils | [] | - shishi | | - skribilo | | - solfege | [] [] | - solfege-manual | [] | - spotmachine | [] | - sudo | [] [] [] | - sudoers | [] [] [] | - sysstat | [] [] | - tar | [] [] [] | - texinfo | [] | - texinfo_document | [] | - tigervnc | [] | - tin | | - tin-man | | - tracgoogleappsa... | [] [] [] | - trader | [] | - util-linux | [] | - ve | [] | - vice | [] | - vmm | [] | - vorbis-tools | [] | - wastesedge | [] | - wcd | [] | - wcd-man | [] | - wdiff | [] | - wget | [] [] | - wyslij-po | [] | - xboard | [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - +--------------------------------------------------+ - kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl - 5 15 4 6 0 13 23 3 3 3 4 11 2 42 1 125 - - nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr - +------------------------------------------------+ - a2ps | [] [] [] [] [] [] [] | - aegis | [] [] | - anubis | [] [] [] | - aspell | [] [] [] [] [] [] [] | - bash | [] [] [] [] [] [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - bison-runtime | [] [] [] [] [] [] [] [] | - buzztrax | [] | - ccd2cue | [] [] | - ccide | [] [] [] | - cflow | [] [] [] | - clisp | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cppi | [] [] [] | - cpplib | [] [] [] | - cryptsetup | [] [] [] | - datamash | [] [] | - denemo | | - dfarc | [] [] [] | - dialog | [] [] [] [] [] [] [] | - dico | [] | - diffutils | [] [] [] | - dink | | - direvent | [] [] [] | - doodle | [] [] | - dos2unix | [] [] [] [] | - dos2unix-man | [] [] | - e2fsprogs | [] | - enscript | [] [] [] [] [] [] | - exif | [] [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - freedink | [] [] [] [] [] | - fusionforge | | - gas | | - gawk | [] | - gcal | | - gcc | | - gdbm | [] [] [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gjay | [] | - glunarclock | [] [] [] [] [] [] | - gnubiff | [] | - gnubik | [] [] [] [] | - gnucash | () () () () () [] | - gnuchess | [] [] | - gnulib | [] [] [] [] [] | - gnunet | | - gnunet-gtk | | - gold | | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - grub | [] [] [] [] [] | - gsasl | [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] [] [] | - gst-plugins-base | [] [] [] [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | [] [] [] [] [] | - gtkam | [] [] [] [] [] [] | - gtkspell | [] [] [] [] [] [] [] [] [] | - guix | | - guix-packages | | - gutenprint | [] [] | - hello | [] [] [] [] [] [] | - help2man | [] [] [] [] | - help2man-texi | [] | - hylafax | | - idutils | [] [] [] | - iso_15924 | [] () [] [] [] [] | - iso_3166 | [] [] [] [] () [] [] [] [] [] [] [] [] | - iso_3166_2 | [] () [] | - iso_4217 | [] [] () [] [] [] [] [] | - iso_639 | [] [] [] () [] [] [] [] [] [] | - iso_639_3 | [] () | - iso_639_5 | () [] | - jwhois | [] [] [] [] | - kbd | [] [] | - klavaro | [] [] [] [] [] | - ld | | - leafpad | [] [] [] [] [] [] [] [] | - libc | [] [] [] | - libexif | [] () [] | - libextractor | [] | - libgnutls | [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] [] [] | - libidn | [] [] [] | - liferea | [] [] [] [] () [] [] | - lilypond | | - lordsawar | | - lprng | [] | - lynx | [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] | - make | [] [] [] | - man-db | [] [] [] | - man-db-manpages | [] [] [] | - midi-instruments | [] [] [] [] [] [] [] [] | - minicom | [] [] [] [] | - mkisofs | [] [] [] | - myserver | [] [] | - nano | [] [] [] [] [] [] | - opcodes | | - parted | [] [] [] [] [] [] | - pies | [] | - pnmixer | [] | - popt | [] [] [] [] [] [] | - procps-ng | [] | - procps-ng-man | [] | - psmisc | [] [] [] [] | - pspp | [] [] | - pushover | | - pwdutils | [] | - pyspread | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - recutils | [] [] | - rpm | [] | - rush | [] [] [] | - sarg | [] [] | - sed | [] [] [] [] [] [] [] [] | - sharutils | [] [] [] | - shishi | [] [] | - skribilo | [] | - solfege | [] [] [] | - solfege-manual | [] [] | - spotmachine | [] [] | - sudo | [] [] [] [] [] [] | - sudoers | [] [] [] [] | - sysstat | [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - texinfo_document | [] [] | - tigervnc | [] [] [] | - tin | [] | - tin-man | | - tracgoogleappsa... | [] [] [] [] | - trader | [] [] | - util-linux | [] [] | - ve | [] [] [] | - vice | | - vmm | | - vorbis-tools | [] [] [] | - wastesedge | | - wcd | | - wcd-man | | - wdiff | [] [] [] [] [] | - wget | [] [] [] [] [] | - wyslij-po | [] [] [] [] | - xboard | [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - +------------------------------------------------+ - nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr - 7 3 6 114 1 12 88 32 82 3 40 45 7 101 - - sv sw ta te tg th tr uk ur vi wa wo zh_CN - +----------------------------------------------+ - a2ps | [] [] [] [] [] | - aegis | [] | - anubis | [] [] [] [] | - aspell | [] [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] | - bison-runtime | [] [] [] [] [] [] | - buzztrax | [] [] [] | - ccd2cue | [] [] [] | - ccide | [] [] [] [] | - cflow | [] [] [] [] | - clisp | | - coreutils | [] [] [] | - cpio | [] [] [] [] [] | - cppi | [] [] [] [] | - cpplib | [] [] [] [] [] | - cryptsetup | [] [] [] | - datamash | [] [] [] | - denemo | [] | - dfarc | [] [] | - dialog | [] [] [] [] [] [] | - dico | [] | - diffutils | [] [] [] [] [] | - dink | [] | - direvent | [] [] | - doodle | [] [] | - dos2unix | [] [] [] [] | - dos2unix-man | [] [] [] | - e2fsprogs | [] [] [] [] | - enscript | [] [] [] [] | - exif | [] [] [] [] [] | - fetchmail | [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] | - freedink | [] [] [] | - fusionforge | | - gas | [] | - gawk | [] [] [] | - gcal | [] [] [] | - gcc | [] | - gdbm | [] [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] [] [] | - gjay | [] [] [] | - glunarclock | [] [] [] [] | - gnubiff | [] [] | - gnubik | [] [] [] [] | - gnucash | () () () () [] | - gnuchess | [] [] [] | - gnulib | [] [] [] [] | - gnunet | | - gnunet-gtk | | - gold | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] [] | - gramadoir | [] [] [] | - grep | [] [] [] [] [] | - grub | [] [] [] [] | - gsasl | [] [] [] [] | - gss | [] [] [] | - gst-plugins-bad | [] [] [] [] [] | - gst-plugins-base | [] [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] | - gstreamer | [] [] [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkspell | [] [] [] [] [] [] [] | - guix | | - guix-packages | | - gutenprint | [] [] [] [] | - hello | [] [] [] [] [] [] | - help2man | [] [] [] | - help2man-texi | [] | - hylafax | [] | - idutils | [] [] [] | - iso_15924 | [] () [] [] () [] | - iso_3166 | [] [] () [] [] () [] [] | - iso_3166_2 | () [] [] () [] | - iso_4217 | [] () [] [] () [] | - iso_639 | [] [] [] () [] [] () [] [] | - iso_639_3 | [] () [] [] () | - iso_639_5 | () [] () | - jwhois | [] [] [] [] | - kbd | [] [] [] [] | - klavaro | [] [] [] [] [] [] | - ld | [] [] [] [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] [] () | - libextractor | [] [] | - libgnutls | [] [] [] [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] [] [] | - libidn | () [] [] [] | - liferea | [] [] [] [] [] | - lilypond | [] | - lordsawar | | - lprng | [] | - lynx | [] [] [] [] | - m4 | [] [] [] | - mailfromd | [] [] | - mailutils | [] | - make | [] [] [] [] | - man-db | [] [] [] | - man-db-manpages | [] [] | - midi-instruments | [] [] [] [] [] [] | - minicom | [] [] | - mkisofs | [] [] [] | - myserver | [] | - nano | [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] [] | - pies | [] [] | - pnmixer | [] [] [] | - popt | [] [] [] [] [] [] [] | - procps-ng | [] [] | - procps-ng-man | [] | - psmisc | [] [] [] [] | - pspp | [] [] [] | - pushover | [] | - pwdutils | [] [] | - pyspread | [] | - radius | [] [] | - recode | [] [] [] [] | - recutils | [] [] [] | - rpm | [] [] [] [] | - rush | [] [] | - sarg | | - sed | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] [] | - skribilo | [] [] | - solfege | [] [] [] [] | - solfege-manual | [] | - spotmachine | [] [] [] | - sudo | [] [] [] [] [] | - sudoers | [] [] [] [] | - sysstat | [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - texinfo_document | [] | - tigervnc | [] [] [] | - tin | [] | - tin-man | | - tracgoogleappsa... | [] [] [] [] [] | - trader | [] | - util-linux | [] [] [] [] | - ve | [] [] [] [] | - vice | () () | - vmm | | - vorbis-tools | [] [] | - wastesedge | | - wcd | [] [] [] | - wcd-man | [] | - wdiff | [] [] [] [] | - wget | [] [] [] | - wyslij-po | [] [] | - xboard | [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - +----------------------------------------------+ - sv sw ta te tg th tr uk ur vi wa wo zh_CN - 106 1 4 3 0 13 51 115 1 125 7 1 100 - - zh_HK zh_TW - +-------------+ - a2ps | | 30 - aegis | | 9 - anubis | | 19 - aspell | | 29 - bash | [] | 23 - bfd | | 11 - binutils | | 12 - bison | [] | 18 - bison-runtime | [] | 38 - buzztrax | | 9 - ccd2cue | | 10 - ccide | | 17 - cflow | | 16 - clisp | | 10 - coreutils | | 18 - cpio | | 20 - cppi | | 17 - cpplib | [] | 19 - cryptsetup | | 14 - datamash | | 11 - denemo | | 5 - dfarc | | 17 - dialog | [] | 42 - dico | | 6 - diffutils | | 22 - dink | | 10 - direvent | | 11 - doodle | | 12 - dos2unix | [] | 18 - dos2unix-man | | 9 - e2fsprogs | | 15 - enscript | | 21 - exif | | 27 - fetchmail | | 19 - findutils | | 29 - flex | [] | 19 - freedink | | 24 - fusionforge | | 3 - gas | | 5 - gawk | | 13 - gcal | | 8 - gcc | | 2 - gdbm | | 10 - gettext-examples | [] [] | 40 - gettext-runtime | [] [] | 35 - gettext-tools | [] | 24 - gjay | | 9 - glunarclock | [] | 27 - gnubiff | | 9 - gnubik | | 19 - gnucash | () | 6 - gnuchess | | 11 - gnulib | | 23 - gnunet | | 1 - gnunet-gtk | | 1 - gold | | 7 - gphoto2 | [] | 19 - gprof | | 21 - gramadoir | | 14 - grep | [] | 31 - grub | | 21 - gsasl | [] | 19 - gss | | 17 - gst-plugins-bad | | 21 - gst-plugins-base | | 27 - gst-plugins-good | | 32 - gst-plugins-ugly | | 34 - gstreamer | [] | 32 - gtick | | 19 - gtkam | | 24 - gtkspell | [] [] | 48 - guix | | 2 - guix-packages | | 0 - gutenprint | | 15 - hello | [] | 30 - help2man | | 18 - help2man-texi | | 5 - hylafax | | 5 - idutils | | 14 - iso_15924 | [] | 23 - iso_3166 | [] [] | 58 - iso_3166_2 | | 9 - iso_4217 | [] [] | 28 - iso_639 | [] [] | 46 - iso_639_3 | | 10 - iso_639_5 | | 2 - jwhois | [] | 20 - kbd | | 17 - klavaro | | 30 - ld | [] | 15 - leafpad | [] | 39 - libc | [] | 24 - libexif | | 10 - libextractor | | 5 - libgnutls | | 13 - libgphoto2 | | 10 - libgphoto2_port | [] | 19 - libgsasl | | 18 - libiconv | [] | 29 - libidn | | 17 - liferea | | 29 - lilypond | | 11 - lordsawar | | 3 - lprng | | 3 - lynx | | 19 - m4 | [] | 22 - mailfromd | | 4 - mailutils | | 6 - make | | 19 - man-db | | 15 - man-db-manpages | | 10 - midi-instruments | [] | 43 - minicom | [] | 17 - mkisofs | | 13 - myserver | | 9 - nano | [] | 30 - opcodes | | 12 - parted | [] | 23 - pies | | 4 - pnmixer | | 9 - popt | [] | 36 - procps-ng | | 5 - procps-ng-man | | 4 - psmisc | [] | 22 - pspp | | 13 - pushover | | 6 - pwdutils | | 8 - pyspread | | 6 - radius | | 9 - recode | | 31 - recutils | | 10 - rpm | [] | 13 - rush | | 10 - sarg | | 4 - sed | [] | 35 - sharutils | | 13 - shishi | | 7 - skribilo | | 7 - solfege | | 21 - solfege-manual | | 9 - spotmachine | | 11 - sudo | | 26 - sudoers | | 22 - sysstat | | 23 - tar | [] | 30 - texinfo | | 17 - texinfo_document | | 13 - tigervnc | | 14 - tin | [] | 7 - tin-man | | 1 - tracgoogleappsa... | [] | 22 - trader | | 12 - util-linux | | 13 - ve | | 14 - vice | | 1 - vmm | | 3 - vorbis-tools | | 13 - wastesedge | | 3 - wcd | | 8 - wcd-man | | 3 - wdiff | [] | 23 - wget | | 21 - wyslij-po | | 14 - xboard | | 10 - xdg-user-dirs | [] [] | 68 - xkeyboard-config | [] | 28 - +-------------+ - 89 teams zh_HK zh_TW - 166 domains 7 42 2809 + Ready PO files am az be bg ca cs da de el en en_GB eo es + +-------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | | + ap-utils | | + bash | [] [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] | + clisp | [] [] [] | + clisp | | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | [] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + fslint | | + gas | [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] [] | + gnubiff | [] | + gnucash | [] () [] [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] | + gpsdrive | () () () | + gramadoir | [] | + grep | [] [] [] [] [] [] | + gretl | [] | + gtick | () | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + jpilot | [] [] [] | + jtag | | + jwhois | [] | + kbd | [] [] [] [] [] | + latrine | () | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | | + sharutils | [] [] [] [] [] [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] [] | + tin | () () | + tuxpaint | [] [] [] [] [] [] [] | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] | + xchat | [] [] [] [] | + xfree86_xkb_xml | [] | + xpad | [] | + +-------------------------------------------+ + am az be bg ca cs da de el en en_GB eo es + 0 1 8 3 37 37 54 73 15 1 5 12 62 + + et fa fi fr ga gl he hr hu id is it ja + +----------------------------------------+ + a2ps | [] [] [] () | + aegis | | + ant-phone | | + anubis | [] | + ap-utils | [] | + bash | [] [] | + batchelor | [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] [] | + clisp | [] | + clisp | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] | + flex | [] [] | + fslint | | + gas | [] | + gawk | [] [] [] | + gbiff | | + gcal | [] | + gcc | [] | + gettext | [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] [] | + gnubiff | | + gnucash | () [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] [] [] | + gpe-clock | [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () [] () () | + gramadoir | [] | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] | + gtick | [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] | + jpilot | [] () | + jtag | | + jwhois | [] [] [] [] | + kbd | [] | + latrine | | + ld | [] | + libc | [] [] [] [] [] | + libgpewidget | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] | + man-db | () () | + minicom | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] | + screem | | + scrollkeeper | [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] | + sharutils | [] [] [] [] [] | + sketch | [] | + soundtracker | [] [] [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + tuxpaint | [] [] [] [] [] [] [] [] | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | | + xpad | [] | + +----------------------------------------+ + et fa fi fr ga gl he hr hu id is it ja + 21 1 24 84 24 24 8 10 38 31 1 22 33 + + ko lg lt lv ms nb nl nn no pl pt pt_BR ro + +-------------------------------------------+ + a2ps | () [] [] () () [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] [] [] | + ap-utils | [] () [] | + bash | [] [] | + batchelor | [] | + bfd | [] | + binutils | | + bison | [] [] [] [] | + bluez-pin | [] [] [] | + clisp | [] | + clisp | | + coreutils | [] | + cpio | [] [] [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] [] | + e2fsprogs | [] | + enscript | [] [] [] | + error | [] [] [] | + fetchmail | [] [] () | + fileutils | [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + fslint | [] [] | + gas | | + gawk | [] [] [] | + gbiff | [] [] | + gcal | | + gcc | | + gettext | [] [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] | + gliv | [] [] [] | + glunarclock | [] [] [] | + gnubiff | | + gnucash | [] [] () | + gnucash-glossary | [] [] | + gnupg | [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] | + gpe-calendar | [] [] [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] [] | + gpe-go | [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] | + gprof | [] [] | + gpsdrive | () () () [] | + gramadoir | [] | + grep | [] [] [] [] | + gretl | | + gtick | [] [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] [] [] [] | + kbd | [] [] [] | + latrine | [] | + ld | | + libc | [] [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] | + lifelines | | + lilypond | | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] | + m4 | [] [] [] [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] | + screem | | + scrollkeeper | [] [] [] [] | + sed | [] [] [] | + sh-utils | [] | + shared-mime-info | [] | + sharutils | [] | + sketch | [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] | + tin | | + tuxpaint | [] [] [] [] [] [] [] [] [] | + util-linux | [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] | + wget | [] [] | + xchat | [] [] | + xfree86_xkb_xml | [] | + xpad | [] [] | + +-------------------------------------------+ + ko lg lt lv ms nb nl nn no pl pt pt_BR ro + 11 0 1 2 12 10 60 4 4 38 23 34 74 + + ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + +-------------------------------------------+ + a2ps | [] [] [] [] [] | 16 + aegis | () | 0 + ant-phone | | 2 + anubis | [] [] [] | 9 + ap-utils | () | 3 + bash | [] | 9 + batchelor | | 2 + bfd | [] [] | 6 + binutils | [] [] [] | 7 + bison | [] [] [] | 14 + bluez-pin | [] [] [] | 13 + clisp | | 5 + clisp | | 0 + coreutils | [] [] [] [] [] | 16 + cpio | [] [] [] | 14 + darkstat | [] [] [] () () | 12 + diffutils | [] [] [] [] | 22 + e2fsprogs | [] [] | 5 + enscript | [] [] [] | 12 + error | [] [] [] | 15 + fetchmail | [] [] [] | 11 + fileutils | [] [] [] [] [] [] | 16 + findutils | [] [] [] [] [] [] [] | 29 + flex | [] [] [] | 13 + fslint | | 2 + gas | [] | 3 + gawk | [] [] | 12 + gbiff | | 3 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] [] | 16 + gettext-examples | [] [] | 9 + gettext-runtime | [] [] [] [] [] [] [] [] [] | 21 + gettext-tools | [] [] [] [] [] [] | 14 + gimp-print | [] [] | 10 + gliv | | 3 + glunarclock | [] [] [] [] | 15 + gnubiff | | 1 + gnucash | [] [] [] | 9 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 17 + gpe-aerial | [] [] | 7 + gpe-beam | [] [] | 8 + gpe-calendar | [] [] [] [] [] | 13 + gpe-clock | [] [] [] | 9 + gpe-conf | [] [] [] | 9 + gpe-contacts | [] [] [] [] | 11 + gpe-edit | [] [] [] [] [] | 11 + gpe-go | [] | 5 + gpe-login | [] [] [] [] [] | 12 + gpe-ownerinfo | [] [] [] [] | 12 + gpe-sketchbook | [] [] [] | 9 + gpe-su | [] [] [] | 9 + gpe-taskmanager | [] [] [] | 9 + gpe-timesheet | [] [] [] [] | 11 + gpe-today | [] [] [] [] [] | 12 + gpe-todo | [] [] [] [] [] | 12 + gphoto2 | [] [] [] | 11 + gprof | [] [] | 9 + gpsdrive | [] [] | 4 + gramadoir | | 3 + grep | [] [] [] [] [] | 26 + gretl | | 2 + gtick | [] | 5 + hello | [] [] [] [] [] | 33 + id-utils | [] [] [] | 12 + indent | [] [] [] [] [] | 21 + jpilot | [] [] [] [] [] | 9 + jtag | [] | 1 + jwhois | () () [] [] | 11 + kbd | [] [] | 11 + latrine | | 1 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | [] [] [] | 12 + libiconv | [] [] [] [] [] [] [] [] [] | 27 + lifelines | [] | 2 + lilypond | [] | 3 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] [] | 14 + m4 | [] [] [] | 15 + mailutils | [] | 4 + make | [] [] [] [] | 16 + man-db | [] | 5 + minicom | [] | 11 + mysecretdiary | [] [] | 10 + nano | [] [] [] [] [] | 17 + nano_1_0 | [] [] [] [] | 17 + opcodes | [] [] | 6 + parted | [] [] [] | 15 + ptx | [] [] [] | 22 + python | | 0 + radius | [] | 2 + recode | [] [] [] [] | 20 + screem | [] [] | 2 + scrollkeeper | [] [] [] [] | 15 + sed | [] [] [] [] [] [] | 23 + sh-utils | [] [] [] | 14 + shared-mime-info | [] [] | 4 + sharutils | [] [] [] [] [] | 17 + sketch | [] | 6 + soundtracker | [] [] | 9 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] [] | 14 + textutils | [] [] [] [] [] | 16 + tin | | 1 + tuxpaint | [] [] [] [] [] | 29 + util-linux | [] [] [] | 15 + vorbis-tools | [] | 8 + wastesedge | | 0 + wdiff | [] [] [] [] | 18 + wget | [] [] [] [] [] [] [] [] | 23 + xchat | [] [] [] [] [] | 14 + xfree86_xkb_xml | [] [] [] [] | 6 + xpad | | 4 + +-------------------------------------------+ + 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + 117 domains 58 41 16 16 78 0 53 12 1 10 21 22 1230 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1350,30 +674,32 @@ dialects. For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and distributed -as such by its maintainer. There might be an observable lag between the -mere existence a PO file and its wide availability in a distribution. - - If Jun 2014 seems to be old, you may fetch a more recent copy of this -'ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix -with full percentage details can be found at -'http://translationproject.org/extra/matrix.html'. +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If November 2003 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. -1.5 Using 'gettext' in new packages -=================================== +Using `gettext' in new packages +=============================== If you are writing a freely available program and want to -internationalize it you are welcome to use GNU 'gettext' in your -package. Of course you have to respect the GNU Lesser General Public -License which covers the use of the GNU 'gettext' library. This means -in particular that even non-free programs can use 'libintl' as a shared -library, whereas only free software can use 'libintl' as a static -library or use modified versions of 'libintl'. +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -the use of 'gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -'coordinator@translationproject.org' to make the '.pot' files available -to the translation teams. +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. + diff -Nru goffice-0.10.53/aclocal.m4 goffice-0.10.55/aclocal.m4 --- goffice-0.10.53/aclocal.m4 2022-09-17 20:37:35.000000000 +0000 +++ goffice-0.10.55/aclocal.m4 2023-02-03 01:54:18.000000000 +0000 @@ -1185,9 +1185,14 @@ ]) # _AM_PROG_TAR m4_include([m4/ax_is_release.m4]) -m4_include([m4/glib-gettext.m4]) +m4_include([m4/gettext.m4]) m4_include([m4/gtk-doc.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/intlmacosx.m4]) m4_include([m4/intltool.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) @@ -1195,3 +1200,5 @@ m4_include([m4/lt~obsolete.m4]) m4_include([m4/nls.m4]) m4_include([m4/pkg.m4]) +m4_include([m4/po.m4]) +m4_include([m4/progtest.m4]) diff -Nru goffice-0.10.53/ChangeLog goffice-0.10.55/ChangeLog --- goffice-0.10.53/ChangeLog 2022-09-17 15:59:02.000000000 +0000 +++ goffice-0.10.55/ChangeLog 2023-02-03 02:17:43.000000000 +0000 @@ -1,3 +1,42 @@ +2023-02-02 Morten Welinder + + * Release 0.10.55 + +2023-01-23 Morten Welinder + + * configure.ac: Post-release bump. + +2023-01-19 Morten Welinder + + * Release 0.10.54 + +2023-01-18 Morten Welinder + + * goffice/canvas/goc-item.c (goc_item_bounds_changed): Don't + invalidate twice. + + * goffice/utils/go-format.c (go_format_execute): Avoid integer + overflow when dealing with denominators. + +2022-12-28 Morten Welinder + + * goffice/math/go-accumulator.c (go_accumulator_add): Catch + non-finite numbers early. + +2022-11-29 Morten Welinder + + * goffice/graph/gog-series.c (role_series_labels_can_add): Allow + multiple data labels. See #64. + +2022-10-22 Morten Welinder + + * goffice/math/go-math.c (go_pow10l): Make the table cover the + full range of long double. + +2022-09-17 Morten Welinder + + * configure.ac: Post-release bump. + 2022-09-17 Morten Welinder * Release 0.10.53 diff -Nru goffice-0.10.53/config.rpath goffice-0.10.55/config.rpath --- goffice-0.10.53/config.rpath 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/config.rpath 2023-01-23 17:49:32.000000000 +0000 @@ -0,0 +1,548 @@ +#! /bin/sh +# Output a system dependent set of variables, describing how to set the +# run time search path of shared libraries in an executable. +# +# Copyright 1996-2003 Free Software Foundation, Inc. +# Taken from GNU libtool, 2001 +# Originally by Gordon Matzigkeit , 1996 +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld +# should be set by the caller. +# +# The set of defined variables is at the end of this script. + +# Known limitations: +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +# than 256 bytes, otherwise the compiler driver will dump core. The only +# known workaround is to choose shorter directory names for the build +# directory and/or the installation directory. + +# All known linkers require a `.a' archive for static linking (except M$VC, +# which needs '.lib'). +libext=a +shrext=.so + +host="$1" +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. + +wl= +if test "$GCC" = yes; then + wl='-Wl,' +else + case "$host_os" in + aix*) + wl='-Wl,' + ;; + mingw* | pw32* | os2*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' + ;; + irix5* | irix6* | nonstopux*) + wl='-Wl,' + ;; + newsos6) + ;; + linux*) + case $CC in + icc|ecc) + wl='-Wl,' + ;; + ccc) + wl='-Wl,' + ;; + esac + ;; + osf3* | osf4* | osf5*) + wl='-Wl,' + ;; + sco3.2v5*) + ;; + solaris*) + wl='-Wl,' + ;; + sunos4*) + wl='-Qoption ld ' + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + wl='-Wl,' + ;; + sysv4*MP*) + ;; + uts4*) + ;; + esac +fi + +# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. + +hardcode_libdir_flag_spec= +hardcode_libdir_separator= +hardcode_direct=no +hardcode_minus_L=no + +case "$host_os" in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + openbsd*) + with_gnu_ld=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes; then + case "$host_os" in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + fi + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can use + # them. + ld_shlibs=no + ;; + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) + ;; + solaris* | sysv5*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + sunos4*) + hardcode_direct=yes + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = yes; then + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + fi +else + case "$host_os" in + aix3*) + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + else + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + fi + hardcode_direct=yes + hardcode_libdir_separator=':' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + fi + # Begin _LT_AC_SYS_LIBPATH_AIX. + echo 'int main () { return 0; }' > conftest.c + ${CC} ${LDFLAGS} conftest.c -o conftest + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + fi + if test -z "$aix_libpath"; then + aix_libpath="/usr/lib:/lib" + fi + rm -f conftest.c conftest + # End _LT_AC_SYS_LIBPATH_AIX. + if test "$aix_use_runtimelinking" = yes; then + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + else + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + fi + fi + ;; + amigaos*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; + bsdi4*) + ;; + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + libext=lib + ;; + darwin* | rhapsody*) + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + hardcode_direct=no + fi + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + freebsd1*) + ld_shlibs=no + ;; + freebsd2.2*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + freebsd2*) + hardcode_direct=yes + hardcode_minus_L=yes + ;; + freebsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + hpux9*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + hpux10* | hpux11*) + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=no + ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + netbsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + newsos6) + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + openbsd*) + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + osf3*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + osf4* | osf5*) + if test "$GCC" = yes; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + # Both cc and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + sco3.2v5*) + ;; + solaris*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + sunos4*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + ;; + sysv4) + case $host_vendor in + sni) + hardcode_direct=yes # is this really true??? + ;; + siemens) + hardcode_direct=no + ;; + motorola) + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + ;; + sysv4.3*) + ;; + sysv4*MP*) + if test -d /usr/nec; then + ld_shlibs=yes + fi + ;; + sysv4.2uw2*) + hardcode_direct=yes + hardcode_minus_L=no + ;; + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + ;; + sysv5*) + hardcode_libdir_flag_spec= + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + *) + ld_shlibs=no + ;; + esac +fi + +# Check dynamic linker characteristics +# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +libname_spec='lib$name' +case "$host_os" in + aix3*) + ;; + aix4* | aix5*) + ;; + amigaos*) + ;; + beos*) + ;; + bsdi4*) + ;; + cygwin* | mingw* | pw32*) + shrext=.dll + ;; + darwin* | rhapsody*) + shrext=.dylib + ;; + dgux*) + ;; + freebsd1*) + ;; + freebsd*) + ;; + gnu*) + ;; + hpux9* | hpux10* | hpux11*) + case "$host_cpu" in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac + ;; + irix5* | irix6* | nonstopux*) + case "$host_os" in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; + *) libsuff= shlibsuff= ;; + esac + ;; + esac + ;; + linux*oldld* | linux*aout* | linux*coff*) + ;; + linux*) + ;; + netbsd*) + ;; + newsos6) + ;; + nto-qnx) + ;; + openbsd*) + ;; + os2*) + libname_spec='$name' + shrext=.dll + ;; + osf3* | osf4* | osf5*) + ;; + sco3.2v5*) + ;; + solaris*) + ;; + sunos4*) + ;; + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + ;; + sysv4*MP*) + ;; + uts4*) + ;; +esac + +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` + +sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. # @@ -183,7 +183,6 @@ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -191,7 +190,8 @@ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='goffice' PACKAGE_TARNAME='goffice' -PACKAGE_VERSION='0.10.53' -PACKAGE_STRING='goffice 0.10.53' +PACKAGE_VERSION='0.10.55' +PACKAGE_STRING='goffice 0.10.55' PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/goffice/issues' PACKAGE_URL='' @@ -659,6 +659,7 @@ #endif" ac_header_c_list= +gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -707,19 +708,19 @@ PERL GDK_PIXBUF_CSOURCE GLIB_GENMARSHAL -MKINSTALLDIRS POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE +LTLIBINTL +LIBINTL INTLLIBS -INSTOBJEXT -GMOFILES -DATADIRNAME -CATOBJEXT -CATALOGS -MSGFMT_OPTS +LTLIBICONV +LIBICONV INTL_MACOSX_LIBS +CPP +XGETTEXT_EXTRA_OPTIONS +XGETTEXT_015 +GMSGFMT_015 +MSGFMT_015 +GETTEXT_MACRO_VERSION GETTEXT_PACKAGE GOFFICE_PLUGIN_LIBADD GOFFICE_PLUGIN_LDFLAGS @@ -772,10 +773,10 @@ DUMPBIN LD FGREP -SED -LIBTOOL EGREP GREP +SED +LIBTOOL LN_S am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -932,6 +933,9 @@ with_lasem with_config_backend with_gtk +enable_rpath +with_libiconv_prefix +with_libintl_prefix with_long_double enable_introspection with_gir_dir @@ -967,6 +971,7 @@ GTK_LIBS GOFFICE_CFLAGS GOFFICE_LIBS +CPP GLIB_GENMARSHAL GDK_PIXBUF_CSOURCE PERL @@ -1520,7 +1525,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures goffice 0.10.53 to adapt to many kinds of systems. +\`configure' configures goffice 0.10.55 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1596,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of goffice 0.10.53:";; + short | recursive ) echo "Configuration of goffice 0.10.55:";; esac cat <<\_ACEOF @@ -1615,6 +1620,7 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --disable-rpath do not hardcode runtime library paths --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-gtk-doc use gtk-doc to build documentation [[default=no]] @@ -1636,6 +1642,11 @@ Build with lasem use (default=auto) --with-config-backend=gsettings|keyfile|win32 Choose the config backend --without-gtk Build without UI + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir --without-long-double disable support for long double --with-gir-dir path to gir repository (automatically detected via pkg-config) @@ -1681,6 +1692,7 @@ C compiler flags for GOFFICE, overriding pkg-config GOFFICE_LIBS linker flags for GOFFICE, overriding pkg-config + CPP C preprocessor GLIB_GENMARSHAL The glib-genmarshal executable. GDK_PIXBUF_CSOURCE @@ -1758,7 +1770,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -goffice configure 0.10.53 +goffice configure 0.10.55 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1996,6 +2008,44 @@ } # ac_fn_c_try_run +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR # ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR @@ -2071,7 +2121,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by goffice $as_me 0.10.53, which was +It was created by goffice $as_me 0.10.55, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2659,9 +2709,10 @@ as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +gt_needs="$gt_needs " # Auxiliary files required by this configure script. -ac_aux_files="ltmain.sh compile config.guess config.sub missing install-sh" +ac_aux_files="config.rpath ltmain.sh compile config.guess config.sub missing install-sh" # Locations in which to look for auxiliary files. ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." @@ -3342,7 +3393,7 @@ # Define the identity of the package. PACKAGE='goffice' - VERSION='0.10.53' + VERSION='0.10.55' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3448,7 +3499,7 @@ -VERSION_INFO=10:53:0 +VERSION_INFO=10:55:0 VERSION_IFACE=10 @@ -5460,65 +5511,6 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -printf %s "checking for library containing strerror... " >&6; } -if test ${ac_cv_search_strerror+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char strerror (); -int -main (void) -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix -do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO" -then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext - if test ${ac_cv_search_strerror+y} -then : - break -fi -done -if test ${ac_cv_search_strerror+y} -then : - -else $as_nop - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -printf "%s\n" "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no -then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6440,7 +6432,6 @@ fi - if test "$ac_cv_prog_cc_c99" = no; then as_fn_error $? "*** c99 is required" "$LINENO" 5 fi @@ -6455,179 +6446,6 @@ printf "%s\n" "no, using $LN_S" >&6; } fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -# Autoupdate added the next two lines to ensure that your configure -# script's behavior did not change. They are probably safe to remove. - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - # Check whether --enable-largefile was given. @@ -7020,17 +6838,14 @@ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -printf %s "checking for fgrep... " >&6; } -if test ${ac_cv_path_FGREP+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} then : printf %s "(cached) " >&6 else $as_nop - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false + if test -z "$GREP"; then + ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin @@ -7041,7 +6856,152 @@ */) ;; *) as_dir=$as_dir/ ;; esac - for ac_prog in fgrep + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" @@ -10273,6 +10233,35 @@ esac } +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -15954,790 +15943,2086 @@ printf "%s\n" "#define GETTEXT_PACKAGE \"$GETTEXT_PACKAGE\"" >>confdefs.h - ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes -then : - printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h - -fi - if test $ac_cv_header_locale_h = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -printf %s "checking for LC_MESSAGES... " >&6; } -if test ${am_cv_val_LC_MESSAGES+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - am_cv_val_LC_MESSAGES=yes -else $as_nop - am_cv_val_LC_MESSAGES=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -printf "%s\n" "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then -printf "%s\n" "#define HAVE_LC_MESSAGES 1" >>confdefs.h + GETTEXT_MACRO_VERSION=0.19 - fi - fi - USE_NLS=yes - gt_cv_have_gettext=no - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -printf %s "checking for CFPreferencesCopyAppValue... " >&6; } -if test ${gt_cv_func_CFPreferencesCopyAppValue+y} +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} then : printf %s "(cached) " >&6 else $as_nop - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - gt_cv_func_CFPreferencesCopyAppValue=yes -else $as_nop - gt_cv_func_CFPreferencesCopyAppValue=no + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 -printf %s "checking for CFLocaleCopyCurrent... " >&6; } -if test ${gt_cv_func_CFLocaleCopyCurrent+y} +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + + case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; + *) MSGFMT_015=$MSGFMT ;; + esac + + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; + *) GMSGFMT_015=$GMSGFMT ;; + esac + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} then : printf %s "(cached) " >&6 else $as_nop - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -CFLocaleCopyCurrent(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + rm -f messages.po + + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; + *) XGETTEXT_015=$XGETTEXT ;; + esac + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} then : - gt_cv_func_CFLocaleCopyCurrent=yes + printf %s "(cached) " >&6 else $as_nop - gt_cv_func_CFLocaleCopyCurrent=no + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; } - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + test -n "$localedir" || localedir='${datadir}/locale' + + + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + + ac_config_commands="$ac_config_commands po-directories" + + + + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" + + + +# Check whether --with-gnu-ld was given. +if test ${with_gnu_ld+y} +then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else $as_nop + with_gnu_ld=no +fi + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } +fi +if test ${acl_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$LD"; then + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 &5 +printf "%s\n" "$LD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${acl_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$acl_cv_prog_gnu_ld - ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +printf %s "checking for shared library run path origin... " >&6; } +if test ${acl_cv_rpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +printf "%s\n" "$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath was given. +if test ${enable_rpath+y} then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + enableval=$enable_rpath; : +else $as_nop + enable_rpath=yes +fi - # - # First check in libc - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -printf %s "checking for ngettext in libc... " >&6; } -if test ${gt_cv_func_ngettext_libc+y} + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} then : printf %s "(cached) " >&6 else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : -#include +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext -int -main (void) -{ -return !ngettext ("","", 1) - ; - return 0; -} + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok then : - gt_cv_func_ngettext_libc=yes + else $as_nop - gt_cv_func_ngettext_libc=no + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 -printf "%s\n" "$gt_cv_func_ngettext_libc" >&6; } +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -printf %s "checking for dgettext in libc... " >&6; } -if test ${gt_cv_func_dgettext_libc+y} + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +printf %s "checking for 64-bit host... " >&6; } +if test ${gl_cv_solaris_64bit+y} then : printf %s "(cached) " >&6 else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#ifdef _LP64 +sixtyfour bits +#endif -int -main (void) -{ -return !dgettext ("","") - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1 then : - gt_cv_func_dgettext_libc=yes + gl_cv_solaris_64bit=yes else $as_nop - gt_cv_func_dgettext_libc=no + gl_cv_solaris_64bit=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext +rm -rf conftest* + fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -printf "%s\n" "$gt_cv_func_dgettext_libc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +printf "%s\n" "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes + + + + + + + + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libiconv-prefix was given. +if test ${with_libiconv_prefix+y} then : - printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi fi + LIBICONV= + LTLIBICONV= + INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi + + + - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -printf %s "checking for bindtextdomain in -lintl... " >&6; } -if test ${ac_cv_lib_intl_bindtextdomain+y} + + + + + + + + + + + + + + + + + + + + + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +printf %s "checking for CFPreferencesCopyAppValue... " >&6; } +if test ${gt_cv_func_CFPreferencesCopyAppValue+y} then : printf %s "(cached) " >&6 else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char bindtextdomain (); +#include int main (void) { -return bindtextdomain (); +CFPreferencesCopyAppValue(NULL, NULL) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_intl_bindtextdomain=yes + gt_cv_func_CFPreferencesCopyAppValue=yes else $as_nop - ac_cv_lib_intl_bindtextdomain=no + gt_cv_func_CFPreferencesCopyAppValue=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -printf "%s\n" "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -printf %s "checking for ngettext in -lintl... " >&6; } -if test ${ac_cv_lib_intl_ngettext+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +printf %s "checking for CFLocaleCopyCurrent... " >&6; } +if test ${gt_cv_func_CFLocaleCopyCurrent+y} then : printf %s "(cached) " >&6 else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char ngettext (); +#include int main (void) { -return ngettext (); +CFLocaleCopyCurrent(); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_intl_ngettext=yes + gt_cv_func_CFLocaleCopyCurrent=yes else $as_nop - ac_cv_lib_intl_ngettext=no + gt_cv_func_CFLocaleCopyCurrent=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS="$gt_save_LIBS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -printf "%s\n" "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -printf %s "checking for dgettext in -lintl... " >&6; } -if test ${ac_cv_lib_intl_dgettext+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +printf %s "checking for GNU gettext in libc... " >&6; } +if eval test \${$gt_func_gnugettext_libc+y} then : printf %s "(cached) " >&6 else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dgettext (); +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + int main (void) { -return dgettext (); + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_intl_dgettext=yes + eval "$gt_func_gnugettext_libc=yes" else $as_nop - ac_cv_lib_intl_dgettext=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 -printf "%s\n" "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes -then : - gt_cv_func_dgettext_libintl=yes fi +eval ac_res=\$$gt_func_gnugettext_libc + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } -fi + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -fi - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 -printf %s "checking if -liconv is needed to use gettext... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 -printf "%s\n" "" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -printf %s "checking for ngettext in -lintl... " >&6; } -if test ${ac_cv_lib_intl_ngettext+y} + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +printf %s "checking for iconv... " >&6; } +if test ${am_cv_func_iconv+y} then : printf %s "(cached) " >&6 else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char ngettext (); + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include int main (void) { -return ngettext (); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_intl_ngettext=yes -else $as_nop - ac_cv_lib_intl_ngettext=no + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -printf "%s\n" "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -printf %s "checking for dcgettext in -lintl... " >&6; } -if test ${ac_cv_lib_intl_dcgettext+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char dcgettext (); +#include +#include int main (void) { -return dcgettext (); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_intl_dcgettext=yes -else $as_nop - ac_cv_lib_intl_dcgettext=no + am_cv_lib_iconv=yes + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 -printf "%s\n" "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes -then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -else $as_nop - : -fi + LIBS="$am_save_LIBS" + fi -else $as_nop - : fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +printf "%s\n" "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + +printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h - fi + fi + if test "$am_cv_lib_iconv" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +printf %s "checking how to link with libiconv... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +printf "%s\n" "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes -then : - printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h -fi - LIBS="$glib_save_LIBS" - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - if test "$gt_cv_have_gettext" = "yes"; then -printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_MSGFMT+y} + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test ${with_libintl_prefix+y} then : - printf %s "(cached) " >&6 -else $as_nop - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -printf "%s\n" "$MSGFMT" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes -then : - printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h fi - MSGFMT_OPTS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 -printf %s "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF - -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" + LIBINTL= + LTLIBINTL= + INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi -_ACEOF -if { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -echo "$as_me: failed input was:" >&5 -sed 's/^/| /' conftest.foo >&5 -fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_GMSGFMT+y} + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +printf %s "checking for GNU gettext in libintl... " >&6; } +if eval test \${$gt_func_gnugettext_libintl+y} then : printf %s "(cached) " >&6 else $as_nop - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -printf "%s\n" "$GMSGFMT" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main (void) +{ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_XGETTEXT+y} + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" then : - printf %s "(cached) " >&6 + eval "$gt_func_gnugettext_libintl=yes" else $as_nop - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -printf "%s\n" "$XGETTEXT" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + eval "$gt_func_gnugettext_libintl=no" fi - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + int main (void) { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - CATOBJEXT=.gmo - DATADIRNAME=share -else $as_nop - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes -then : - CATOBJEXT=.gmo - DATADIRNAME=share -else $as_nop - CATOBJEXT=.mo - DATADIRNAME=lib -fi + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" fi +eval ac_res=\$$gt_func_gnugettext_libintl + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + fi + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi - if test "$gt_cv_have_gettext" = "yes" ; then + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h + else + USE_NLS=no fi + fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +printf %s "checking whether to use NLS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +printf %s "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -printf "%s\n" "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" + gt_source="libc" fi + else + gt_source="included intl directory" fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +printf "%s\n" "$gt_source" >&6; } + fi - # We need to process the po/ directory. - POSUB=po - - ac_config_commands="$ac_config_commands default-1" + if test "$USE_NLS" = "yes"; then + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +printf %s "checking how to link with libintl... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +printf "%s\n" "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" + if test "X$x" = "X$element"; then + haveit=yes + break + fi done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + fi +printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h + fi + POSUB=po + fi + INTLLIBS="$LIBINTL" - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -printf %s "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -printf "%s\n" "$LINGUAS" >&6; } - fi - - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES @@ -17928,7 +19213,7 @@ goffice_icondir='${datadir}/pixmaps/goffice/${VERSION}' -goffice_localedir='${prefix}/${DATADIRNAME}/locale' +goffice_localedir='${localedir}' goffice_plugindir='${goffice_libdir}/plugins' @@ -17936,7 +19221,7 @@ -printf "%s\n" "#define GOFFICE_VERSION \"0.10.53\"" >>confdefs.h +printf "%s\n" "#define GOFFICE_VERSION \"0.10.55\"" >>confdefs.h printf "%s\n" "#define GO_VERSION_EPOCH 0" >>confdefs.h @@ -17945,7 +19230,7 @@ printf "%s\n" "#define GO_VERSION_MAJOR 10" >>confdefs.h -printf "%s\n" "#define GO_VERSION_MINOR 53" >>confdefs.h +printf "%s\n" "#define GO_VERSION_MINOR 55" >>confdefs.h printf "%s\n" "#define GO_VERSION_EXTRA \"\"" >>confdefs.h @@ -18942,7 +20227,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by goffice $as_me 0.10.53, which was +This file was extended by goffice $as_me 0.10.55, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19010,7 +20295,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -goffice config.status 0.10.53 +goffice config.status 0.10.55 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -19413,6 +20698,12 @@ +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it + # from automake < 1.5. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" _ACEOF @@ -19427,7 +20718,7 @@ "goffice/goffice-features.h") CONFIG_HEADERS="$CONFIG_HEADERS goffice/goffice-features.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libgoffice.pc") CONFIG_FILES="$CONFIG_FILES libgoffice.pc" ;; "goffice/Makefile") CONFIG_FILES="$CONFIG_FILES goffice/Makefile" ;; @@ -20684,9 +21975,120 @@ chmod +x "$ofile" ;; - "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac ;; + "po-directories":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 diff -Nru goffice-0.10.53/configure.ac goffice-0.10.55/configure.ac --- goffice-0.10.53/configure.ac 2022-04-19 00:49:33.000000000 +0000 +++ goffice-0.10.55/configure.ac 2023-02-03 01:53:50.000000000 +0000 @@ -1,13 +1,13 @@ >-*- mode: m4 -*- dnl We require Automake 1.7.2, which requires Autoconf 2.54. dnl (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.) -AC_PREREQ(2.54) +AC_PREREQ([2.54]) AC_CONFIG_MACRO_DIR([m4]) AX_IS_RELEASE([git-directory]) m4_define([goffice_version_epoch], [0]) m4_define([goffice_version_major], [10]) -m4_define([goffice_version_minor], [53]) +m4_define([goffice_version_minor], [55]) m4_define([goffice_version_extra], []) m4_define([goffice_full_version], [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra]) @@ -16,8 +16,7 @@ m4_define([BIG_CHECKING], [AC_MSG_CHECKING([ ======== $1])]) -AC_INIT([goffice], [goffice_full_version], - [https://gitlab.gnome.org/GNOME/goffice/issues]) +AC_INIT([goffice],[goffice_full_version],[https://gitlab.gnome.org/GNOME/goffice/issues]) AC_CONFIG_SRCDIR(goffice/goffice.h) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -84,14 +83,13 @@ dnl We use $host_os: AC_CANONICAL_HOST -AC_ISC_POSIX -AC_PROG_CC AC_PROG_CC_C99 +AC_PROG_CC if test "$ac_cv_prog_cc_c99" = no; then AC_MSG_ERROR([*** c99 is required]) fi AC_PROG_LN_S -AC_HEADER_STDC + AC_SYS_LARGEFILE LT_PREREQ([2.2.6]) @@ -400,7 +398,8 @@ AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The package name, for gettext]) -AM_GLIB_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.13]) +AM_GNU_GETTEXT([external]) dnl **************************** dnl prep the pixmap generator @@ -776,7 +775,7 @@ AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') -AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') +AC_SUBST(goffice_localedir, '${localedir}') dnl AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') AC_SUBST(goffice_externplugindir, '${libdir}/goffice/${GOFFICE_API_VER}/plugins') diff -Nru goffice-0.10.53/debian/changelog goffice-0.10.55/debian/changelog --- goffice-0.10.53/debian/changelog 2022-09-21 08:25:57.000000000 +0000 +++ goffice-0.10.55/debian/changelog 2023-02-06 08:48:01.000000000 +0000 @@ -1,3 +1,10 @@ +goffice (0.10.55-1) unstable; urgency=medium + + * New upstream release. + * Standards-Version: 4.6.2. + + -- Dmitry Smirnov Mon, 06 Feb 2023 19:48:01 +1100 + goffice (0.10.53-1) unstable; urgency=medium * New upstream release. diff -Nru goffice-0.10.53/debian/control goffice-0.10.55/debian/control --- goffice-0.10.53/debian/control 2022-03-30 09:50:40.000000000 +0000 +++ goffice-0.10.55/debian/control 2023-02-06 08:45:08.000000000 +0000 @@ -1,7 +1,7 @@ Source: goffice Section: libs Priority: optional -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Maintainer: Dmitry Smirnov Build-Depends: debhelper-compat (= 12) ,dpkg-dev (>= 1.16.1.1) ,gobject-introspection (>= 1.41.4) diff -Nru goffice-0.10.53/debian/copyright goffice-0.10.55/debian/copyright --- goffice-0.10.53/debian/copyright 2022-04-27 05:14:09.000000000 +0000 +++ goffice-0.10.55/debian/copyright 2023-02-06 08:48:01.000000000 +0000 @@ -179,7 +179,7 @@ Files: debian/* Copyright: - 2013-2022 Dmitry Smirnov + 2013-2023 Dmitry Smirnov 2005-2013 J.H.M. Dassen (Ray) License: GPL-2+ diff -Nru goffice-0.10.53/debian/patches/no-nested-externs-error.patch goffice-0.10.55/debian/patches/no-nested-externs-error.patch --- goffice-0.10.53/debian/patches/no-nested-externs-error.patch 2020-09-30 23:29:35.000000000 +0000 +++ goffice-0.10.55/debian/patches/no-nested-externs-error.patch 2023-02-06 08:48:01.000000000 +0000 @@ -7,7 +7,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -435,9 +435,9 @@ +@@ -434,9 +434,9 @@ -Wsign-compare -Werror=pointer-arith \ -Wchar-subscripts -Wwrite-strings \ -Wdeclaration-after-statement -Wnested-externs \ diff -Nru goffice-0.10.53/debian/source/lintian-overrides goffice-0.10.55/debian/source/lintian-overrides --- goffice-0.10.53/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/debian/source/lintian-overrides 2023-02-06 08:48:01.000000000 +0000 @@ -0,0 +1,3 @@ +## False-positives: +source-is-missing [docs/reference/html/GOPersist.html] +source-is-missing [docs/reference/html/GOStyledObject.html] diff -Nru goffice-0.10.53/docs/Makefile.in goffice-0.10.55/docs/Makefile.in --- goffice-0.10.53/docs/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/docs/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -90,16 +90,19 @@ subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -157,7 +160,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -194,16 +197,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -220,11 +221,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -248,7 +250,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -270,11 +271,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -283,9 +288,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -305,10 +309,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -322,6 +323,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/docs/reference/html/index.html goffice-0.10.55/docs/reference/html/index.html --- goffice-0.10.53/docs/reference/html/index.html 2022-09-17 20:37:47.000000000 +0000 +++ goffice-0.10.55/docs/reference/html/index.html 2023-02-03 02:18:56.000000000 +0000 @@ -14,7 +14,7 @@
-

For goffice 0.10.53 +

For goffice 0.10.55

diff -Nru goffice-0.10.53/docs/reference/Makefile.in goffice-0.10.55/docs/reference/Makefile.in --- goffice-0.10.53/docs/reference/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/docs/reference/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -115,16 +115,19 @@ subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = version.xml @@ -150,7 +153,7 @@ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \ - $(top_srcdir)/gtk-doc.make TODO + $(top_srcdir)/gtk-doc.make $(top_srcdir)/mkinstalldirs TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -162,16 +165,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -188,11 +189,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -216,7 +218,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -238,11 +239,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -251,9 +256,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -273,10 +277,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -290,6 +291,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/goffice/canvas/goc-item.c goffice-0.10.55/goffice/canvas/goc-item.c --- goffice-0.10.53/goffice/canvas/goc-item.c 2022-02-22 00:20:04.000000000 +0000 +++ goffice-0.10.55/goffice/canvas/goc-item.c 2023-02-03 01:53:50.000000000 +0000 @@ -598,6 +598,7 @@ cur->cached_bounds = FALSE; cur = GOC_ITEM (cur->parent); } while (cur); + return; } goc_item_invalidate (item); } diff -Nru goffice-0.10.53/goffice/goffice-config.h.in goffice-0.10.55/goffice/goffice-config.h.in --- goffice-0.10.53/goffice/goffice-config.h.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/goffice/goffice-config.h.in 2023-02-03 01:54:19.000000000 +0000 @@ -1,6 +1,7 @@ /* goffice/goffice-config.h.in. Generated from configure.ac by autoheader. */ -/* always defined to indicate that i18n is enabled */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ #undef ENABLE_NLS /* Using GDK Quartz (not X11) */ @@ -75,9 +76,6 @@ /* Defined if app is GtkOSXApplication */ #undef GTKOSXAPPLICATION -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT @@ -86,7 +84,8 @@ the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE -/* Define to 1 if you have the `dcgettext' function. */ +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ #undef HAVE_DCGETTEXT /* Define to 1 if you have the `decimal_to_quadruple' function. */ @@ -127,6 +126,9 @@ function. */ #undef HAVE_G_FILE_INFO_GET_MODIFICATION_DATE_TIME +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + /* Define to 1 if you have the header file. */ #undef HAVE_IEEE754_H @@ -142,18 +144,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Define to 1 if you have the `intl' library (-lintl). */ #undef HAVE_LIBINTL /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define if the log function is available */ #undef HAVE_LOG diff -Nru goffice-0.10.53/goffice/goffice-features.h goffice-0.10.55/goffice/goffice-features.h --- goffice-0.10.53/goffice/goffice-features.h 2022-07-06 19:35:26.000000000 +0000 +++ goffice-0.10.55/goffice/goffice-features.h 2023-02-03 01:54:25.000000000 +0000 @@ -35,7 +35,7 @@ /* #undef GOFFICE_SUPPLIED_STRTOLD */ /* The version number of this release, possibly with additional suffix */ -#define GOFFICE_VERSION "0.10.53" +#define GOFFICE_VERSION "0.10.55" /* The Epoch of this release */ #define GO_VERSION_EPOCH 0 @@ -44,7 +44,7 @@ #define GO_VERSION_MAJOR 10 /* The Minor version number of this release */ -#define GO_VERSION_MINOR 53 +#define GO_VERSION_MINOR 55 /* Extra, possibly empty tag for this release */ #define GO_VERSION_EXTRA "" diff -Nru goffice-0.10.53/goffice/graph/gog-series.c goffice-0.10.55/goffice/graph/gog-series.c --- goffice-0.10.53/goffice/graph/gog-series.c 2022-02-21 23:18:28.000000000 +0000 +++ goffice-0.10.55/goffice/graph/gog-series.c 2023-02-03 01:53:50.000000000 +0000 @@ -376,7 +376,7 @@ { GogSeries *series = GOG_SERIES (parent); - return (series->allowed_pos != 0 && gog_object_get_child_by_name (parent, "Data labels") == NULL); + return (series->allowed_pos != 0); } static void diff -Nru goffice-0.10.53/goffice/Makefile.in goffice-0.10.55/goffice/Makefile.in --- goffice-0.10.53/goffice/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/goffice/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -125,12 +125,15 @@ subdir = goffice ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(app_HEADERS) $(canvas_HEADERS) \ @@ -138,7 +141,7 @@ $(graph_gtk_HEADERS) $(graph_lasem_HEADERS) $(gtk_HEADERS) \ $(libgoffice_@GOFFICE_API_VER@_la_HEADERS) $(math_HEADERS) \ $(noinst_HEADERS) $(utils_HEADERS) $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = goffice-config.h goffice-features.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -502,7 +505,7 @@ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/goffice-config.h.in \ $(srcdir)/goffice-features.h.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice.mk + $(top_srcdir)/goffice.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -514,16 +517,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -540,11 +541,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -568,7 +570,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -590,11 +591,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -603,9 +608,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -625,10 +629,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -642,6 +643,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/goffice/math/go-accumulator.c goffice-0.10.55/goffice/math/go-accumulator.c --- goffice-0.10.53/goffice/math/go-accumulator.c 2014-09-21 22:03:01.000000000 +0000 +++ goffice-0.10.55/goffice/math/go-accumulator.c 2023-02-03 01:53:50.000000000 +0000 @@ -149,6 +149,11 @@ y = t; } hi = x + y; + if (!SUFFIX(go_finite)(hi)) { + x = hi; + ui = 0; + break; + } lo = y - (hi - x); if (lo != 0) { g_array_index (acc->partials, DOUBLE, ui) = lo; diff -Nru goffice-0.10.53/goffice/math/go-math.c goffice-0.10.55/goffice/math/go-math.c --- goffice-0.10.53/goffice/math/go-math.c 2022-02-20 16:40:27.000000000 +0000 +++ goffice-0.10.55/goffice/math/go-math.c 2023-02-03 01:53:50.000000000 +0000 @@ -354,6 +354,9 @@ return ldexp (1.0, n); } +#define TEN(n) ONE(n ## 0),ONE(n ## 1),ONE(n ## 2),ONE(n ## 3),ONE(n ## 4),ONE(n ## 5),ONE(n ## 6),ONE(n ## 7),ONE(n ## 8),ONE(n ## 9) +#define HUNDRED(n) TEN(n ## 0),TEN(n ## 1),TEN(n ## 2),TEN(n ## 3),TEN(n ## 4),TEN(n ## 5),TEN(n ## 6),TEN(n ## 7),TEN(n ## 8),TEN(n ## 9) + double go_pow10 (int n) { @@ -362,26 +365,24 @@ // range. We do not want to depend on the accuracy of pow(10,n) // because it is known not to be what it should be. -#define TEN(n) ONE(n ## 0),ONE(n ## 1),ONE(n ## 2),ONE(n ## 3),ONE(n ## 4),ONE(n ## 5),ONE(n ## 6),ONE(n ## 7),ONE(n ## 8),ONE(n ## 9) static const double pos[] = { #define ONE(n) 1e+0 ## n - TEN(00), TEN(01), TEN(02), TEN(03), TEN(04), TEN(05), TEN(06), TEN(07), TEN(08), TEN(09), - TEN(10), TEN(11), TEN(12), TEN(13), TEN(14), TEN(15), TEN(16), TEN(17), TEN(18), TEN(19), - TEN(20), TEN(21), TEN(22), TEN(23), TEN(24), TEN(25), TEN(26), TEN(27), TEN(28), TEN(29) + HUNDRED(0), HUNDRED(1), HUNDRED(2), + 1e+300, 1e+301, 1e+302, 1e+303, 1e+304, 1e+305, + 1e+306, 1e+307, 1e+308 #undef ONE }; static const double neg[] = { #define ONE(n) 1e-0 ## n - TEN(00), TEN(01), TEN(02), TEN(03), TEN(04), TEN(05), TEN(06), TEN(07), TEN(08), TEN(09), - TEN(10), TEN(11), TEN(12), TEN(13), TEN(14), TEN(15), TEN(16), TEN(17), TEN(18), TEN(19), - TEN(20), TEN(21), TEN(22), TEN(23), TEN(24), TEN(25), TEN(26), TEN(27), TEN(28), TEN(29) + HUNDRED(0), HUNDRED(1), HUNDRED(2), + TEN(30), TEN(31), + 1e-320, 1e-321, 1e-322, 1e-323 #undef ONE }; -#undef TEN if (n >= 0 && n < (int)G_N_ELEMENTS(pos)) return pos[n]; - if (n < 0 && -n < (int)G_N_ELEMENTS(neg)) + if (n < 0 && (size_t)-n < G_N_ELEMENTS(neg)) return neg[-n]; return pow (10.0, n); @@ -609,36 +610,54 @@ long double go_pow10l (int n) { - // On the assumption that the compiler's handling of long double constants - // is correct, make a large table covering more or less the whole - // range of double (not long double -- that's much bigger). + // On the assumption that the compiler's handling of long double + // constants is correct, make a large table covering more or less + // the whole range of long double. // We do not want to depend on the accuracy of powl(10,n) // because it is known not to be what it should be. -#define TEN(n) ONE(n ## 0),ONE(n ## 1),ONE(n ## 2),ONE(n ## 3),ONE(n ## 4),ONE(n ## 5),ONE(n ## 6),ONE(n ## 7),ONE(n ## 8),ONE(n ## 9) static const long double pos[] = { -#define ONE(n) 1e+0 ## n ## L - TEN(00), TEN(01), TEN(02), TEN(03), TEN(04), TEN(05), TEN(06), TEN(07), TEN(08), TEN(09), - TEN(10), TEN(11), TEN(12), TEN(13), TEN(14), TEN(15), TEN(16), TEN(17), TEN(18), TEN(19), - TEN(20), TEN(21), TEN(22), TEN(23), TEN(24), TEN(25), TEN(26), TEN(27), TEN(28), TEN(29) +#define ONE(n) 1E+0 ## n ## L + HUNDRED(0), HUNDRED(1), HUNDRED(2), HUNDRED(3), HUNDRED(4), + HUNDRED(5), HUNDRED(6), HUNDRED(7), HUNDRED(8), HUNDRED(9), + HUNDRED(10), HUNDRED(11), HUNDRED(12), HUNDRED(13), HUNDRED(14), + HUNDRED(15), HUNDRED(16), HUNDRED(17), HUNDRED(18), HUNDRED(19), + HUNDRED(20), HUNDRED(21), HUNDRED(22), HUNDRED(23), HUNDRED(24), + HUNDRED(25), HUNDRED(26), HUNDRED(27), HUNDRED(28), HUNDRED(29), + HUNDRED(30), HUNDRED(31), HUNDRED(32), HUNDRED(33), HUNDRED(34), + HUNDRED(35), HUNDRED(36), HUNDRED(37), HUNDRED(38), HUNDRED(39), + HUNDRED(40), HUNDRED(41), HUNDRED(42), HUNDRED(43), HUNDRED(44), + HUNDRED(45), HUNDRED(46), HUNDRED(47), HUNDRED(48), + TEN(490), TEN(491), TEN(492), + 1E+4930L, 1E+4931L, 1E+4932L #undef ONE }; static const long double neg[] = { -#define ONE(n) 1e-0 ## n ## L - TEN(00), TEN(01), TEN(02), TEN(03), TEN(04), TEN(05), TEN(06), TEN(07), TEN(08), TEN(09), - TEN(10), TEN(11), TEN(12), TEN(13), TEN(14), TEN(15), TEN(16), TEN(17), TEN(18), TEN(19), - TEN(20), TEN(21), TEN(22), TEN(23), TEN(24), TEN(25), TEN(26), TEN(27), TEN(28), TEN(29) +#define ONE(n) 1E-0 ## n ## L + HUNDRED(0), HUNDRED(1), HUNDRED(2), HUNDRED(3), HUNDRED(4), + HUNDRED(5), HUNDRED(6), HUNDRED(7), HUNDRED(8), HUNDRED(9), + HUNDRED(10), HUNDRED(11), HUNDRED(12), HUNDRED(13), HUNDRED(14), + HUNDRED(15), HUNDRED(16), HUNDRED(17), HUNDRED(18), HUNDRED(19), + HUNDRED(20), HUNDRED(21), HUNDRED(22), HUNDRED(23), HUNDRED(24), + HUNDRED(25), HUNDRED(26), HUNDRED(27), HUNDRED(28), HUNDRED(29), + HUNDRED(30), HUNDRED(31), HUNDRED(32), HUNDRED(33), HUNDRED(34), + HUNDRED(35), HUNDRED(36), HUNDRED(37), HUNDRED(38), HUNDRED(39), + HUNDRED(40), HUNDRED(41), HUNDRED(42), HUNDRED(43), HUNDRED(44), + HUNDRED(45), HUNDRED(46), HUNDRED(47), HUNDRED(48), + TEN(490), TEN(491), TEN(492), TEN(493), TEN(494), + 1E-4950L #undef ONE }; -#undef TEN if (n >= 0 && n < (int)G_N_ELEMENTS(pos)) return pos[n]; - if (n < 0 && -n < (int)G_N_ELEMENTS(neg)) + if (n < 0 && (size_t)-n < G_N_ELEMENTS(neg)) return neg[-n]; return powl (10.0L, n); } +#undef TEN +#undef HUNDRED long double go_powl (long double x, long double y) diff -Nru goffice-0.10.53/goffice/utils/go-format.c goffice-0.10.55/goffice/utils/go-format.c --- goffice-0.10.53/goffice/utils/go-format.c 2022-04-30 01:39:13.000000000 +0000 +++ goffice-0.10.55/goffice/utils/go-format.c 2023-02-03 01:53:50.000000000 +0000 @@ -4530,9 +4530,13 @@ fraction.digits = cnt_digits (fraction.d); fraction.n = SUFFIX(floor) (0.5 + aval * fraction.d); } else { - int ni, di; + int ni, di, max_denom; + DOUBLE p10; + fraction.digits = *prg++; - go_continued_fraction (aval, SUFFIX(go_pow10) (fraction.digits) - 1, &ni, &di); + p10 = SUFFIX(go_pow10) (fraction.digits); + max_denom = MIN (INT_MAX, p10 - 1); + go_continued_fraction (aval, max_denom, &ni, &di); fraction.n = ni; fraction.d = di; } diff -Nru goffice-0.10.53/m4/gettext.m4 goffice-0.10.55/m4/gettext.m4 --- goffice-0.10.53/m4/gettext.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/gettext.m4 2019-01-28 00:46:13.000000000 +0000 @@ -0,0 +1,420 @@ +# gettext.m4 serial 68 (gettext-0.19.8) +dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2006, 2008-2010. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value '$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define([gt_included_intl], + ifelse([$1], [external], + ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), + [yes])) + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + + dnl Set USE_NLS. + AC_REQUIRE([AM_NLS]) + + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= + + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH([included-gettext], + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + [$gt_func_gnugettext_libintl], + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) + dnl Now see whether libintl exists and depends on libiconv. + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi + + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + CATOBJEXT= + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo + fi + ]) + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE([ENABLE_NLS], [1], + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no + fi + fi + + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE([HAVE_GETTEXT], [1], + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE([HAVE_DCGETTEXT], [1], + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl Make all variables we use known to autoconf. + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST([DATADIRNAME]) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST([INSTOBJEXT]) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST([GENCAT]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLOBJS= + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST([INTLOBJS]) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) + ]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) + + dnl Make all documented variables known to autoconf. + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) +]) + + +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], +[ + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) +]) + + +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], +[ + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + + +dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) diff -Nru goffice-0.10.53/m4/glib-gettext.m4 goffice-0.10.55/m4/glib-gettext.m4 --- goffice-0.10.53/m4/glib-gettext.m4 2018-07-07 03:00:01.000000000 +0000 +++ goffice-0.10.55/m4/glib-gettext.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,486 +0,0 @@ -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 - -# Increment this whenever this file is changed. -#serial 1 - -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -dnl Checks for special options needed on Mac OS X. -dnl Defines INTL_MACOSX_LIBS. -dnl -dnl Copied from intlmacosx.m4 in gettext, GPL. -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. -glib_DEFUN([glib_gt_INTL_MACOSX], -[ - dnl Check for API introduced in Mac OS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFPreferencesCopyAppValue(NULL, NULL)]])], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in Mac OS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFLocaleCopyCurrent();]])], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - glib_gt_INTL_MACOSX - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ], - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - diff -Nru goffice-0.10.53/m4/iconv.m4 goffice-0.10.55/m4/iconv.m4 --- goffice-0.10.53/m4/iconv.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/iconv.m4 2023-01-23 17:49:32.000000000 +0000 @@ -0,0 +1,103 @@ +# iconv.m4 serial AM4 (gettext-0.11.3) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) diff -Nru goffice-0.10.53/m4/intlmacosx.m4 goffice-0.10.55/m4/intlmacosx.m4 --- goffice-0.10.53/m4/intlmacosx.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/intlmacosx.m4 2019-01-28 00:46:13.000000000 +0000 @@ -0,0 +1,56 @@ +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) diff -Nru goffice-0.10.53/m4/lib-ld.m4 goffice-0.10.55/m4/lib-ld.m4 --- goffice-0.10.53/m4/lib-ld.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/lib-ld.m4 2019-01-28 00:46:13.000000000 +0000 @@ -0,0 +1,119 @@ +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Subroutines of libtool.m4, +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. + +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 /dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL([acl_cv_path_LD], +[if test -z "$LD"; then + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 = 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE([rpath], + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$acl_hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +dnl For those cases where a variable contains several -L and -l options +dnl referring to unknown libraries and directories, this macro determines the +dnl necessary additional linker options for the runtime path. +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, +dnl otherwise linking without libtool is assumed. +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], +[ + AC_REQUIRE([AC_LIB_RPATH]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + $1= + if test "$enable_rpath" != no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode directories into the resulting + dnl binary. + rpathdirs= + next= + for opt in $2; do + if test -n "$next"; then + dir="$next" + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= + else + case $opt in + -L) next=yes ;; + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= ;; + *) next= ;; + esac + fi + done + if test "X$rpathdirs" != "X"; then + if test -n ""$3""; then + dnl libtool is used for linking. Use -R options. + for dir in $rpathdirs; do + $1="${$1}${$1:+ }-R$dir" + done + else + dnl The linker is used for linking directly. + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user + dnl must pass all path elements in one option. + alldirs= + for dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="$flag" + else + dnl The -rpath options are cumulative. + for dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="${$1}${$1:+ }$flag" + done + fi + fi + fi + fi + fi + AC_SUBST([$1]) +]) diff -Nru goffice-0.10.53/m4/lib-prefix.m4 goffice-0.10.55/m4/lib-prefix.m4 --- goffice-0.10.53/m4/lib-prefix.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/lib-prefix.m4 2019-01-28 00:46:13.000000000 +0000 @@ -0,0 +1,224 @@ +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" +]) diff -Nru goffice-0.10.53/m4/po.m4 goffice-0.10.55/m4/po.m4 --- goffice-0.10.53/m4/po.m4 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/m4/po.m4 2019-01-28 00:46:13.000000000 +0000 @@ -0,0 +1,453 @@ +# po.m4 serial 24 (gettext-0.19) +dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.60]) + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) + + dnl Test whether it is GNU msgfmt >= 0.15. +changequote(,)dnl + case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; + *) MSGFMT_015=$MSGFMT ;; + esac +changequote([,])dnl + AC_SUBST([MSGFMT_015]) +changequote(,)dnl + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; + *) GMSGFMT_015=$GMSGFMT ;; + esac +changequote([,])dnl + AC_SUBST([GMSGFMT_015]) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Test whether it is GNU xgettext >= 0.15. +changequote(,)dnl + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; + *) XGETTEXT_015=$XGETTEXT ;; + esac +changequote([,])dnl + AC_SUBST([XGETTEXT_015]) + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) + + dnl Installation directories. + dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we + dnl have to define it here, so that it can be used in po/Makefile. + test -n "$localedir" || localedir='${datadir}/locale' + AC_SUBST([localedir]) + + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + + AC_CONFIG_COMMANDS([po-directories], [[ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done]], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it + # from automake < 1.5. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + +dnl Postprocesses a Makefile in a directory containing PO files. +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +[ + # When this code is run, in config.status, two variables have already been + # set: + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, + # - LINGUAS is the value of the environment variable LINGUAS at configure + # time. + +changequote(,)dnl + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + # Find a way to echo strings without interpreting backslash. + if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='echo' + else + if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='printf %s\n' + else + echo_func () { + cat < "$ac_file.tmp" + tab=`printf '\t'` + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + cat >> "$ac_file.tmp" < /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` + cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. + +AC_PREREQ([2.50]) + +# Search path for a program which passes the given test. + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL([ac_cv_path_$1], +[case "[$]$1" in + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$][$1]) +else + AC_MSG_RESULT([no]) +fi +AC_SUBST([$1])dnl +]) diff -Nru goffice-0.10.53/Makefile.in goffice-0.10.55/Makefile.in --- goffice-0.10.53/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -93,19 +93,22 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = libgoffice.pc @@ -194,8 +197,8 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libgoffice.pc.in \ $(top_srcdir)/goffice.mk ABOUT-NLS AUTHORS COPYING ChangeLog \ - INSTALL NEWS README compile config.guess config.sub install-sh \ - ltmain.sh missing + INSTALL NEWS README compile config.guess config.rpath \ + config.sub install-sh ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -250,16 +253,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -276,11 +277,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -304,7 +306,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -326,11 +327,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -339,9 +344,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -361,10 +365,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -378,6 +379,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/mkinstalldirs goffice-0.10.55/mkinstalldirs --- goffice-0.10.53/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 +++ goffice-0.10.55/mkinstalldirs 2023-02-03 01:54:20.000000000 +0000 @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2020-07-26.22; # UTC + +# Original author: Noah Friedman +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the 'mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because '.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "umask 22" + umask 22 + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +echo "umask 22" +umask 22 + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + fi + fi + + pathcomp=$pathcomp/ + done + + if test ! -z "$dirmode"; then + echo "chmod $dirmode $file" + chmod "$dirmode" "$file" || errstatus=$? + fi +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -Nru goffice-0.10.53/mmlitex/Makefile.in goffice-0.10.55/mmlitex/Makefile.in --- goffice-0.10.53/mmlitex/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/mmlitex/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -91,16 +91,19 @@ subdir = mmlitex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -154,7 +157,8 @@ am__installdirs = "$(DESTDIR)$(xsltdir)" DATA = $(xslt_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in README +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -166,16 +170,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -192,11 +194,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -220,7 +223,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -242,11 +244,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -255,9 +261,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -277,10 +282,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -294,6 +296,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/NEWS goffice-0.10.55/NEWS --- goffice-0.10.53/NEWS 2022-08-29 23:24:19.000000000 +0000 +++ goffice-0.10.55/NEWS 2023-02-03 01:53:50.000000000 +0000 @@ -1,3 +1,19 @@ +goffice 0.10.55: + +Morten: + * Configuration updates. + +-------------------------------------------------------------------------- +goffice 0.10.54: + +John Denker: + * Allow multiple data labels for series. [#64] + +Morten: + * Fix accumulator problem with infinites. [Gnumeric #683] + * Fix fraction-formatting overflow problem. [Part of Gnumeric #637] + +-------------------------------------------------------------------------- goffice 0.10.53: Morten: diff -Nru goffice-0.10.53/plugins/lasem/Makefile.in goffice-0.10.55/plugins/lasem/Makefile.in --- goffice-0.10.53/plugins/lasem/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/lasem/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -92,16 +92,19 @@ subdir = plugins/lasem ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -208,7 +211,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -220,16 +223,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -246,11 +247,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -274,7 +276,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -296,11 +297,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -309,9 +314,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -331,10 +335,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -348,6 +349,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/Makefile.in goffice-0.10.55/plugins/Makefile.in --- goffice-0.10.53/plugins/Makefile.in 2022-09-17 20:37:36.000000000 +0000 +++ goffice-0.10.55/plugins/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -93,16 +93,19 @@ subdir = plugins ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -161,7 +164,7 @@ done | $(am__uniquify_input)` DIST_SUBDIRS = plot_pie plot_barcol plot_xy plot_radar plot_surface \ plot_distrib reg_linear reg_logfit smoothing lasem -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -198,16 +201,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -224,11 +225,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -252,7 +254,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -274,11 +275,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -287,9 +292,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -309,10 +313,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -326,6 +327,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_barcol/Makefile.in goffice-0.10.55/plugins/plot_barcol/Makefile.in --- goffice-0.10.53/plugins/plot_barcol/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_barcol/Makefile.in 2023-02-03 01:54:19.000000000 +0000 @@ -93,16 +93,19 @@ subdir = plugins/plot_barcol ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -217,7 +220,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -229,16 +232,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -255,11 +256,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -283,7 +285,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -305,11 +306,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -318,9 +323,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -340,10 +344,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -357,6 +358,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_distrib/Makefile.in goffice-0.10.55/plugins/plot_distrib/Makefile.in --- goffice-0.10.53/plugins/plot_distrib/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_distrib/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -96,16 +96,19 @@ subdir = plugins/plot_distrib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -220,7 +223,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -232,16 +235,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -258,11 +259,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -286,7 +288,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -308,11 +309,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -321,9 +326,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -343,10 +347,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -360,6 +361,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_pie/Makefile.in goffice-0.10.55/plugins/plot_pie/Makefile.in --- goffice-0.10.53/plugins/plot_pie/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_pie/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -93,16 +93,19 @@ subdir = plugins/plot_pie ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -212,7 +215,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -224,16 +227,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -250,11 +251,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -278,7 +280,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -300,11 +301,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -313,9 +318,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +339,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -352,6 +353,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_radar/Makefile.in goffice-0.10.55/plugins/plot_radar/Makefile.in --- goffice-0.10.53/plugins/plot_radar/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_radar/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -92,16 +92,19 @@ subdir = plugins/plot_radar ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -208,7 +211,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -220,16 +223,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -246,11 +247,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -274,7 +276,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -296,11 +297,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -309,9 +314,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -331,10 +335,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -348,6 +349,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_surface/Makefile.in goffice-0.10.55/plugins/plot_surface/Makefile.in --- goffice-0.10.53/plugins/plot_surface/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_surface/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -96,16 +96,19 @@ subdir = plugins/plot_surface ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -225,7 +228,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -237,16 +240,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -263,11 +264,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -291,7 +293,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -313,11 +314,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -326,9 +331,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -348,10 +352,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -365,6 +366,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/plot_xy/Makefile.in goffice-0.10.55/plugins/plot_xy/Makefile.in --- goffice-0.10.53/plugins/plot_xy/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/plot_xy/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -93,16 +93,19 @@ subdir = plugins/plot_xy ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -216,7 +219,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -228,16 +231,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -254,11 +255,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -282,7 +284,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -304,11 +305,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -317,9 +322,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -339,10 +343,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -356,6 +357,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/reg_linear/Makefile.in goffice-0.10.55/plugins/reg_linear/Makefile.in --- goffice-0.10.53/plugins/reg_linear/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/reg_linear/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -92,16 +92,19 @@ subdir = plugins/reg_linear ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -211,7 +214,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -223,16 +226,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -249,11 +250,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -277,7 +279,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -299,11 +300,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -312,9 +317,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -334,10 +338,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -351,6 +352,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/reg_logfit/Makefile.in goffice-0.10.55/plugins/reg_logfit/Makefile.in --- goffice-0.10.53/plugins/reg_logfit/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/reg_logfit/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -92,16 +92,19 @@ subdir = plugins/reg_logfit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -208,7 +211,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -220,16 +223,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -246,11 +247,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -274,7 +276,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -296,11 +297,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -309,9 +314,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -331,10 +335,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -348,6 +349,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/plugins/smoothing/Makefile.in goffice-0.10.55/plugins/smoothing/Makefile.in --- goffice-0.10.53/plugins/smoothing/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/plugins/smoothing/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -92,16 +92,19 @@ subdir = plugins/smoothing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -210,7 +213,7 @@ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice-plugins.mk + $(top_srcdir)/goffice-plugins.mk $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -222,16 +225,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -248,11 +249,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -276,7 +278,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -298,11 +299,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -311,9 +316,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -333,10 +337,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -350,6 +351,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/po/ChangeLog goffice-0.10.55/po/ChangeLog --- goffice-0.10.53/po/ChangeLog 2022-09-17 15:59:02.000000000 +0000 +++ goffice-0.10.55/po/ChangeLog 2023-02-03 02:17:43.000000000 +0000 @@ -1,3 +1,11 @@ +2023-02-02 Morten Welinder + + * Release 0.10.55 + +2023-01-19 Morten Welinder + + * Release 0.10.54 + 2022-09-17 Morten Welinder * Release 0.10.53 diff -Nru goffice-0.10.53/po/sl.po goffice-0.10.55/po/sl.po --- goffice-0.10.53/po/sl.po 2019-05-05 20:45:20.000000000 +0000 +++ goffice-0.10.55/po/sl.po 2023-02-03 01:53:50.000000000 +0000 @@ -4,24 +4,25 @@ # # Andrej Žnidaršič , 2009. # Chris Leonard , 2012. -# Martin Srebotnjak , 2011-2013. +# Martin Srebotnjak , 2011-2013, 2022-. # Matej Urbančič , 2010–2019 # msgid "" msgstr "" "Project-Id-Version: goffice master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/goffice/issues\n" -"POT-Creation-Date: 2019-01-27 23:59+0000\n" -"PO-Revision-Date: 2019-02-12 17:33+0100\n" -"Last-Translator: Matej Urbančič \n" +"POT-Creation-Date: 2022-09-21 15:58+0000\n" +"PO-Revision-Date: 2022-09-26 23:22+0200\n" +"Last-Translator: Martin Srebotnjak \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 3.1.1\n" #: ../goffice/app/file.c:177 ../goffice/app/file.c:632 msgid "ID" @@ -97,11 +98,13 @@ #: ../goffice/app/file.c:716 msgid "Sheet Selection" -msgstr "" +msgstr "Izbor delovnega lista" #: ../goffice/app/file.c:717 msgid "TRUE if this saver supports saving a subset of all sheet" msgstr "" +"PRAV, če ta shranjevalnik podpira shranjevanje podskupine vseh delovnih " +"listov" #: ../goffice/app/file.c:918 msgid "Saving over old files of this type is disabled for safety." @@ -120,47 +123,63 @@ msgid "Invalid %s: '%s'" msgstr "Neveljavno %s: '%s'" -#: ../goffice/app/go-doc.c:177 +#: ../goffice/app/go-doc.c:197 msgid "URI" msgstr "Naslov URI" -#: ../goffice/app/go-doc.c:178 +#: ../goffice/app/go-doc.c:198 msgid "The URI associated with this document." msgstr "Naslov URI povezan s tem dokumentom." -#: ../goffice/app/go-doc.c:182 +#: ../goffice/app/go-doc.c:202 msgid "Dirty" msgstr "Spremenjeno" -#: ../goffice/app/go-doc.c:183 +#: ../goffice/app/go-doc.c:203 msgid "Whether the document has been changed." msgstr "Ali je dokument spremenjen." -#: ../goffice/app/go-doc.c:187 +#: ../goffice/app/go-doc.c:207 msgid "Dirty Time" msgstr "Čas prve spremembe" -#: ../goffice/app/go-doc.c:188 +#: ../goffice/app/go-doc.c:208 msgid "When the document was first changed." msgstr "Datum prve spremembe dokumenta." -#: ../goffice/app/go-doc.c:193 +#: ../goffice/app/go-doc.c:213 msgid "Pristine" msgstr "Pristno" -#: ../goffice/app/go-doc.c:194 +#: ../goffice/app/go-doc.c:214 msgid "Whether the document is unchanged since it was created." msgstr "Ali je dokument od ustvarjanja dalje ostal nespremenjen." -#: ../goffice/app/go-doc.c:198 +#: ../goffice/app/go-doc.c:218 msgid "Modification time" -msgstr "" +msgstr "Čas spremembe" -#: ../goffice/app/go-doc.c:199 +#: ../goffice/app/go-doc.c:219 msgid "The known file system modification time" -msgstr "" +msgstr "Znani čas spreminjanja iz datotečnega sistema" + +#: ../goffice/app/go-doc.c:224 +msgid "State" +msgstr "Stanje" -#: ../goffice/app/go-doc.c:505 ../goffice/canvas/goc-image.c:299 +#: ../goffice/app/go-doc.c:225 +msgid "Current state of document" +msgstr "Trenutno stanje dokumenta" + +#: ../goffice/app/go-doc.c:229 +msgid "Saved state" +msgstr "Shranjeno stanje" + +#: ../goffice/app/go-doc.c:230 +msgid "State of document when last saved" +msgstr "Stanje dokumenta, ko je bil nazadnje shranjen" + +#: ../goffice/app/go-doc.c:624 ../goffice/canvas/goc-image.c:317 #: ../goffice/utils/go-style-prefs.ui.h:14 msgid "Image" msgstr "Slika" @@ -428,7 +447,7 @@ msgstr "Funkcija čiščenja znotraj vstavka je vrnila napako." #: ../goffice/app/go-plugin-service.c:229 ../goffice/gtk/go-format-sel.c:59 -#: ../goffice/utils/go-format.c:1037 ../goffice/utils/go-format.c:5509 +#: ../goffice/utils/go-format.c:1040 ../goffice/utils/go-format.c:5521 msgid "General" msgstr "Splošno" @@ -507,122 +526,122 @@ msgid "Execute main loop iteration" msgstr "Izvedi ponovitev glavne zanke" -#: ../goffice/canvas/goc-arc.c:446 +#: ../goffice/canvas/goc-arc.c:466 msgid "xc" msgstr "xk" -#: ../goffice/canvas/goc-arc.c:447 +#: ../goffice/canvas/goc-arc.c:467 msgid "The arc center x coordinate" msgstr "Koordinata x središča loka" -#: ../goffice/canvas/goc-arc.c:452 +#: ../goffice/canvas/goc-arc.c:472 msgid "yc" msgstr "yk" -#: ../goffice/canvas/goc-arc.c:453 +#: ../goffice/canvas/goc-arc.c:473 msgid "The arc center y coordinate" msgstr "Koordinata y središča loka" -#: ../goffice/canvas/goc-arc.c:458 +#: ../goffice/canvas/goc-arc.c:478 msgid "xr" msgstr "xr" -#: ../goffice/canvas/goc-arc.c:459 +#: ../goffice/canvas/goc-arc.c:479 msgid "The arc x radius" msgstr "Radij x loka" -#: ../goffice/canvas/goc-arc.c:464 +#: ../goffice/canvas/goc-arc.c:484 msgid "yr" msgstr "yr" -#: ../goffice/canvas/goc-arc.c:465 +#: ../goffice/canvas/goc-arc.c:485 msgid "The arc y radius" msgstr "Radij y loka" -#: ../goffice/canvas/goc-arc.c:470 +#: ../goffice/canvas/goc-arc.c:490 msgid "ang1" msgstr "kot1" -#: ../goffice/canvas/goc-arc.c:471 +#: ../goffice/canvas/goc-arc.c:491 msgid "The arc start angle" msgstr "Začetni kot loka" -#: ../goffice/canvas/goc-arc.c:476 +#: ../goffice/canvas/goc-arc.c:496 msgid "ang2" msgstr "kot2" -#: ../goffice/canvas/goc-arc.c:477 +#: ../goffice/canvas/goc-arc.c:497 msgid "The arc end angle" msgstr "Končni kot loka" -#: ../goffice/canvas/goc-arc.c:482 ../goffice/canvas/goc-component.c:315 -#: ../goffice/canvas/goc-ellipse.c:287 ../goffice/canvas/goc-path.c:292 -#: ../goffice/canvas/goc-rectangle.c:343 ../goffice/canvas/goc-text.c:460 +#: ../goffice/canvas/goc-arc.c:502 ../goffice/canvas/goc-component.c:315 +#: ../goffice/canvas/goc-ellipse.c:303 ../goffice/canvas/goc-path.c:306 +#: ../goffice/canvas/goc-rectangle.c:362 ../goffice/canvas/goc-text.c:480 #: ../goffice/graph/gog-3d-box.c:166 ../goffice/gtk/go-3d-rotation-sel.ui.h:1 msgid "Rotation" msgstr "Vrtenje" -#: ../goffice/canvas/goc-arc.c:483 +#: ../goffice/canvas/goc-arc.c:503 msgid "The rotation around center position" msgstr "Vrtenje okoli središča" -#: ../goffice/canvas/goc-arc.c:488 ../goffice/canvas/goc-rectangle.c:349 +#: ../goffice/canvas/goc-arc.c:508 ../goffice/canvas/goc-rectangle.c:368 #: ../goffice/graph/gog-axis.c:3415 ../goffice/graph/gog-grid.c:127 -#: ../plugins/plot_barcol/gog-1.5d.c:352 +#: ../plugins/plot_barcol/gog-1.5d.c:355 msgid "Type" msgstr "Vrsta" -#: ../goffice/canvas/goc-arc.c:489 +#: ../goffice/canvas/goc-arc.c:509 msgid "The type of arc: arc, chord or pie" msgstr "Vrsta loka: lok, tetiva ali izsek" -#: ../goffice/canvas/goc-arc.c:495 ../goffice/canvas/goc-line.c:318 +#: ../goffice/canvas/goc-arc.c:515 ../goffice/canvas/goc-line.c:335 msgid "Start Arrow" msgstr "Začetek puščice" -#: ../goffice/canvas/goc-arc.c:496 ../goffice/canvas/goc-line.c:319 +#: ../goffice/canvas/goc-arc.c:516 ../goffice/canvas/goc-line.c:336 msgid "Arrow for line's start" msgstr "Puščica za začetek črte" -#: ../goffice/canvas/goc-arc.c:501 ../goffice/canvas/goc-line.c:324 +#: ../goffice/canvas/goc-arc.c:521 ../goffice/canvas/goc-line.c:341 msgid "End Arrow" msgstr "Konec puščice" -#: ../goffice/canvas/goc-arc.c:502 ../goffice/canvas/goc-line.c:325 +#: ../goffice/canvas/goc-arc.c:522 ../goffice/canvas/goc-line.c:342 msgid "Arrow for line's end" msgstr "Puščica za konec črte" -#: ../goffice/canvas/goc-circle.c:174 ../goffice/canvas/goc-component.c:291 -#: ../goffice/canvas/goc-ellipse.c:263 ../goffice/canvas/goc-graph.c:441 -#: ../goffice/canvas/goc-group.c:254 ../goffice/canvas/goc-image.c:270 -#: ../goffice/canvas/goc-path.c:280 ../goffice/canvas/goc-pixbuf.c:235 -#: ../goffice/canvas/goc-rectangle.c:319 ../goffice/canvas/goc-text.c:448 -#: ../goffice/canvas/goc-widget.c:804 ../goffice/utils/go-marker.c:104 +#: ../goffice/canvas/goc-circle.c:188 ../goffice/canvas/goc-component.c:291 +#: ../goffice/canvas/goc-ellipse.c:279 ../goffice/canvas/goc-graph.c:454 +#: ../goffice/canvas/goc-group.c:294 ../goffice/canvas/goc-image.c:288 +#: ../goffice/canvas/goc-path.c:294 ../goffice/canvas/goc-pixbuf.c:235 +#: ../goffice/canvas/goc-rectangle.c:338 ../goffice/canvas/goc-text.c:468 +#: ../goffice/canvas/goc-widget.c:820 ../goffice/utils/go-marker.c:104 msgid "x" msgstr "x" -#: ../goffice/canvas/goc-circle.c:175 +#: ../goffice/canvas/goc-circle.c:189 msgid "The circle center horizontal position" msgstr "Vodoravni položaj središča kroga" -#: ../goffice/canvas/goc-circle.c:180 ../goffice/canvas/goc-component.c:297 -#: ../goffice/canvas/goc-ellipse.c:269 ../goffice/canvas/goc-graph.c:447 -#: ../goffice/canvas/goc-group.c:260 ../goffice/canvas/goc-image.c:276 -#: ../goffice/canvas/goc-path.c:286 ../goffice/canvas/goc-pixbuf.c:241 -#: ../goffice/canvas/goc-rectangle.c:325 ../goffice/canvas/goc-text.c:454 -#: ../goffice/canvas/goc-widget.c:810 +#: ../goffice/canvas/goc-circle.c:194 ../goffice/canvas/goc-component.c:297 +#: ../goffice/canvas/goc-ellipse.c:285 ../goffice/canvas/goc-graph.c:460 +#: ../goffice/canvas/goc-group.c:300 ../goffice/canvas/goc-image.c:294 +#: ../goffice/canvas/goc-path.c:300 ../goffice/canvas/goc-pixbuf.c:241 +#: ../goffice/canvas/goc-rectangle.c:344 ../goffice/canvas/goc-text.c:474 +#: ../goffice/canvas/goc-widget.c:826 msgid "y" msgstr "y" -#: ../goffice/canvas/goc-circle.c:181 +#: ../goffice/canvas/goc-circle.c:195 msgid "The circle center vertical position" msgstr "Navpični položaj središča kroga" -#: ../goffice/canvas/goc-circle.c:186 +#: ../goffice/canvas/goc-circle.c:200 msgid "Radius" msgstr "Radij" -#: ../goffice/canvas/goc-circle.c:187 +#: ../goffice/canvas/goc-circle.c:201 msgid "The circle radius" msgstr "Radij kroga" @@ -635,20 +654,20 @@ msgstr "Zgornji položaj predmeta" #: ../goffice/canvas/goc-component.c:303 ../goffice/canvas/goc-component.c:304 -#: ../goffice/canvas/goc-ellipse.c:281 ../goffice/canvas/goc-graph.c:453 -#: ../goffice/canvas/goc-graph.c:454 ../goffice/canvas/goc-image.c:288 -#: ../goffice/canvas/goc-pixbuf.c:253 ../goffice/canvas/goc-rectangle.c:337 -#: ../goffice/canvas/goc-widget.c:823 ../goffice/graph/gog-graph.c:505 -#: ../goffice/graph/gog-object.c:206 ../goffice/utils/go-image.c:514 +#: ../goffice/canvas/goc-ellipse.c:297 ../goffice/canvas/goc-graph.c:466 +#: ../goffice/canvas/goc-graph.c:467 ../goffice/canvas/goc-image.c:306 +#: ../goffice/canvas/goc-pixbuf.c:253 ../goffice/canvas/goc-rectangle.c:356 +#: ../goffice/canvas/goc-widget.c:839 ../goffice/graph/gog-graph.c:505 +#: ../goffice/graph/gog-object.c:209 ../goffice/utils/go-image.c:514 msgid "Height" msgstr "Višina" #: ../goffice/canvas/goc-component.c:309 ../goffice/canvas/goc-component.c:310 -#: ../goffice/canvas/goc-ellipse.c:275 ../goffice/canvas/goc-graph.c:459 -#: ../goffice/canvas/goc-graph.c:460 ../goffice/canvas/goc-image.c:282 -#: ../goffice/canvas/goc-pixbuf.c:247 ../goffice/canvas/goc-rectangle.c:331 -#: ../goffice/canvas/goc-widget.c:817 ../goffice/graph/gog-color-scale.c:340 -#: ../goffice/graph/gog-graph.c:499 ../goffice/graph/gog-object.c:204 +#: ../goffice/canvas/goc-ellipse.c:291 ../goffice/canvas/goc-graph.c:472 +#: ../goffice/canvas/goc-graph.c:473 ../goffice/canvas/goc-image.c:300 +#: ../goffice/canvas/goc-pixbuf.c:247 ../goffice/canvas/goc-rectangle.c:350 +#: ../goffice/canvas/goc-widget.c:833 ../goffice/graph/gog-color-scale.c:340 +#: ../goffice/graph/gog-graph.c:499 ../goffice/graph/gog-object.c:207 #: ../goffice/utils/go-image.c:510 ../plugins/plot_xy/gog-xy-dropbar.c:308 msgid "Width" msgstr "Širina" @@ -665,201 +684,201 @@ msgid "The embedded GOComponent object" msgstr "Vdelani predmet GOComponent" -#: ../goffice/canvas/goc-ellipse.c:264 +#: ../goffice/canvas/goc-ellipse.c:280 msgid "The ellipse left position (or right position in RTL mode)" msgstr "Leva točka položaja elipse (ali desna v načinu D-L)" -#: ../goffice/canvas/goc-ellipse.c:270 +#: ../goffice/canvas/goc-ellipse.c:286 msgid "The ellipse top position" msgstr "Zgornja točka položaja elipse" -#: ../goffice/canvas/goc-ellipse.c:276 +#: ../goffice/canvas/goc-ellipse.c:292 msgid "The ellipse width" msgstr "Širina elipse" -#: ../goffice/canvas/goc-ellipse.c:282 +#: ../goffice/canvas/goc-ellipse.c:298 msgid "The ellipse height" msgstr "Višina elipse" -#: ../goffice/canvas/goc-ellipse.c:288 ../goffice/canvas/goc-rectangle.c:344 +#: ../goffice/canvas/goc-ellipse.c:304 ../goffice/canvas/goc-rectangle.c:363 msgid "The rotation around top left position" msgstr "Vrtenje okoli zgornje leve točke" #. Note to translators: the following is a format string for a pair of coordinates. If your locale uses decimal comma then you should probably translate the comma here to a semi-colon. -#: ../goffice/canvas/goc-graph.c:373 +#: ../goffice/canvas/goc-graph.c:386 #, c-format msgid "(%s,%s)" msgstr "(%s,%s)" -#: ../goffice/canvas/goc-graph.c:442 +#: ../goffice/canvas/goc-graph.c:455 msgid "The graph left position" msgstr "Leva lega diagrama" -#: ../goffice/canvas/goc-graph.c:448 +#: ../goffice/canvas/goc-graph.c:461 msgid "The graph top position" msgstr "Zgornja lega diagrama" #. default #. Cheat and assign a name here, graphs will not have parents until we #. * support graphs in graphs -#: ../goffice/canvas/goc-graph.c:465 ../goffice/graph/gog-graph.c:258 +#: ../goffice/canvas/goc-graph.c:478 ../goffice/graph/gog-graph.c:258 #: ../goffice/graph/gog-graph.c:531 ../goffice/graph/gog-theme.c:581 msgid "Graph" msgstr "Diagram" -#: ../goffice/canvas/goc-graph.c:466 +#: ../goffice/canvas/goc-graph.c:479 msgid "The GogGraph this object displays" msgstr "Predmet GogGraph, ki ga ta predmet izrisuje" -#: ../goffice/canvas/goc-graph.c:471 ../goffice/graph/gog-graph.c:1075 +#: ../goffice/canvas/goc-graph.c:484 ../goffice/graph/gog-graph.c:1075 msgid "Renderer" msgstr "Izrisovalnik" -#: ../goffice/canvas/goc-graph.c:472 +#: ../goffice/canvas/goc-graph.c:485 msgid "The GogRenderer being displayed" msgstr "Prikazan predmet GogRenderer" -#: ../goffice/canvas/goc-group.c:255 +#: ../goffice/canvas/goc-group.c:295 msgid "The group horizontal offset" msgstr "Vodoravni odmik skupine predmetov" -#: ../goffice/canvas/goc-group.c:261 +#: ../goffice/canvas/goc-group.c:301 msgid "The group vertical offset" msgstr "Navpični odmik skupine predmetov" -#: ../goffice/canvas/goc-image.c:271 ../goffice/canvas/goc-pixbuf.c:236 +#: ../goffice/canvas/goc-image.c:289 ../goffice/canvas/goc-pixbuf.c:236 msgid "The image left position" msgstr "Položaj leve točke slike" -#: ../goffice/canvas/goc-image.c:277 ../goffice/canvas/goc-pixbuf.c:242 +#: ../goffice/canvas/goc-image.c:295 ../goffice/canvas/goc-pixbuf.c:242 msgid "The image top position" msgstr "Položaj zgornje točke slike" -#: ../goffice/canvas/goc-image.c:283 ../goffice/canvas/goc-pixbuf.c:248 +#: ../goffice/canvas/goc-image.c:301 ../goffice/canvas/goc-pixbuf.c:248 msgid "The image width or -1 to use the image width" msgstr "Določena širina slike ali pa -1 za uporabo izvorne vrednosti" -#: ../goffice/canvas/goc-image.c:289 ../goffice/canvas/goc-pixbuf.c:254 +#: ../goffice/canvas/goc-image.c:307 ../goffice/canvas/goc-pixbuf.c:254 msgid "The image height or -1 to use the image height" msgstr "Določena višina slike ali pa -1 za uporabo izvorne vrednosti" -#: ../goffice/canvas/goc-image.c:300 +#: ../goffice/canvas/goc-image.c:318 msgid "The GOImage to display" msgstr "Predmet GOImage za prikaz" -#: ../goffice/canvas/goc-image.c:304 +#: ../goffice/canvas/goc-image.c:322 msgid "Cropped bottom" msgstr "Obrezan spodnji del" -#: ../goffice/canvas/goc-image.c:305 +#: ../goffice/canvas/goc-image.c:323 msgid "The cropped area at the image bottom as a fraction of the image height" msgstr "Obrezan spodnji del slike kot delež višine slike" -#: ../goffice/canvas/goc-image.c:309 +#: ../goffice/canvas/goc-image.c:327 msgid "Cropped left" msgstr "Obrezan levi del" -#: ../goffice/canvas/goc-image.c:310 +#: ../goffice/canvas/goc-image.c:328 msgid "The cropped area at the image left of the image width" msgstr "Obrezan levi del slike kot del širine slike" -#: ../goffice/canvas/goc-image.c:314 +#: ../goffice/canvas/goc-image.c:332 msgid "Cropped right" msgstr "Obrezan desni del" -#: ../goffice/canvas/goc-image.c:315 +#: ../goffice/canvas/goc-image.c:333 msgid "The cropped area at the image right of the image width" msgstr "Obrezan desni del slike kot del širine slike" -#: ../goffice/canvas/goc-image.c:319 +#: ../goffice/canvas/goc-image.c:337 msgid "Cropped top" msgstr "Obrezan zgornji del" -#: ../goffice/canvas/goc-image.c:320 +#: ../goffice/canvas/goc-image.c:338 msgid "The cropped area at the image top as a fraction of the image height" msgstr "Obrezan zgornji del slike kot delež višine slike" -#: ../goffice/canvas/goc-item.c:275 +#: ../goffice/canvas/goc-item.c:276 msgid "Canvas" msgstr "Platno" -#: ../goffice/canvas/goc-item.c:276 +#: ../goffice/canvas/goc-item.c:277 msgid "The canvas object on which the item resides" msgstr "Platno kateremu predmet pripada" -#: ../goffice/canvas/goc-item.c:281 ../goffice/graph/gog-view.c:693 +#: ../goffice/canvas/goc-item.c:282 ../goffice/graph/gog-view.c:692 msgid "Parent" msgstr "Nadrejeni" -#: ../goffice/canvas/goc-item.c:282 +#: ../goffice/canvas/goc-item.c:283 msgid "The group in which the item resides" msgstr "Skupina kateri pripada predmet" -#: ../goffice/canvas/goc-line.c:294 +#: ../goffice/canvas/goc-line.c:311 msgid "x0" msgstr "x0" -#: ../goffice/canvas/goc-line.c:295 +#: ../goffice/canvas/goc-line.c:312 msgid "The line start x coordinate" msgstr "Koordinata x začetka črte" -#: ../goffice/canvas/goc-line.c:300 +#: ../goffice/canvas/goc-line.c:317 msgid "y0" msgstr "y0" -#: ../goffice/canvas/goc-line.c:301 +#: ../goffice/canvas/goc-line.c:318 msgid "The line start y coordinate" msgstr "Koordinata y začetka črte" -#: ../goffice/canvas/goc-line.c:306 +#: ../goffice/canvas/goc-line.c:323 msgid "x1" msgstr "x1" -#: ../goffice/canvas/goc-line.c:307 +#: ../goffice/canvas/goc-line.c:324 msgid "The line end x coordinate" msgstr "Koordinata x konca črte" -#: ../goffice/canvas/goc-line.c:312 +#: ../goffice/canvas/goc-line.c:329 msgid "y1" msgstr "y1" -#: ../goffice/canvas/goc-line.c:313 +#: ../goffice/canvas/goc-line.c:330 msgid "The line end y coordinate" msgstr "Koordinata y konca črte" -#: ../goffice/canvas/goc-path.c:281 +#: ../goffice/canvas/goc-path.c:295 msgid "The path first point x coordinate" msgstr "Koordinata x prve točke poti" -#: ../goffice/canvas/goc-path.c:287 +#: ../goffice/canvas/goc-path.c:301 msgid "The path first point y coordinate" msgstr "Koordinata y prve točke poti" -#: ../goffice/canvas/goc-path.c:293 +#: ../goffice/canvas/goc-path.c:307 msgid "The rotation around first point position" msgstr "Vrtenje okoli položaja prve točke" -#: ../goffice/canvas/goc-path.c:298 +#: ../goffice/canvas/goc-path.c:312 msgid "Closed" msgstr "Zaprto" -#: ../goffice/canvas/goc-path.c:299 +#: ../goffice/canvas/goc-path.c:313 msgid "The flag for closed path" msgstr "Zastavica za zaprto pot" -#: ../goffice/canvas/goc-path.c:304 ../goffice/canvas/goc-polygon.c:354 +#: ../goffice/canvas/goc-path.c:318 ../goffice/canvas/goc-polygon.c:378 msgid "Fill rule" msgstr "Pravilo polnjenja" -#: ../goffice/canvas/goc-path.c:305 ../goffice/canvas/goc-polygon.c:355 +#: ../goffice/canvas/goc-path.c:319 ../goffice/canvas/goc-polygon.c:379 msgid "Set fill rule to winding or even/odd" msgstr "Določilo pravila navojnega števila za sode in lihe vrednosti" -#: ../goffice/canvas/goc-path.c:310 +#: ../goffice/canvas/goc-path.c:324 msgid "Path" msgstr "Pot" -#: ../goffice/canvas/goc-path.c:311 +#: ../goffice/canvas/goc-path.c:325 msgid "The path points" msgstr "Točke poti" @@ -871,27 +890,27 @@ msgid "The GdkPixbuf to display" msgstr "GdkPixbuf za prikaz" -#: ../goffice/canvas/goc-polygon.c:343 ../goffice/canvas/goc-polyline.c:260 +#: ../goffice/canvas/goc-polygon.c:367 ../goffice/canvas/goc-polyline.c:277 msgid "points" msgstr "točk" -#: ../goffice/canvas/goc-polygon.c:343 +#: ../goffice/canvas/goc-polygon.c:367 msgid "The polygon vertices" msgstr "Oglišča mnogokotnika" -#: ../goffice/canvas/goc-polygon.c:348 ../goffice/canvas/goc-polyline.c:265 +#: ../goffice/canvas/goc-polygon.c:372 ../goffice/canvas/goc-polyline.c:282 msgid "Use spline" msgstr "Uporabi zlepke" -#: ../goffice/canvas/goc-polygon.c:349 +#: ../goffice/canvas/goc-polygon.c:373 msgid "Use a Bezier closed cubic spline as contour" msgstr "Uporabi Bezierjev zaprti kubični zlepek kot obris" -#: ../goffice/canvas/goc-polygon.c:359 +#: ../goffice/canvas/goc-polygon.c:383 msgid "sizes" msgstr "velikosti" -#: ../goffice/canvas/goc-polygon.c:360 +#: ../goffice/canvas/goc-polygon.c:384 msgid "" "If set, the polygon will be split as several polygons according to the given " "sizes. Each size must be at least 3. Values following an invalid value will " @@ -902,31 +921,31 @@ "Vrednosti za neveljavno vrednostjo bodo prezrte. Z določevanjem lastnosti " "\"točke\" bodo vse velikosti počiščene." -#: ../goffice/canvas/goc-polyline.c:260 +#: ../goffice/canvas/goc-polyline.c:277 msgid "The polyline vertices" msgstr "Oglišča mnogokotne črte" -#: ../goffice/canvas/goc-polyline.c:266 +#: ../goffice/canvas/goc-polyline.c:283 msgid "Use a Bezier cubic spline as line" msgstr "Uporabi Bezierjev kubični zlepek kot črto" -#: ../goffice/canvas/goc-rectangle.c:320 +#: ../goffice/canvas/goc-rectangle.c:339 msgid "The rectangle left position (or right position in RTL mode)" msgstr "Leva točka položaja pravokotnika (ali desna v načinu D-L)" -#: ../goffice/canvas/goc-rectangle.c:326 +#: ../goffice/canvas/goc-rectangle.c:345 msgid "The rectangle top position" msgstr "Zgornja lega pravokotnika" -#: ../goffice/canvas/goc-rectangle.c:332 +#: ../goffice/canvas/goc-rectangle.c:351 msgid "The rectangle width" msgstr "Širina pravokotnika" -#: ../goffice/canvas/goc-rectangle.c:338 +#: ../goffice/canvas/goc-rectangle.c:357 msgid "The rectangle height" msgstr "Višina pravokotnika" -#: ../goffice/canvas/goc-rectangle.c:350 +#: ../goffice/canvas/goc-rectangle.c:369 msgid "" "The rectangle type: 0 for no rounded corner, 1 for rounded top left, 2 for " "top right, 4 for bottom right, 8 for bottom left, or any combination of " @@ -936,131 +955,131 @@ "2 za desni zgodnji rob, 4 za desni spodnji, 8 za levi spodnji ali njihovo " "poljubno kombinacijo." -#: ../goffice/canvas/goc-rectangle.c:355 +#: ../goffice/canvas/goc-rectangle.c:374 msgid "rx" msgstr "rx" -#: ../goffice/canvas/goc-rectangle.c:356 +#: ../goffice/canvas/goc-rectangle.c:375 msgid "The round rectangle rx" msgstr "Vrednost točke rx za zaobljeni pravokotnik" -#: ../goffice/canvas/goc-rectangle.c:361 +#: ../goffice/canvas/goc-rectangle.c:380 msgid "ry" msgstr "ry" -#: ../goffice/canvas/goc-rectangle.c:362 +#: ../goffice/canvas/goc-rectangle.c:381 msgid "The round rectangle ry" msgstr "Vrednost točke ry za zaobljeni pravokotnik" -#: ../goffice/canvas/goc-styled-item.c:162 +#: ../goffice/canvas/goc-styled-item.c:171 #: ../goffice/graph/gog-error-bar-prefs.ui.h:6 #: ../goffice/graph/gog-styled-object.c:225 ../goffice/utils/go-style.c:1122 msgid "Style" msgstr "Slog" -#: ../goffice/canvas/goc-styled-item.c:163 +#: ../goffice/canvas/goc-styled-item.c:172 #: ../goffice/graph/gog-styled-object.c:226 msgid "A pointer to the GOStyle object" msgstr "Kazalnik za predmet GOStyle" -#: ../goffice/canvas/goc-styled-item.c:168 +#: ../goffice/canvas/goc-styled-item.c:177 msgid "Scale line width" msgstr "Širina črte merila" -#: ../goffice/canvas/goc-styled-item.c:169 +#: ../goffice/canvas/goc-styled-item.c:178 msgid "Whether to scale the line width when zooming" msgstr "Ali naj se med približevanjem spremeni merilo širine črte" -#: ../goffice/canvas/goc-text.c:449 +#: ../goffice/canvas/goc-text.c:469 msgid "The text horizontal position" msgstr "Položaj vodoravnega besedila" -#: ../goffice/canvas/goc-text.c:455 +#: ../goffice/canvas/goc-text.c:475 msgid "The text position" msgstr "Lega besedila" -#: ../goffice/canvas/goc-text.c:461 +#: ../goffice/canvas/goc-text.c:481 msgid "The rotation around the anchor" msgstr "Vrtenje okoli točke sidrišča" -#: ../goffice/canvas/goc-text.c:466 ../goffice/graph/gog-object.c:858 +#: ../goffice/canvas/goc-text.c:486 ../goffice/graph/gog-object.c:861 msgid "Anchor" msgstr "Sidro" -#: ../goffice/canvas/goc-text.c:467 +#: ../goffice/canvas/goc-text.c:487 msgid "The anchor point for the text" msgstr "Sidrna točka za besedilo" -#: ../goffice/canvas/goc-text.c:472 ../goffice/gtk/go-format-sel.c:68 +#: ../goffice/canvas/goc-text.c:492 ../goffice/gtk/go-format-sel.c:68 #: ../goffice/gtk/go-rotation-sel.c:230 ../goffice/utils/go-style.c:988 msgid "Text" msgstr "Besedilo" -#: ../goffice/canvas/goc-text.c:473 +#: ../goffice/canvas/goc-text.c:493 msgid "The text to display" msgstr "Besedilo za prikaz" -#: ../goffice/canvas/goc-text.c:476 +#: ../goffice/canvas/goc-text.c:496 msgid "Attributes" msgstr "Določila" -#: ../goffice/canvas/goc-text.c:476 +#: ../goffice/canvas/goc-text.c:496 msgid "The attributes list as a PangoAttrList" msgstr "Seznam določil kot PangoAttrList" -#: ../goffice/canvas/goc-text.c:481 +#: ../goffice/canvas/goc-text.c:501 msgid "Clip" msgstr "Izreži" -#: ../goffice/canvas/goc-text.c:482 +#: ../goffice/canvas/goc-text.c:502 msgid "Whether to clip or not" msgstr "Ali naj bodo mere izrezane ali ne" -#: ../goffice/canvas/goc-text.c:487 +#: ../goffice/canvas/goc-text.c:507 msgid "Clip width" msgstr "Izrezana širina" -#: ../goffice/canvas/goc-text.c:488 +#: ../goffice/canvas/goc-text.c:508 msgid "Clip width for the text" msgstr "Izrezana širina za besedilo" -#: ../goffice/canvas/goc-text.c:493 +#: ../goffice/canvas/goc-text.c:513 msgid "Clip height" msgstr "Izrezana višina" -#: ../goffice/canvas/goc-text.c:494 +#: ../goffice/canvas/goc-text.c:514 msgid "Clip height for the text" msgstr "Izrezana višina za besedilo" -#: ../goffice/canvas/goc-text.c:499 +#: ../goffice/canvas/goc-text.c:519 msgid "Wrap width" msgstr "Prelomi širino" -#: ../goffice/canvas/goc-text.c:500 +#: ../goffice/canvas/goc-text.c:520 msgid "Wrap width for the text" msgstr "Prelomi širino besedila" -#: ../goffice/canvas/goc-widget.c:798 +#: ../goffice/canvas/goc-widget.c:814 msgid "Widget" msgstr "Gradnik" -#: ../goffice/canvas/goc-widget.c:799 +#: ../goffice/canvas/goc-widget.c:815 msgid "A pointer to the embedded widget" msgstr "Kazalec vstavljenega gradnika" -#: ../goffice/canvas/goc-widget.c:805 +#: ../goffice/canvas/goc-widget.c:821 msgid "The widget left position" msgstr "Levi položaj gradnika" -#: ../goffice/canvas/goc-widget.c:811 +#: ../goffice/canvas/goc-widget.c:827 msgid "The widget top position" msgstr "Zgornji položaj gradnika" -#: ../goffice/canvas/goc-widget.c:818 +#: ../goffice/canvas/goc-widget.c:834 msgid "The widget width" msgstr "Širina gradnika" -#: ../goffice/canvas/goc-widget.c:824 +#: ../goffice/canvas/goc-widget.c:840 msgid "The widget height" msgstr "Višina gradnika" @@ -1216,9 +1235,9 @@ msgid "Metrics" msgstr "Merila" -#: ../goffice/graph/gog-axis.c:3362 ../goffice/graph/gog-axis-line.c:2606 +#: ../goffice/graph/gog-axis.c:3362 ../goffice/graph/gog-axis-line.c:2621 #: ../goffice/graph/gog-series-labels.c:911 -#: ../goffice/graph/gog-series-labels.c:1441 +#: ../goffice/graph/gog-series-labels.c:1442 msgid "Format" msgstr "Oblika" @@ -1246,11 +1265,11 @@ msgid "The name of the map for scaling" msgstr "Ime zemljevida za določanje reda velikosti" -#: ../goffice/graph/gog-axis.c:3431 ../goffice/graph/gog-axis-line.c:2694 +#: ../goffice/graph/gog-axis.c:3431 ../goffice/graph/gog-axis-line.c:2703 msgid "Assigned XL format" msgstr "Določena XL oblika" -#: ../goffice/graph/gog-axis.c:3432 ../goffice/graph/gog-axis-line.c:2695 +#: ../goffice/graph/gog-axis.c:3432 ../goffice/graph/gog-axis-line.c:2704 msgid "" "The user assigned format to use for non-discrete axis labels (XL format)" msgstr "Uporabniško določeni zapis za ne-diskretne oznake osi (zapis XL)" @@ -1316,6 +1335,8 @@ "If an axis is used as reference, gives the ratio of the ticks distance, and " "if the metrix is absolute, the ticks distance. Defaults to 1.0" msgstr "" +"Če se os uporablja kot referenca, vrne razmerje razdalj med oznakami; če je " +"metrika absolutna, razdaljo med oznakami. Privzeta vrednost je 1,0" #: ../goffice/graph/gog-axis.c:3483 msgid "Metrics Unit" @@ -1331,11 +1352,11 @@ #: ../goffice/graph/gog-axis.c:3489 msgid "Display factor" -msgstr "" +msgstr "Faktor prikaza" #: ../goffice/graph/gog-axis.c:3490 msgid "Real values are the displayed ones multipled by the display factor." -msgstr "" +msgstr "Prikazane so realne vrednosti, pomnožene s faktorjem prikaza." #: ../goffice/graph/gog-axis-color-map.c:132 ../goffice/graph/gog-theme.c:322 msgid "Resource type" @@ -1367,7 +1388,7 @@ msgstr "Barva" #: ../goffice/graph/gog-axis-color-map-prefs.ui.h:5 -#: ../goffice/graph/gog-guru.c:1030 ../goffice/graph/gog-series.c:593 +#: ../goffice/graph/gog-guru.c:1032 ../goffice/graph/gog-series.c:595 #: ../goffice/graph/gog-theme-editor.ui.h:2 msgid "Name" msgstr "Ime" @@ -1388,122 +1409,122 @@ msgid "Erase" msgstr "Izbriši" -#: ../goffice/graph/gog-axis-line.c:671 +#: ../goffice/graph/gog-axis-line.c:678 msgid "Layout" msgstr "Postavitev" -#: ../goffice/graph/gog-axis-line.c:755 +#: ../goffice/graph/gog-axis-line.c:762 msgid "MajorGrid" msgstr "Glavna mreža" -#: ../goffice/graph/gog-axis-line.c:758 +#: ../goffice/graph/gog-axis-line.c:765 msgid "MinorGrid" msgstr "Podrobna mreža" -#: ../goffice/graph/gog-axis-line.c:761 ../goffice/graph/gog-color-scale.c:325 +#: ../goffice/graph/gog-axis-line.c:768 ../goffice/graph/gog-color-scale.c:325 #: ../goffice/graph/gog-theme.c:591 msgid "Label" msgstr "Oznaka" -#: ../goffice/graph/gog-axis-line.c:776 +#: ../goffice/graph/gog-axis-line.c:783 msgid "Axis position" msgstr "Lega osi" -#: ../goffice/graph/gog-axis-line.c:777 ../goffice/graph/gog-axis-line.c:783 +#: ../goffice/graph/gog-axis-line.c:784 ../goffice/graph/gog-axis-line.c:790 msgid "Where to position an axis low, high, or crossing" msgstr "Kje postaviti najnižjo in najvišjo točko osi oziroma kje se križa" -#: ../goffice/graph/gog-axis-line.c:782 +#: ../goffice/graph/gog-axis-line.c:789 msgid "Axis position (as a string)" msgstr "Lega osi (kot niz)" -#: ../goffice/graph/gog-axis-line.c:789 +#: ../goffice/graph/gog-axis-line.c:796 msgid "Major labels" msgstr "Glavne oznake" -#: ../goffice/graph/gog-axis-line.c:790 +#: ../goffice/graph/gog-axis-line.c:797 msgid "Show labels for major ticks" msgstr "Pokaži označbe glavnih oznak" -#: ../goffice/graph/gog-axis-line.c:795 +#: ../goffice/graph/gog-axis-line.c:802 msgid "Inside major ticks" msgstr "Znotraj glavnih točk osi" -#: ../goffice/graph/gog-axis-line.c:796 +#: ../goffice/graph/gog-axis-line.c:803 msgid "Major tick marks inside the chart area" msgstr "Glavne označbe znotraj območja diagrama" -#: ../goffice/graph/gog-axis-line.c:801 +#: ../goffice/graph/gog-axis-line.c:808 msgid "Outside major ticks" msgstr "Izven glavnih točk osi" -#: ../goffice/graph/gog-axis-line.c:802 +#: ../goffice/graph/gog-axis-line.c:809 msgid "Major tick marks outside the chart area" msgstr "Glavne oznake izven območja diagrama" -#: ../goffice/graph/gog-axis-line.c:807 +#: ../goffice/graph/gog-axis-line.c:814 msgid "Major tick size" msgstr "Velikost glavnih točk osi" -#: ../goffice/graph/gog-axis-line.c:808 +#: ../goffice/graph/gog-axis-line.c:815 msgid "Size of the major tick marks, in points" msgstr "Velikost oznak glavnih točk osi (v točkah)" -#: ../goffice/graph/gog-axis-line.c:814 +#: ../goffice/graph/gog-axis-line.c:821 msgid "Inside minor ticks" msgstr "Znotraj podrobnih točk osi" -#: ../goffice/graph/gog-axis-line.c:815 +#: ../goffice/graph/gog-axis-line.c:822 msgid "Minor tick marks inside the chart area" msgstr "Podrobne oznake znotraj območja diagrama" -#: ../goffice/graph/gog-axis-line.c:820 +#: ../goffice/graph/gog-axis-line.c:827 msgid "Outside minor ticks" msgstr "Izven podrobnih točk osi" -#: ../goffice/graph/gog-axis-line.c:821 +#: ../goffice/graph/gog-axis-line.c:828 msgid "Minor tick marks outside the axis" msgstr "Podrobne oznake izven območja diagrama" -#: ../goffice/graph/gog-axis-line.c:826 +#: ../goffice/graph/gog-axis-line.c:833 msgid "Minor tick size" msgstr "Velikost podrobnih točk osi" -#: ../goffice/graph/gog-axis-line.c:827 +#: ../goffice/graph/gog-axis-line.c:834 msgid "Size of the minor tick marks, in points" msgstr "Velikost oznak podrobnih točk osi (v točkah)" -#: ../goffice/graph/gog-axis-line.c:833 +#: ../goffice/graph/gog-axis-line.c:840 msgid "Cross axis ID" msgstr "ID izhodišča osi" -#: ../goffice/graph/gog-axis-line.c:834 +#: ../goffice/graph/gog-axis-line.c:841 msgid "Which axis to cross" msgstr "Katero os naj se seka" -#: ../goffice/graph/gog-axis-line.c:840 +#: ../goffice/graph/gog-axis-line.c:847 msgid "Axis padding" msgstr "Blazinjenje osi" -#: ../goffice/graph/gog-axis-line.c:841 +#: ../goffice/graph/gog-axis-line.c:848 msgid "Distance from axis line to plot area, in points" msgstr "Razdalja med osno črto in diagramom površine v točkah" -#: ../goffice/graph/gog-axis-line.c:935 +#: ../goffice/graph/gog-axis-line.c:942 msgid "Select axis" msgstr "Izbor osi" -#: ../goffice/graph/gog-axis-line.c:1041 +#: ../goffice/graph/gog-axis-line.c:1048 msgid "Set start bound" msgstr "Določi začetno mejo" -#: ../goffice/graph/gog-axis-line.c:1052 +#: ../goffice/graph/gog-axis-line.c:1059 msgid "Set stop bound" msgstr "Določi končno mejo" -#: ../goffice/graph/gog-axis-line.c:2594 +#: ../goffice/graph/gog-axis-line.c:2609 msgid "Ticks" -msgstr "" +msgstr "Deli koraka" #: ../goffice/graph/gog-axis-prefs.ui.h:1 msgid "Bounds" @@ -1545,7 +1566,7 @@ #: ../goffice/graph/gog-axis-prefs.ui.h:9 msgid "Major ticks" -msgstr "Glavne točke osi" +msgstr "Glavne oznake osi" #: ../goffice/graph/gog-axis-prefs.ui.h:10 msgid "_Outside" @@ -1559,9 +1580,9 @@ msgid "_Show Labels" msgstr "_Prikaži oznake" -#: ../goffice/graph/gog-axis-prefs.ui.h:13 ../goffice/graph/gog-object.c:790 -#: ../goffice/graph/gog-object.c:834 ../goffice/graph/gog-series-labels.c:899 -#: ../goffice/graph/gog-series-labels.c:1429 +#: ../goffice/graph/gog-axis-prefs.ui.h:13 ../goffice/graph/gog-object.c:793 +#: ../goffice/graph/gog-object.c:837 ../goffice/graph/gog-series-labels.c:899 +#: ../goffice/graph/gog-series-labels.c:1430 msgid "Position" msgstr "Lega" @@ -1593,7 +1614,7 @@ #: ../goffice/graph/gog-axis-prefs.ui.h:20 msgid "Minor ticks" -msgstr "Podrobne točke osi" +msgstr "Drugotne oznake osi" #: ../goffice/graph/gog-axis-prefs.ui.h:21 msgid "O_utside" @@ -1630,7 +1651,7 @@ #: ../goffice/graph/gog-axis-prefs.ui.h:29 msgid "Custom ticks" -msgstr "" +msgstr "Oznake po meri" #: ../goffice/graph/gog-axis-prefs.ui.h:30 msgid "Positions:" @@ -1790,27 +1811,27 @@ msgid "%s to %s" msgstr "%s za %s" -#: ../goffice/graph/gog-color-scale.c:144 ../goffice/graph/gog-object.c:173 -#: ../goffice/graph/gog-object.c:192 ../goffice/graph/gog-series.c:110 +#: ../goffice/graph/gog-color-scale.c:144 ../goffice/graph/gog-object.c:176 +#: ../goffice/graph/gog-object.c:195 ../goffice/graph/gog-series.c:112 #: ../goffice/graph/gog-series-labels.c:58 msgid "Top" msgstr "Zgoraj" -#: ../goffice/graph/gog-color-scale.c:145 ../goffice/graph/gog-object.c:177 -#: ../goffice/graph/gog-object.c:198 ../goffice/graph/gog-series.c:108 +#: ../goffice/graph/gog-color-scale.c:145 ../goffice/graph/gog-object.c:180 +#: ../goffice/graph/gog-object.c:201 ../goffice/graph/gog-series.c:110 #: ../goffice/graph/gog-series-labels.c:59 msgid "Bottom" msgstr "Spodaj" -#: ../goffice/graph/gog-color-scale.c:147 ../goffice/graph/gog-object.c:179 -#: ../goffice/graph/gog-object.c:194 ../goffice/graph/gog-series.c:109 +#: ../goffice/graph/gog-color-scale.c:147 ../goffice/graph/gog-object.c:182 +#: ../goffice/graph/gog-object.c:197 ../goffice/graph/gog-series.c:111 #: ../goffice/graph/gog-series-labels.c:60 #: ../goffice/gtk/go-gradient-selector.c:101 msgid "Left" msgstr "Levo" -#: ../goffice/graph/gog-color-scale.c:148 ../goffice/graph/gog-object.c:175 -#: ../goffice/graph/gog-object.c:196 ../goffice/graph/gog-series.c:111 +#: ../goffice/graph/gog-color-scale.c:148 ../goffice/graph/gog-object.c:178 +#: ../goffice/graph/gog-object.c:199 ../goffice/graph/gog-series.c:113 #: ../goffice/graph/gog-series-labels.c:61 #: ../goffice/gtk/go-gradient-selector.c:103 msgid "Right" @@ -1822,7 +1843,7 @@ #: ../goffice/graph/gog-smoothed-curve.c:60 #: ../goffice/graph/gog-trend-line.c:92 #: ../plugins/plot_distrib/gog-probability-plot.c:75 -#: ../plugins/plot_xy/gog-xy.c:2103 +#: ../plugins/plot_xy/gog-xy.c:2110 msgid "Details" msgstr "Podrobnosti" @@ -1853,15 +1874,15 @@ #: ../goffice/graph/gog-color-scale.c:352 msgid "Tick size" -msgstr "Velikost točk osi" +msgstr "Velikost oznak na osi" #: ../goffice/graph/gog-color-scale.c:353 msgid "Size of the tick marks, in points" -msgstr "Velikost oznak glavnih točk osi (v točkah)" +msgstr "Velikost oznak glavnih točk na osi (v sl. točkah)" #: ../goffice/graph/gog-color-scale-prefs.ui.h:1 msgid "Ticks position:" -msgstr "Položaj točk osi:" +msgstr "Položaj oznak osi:" #: ../goffice/graph/gog-color-scale-prefs.ui.h:2 msgid "Direction:" @@ -1885,10 +1906,10 @@ #: ../goffice/graph/gog-error-bar.c:79 #: ../goffice/graph/gog-error-bar-prefs.ui.h:11 -#: ../goffice/graph/gog-object.c:203 +#: ../goffice/graph/gog-object.c:206 #: ../goffice/graph/gog-reg-curve-prefs.ui.h:13 -#: ../goffice/gtk/go-arrow-sel.ui.h:5 ../goffice/gtk/go-format-sel.c:1672 -#: ../goffice/gtk/go-format-sel.c:1852 ../goffice/utils/formats.c:370 +#: ../goffice/gtk/go-arrow-sel.ui.h:5 ../goffice/gtk/go-format-sel.c:1671 +#: ../goffice/gtk/go-format-sel.c:1851 ../goffice/utils/formats.c:370 #: ../goffice/utils/go-line.c:127 ../goffice/utils/go-style-prefs.ui.h:10 msgid "None" msgstr "Brez" @@ -1937,7 +1958,7 @@ msgstr "(-)" #: ../goffice/graph/gog-error-bar-prefs.ui.h:9 -#: ../plugins/plot_barcol/gog-1.5d.c:369 +#: ../plugins/plot_barcol/gog-1.5d.c:372 #: ../plugins/plot_distrib/gog-boxplot.c:428 #: ../plugins/plot_distrib/gog-histogram.c:400 #: ../plugins/plot_distrib/gog-probability-plot.c:317 @@ -2024,23 +2045,23 @@ msgid "Are these minor grid lines" msgstr "Ali so to podrobne mrežne črte" -#: ../goffice/graph/gog-guru.c:1057 +#: ../goffice/graph/gog-guru.c:1059 msgid "Step 1 of 2: Select Chart Type" msgstr "Korak 1 od 2: Izbor vrste diagrama" -#: ../goffice/graph/gog-guru.c:1065 +#: ../goffice/graph/gog-guru.c:1067 msgid "Step 2 of 2: Customize Chart" msgstr "Korak 2 od 2: prilagoditev diagrama" -#: ../goffice/graph/gog-guru.c:1070 +#: ../goffice/graph/gog-guru.c:1072 msgid "Customize Chart" msgstr "Prilagodi diagram" -#: ../goffice/graph/gog-guru.c:1145 +#: ../goffice/graph/gog-guru.c:1147 msgid "_Insert" msgstr "_Vstavi" -#: ../goffice/graph/gog-guru.c:1216 +#: ../goffice/graph/gog-guru.c:1218 #: ../goffice/graph/gog-guru-type-selector.ui.h:1 msgid "_Plot Type" msgstr "Vrsta _diagrama" @@ -2161,102 +2182,102 @@ msgid "padding between the swatches in pts." msgstr "blazinjenje med izvlečki (v točkah)." -#: ../goffice/graph/gog-object.c:174 ../goffice/graph/gog-object.c:193 +#: ../goffice/graph/gog-object.c:177 ../goffice/graph/gog-object.c:196 msgid "Top right" msgstr "Zgoraj desno" -#: ../goffice/graph/gog-object.c:176 ../goffice/graph/gog-object.c:199 +#: ../goffice/graph/gog-object.c:179 ../goffice/graph/gog-object.c:202 msgid "Bottom right" msgstr "Spodaj desno" -#: ../goffice/graph/gog-object.c:178 ../goffice/graph/gog-object.c:197 +#: ../goffice/graph/gog-object.c:181 ../goffice/graph/gog-object.c:200 msgid "Bottom left" msgstr "Spodaj levo" -#: ../goffice/graph/gog-object.c:180 ../goffice/graph/gog-object.c:191 +#: ../goffice/graph/gog-object.c:183 ../goffice/graph/gog-object.c:194 msgid "Top left" msgstr "Zgoraj levo" -#: ../goffice/graph/gog-object.c:184 ../goffice/utils/go-style-prefs.ui.h:29 +#: ../goffice/graph/gog-object.c:187 ../goffice/utils/go-style-prefs.ui.h:29 msgid "Fill" msgstr "Zapolni" -#: ../goffice/graph/gog-object.c:185 ../plugins/plot_barcol/gog-dropbar.c:143 +#: ../goffice/graph/gog-object.c:188 ../plugins/plot_barcol/gog-dropbar.c:143 #: ../plugins/plot_xy/gog-xy-dropbar.c:322 msgid "Start" msgstr "Začetek" -#: ../goffice/graph/gog-object.c:186 ../plugins/plot_barcol/gog-dropbar.c:145 +#: ../goffice/graph/gog-object.c:189 ../plugins/plot_barcol/gog-dropbar.c:145 #: ../plugins/plot_xy/gog-xy-dropbar.c:324 msgid "End" msgstr "Konec" -#: ../goffice/graph/gog-object.c:187 ../goffice/graph/gog-object.c:195 -#: ../goffice/graph/gog-series.c:113 +#: ../goffice/graph/gog-object.c:190 ../goffice/graph/gog-object.c:198 +#: ../goffice/graph/gog-series.c:115 msgid "Center" msgstr "Sredinsko" -#: ../goffice/graph/gog-object.c:205 +#: ../goffice/graph/gog-object.c:208 msgid "Absolute width" msgstr "Absolutna širina" -#: ../goffice/graph/gog-object.c:207 +#: ../goffice/graph/gog-object.c:210 msgid "Absolute height" msgstr "Absolutna višina" -#: ../goffice/graph/gog-object.c:208 +#: ../goffice/graph/gog-object.c:211 msgid "Size" msgstr "Velikost" -#: ../goffice/graph/gog-object.c:209 +#: ../goffice/graph/gog-object.c:212 msgid "Absolute size" msgstr "Absolutna velikost" -#: ../goffice/graph/gog-object.c:828 +#: ../goffice/graph/gog-object.c:831 msgid "Object ID" msgstr "ID predmeta" -#: ../goffice/graph/gog-object.c:829 +#: ../goffice/graph/gog-object.c:832 msgid "Object numerical ID" msgstr "Številčna ID predmeta" -#: ../goffice/graph/gog-object.c:835 +#: ../goffice/graph/gog-object.c:838 msgid "Position and size of object, in percentage of parent size" msgstr "Položaj in velikost predmeta kot odstotek celotne velikosti" -#: ../goffice/graph/gog-object.c:840 +#: ../goffice/graph/gog-object.c:843 msgid "Compass" msgstr "Kompas" -#: ../goffice/graph/gog-object.c:841 +#: ../goffice/graph/gog-object.c:844 msgid "Compass auto position flags" msgstr "Smerne zastavice samodejnega določanja položaja" -#: ../goffice/graph/gog-object.c:846 +#: ../goffice/graph/gog-object.c:849 msgid "Alignment" msgstr "Poravnava" -#: ../goffice/graph/gog-object.c:847 +#: ../goffice/graph/gog-object.c:850 msgid "Alignment flag" msgstr "Zastava poravnave" -#: ../goffice/graph/gog-object.c:852 ../goffice/graph/gog-object.c:853 +#: ../goffice/graph/gog-object.c:855 ../goffice/graph/gog-object.c:856 msgid "Is position manual" msgstr "Je položaj nastavljen ročno" -#: ../goffice/graph/gog-object.c:859 +#: ../goffice/graph/gog-object.c:862 msgid "Anchor for manual position" msgstr "Sidro za ročno lego" -#: ../goffice/graph/gog-object.c:864 ../goffice/graph/gog-object.c:865 +#: ../goffice/graph/gog-object.c:867 ../goffice/graph/gog-object.c:868 msgid "Should the object be hidden" msgstr "Naj bo predmet skrit" -#: ../goffice/graph/gog-object.c:870 +#: ../goffice/graph/gog-object.c:873 msgid "Manual size" msgstr "Ročna vrednost velikosti" -#: ../goffice/graph/gog-object.c:871 +#: ../goffice/graph/gog-object.c:874 msgid "Whether the height or width are manually set" msgstr "Ali sta višina in širina določena ročno" @@ -2334,6 +2355,16 @@ msgid "_Height:" msgstr "_Višina:" +#. We've managed to save some files with translated +#. booleans. Try to recover. +#: ../goffice/graph/gog-object-xml.c:431 ../goffice/utils/go-locale.c:547 +msgid "TRUE" +msgstr "PRAV" + +#: ../goffice/graph/gog-object-xml.c:435 ../goffice/utils/go-locale.c:548 +msgid "FALSE" +msgstr "NAPAK" + #: ../goffice/graph/gog-outlined-object.c:74 msgid "Padding Pts" msgstr "Točke blazinjenja" @@ -2342,133 +2373,133 @@ msgid "Number of pts separating charts in the grid" msgstr "Število točk, ki ločujejo diagrame na mreži" -#: ../goffice/graph/gog-plot.c:229 +#: ../goffice/graph/gog-plot.c:230 msgid "X axis:" msgstr "Os X:" -#: ../goffice/graph/gog-plot.c:230 +#: ../goffice/graph/gog-plot.c:231 msgid "Y axis:" msgstr "Os Y:" -#: ../goffice/graph/gog-plot.c:231 +#: ../goffice/graph/gog-plot.c:232 msgid "Z axis:" msgstr "Os Z:" -#: ../goffice/graph/gog-plot.c:232 +#: ../goffice/graph/gog-plot.c:233 msgid "Circular axis:" msgstr "Krožna os:" -#: ../goffice/graph/gog-plot.c:233 +#: ../goffice/graph/gog-plot.c:234 msgid "Radial axis:" msgstr "Radialna os:" -#: ../goffice/graph/gog-plot.c:234 +#: ../goffice/graph/gog-plot.c:235 msgid "Pseudo 3D axis:" msgstr "Navidezna 3D os:" -#: ../goffice/graph/gog-plot.c:235 +#: ../goffice/graph/gog-plot.c:236 msgid "Color axis:" msgstr "Barvna os:" -#: ../goffice/graph/gog-plot.c:236 +#: ../goffice/graph/gog-plot.c:237 msgid "Bubble axis:" msgstr "Mehurčna os:" -#: ../goffice/graph/gog-plot.c:302 +#: ../goffice/graph/gog-plot.c:303 msgid "Axes" msgstr "Osi" -#: ../goffice/graph/gog-plot.c:438 ../goffice/graph/gog-theme.c:598 +#: ../goffice/graph/gog-plot.c:439 ../goffice/graph/gog-theme.c:598 #: ../goffice/graph/gog-theme-editor.ui.h:4 msgid "Series" msgstr "Nizi" -#: ../goffice/graph/gog-plot.c:459 +#: ../goffice/graph/gog-plot.c:460 msgid "Vary style by element" msgstr "Spremeni slog po predmetih" -#: ../goffice/graph/gog-plot.c:460 +#: ../goffice/graph/gog-plot.c:461 msgid "Use a different style for each segment" msgstr "Uporabi različni slog za vsak razdelek" -#: ../goffice/graph/gog-plot.c:465 +#: ../goffice/graph/gog-plot.c:466 msgid "X axis" msgstr "Os X" -#: ../goffice/graph/gog-plot.c:466 +#: ../goffice/graph/gog-plot.c:467 msgid "Reference to X axis" msgstr "Sklic osi x" -#: ../goffice/graph/gog-plot.c:471 +#: ../goffice/graph/gog-plot.c:472 msgid "Y axis" msgstr "Os Y" -#: ../goffice/graph/gog-plot.c:472 +#: ../goffice/graph/gog-plot.c:473 msgid "Reference to Y axis" msgstr "Sklic osi y" -#: ../goffice/graph/gog-plot.c:477 +#: ../goffice/graph/gog-plot.c:478 msgid "Z axis" msgstr "Os Z" -#: ../goffice/graph/gog-plot.c:478 +#: ../goffice/graph/gog-plot.c:479 msgid "Reference to Z axis" msgstr "Sklic osi Z" -#: ../goffice/graph/gog-plot.c:483 +#: ../goffice/graph/gog-plot.c:484 msgid "Circular axis" msgstr "Krožna os" -#: ../goffice/graph/gog-plot.c:484 +#: ../goffice/graph/gog-plot.c:485 msgid "Reference to circular axis" msgstr "Sklic krožne osi" -#: ../goffice/graph/gog-plot.c:489 +#: ../goffice/graph/gog-plot.c:490 msgid "Radial axis" msgstr "Radialna os" -#: ../goffice/graph/gog-plot.c:490 +#: ../goffice/graph/gog-plot.c:491 msgid "Reference to radial axis" msgstr "Sklic radialne osi" -#: ../goffice/graph/gog-plot.c:495 +#: ../goffice/graph/gog-plot.c:496 msgid "Pseudo-3D axis" msgstr "Navidezna os 3D" -#: ../goffice/graph/gog-plot.c:496 +#: ../goffice/graph/gog-plot.c:497 msgid "Reference to pseudo-3D axis" msgstr "Sklic do navidezne osi 3D" -#: ../goffice/graph/gog-plot.c:501 +#: ../goffice/graph/gog-plot.c:502 msgid "Color axis" msgstr "Barvna os" -#: ../goffice/graph/gog-plot.c:502 +#: ../goffice/graph/gog-plot.c:503 msgid "Reference to color axis" msgstr "Sklic barvne osi" -#: ../goffice/graph/gog-plot.c:507 +#: ../goffice/graph/gog-plot.c:508 msgid "Bubble axis" msgstr "Mehurčna os" -#: ../goffice/graph/gog-plot.c:508 +#: ../goffice/graph/gog-plot.c:509 msgid "Reference to bubble axis" msgstr "Sklic krožne osi" -#: ../goffice/graph/gog-plot.c:513 +#: ../goffice/graph/gog-plot.c:514 msgid "Plot group" msgstr "Skupina diagramov" -#: ../goffice/graph/gog-plot.c:514 +#: ../goffice/graph/gog-plot.c:515 msgid "Name of plot group if any" msgstr "Ime skupine diagramov za izris, če je navedeno" # To je neke vrste "učiteljski namig". -#: ../goffice/graph/gog-plot.c:519 +#: ../goffice/graph/gog-plot.c:520 msgid "Guru hints" msgstr "Gurujev namig" -#: ../goffice/graph/gog-plot.c:520 +#: ../goffice/graph/gog-plot.c:521 msgid "" "Semicolon separated list of hints for automatic addition of objects in guru " "dialog" @@ -2476,19 +2507,19 @@ "S podpičjem ločen seznam Gurujevih namigov za samodejno dodajanje predmetov " "v pogovornem oknu" -#: ../goffice/graph/gog-plot.c:526 +#: ../goffice/graph/gog-plot.c:527 msgid "Default interpolation" msgstr "Privzeta interpolacija" -#: ../goffice/graph/gog-plot.c:527 +#: ../goffice/graph/gog-plot.c:528 msgid "Default type of series line interpolation" msgstr "Privzeta vrsta interpolacije črt niza" -#: ../goffice/graph/gog-plot.c:1175 +#: ../goffice/graph/gog-plot.c:1176 msgid "Move plot area" msgstr "Premakni površino diagrama" -#: ../goffice/graph/gog-plot.c:1227 +#: ../goffice/graph/gog-plot.c:1228 msgid "Resize plot area" msgstr "Spremeni velikost površine diagrama" @@ -2604,139 +2635,139 @@ msgid "Display _regression coefficient R²" msgstr "Prikaži koeficient _regresije R²" -#: ../goffice/graph/gog-renderer.c:1874 ../goffice/graph/gog-view.c:699 +#: ../goffice/graph/gog-renderer.c:1897 ../goffice/graph/gog-view.c:698 msgid "Model" msgstr "Model" -#: ../goffice/graph/gog-renderer.c:1875 +#: ../goffice/graph/gog-renderer.c:1898 msgid "The GogGraph this renderer displays" msgstr "Predmet GogGraph prikazan v izrisovalniku" -#: ../goffice/graph/gog-renderer.c:1880 +#: ../goffice/graph/gog-renderer.c:1903 msgid "View" msgstr "Pogled" -#: ../goffice/graph/gog-renderer.c:1881 +#: ../goffice/graph/gog-renderer.c:1904 msgid "the GogView this renderer is displaying" msgstr "Predmet GogView, ki ga prikazuje izrisovalnik" -#: ../goffice/graph/gog-series.c:106 +#: ../goffice/graph/gog-series.c:108 msgid "Y origin" msgstr "Izvor Y" -#: ../goffice/graph/gog-series.c:107 +#: ../goffice/graph/gog-series.c:109 msgid "X origin" msgstr "Izvor X" -#: ../goffice/graph/gog-series.c:112 +#: ../goffice/graph/gog-series.c:114 msgid "Origin" msgstr "Izvor" -#: ../goffice/graph/gog-series.c:114 +#: ../goffice/graph/gog-series.c:116 msgid "Edge" msgstr "Rob" -#: ../goffice/graph/gog-series.c:115 +#: ../goffice/graph/gog-series.c:117 msgid "Self" msgstr "Samo sebe" -#: ../goffice/graph/gog-series.c:116 +#: ../goffice/graph/gog-series.c:118 msgid "Next series" msgstr "Naslednji niz" -#: ../goffice/graph/gog-series.c:117 +#: ../goffice/graph/gog-series.c:119 msgid "X axis minimum" msgstr "Najmanjša vrednost na osi X" -#: ../goffice/graph/gog-series.c:118 +#: ../goffice/graph/gog-series.c:120 msgid "X axis maximum" msgstr "Največja vrednost na osi X" -#: ../goffice/graph/gog-series.c:119 +#: ../goffice/graph/gog-series.c:121 msgid "Y axis minimum" msgstr "Najmanjša vrednost na osi Y" -#: ../goffice/graph/gog-series.c:120 +#: ../goffice/graph/gog-series.c:122 msgid "Y axis maximum" msgstr "Največja vrednost na osi Y" -#: ../goffice/graph/gog-series.c:233 ../goffice/graph/gog-series-labels.c:414 +#: ../goffice/graph/gog-series.c:235 ../goffice/graph/gog-series-labels.c:414 msgid "Index:" msgstr "Kazalo:" -#: ../goffice/graph/gog-series.c:246 ../plugins/plot_pie/gog-pie.c:91 +#: ../goffice/graph/gog-series.c:248 ../plugins/plot_pie/gog-pie.c:91 msgid "Settings" msgstr "Nastavitve" -#: ../goffice/graph/gog-series.c:287 ../goffice/graph/gog-series-labels.c:917 +#: ../goffice/graph/gog-series.c:289 ../goffice/graph/gog-series-labels.c:917 msgid "Index" msgstr "Kazalo" -#: ../goffice/graph/gog-series.c:288 ../goffice/graph/gog-series-labels.c:918 +#: ../goffice/graph/gog-series.c:290 ../goffice/graph/gog-series-labels.c:918 msgid "Index of the corresponding data element" msgstr "Vpisna številka ustreznega predmeta podatkov" -#: ../goffice/graph/gog-series.c:624 ../goffice/graph/gog-trend-line.c:99 +#: ../goffice/graph/gog-series.c:626 ../goffice/graph/gog-trend-line.c:99 msgid "_Show in Legend" msgstr "_Pokaži v legendi" -#: ../goffice/graph/gog-series.c:634 +#: ../goffice/graph/gog-series.c:636 msgid "Data" msgstr "Podatki" -#: ../goffice/graph/gog-series.c:696 +#: ../goffice/graph/gog-series.c:698 msgid "Derivative at first point of the clamped cubic spline." msgstr "Odvod prve točke rezanega kubičnega zlepka." -#: ../goffice/graph/gog-series.c:701 +#: ../goffice/graph/gog-series.c:703 msgid "Derivative at last point of the clamped cubic spline." msgstr "Odvod zadnje točke rezanega kubičnega zlepka." -#: ../goffice/graph/gog-series.c:774 ../goffice/graph/gog-series-labels.c:1406 +#: ../goffice/graph/gog-series.c:776 ../goffice/graph/gog-series-labels.c:1407 msgid "Point" msgstr "Točka" -#: ../goffice/graph/gog-series.c:780 +#: ../goffice/graph/gog-series.c:782 msgid "Regression curve" msgstr "Regresijska krivulja" -#: ../goffice/graph/gog-series.c:788 ../goffice/graph/gog-theme.c:592 +#: ../goffice/graph/gog-series.c:790 ../goffice/graph/gog-theme.c:592 msgid "Trend line" msgstr "Trendna črta" -#: ../goffice/graph/gog-series.c:796 +#: ../goffice/graph/gog-series.c:798 msgid "Data labels" msgstr "Podatkovne oznake" -#: ../goffice/graph/gog-series.c:831 ../goffice/graph/gog-trend-line.c:151 +#: ../goffice/graph/gog-series.c:833 ../goffice/graph/gog-trend-line.c:151 msgid "Has-legend" msgstr "Ima legendo" -#: ../goffice/graph/gog-series.c:832 +#: ../goffice/graph/gog-series.c:834 msgid "Should the series show up in legends" msgstr "Ali naj se vrednosti nizov podatkov izrišejo v legendi" -#: ../goffice/graph/gog-series.c:837 ../goffice/graph/gog-series-prefs.ui.h:2 +#: ../goffice/graph/gog-series.c:839 ../goffice/graph/gog-series-prefs.ui.h:2 msgid "Interpolation" msgstr "Interpolacija" -#: ../goffice/graph/gog-series.c:838 +#: ../goffice/graph/gog-series.c:840 msgid "Type of line interpolation" msgstr "Vrsta interpolacije črte" -#: ../goffice/graph/gog-series.c:843 +#: ../goffice/graph/gog-series.c:845 msgid "Interpolation skip invalid" msgstr "Interpoliraj brez neveljavnih podatkov" -#: ../goffice/graph/gog-series.c:844 +#: ../goffice/graph/gog-series.c:846 msgid "Should the series interpolation ignore the invalid data" msgstr "Ali naj se pri interpolaciji nizov prezrejo neveljavni podatki" -#: ../goffice/graph/gog-series.c:849 +#: ../goffice/graph/gog-series.c:851 msgid "Fill type" msgstr "Vrsta polnila" -#: ../goffice/graph/gog-series.c:850 +#: ../goffice/graph/gog-series.c:852 msgid "How to fill the area" msgstr "Kako napolniti območje" @@ -2788,28 +2819,28 @@ #. Note to translators: a space might be needed before '%%' in someo_is_finie languages #. FIXME: should the number of digits be customizable? #: ../goffice/graph/gog-series-labels.c:842 -#: ../goffice/graph/gog-series-labels.c:1282 +#: ../goffice/graph/gog-series-labels.c:1283 #, c-format msgid "%.1f%%" msgstr "%.1f%%" #: ../goffice/graph/gog-series-labels.c:900 -#: ../goffice/graph/gog-series-labels.c:1430 +#: ../goffice/graph/gog-series-labels.c:1431 msgid "Position of the label relative to the data graphic element" msgstr "Umesti oznako relativno glede na grafični predmet podatkov" #: ../goffice/graph/gog-series-labels.c:905 -#: ../goffice/graph/gog-series-labels.c:1435 +#: ../goffice/graph/gog-series-labels.c:1436 msgid "Offset" msgstr "Odmik" #: ../goffice/graph/gog-series-labels.c:906 -#: ../goffice/graph/gog-series-labels.c:1436 +#: ../goffice/graph/gog-series-labels.c:1437 msgid "Offset to add to the label position" msgstr "Odmik, dodan položaju oznake" #: ../goffice/graph/gog-series-labels.c:912 -#: ../goffice/graph/gog-series-labels.c:1442 +#: ../goffice/graph/gog-series-labels.c:1443 msgid "Label format" msgstr "Oblika oznake" @@ -2883,7 +2914,7 @@ msgid "Regression equation" msgstr "Enačba regresije" -#: ../goffice/graph/gog-theme.c:597 ../plugins/plot_barcol/gog-1.5d.c:651 +#: ../goffice/graph/gog-theme.c:597 ../plugins/plot_barcol/gog-1.5d.c:654 msgid "Series lines" msgstr "Črte nizov" @@ -2961,23 +2992,23 @@ msgid "Should the trend line show up in legends" msgstr "Ali naj se trendna črta izriše v legedni" -#: ../goffice/graph/gog-view.c:129 +#: ../goffice/graph/gog-view.c:127 msgid "Select object" msgstr "Izbor predmeta" -#: ../goffice/graph/gog-view.c:200 +#: ../goffice/graph/gog-view.c:198 msgid "Move" msgstr "Premakni" -#: ../goffice/graph/gog-view.c:247 +#: ../goffice/graph/gog-view.c:245 msgid "Resize object" msgstr "Spremeni velikost predmeta" -#: ../goffice/graph/gog-view.c:694 +#: ../goffice/graph/gog-view.c:693 msgid "the GogView parent" msgstr "Nadrejeni predmet GogView" -#: ../goffice/graph/gog-view.c:700 +#: ../goffice/graph/gog-view.c:699 msgid "The GogObject this view displays" msgstr "Predmet GogObject uporabljen v prikazu" @@ -2985,11 +3016,11 @@ msgid "Series number" msgstr "Številka niza" -#: ../goffice/gtk/go-action-combo-text.c:224 +#: ../goffice/gtk/go-action-combo-text.c:228 msgid "Case Sensitive" msgstr "Razlikovanje malih/velikih črk" -#: ../goffice/gtk/go-action-combo-text.c:225 +#: ../goffice/gtk/go-action-combo-text.c:229 msgid "Should the text comparison be case sensitive" msgstr "Ali naj bo primerjava besedila občutljiva na velikost črk" @@ -2999,19 +3030,19 @@ #: ../goffice/gtk/go-arrow-sel.c:210 msgid "The currently selected arrow" -msgstr "" +msgstr "Trenutno izbrana puščica" #: ../goffice/gtk/go-arrow-sel.ui.h:1 msgid "Dimension A" -msgstr "" +msgstr "Dimenzija A" #: ../goffice/gtk/go-arrow-sel.ui.h:2 msgid "Dimension B" -msgstr "" +msgstr "Dimenzija B" #: ../goffice/gtk/go-arrow-sel.ui.h:3 msgid "Dimension C" -msgstr "" +msgstr "Dimenzija C" #: ../goffice/gtk/go-arrow-sel.ui.h:4 #: ../plugins/plot_surface/gog-xyz-surface-prefs.ui.h:8 @@ -3020,11 +3051,11 @@ #: ../goffice/gtk/go-arrow-sel.ui.h:6 msgid "Kite" -msgstr "" +msgstr "Zmaj" #: ../goffice/gtk/go-arrow-sel.ui.h:7 msgid "Oval" -msgstr "" +msgstr "Oval" #: ../goffice/gtk/go-charmap-sel.c:73 msgid "Arabic" @@ -3082,7 +3113,7 @@ msgid "Western" msgstr "Zahodno" -#: ../goffice/gtk/go-charmap-sel.c:87 ../goffice/gtk/go-font-sel.c:604 +#: ../goffice/gtk/go-charmap-sel.c:87 ../goffice/gtk/go-font-sel.c:609 #: ../goffice/gtk/go-locale-sel.c:72 msgid "Other" msgstr "Ostalo" @@ -3652,11 +3683,15 @@ msgid "Select an Image" msgstr "Izbor slike" -#: ../goffice/gtk/goffice-gtk.c:1019 +#: ../goffice/gtk/goffice-gtk.c:1035 msgid "Save as" msgstr "Shrani kot" -#: ../goffice/gtk/goffice-gtk.c:1092 +#: ../goffice/gtk/goffice-gtk.c:1051 +msgid "Auto by extension" +msgstr "Samodejno po priponi" + +#: ../goffice/gtk/goffice-gtk.c:1127 msgid "" "The given file extension does not match the chosen file type. Do you want to " "use this name anyway?" @@ -3664,7 +3699,7 @@ "Podana pripona datoteke se ne ujema z izbrano vrsto datoteke. Ali želite " "vseeno uporabiti to ime?" -#: ../goffice/gtk/goffice-gtk.c:1311 +#: ../goffice/gtk/goffice-gtk.c:1345 #, c-format msgid "" "%s\n" @@ -3673,7 +3708,7 @@ "%s\n" "je ime mape" -#: ../goffice/gtk/goffice-gtk.c:1315 +#: ../goffice/gtk/goffice-gtk.c:1349 #, c-format msgid "" "You do not have permission to save to\n" @@ -3682,7 +3717,7 @@ "Ni ustreznih dolvoljenj za shranjevanje v\n" "%s" -#: ../goffice/gtk/goffice-gtk.c:1325 +#: ../goffice/gtk/goffice-gtk.c:1359 #, c-format msgid "" "A file called %s already exists in %s.\n" @@ -3693,7 +3728,7 @@ "\n" "Ali jo želite prepisati?" -#: ../goffice/gtk/go-font-sel.c:348 +#: ../goffice/gtk/go-font-sel.c:353 msgid "Faces" msgstr "Oblike pisav" @@ -3703,477 +3738,477 @@ #. * and whether it is an italic or regular face. The four #. * first here are the important ones. #. -#: ../goffice/gtk/go-font-sel.c:389 +#: ../goffice/gtk/go-font-sel.c:394 msgctxt "FontFace" msgid "Regular" msgstr "Navadna" -#: ../goffice/gtk/go-font-sel.c:390 ../goffice/gtk/go-font-sel.c:424 +#: ../goffice/gtk/go-font-sel.c:395 ../goffice/gtk/go-font-sel.c:429 msgctxt "FontFace" msgid "Italic" msgstr "Ležeča" -#: ../goffice/gtk/go-font-sel.c:391 +#: ../goffice/gtk/go-font-sel.c:396 msgctxt "FontFace" msgid "Bold" msgstr "Krepka" -#: ../goffice/gtk/go-font-sel.c:392 +#: ../goffice/gtk/go-font-sel.c:397 msgctxt "FontFace" msgid "Bold Italic" msgstr "Krepka ležeča" #. These are fairly rare. -#: ../goffice/gtk/go-font-sel.c:395 +#: ../goffice/gtk/go-font-sel.c:400 msgctxt "FontFace" msgid "Black" msgstr "Skrajno krepka" -#: ../goffice/gtk/go-font-sel.c:396 +#: ../goffice/gtk/go-font-sel.c:401 msgctxt "FontFace" msgid "Bold Condensed Italic" msgstr "Krepka zožena ležeča" -#: ../goffice/gtk/go-font-sel.c:397 +#: ../goffice/gtk/go-font-sel.c:402 msgctxt "FontFace" msgid "Bold Condensed" msgstr "Krepka zožena" -#: ../goffice/gtk/go-font-sel.c:398 +#: ../goffice/gtk/go-font-sel.c:403 msgctxt "FontFace" msgid "Bold Italic Small Caps" msgstr "Krepke ležeče kapitalke" -#: ../goffice/gtk/go-font-sel.c:399 +#: ../goffice/gtk/go-font-sel.c:404 msgctxt "FontFace" msgid "Bold Nonextended" msgstr "Krepka nerazširjena" -#: ../goffice/gtk/go-font-sel.c:400 +#: ../goffice/gtk/go-font-sel.c:405 msgctxt "FontFace" msgid "Bold Oblique" msgstr "Krepka nagnjena" -#: ../goffice/gtk/go-font-sel.c:401 +#: ../goffice/gtk/go-font-sel.c:406 msgctxt "FontFace" msgid "Bold Slanted" msgstr "Krepka nagnjena" -#: ../goffice/gtk/go-font-sel.c:402 +#: ../goffice/gtk/go-font-sel.c:407 msgctxt "FontFace" msgid "Bold Small Caps" msgstr "Krepke kapitalke" -#: ../goffice/gtk/go-font-sel.c:403 +#: ../goffice/gtk/go-font-sel.c:408 msgctxt "FontFace" msgid "Book Oblique" msgstr "Navadno nagnjeno" -#: ../goffice/gtk/go-font-sel.c:404 +#: ../goffice/gtk/go-font-sel.c:409 msgctxt "FontFace" msgid "Book" msgstr "Navadno" -#: ../goffice/gtk/go-font-sel.c:405 +#: ../goffice/gtk/go-font-sel.c:410 msgctxt "FontFace" msgid "Condensed Bold Italic" msgstr "Zožena krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:406 +#: ../goffice/gtk/go-font-sel.c:411 msgctxt "FontFace" msgid "Condensed Bold Oblique" msgstr "Zožena krepka nagnjena" -#: ../goffice/gtk/go-font-sel.c:407 +#: ../goffice/gtk/go-font-sel.c:412 msgctxt "FontFace" msgid "Condensed Bold" msgstr "Zožena krepka" -#: ../goffice/gtk/go-font-sel.c:408 +#: ../goffice/gtk/go-font-sel.c:413 msgctxt "FontFace" msgid "Condensed Italic" msgstr "Zožena ležeča" -#: ../goffice/gtk/go-font-sel.c:409 +#: ../goffice/gtk/go-font-sel.c:414 msgctxt "FontFace" msgid "Condensed Oblique" msgstr "Zožena nagnjena" -#: ../goffice/gtk/go-font-sel.c:410 +#: ../goffice/gtk/go-font-sel.c:415 msgctxt "FontFace" msgid "Condensed" msgstr "Zožena" -#: ../goffice/gtk/go-font-sel.c:411 +#: ../goffice/gtk/go-font-sel.c:416 msgctxt "FontFace" msgid "Demi Bold Italic" msgstr "Močno krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:412 +#: ../goffice/gtk/go-font-sel.c:417 msgctxt "FontFace" msgid "Demi Bold" msgstr "Močno krepka" -#: ../goffice/gtk/go-font-sel.c:413 +#: ../goffice/gtk/go-font-sel.c:418 msgctxt "FontFace" msgid "Demi Oblique" msgstr "Močno nagnjena" -#: ../goffice/gtk/go-font-sel.c:414 +#: ../goffice/gtk/go-font-sel.c:419 msgctxt "FontFace" msgid "Demi" msgstr "Močno krepka" -#: ../goffice/gtk/go-font-sel.c:415 +#: ../goffice/gtk/go-font-sel.c:420 msgctxt "FontFace" msgid "Demi-Condensed" msgstr "Močno krepka zožena" -#: ../goffice/gtk/go-font-sel.c:416 +#: ../goffice/gtk/go-font-sel.c:421 msgctxt "FontFace" msgid "Embossed" msgstr "Vdolbena" -#: ../goffice/gtk/go-font-sel.c:417 +#: ../goffice/gtk/go-font-sel.c:422 msgctxt "FontFace" msgid "Expanded Bold Italic" msgstr "Razširjena krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:418 +#: ../goffice/gtk/go-font-sel.c:423 msgctxt "FontFace" msgid "Expanded Bold" msgstr "Razširjena krepka" -#: ../goffice/gtk/go-font-sel.c:419 +#: ../goffice/gtk/go-font-sel.c:424 msgctxt "FontFace" msgid "Expanded Italic" msgstr "Razširjena ležeča" -#: ../goffice/gtk/go-font-sel.c:420 +#: ../goffice/gtk/go-font-sel.c:425 msgctxt "FontFace" msgid "Expanded" msgstr "Razširjena" -#: ../goffice/gtk/go-font-sel.c:421 +#: ../goffice/gtk/go-font-sel.c:426 msgctxt "FontFace" msgid "Extra Light" msgstr "Skrajno stanjšana" -#: ../goffice/gtk/go-font-sel.c:422 +#: ../goffice/gtk/go-font-sel.c:427 msgctxt "FontFace" msgid "Heavy" msgstr "Skrajno krepka" -#: ../goffice/gtk/go-font-sel.c:423 +#: ../goffice/gtk/go-font-sel.c:428 msgctxt "FontFace" msgid "Italic Small Caps" msgstr "Ležeče kapitalke" -#: ../goffice/gtk/go-font-sel.c:425 +#: ../goffice/gtk/go-font-sel.c:430 msgctxt "FontFace" msgid "Light Italic" msgstr "Stanjšano ležeča" -#: ../goffice/gtk/go-font-sel.c:426 +#: ../goffice/gtk/go-font-sel.c:431 msgctxt "FontFace" msgid "Light Oblique" msgstr "Stanjšano nagnjena" -#: ../goffice/gtk/go-font-sel.c:427 +#: ../goffice/gtk/go-font-sel.c:432 msgctxt "FontFace" msgid "Light" msgstr "Stanjšana" -#: ../goffice/gtk/go-font-sel.c:428 +#: ../goffice/gtk/go-font-sel.c:433 msgctxt "FontFace" msgid "Medium Italic" msgstr "Srednja ležeča" -#: ../goffice/gtk/go-font-sel.c:429 +#: ../goffice/gtk/go-font-sel.c:434 msgctxt "FontFace" msgid "Medium" msgstr "Srednja" -#: ../goffice/gtk/go-font-sel.c:430 +#: ../goffice/gtk/go-font-sel.c:435 msgctxt "FontFace" msgid "Normal" msgstr "Navadna" -#: ../goffice/gtk/go-font-sel.c:431 +#: ../goffice/gtk/go-font-sel.c:436 msgctxt "FontFace" msgid "Oblique" msgstr "Nagnjena" -#: ../goffice/gtk/go-font-sel.c:432 +#: ../goffice/gtk/go-font-sel.c:437 msgctxt "FontFace" msgid "Regular Condensed Italic" msgstr "Navadna zožena ležeča" -#: ../goffice/gtk/go-font-sel.c:433 +#: ../goffice/gtk/go-font-sel.c:438 msgctxt "FontFace" msgid "Regular Condensed" msgstr "Navadna zožena" -#: ../goffice/gtk/go-font-sel.c:434 +#: ../goffice/gtk/go-font-sel.c:439 msgctxt "FontFace" msgid "Regular Italic" msgstr "Navadna ležeča" -#: ../goffice/gtk/go-font-sel.c:435 +#: ../goffice/gtk/go-font-sel.c:440 msgctxt "FontFace" msgid "Regular Oblique" msgstr "Navadna nagnjena" -#: ../goffice/gtk/go-font-sel.c:436 +#: ../goffice/gtk/go-font-sel.c:441 msgctxt "FontFace" msgid "Roman Slanted" msgstr "Navadna nagnjena" -#: ../goffice/gtk/go-font-sel.c:437 +#: ../goffice/gtk/go-font-sel.c:442 msgctxt "FontFace" msgid "Roman" msgstr "Navadna" -#: ../goffice/gtk/go-font-sel.c:438 +#: ../goffice/gtk/go-font-sel.c:443 msgctxt "FontFace" msgid "Rounded" msgstr "Zaobljena" -#: ../goffice/gtk/go-font-sel.c:439 +#: ../goffice/gtk/go-font-sel.c:444 msgctxt "FontFace" msgid "Sans Bold Italic" msgstr "Navadna krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:440 +#: ../goffice/gtk/go-font-sel.c:445 msgctxt "FontFace" msgid "Sans Bold" msgstr "Navadna krepka" -#: ../goffice/gtk/go-font-sel.c:441 +#: ../goffice/gtk/go-font-sel.c:446 msgctxt "FontFace" msgid "Sans Italic" msgstr "Navadna ležeča" -#: ../goffice/gtk/go-font-sel.c:442 +#: ../goffice/gtk/go-font-sel.c:447 msgctxt "FontFace" msgid "Sans" msgstr "Navadna" -#: ../goffice/gtk/go-font-sel.c:443 +#: ../goffice/gtk/go-font-sel.c:448 msgctxt "FontFace" msgid "Semi-Bold Italic Small Caps" msgstr "Polkrepke ležeče kapitalke" -#: ../goffice/gtk/go-font-sel.c:444 +#: ../goffice/gtk/go-font-sel.c:449 msgctxt "FontFace" msgid "Semi-Bold Italic" msgstr "Polkrepka ležeča" -#: ../goffice/gtk/go-font-sel.c:445 +#: ../goffice/gtk/go-font-sel.c:450 msgctxt "FontFace" msgid "Semi-Bold Oblique" msgstr "Polkrepka nagnjena" -#: ../goffice/gtk/go-font-sel.c:446 +#: ../goffice/gtk/go-font-sel.c:451 msgctxt "FontFace" msgid "Semi-Bold Slanted" msgstr "Polkrepka nagnjena" -#: ../goffice/gtk/go-font-sel.c:447 +#: ../goffice/gtk/go-font-sel.c:452 msgctxt "FontFace" msgid "Semi-Bold Small Caps" msgstr "Polkrepke kapitalke" -#: ../goffice/gtk/go-font-sel.c:448 +#: ../goffice/gtk/go-font-sel.c:453 msgctxt "FontFace" msgid "Semi-Bold" msgstr "Polkrepka" -#: ../goffice/gtk/go-font-sel.c:449 +#: ../goffice/gtk/go-font-sel.c:454 msgctxt "FontFace" msgid "Semi-Condensed Bold Italic" msgstr "Pol-zožena krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:450 +#: ../goffice/gtk/go-font-sel.c:455 msgctxt "FontFace" msgid "Semi-Condensed Bold" msgstr "Pol-zožena krepka" -#: ../goffice/gtk/go-font-sel.c:451 +#: ../goffice/gtk/go-font-sel.c:456 msgctxt "FontFace" msgid "Semi-Condensed Italic" msgstr "Pol-zožena ležeča" -#: ../goffice/gtk/go-font-sel.c:452 +#: ../goffice/gtk/go-font-sel.c:457 msgctxt "FontFace" msgid "Semi-Condensed Oblique" msgstr "Pol-zožena nagnjena" -#: ../goffice/gtk/go-font-sel.c:453 +#: ../goffice/gtk/go-font-sel.c:458 msgctxt "FontFace" msgid "Semi-Condensed" msgstr "Pol-zožena" -#: ../goffice/gtk/go-font-sel.c:454 +#: ../goffice/gtk/go-font-sel.c:459 msgctxt "FontFace" msgid "Semi-Expanded Bold Italic" msgstr "Pol-razširjena krepka ležeča" -#: ../goffice/gtk/go-font-sel.c:455 +#: ../goffice/gtk/go-font-sel.c:460 msgctxt "FontFace" msgid "Semi-Expanded Bold" msgstr "Pol-razširjena krepka" -#: ../goffice/gtk/go-font-sel.c:456 +#: ../goffice/gtk/go-font-sel.c:461 msgctxt "FontFace" msgid "Semi-Expanded Italic" msgstr "Pol-razširjena ležeča" -#: ../goffice/gtk/go-font-sel.c:457 +#: ../goffice/gtk/go-font-sel.c:462 msgctxt "FontFace" msgid "Semi-Expanded" msgstr "Pol-razširjena" -#: ../goffice/gtk/go-font-sel.c:458 +#: ../goffice/gtk/go-font-sel.c:463 msgctxt "FontFace" msgid "Slanted" msgstr "Nagnjena" # vzorci diagramov in grafov -#: ../goffice/gtk/go-font-sel.c:459 +#: ../goffice/gtk/go-font-sel.c:464 msgctxt "FontFace" msgid "Small Caps" msgstr "Kapitalke" -#: ../goffice/gtk/go-font-sel.c:460 +#: ../goffice/gtk/go-font-sel.c:465 msgctxt "FontFace" msgid "Thin" msgstr "ZoženaZožana" -#: ../goffice/gtk/go-font-sel.c:461 +#: ../goffice/gtk/go-font-sel.c:466 msgctxt "FontFace" msgid "Upright Italic" msgstr "Pokončna ležeča" -#: ../goffice/gtk/go-font-sel.c:529 ../goffice/utils/go-style.c:957 +#: ../goffice/gtk/go-font-sel.c:534 ../goffice/utils/go-style.c:957 #: ../plugins/lasem/component.c:268 ../plugins/lasem/component.c:492 msgid "Font" msgstr "Pisava" -#: ../goffice/gtk/go-font-sel.c:605 +#: ../goffice/gtk/go-font-sel.c:610 msgid "All fonts..." msgstr "Vse pisave ..." -#: ../goffice/gtk/go-font-sel.c:936 +#: ../goffice/gtk/go-font-sel.c:941 msgctxt "underline" msgid "None" msgstr "Brez" -#: ../goffice/gtk/go-font-sel.c:937 +#: ../goffice/gtk/go-font-sel.c:942 msgctxt "underline" msgid "Single" msgstr "Enojno" -#: ../goffice/gtk/go-font-sel.c:938 +#: ../goffice/gtk/go-font-sel.c:943 msgctxt "underline" msgid "Double" msgstr "Dvojno" -#: ../goffice/gtk/go-font-sel.c:939 +#: ../goffice/gtk/go-font-sel.c:944 msgctxt "underline" msgid "Low" msgstr "Nizko" -#: ../goffice/gtk/go-font-sel.c:940 +#: ../goffice/gtk/go-font-sel.c:945 msgctxt "underline" msgid "Error" msgstr "Napaka" -#: ../goffice/gtk/go-font-sel.c:961 ../goffice/math/go-distribution.c:77 +#: ../goffice/gtk/go-font-sel.c:966 ../goffice/math/go-distribution.c:77 msgid "Normal" msgstr "Običajna" -#: ../goffice/gtk/go-font-sel.c:962 +#: ../goffice/gtk/go-font-sel.c:967 msgid "Subscript" msgstr "Podpisano" -#: ../goffice/gtk/go-font-sel.c:963 +#: ../goffice/gtk/go-font-sel.c:968 msgid "Superscript" msgstr "Nadpisano" -#: ../goffice/gtk/go-font-sel.c:1216 +#: ../goffice/gtk/go-font-sel.c:1251 msgid "Show Style" msgstr "Pokaži slog" -#: ../goffice/gtk/go-font-sel.c:1217 +#: ../goffice/gtk/go-font-sel.c:1252 msgid "Whether style is part of the font being selected" msgstr "Ali je slog del izbrane pisave" -#: ../goffice/gtk/go-font-sel.c:1225 +#: ../goffice/gtk/go-font-sel.c:1260 msgid "Show Color" msgstr "Pokaži barvo" -#: ../goffice/gtk/go-font-sel.c:1226 +#: ../goffice/gtk/go-font-sel.c:1261 msgid "Whether color is part of the font being selected" msgstr "Ali je barva del izbrane pisave" -#: ../goffice/gtk/go-font-sel.c:1234 +#: ../goffice/gtk/go-font-sel.c:1269 msgid "Show Underline" msgstr "Prikaži podčrtano" -#: ../goffice/gtk/go-font-sel.c:1235 +#: ../goffice/gtk/go-font-sel.c:1270 msgid "Whether underlining is part of the font being selected" msgstr "Ali je slog podčrtanosti del izbrane pisave" -#: ../goffice/gtk/go-font-sel.c:1243 +#: ../goffice/gtk/go-font-sel.c:1278 msgid "Show Script" msgstr "Pokaži podpis in nadpis" -#: ../goffice/gtk/go-font-sel.c:1244 +#: ../goffice/gtk/go-font-sel.c:1279 msgid "Whether subscript/superscript is part of the font being selected" msgstr "Ali je slog nadpisane in podpisane pisave del izbrane pisave" -#: ../goffice/gtk/go-font-sel.c:1252 +#: ../goffice/gtk/go-font-sel.c:1287 msgid "Show Strikethrough" msgstr "Pokaži prečrtano" -#: ../goffice/gtk/go-font-sel.c:1253 +#: ../goffice/gtk/go-font-sel.c:1288 msgid "Whether strikethrough is part of the font being selected" msgstr "Ali je slog prečrtanega besedila del izbrane pisave" -#: ../goffice/gtk/go-font-sel.c:1261 +#: ../goffice/gtk/go-font-sel.c:1296 msgid "Color unset text" msgstr "Besedilo nenastavljene barve" -#: ../goffice/gtk/go-font-sel.c:1262 +#: ../goffice/gtk/go-font-sel.c:1297 msgid "The text to show for selecting no color" -msgstr "" +msgstr "Besedilo, ki ga želite pokazati, če ni izbrana nobena barva" -#: ../goffice/gtk/go-font-sel.c:1270 +#: ../goffice/gtk/go-font-sel.c:1305 msgid "Color Group" msgstr "Barvna skupina" -#: ../goffice/gtk/go-font-sel.c:1271 +#: ../goffice/gtk/go-font-sel.c:1306 msgid "The color group to use for the color picker" msgstr "Barvna skupina za izbirnik barv" -#: ../goffice/gtk/go-font-sel.c:1279 +#: ../goffice/gtk/go-font-sel.c:1314 msgid "Color Default" msgstr "Privzeta barva" -#: ../goffice/gtk/go-font-sel.c:1280 +#: ../goffice/gtk/go-font-sel.c:1315 msgid "The color to show for an unset color" msgstr "Barva, ki določa besedilo brez nastavljene barve" -#: ../goffice/gtk/go-font-sel.c:1290 +#: ../goffice/gtk/go-font-sel.c:1325 msgid "Underline Picker" msgstr "Izbirnik podčrtanosti" -#: ../goffice/gtk/go-font-sel.c:1291 +#: ../goffice/gtk/go-font-sel.c:1326 msgid "The widget to use for picking underline type" msgstr "Gradnik za uporabo vrste podčrtanosti" -#: ../goffice/gtk/go-font-sel-dialog.c:107 +#: ../goffice/gtk/go-font-sel-dialog.c:112 msgid "Pick a Font" msgstr "Izbor pisave" @@ -4277,164 +4312,164 @@ msgstr "Po meri" #. See http://en.wikipedia.org/wiki/Ampere -#: ../goffice/gtk/go-format-sel.c:309 +#: ../goffice/gtk/go-format-sel.c:311 msgid "A (ampere)" msgstr "A (amper)" #. See http://en.wikipedia.org/wiki/Becquerel -#: ../goffice/gtk/go-format-sel.c:311 +#: ../goffice/gtk/go-format-sel.c:313 msgid "Bq (becquerel)" msgstr "Bq (bekerel)" #. See http://en.wikipedia.org/wiki/Candela -#: ../goffice/gtk/go-format-sel.c:313 +#: ../goffice/gtk/go-format-sel.c:315 msgid "cd (candela)" msgstr "cd (kandela)" #. See http://en.wikipedia.org/wiki/Coulomb -#: ../goffice/gtk/go-format-sel.c:315 +#: ../goffice/gtk/go-format-sel.c:317 msgid "C (coulomb)" msgstr "C (coulomb)" #. See http://en.wikipedia.org/wiki/Degree_Celsius -#: ../goffice/gtk/go-format-sel.c:317 +#: ../goffice/gtk/go-format-sel.c:319 msgid "°C (degree Celsius)" msgstr "°C (stopinja Celzija)" #. See http://en.wikipedia.org/wiki/Farad -#: ../goffice/gtk/go-format-sel.c:319 +#: ../goffice/gtk/go-format-sel.c:321 msgid "F (farad)" msgstr "F (farad)" #. See http://en.wikipedia.org/wiki/Gray_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:321 +#: ../goffice/gtk/go-format-sel.c:323 msgid "Gy (gray)" msgstr "Gy (gray)" #. See http://en.wikipedia.org/wiki/Henry_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:323 +#: ../goffice/gtk/go-format-sel.c:325 msgid "H (henry)" msgstr "H (henry)" #. See http://en.wikipedia.org/wiki/Hertz -#: ../goffice/gtk/go-format-sel.c:325 +#: ../goffice/gtk/go-format-sel.c:327 msgid "Hz (hertz)" msgstr "Hz (hertz)" #. See http://en.wikipedia.org/wiki/Joule -#: ../goffice/gtk/go-format-sel.c:327 +#: ../goffice/gtk/go-format-sel.c:329 msgid "J (joule)" msgstr "J (joule)" #. See http://en.wikipedia.org/wiki/Kelvin -#: ../goffice/gtk/go-format-sel.c:329 +#: ../goffice/gtk/go-format-sel.c:331 msgid "K (kelvin)" msgstr "K (kelvin)" #. See http://en.wikipedia.org/wiki/Kilogram -#: ../goffice/gtk/go-format-sel.c:331 +#: ../goffice/gtk/go-format-sel.c:333 msgid "kg (kilogram)" msgstr "kg (kilogram)" #. See http://en.wikipedia.org/wiki/Lumen_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:333 +#: ../goffice/gtk/go-format-sel.c:335 msgid "lm (lumen)" msgstr "lm (lumen)" #. See http://en.wikipedia.org/wiki/Lux -#: ../goffice/gtk/go-format-sel.c:335 +#: ../goffice/gtk/go-format-sel.c:337 msgid "lx (lux)" msgstr "lx (luks)" #. See http://en.wikipedia.org/wiki/Metre -#: ../goffice/gtk/go-format-sel.c:337 +#: ../goffice/gtk/go-format-sel.c:339 msgid "m (meter)" msgstr "m (meter)" #. See http://en.wikipedia.org/wiki/Mole_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:339 +#: ../goffice/gtk/go-format-sel.c:341 msgid "mol (mole)" msgstr "mol (mol)" #. See http://en.wikipedia.org/wiki/Newton_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:341 +#: ../goffice/gtk/go-format-sel.c:343 msgid "N (newton)" msgstr "N (newton)" #. See http://en.wikipedia.org/wiki/Ohm_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:343 +#: ../goffice/gtk/go-format-sel.c:345 msgid "Ω (ohm)" msgstr "Ω (om)" #. See http://en.wikipedia.org/wiki/Pascal_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:345 +#: ../goffice/gtk/go-format-sel.c:347 msgid "Pa (pascal)" msgstr "Pa (paskal)" #. See http://en.wikipedia.org/wiki/Radian -#: ../goffice/gtk/go-format-sel.c:347 +#: ../goffice/gtk/go-format-sel.c:349 msgid "rad (radian)" msgstr "rad (radian)" #. See http://en.wikipedia.org/wiki/Second -#: ../goffice/gtk/go-format-sel.c:349 +#: ../goffice/gtk/go-format-sel.c:351 msgid "s (second)" msgstr "s (sekunda)" #. See http://en.wikipedia.org/wiki/Siemens_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:351 +#: ../goffice/gtk/go-format-sel.c:353 msgid "S (siemens)" msgstr "S (siemens)" #. See http://en.wikipedia.org/wiki/Steradian -#: ../goffice/gtk/go-format-sel.c:353 +#: ../goffice/gtk/go-format-sel.c:355 msgid "sr (steradian)" msgstr "sr (steradian)" #. See http://en.wikipedia.org/wiki/Sievert -#: ../goffice/gtk/go-format-sel.c:355 +#: ../goffice/gtk/go-format-sel.c:357 msgid "Sv (sievert)" msgstr "Sv (sievert)" #. See http://en.wikipedia.org/wiki/Tesla_%28unit%29 -#: ../goffice/gtk/go-format-sel.c:357 +#: ../goffice/gtk/go-format-sel.c:359 msgid "T (tesla)" msgstr "T (tesla)" #. See http://en.wikipedia.org/wiki/Katal -#: ../goffice/gtk/go-format-sel.c:359 +#: ../goffice/gtk/go-format-sel.c:361 msgid "kat (katal)" msgstr "kat (katal)" #. See http://en.wikipedia.org/wiki/Volt -#: ../goffice/gtk/go-format-sel.c:361 +#: ../goffice/gtk/go-format-sel.c:363 msgid "V (volt)" msgstr "V (volt)" #. See http://en.wikipedia.org/wiki/Watt -#: ../goffice/gtk/go-format-sel.c:363 +#: ../goffice/gtk/go-format-sel.c:365 msgid "W (watt)" msgstr "W (vat)" #. See http://en.wikipedia.org/wiki/Weber_%28Wb%29 -#: ../goffice/gtk/go-format-sel.c:365 +#: ../goffice/gtk/go-format-sel.c:367 msgid "Wb (weber)" msgstr "Wb (weber)" -#: ../goffice/gtk/go-format-sel.c:1030 ../goffice/gtk/go-format-sel.ui.h:41 +#: ../goffice/gtk/go-format-sel.c:1032 ../goffice/gtk/go-format-sel.ui.h:41 msgid "Append no further unit." msgstr "Ne dodaj enote." -#: ../goffice/gtk/go-format-sel.c:1037 +#: ../goffice/gtk/go-format-sel.c:1039 #, c-format msgid "Append '%s'." msgstr "Dodaj '%s'." -#: ../goffice/gtk/go-format-sel.c:1580 +#: ../goffice/gtk/go-format-sel.c:1579 msgid "Negative Number Format" msgstr "Oblike negativnih števil" -#: ../goffice/gtk/go-format-sel.c:1640 +#: ../goffice/gtk/go-format-sel.c:1639 msgid "Number Formats" msgstr "Oblike števil" @@ -4617,51 +4652,51 @@ #: ../goffice/gtk/go-gradient-selector.c:97 msgid "Vertical from middle" -msgstr "" +msgstr "Navpično iz sredine" #: ../goffice/gtk/go-gradient-selector.c:99 msgid "Vertical to middle" -msgstr "" +msgstr "Navpično v sredino" #: ../goffice/gtk/go-gradient-selector.c:105 msgid "Horizontal from middle" -msgstr "" +msgstr "Vodoravno iz sredine" #: ../goffice/gtk/go-gradient-selector.c:107 msgid "Horizontal to middle" -msgstr "" +msgstr "Vodoravno v sredino" #: ../goffice/gtk/go-gradient-selector.c:109 msgid "Up and left" -msgstr "" +msgstr "Navzgor in levo" #: ../goffice/gtk/go-gradient-selector.c:111 msgid "Down and right" -msgstr "" +msgstr "Navzdol in desno" #: ../goffice/gtk/go-gradient-selector.c:113 msgid "Diagonal from middle" -msgstr "" +msgstr "Diagonalno iz sredine" #: ../goffice/gtk/go-gradient-selector.c:115 msgid "Diagonal to middle" -msgstr "" +msgstr "Diagonalno proti sredini" #: ../goffice/gtk/go-gradient-selector.c:117 msgid "Up and right" -msgstr "" +msgstr "Navzgor in desno" #: ../goffice/gtk/go-gradient-selector.c:119 msgid "Down and left" -msgstr "" +msgstr "Navzdol in levo" #: ../goffice/gtk/go-gradient-selector.c:121 msgid "Reverse diagonal from middle" -msgstr "" +msgstr "Obratno diagonalno iz sredine" #: ../goffice/gtk/go-gradient-selector.c:123 msgid "Reverse diagonal to middle" -msgstr "" +msgstr "Obratno diagonalno v sredino" #: ../goffice/gtk/go-image-save-dialog-extra.ui.h:1 msgid "_File type:" @@ -5138,7 +5173,7 @@ #: ../goffice/gtk/go-locale-sel.c:203 msgid "Philippines/Filipino (fil_PH)" -msgstr "" +msgstr "Filipini/Filipinsko (fil_PH)" #: ../goffice/gtk/go-locale-sel.c:204 msgid "Faroe Islands (fo_FO)" @@ -5754,79 +5789,79 @@ #: ../goffice/gtk/go-pattern-selector.c:66 msgid "Solid background" -msgstr "" +msgstr "Zapolnjeno ozadje" #: ../goffice/gtk/go-pattern-selector.c:67 msgid "75% background" -msgstr "" +msgstr "75 % ozadje" #: ../goffice/gtk/go-pattern-selector.c:68 msgid "50% background" -msgstr "" +msgstr "50 % ozadje" #: ../goffice/gtk/go-pattern-selector.c:69 msgid "25% background" -msgstr "" +msgstr "25 % ozadje" #: ../goffice/gtk/go-pattern-selector.c:70 msgid "12.5% background" -msgstr "" +msgstr "12,5 % ozadje" #: ../goffice/gtk/go-pattern-selector.c:71 msgid "6.25% background" -msgstr "" +msgstr "6,25 % ozadje" #: ../goffice/gtk/go-pattern-selector.c:72 msgid "Horizontal stripes" -msgstr "" +msgstr "Vodoravne proge" #: ../goffice/gtk/go-pattern-selector.c:73 msgid "Vertical stripes" -msgstr "" +msgstr "Navpične proge" #: ../goffice/gtk/go-pattern-selector.c:74 msgid "Reverse diagonal stripes" -msgstr "" +msgstr "Obratne diagonalne proge" #: ../goffice/gtk/go-pattern-selector.c:75 msgid "Diagonal stripes" -msgstr "" +msgstr "Diagonalne proge" #: ../goffice/gtk/go-pattern-selector.c:76 msgid "Diagonal crosshatch" -msgstr "" +msgstr "Diagonalno križno" #: ../goffice/gtk/go-pattern-selector.c:77 msgid "Thick diagonal crosshatch" -msgstr "" +msgstr "Debelo diagonalno križno" #: ../goffice/gtk/go-pattern-selector.c:78 msgid "Thin horizontal stripes" -msgstr "" +msgstr "Tanke vodoravne proge" #: ../goffice/gtk/go-pattern-selector.c:79 msgid "Thin vertical stripes" -msgstr "" +msgstr "Tanke navpične proge" #: ../goffice/gtk/go-pattern-selector.c:80 msgid "Thin reverse diagonal stripes" -msgstr "" +msgstr "Tanke obratne diagonalne proge" #: ../goffice/gtk/go-pattern-selector.c:81 msgid "Thin diagonal stripes" -msgstr "" +msgstr "Tanke diagonalne proge" #: ../goffice/gtk/go-pattern-selector.c:82 msgid "Thin horizontal crosshatch" -msgstr "" +msgstr "Tanko vodoravno križno" #: ../goffice/gtk/go-pattern-selector.c:83 msgid "Thin diagonal crosshatch" -msgstr "" +msgstr "Tanko diagonalno križno" #: ../goffice/gtk/go-pattern-selector.c:84 msgid "Solid foreground" -msgstr "" +msgstr "Zapolnjeno ospredje" #: ../goffice/gtk/go-pattern-selector.c:85 msgid "Small circles" @@ -5837,7 +5872,7 @@ msgstr "Srednje veliki krogi" # vzorci diagramov in grafov -#: ../goffice/gtk/go-pattern-selector.c:87 ../goffice/utils/go-pattern.c:212 +#: ../goffice/gtk/go-pattern-selector.c:87 ../goffice/utils/go-pattern.c:211 msgid "Thatch" msgstr "slamnato" @@ -5846,7 +5881,7 @@ msgstr "Veliki krogi" # vzorci diagramov in grafov -#: ../goffice/gtk/go-pattern-selector.c:89 ../goffice/utils/go-pattern.c:224 +#: ../goffice/gtk/go-pattern-selector.c:89 ../goffice/utils/go-pattern.c:223 msgid "Bricks" msgstr "opečno" @@ -6169,7 +6204,7 @@ #: ../goffice/utils/formats.c:455 msgid "Iceland, Kronur" -msgstr "" +msgstr "Islandija, Kronur" #: ../goffice/utils/formats.c:456 msgid "Jamaica, Dollars" @@ -6537,7 +6572,7 @@ #: ../goffice/utils/formats.c:547 msgid "Bond Markets Units, European Composite Units (EURCO)" -msgstr "" +msgstr "Enote za trge obveznic, evropske sestavljene enote (EURCO)" #: ../goffice/utils/formats.c:548 msgid "European Monetary Units (E.M.U.-6)" @@ -6595,96 +6630,96 @@ msgid "Zimbabwe, Zimbabwe Dollars" msgstr "Zimbabve, zimbabski dolar" -#: ../goffice/utils/go-emf.c:230 +#: ../goffice/utils/go-emf.c:233 #, c-format msgid "Could not load the image data\n" msgstr "Ni mogoče naložiti podatkov slike\n" -#: ../goffice/utils/go-emf.c:269 +#: ../goffice/utils/go-emf.c:272 #, c-format msgid "Could not input the image data\n" msgstr "Ni mogoče vnesti podatkov slike\n" -#: ../goffice/utils/go-emf.c:4885 ../goffice/utils/go-emf.c:4891 +#: ../goffice/utils/go-emf.c:4916 ../goffice/utils/go-emf.c:4922 #, c-format msgid "Invalid image data\n" msgstr "Neveljavni podatki slike\n" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:610 +#: ../goffice/utils/go-format.c:613 msgid "*Long Date Format" msgstr "*Dolg zapis datuma" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:618 +#: ../goffice/utils/go-format.c:621 msgid "*Medium Date Format" msgstr "*Srednji zapis datuma" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:626 +#: ../goffice/utils/go-format.c:629 msgid "*Short Date Format" msgstr "*Kratek zapis datuma" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:639 +#: ../goffice/utils/go-format.c:642 msgid "*Short Date/Time Format" msgstr "*Kratek zapis datuma/časa" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:654 +#: ../goffice/utils/go-format.c:657 msgid "*Long Time Format" msgstr "*Dolg zapis časa" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:666 +#: ../goffice/utils/go-format.c:669 msgid "*Medium Time Format" msgstr "*Srednji zapis časa" #. xgettext: See http://www.gnumeric.org/date-time-formats.shtml -#: ../goffice/utils/go-format.c:678 +#: ../goffice/utils/go-format.c:681 msgid "*Short Time Format" msgstr "*Kratek zapis časa" -#: ../goffice/utils/go-format.c:721 +#: ../goffice/utils/go-format.c:724 msgid "Black" msgstr "Črna" #. Color 1 -#: ../goffice/utils/go-format.c:722 +#: ../goffice/utils/go-format.c:725 msgid "White" msgstr "Bela" #. Color 2 -#: ../goffice/utils/go-format.c:723 +#: ../goffice/utils/go-format.c:726 msgid "Red" msgstr "Rdeča" #. Color 3 -#: ../goffice/utils/go-format.c:724 +#: ../goffice/utils/go-format.c:727 msgid "Green" msgstr "Zelena" #. Color 4 -#: ../goffice/utils/go-format.c:725 +#: ../goffice/utils/go-format.c:728 msgid "Blue" msgstr "Modra" #. Color 5 -#: ../goffice/utils/go-format.c:726 +#: ../goffice/utils/go-format.c:729 msgid "Yellow" msgstr "Rumena" #. Color 6 -#: ../goffice/utils/go-format.c:727 +#: ../goffice/utils/go-format.c:730 msgid "Magenta" msgstr "Škrlatna" #. Color 7 -#: ../goffice/utils/go-format.c:728 +#: ../goffice/utils/go-format.c:731 msgid "Cyan" msgstr "Sinja" -#: ../goffice/utils/go-format.c:871 +#: ../goffice/utils/go-format.c:874 msgid "color" msgstr "barva" @@ -6708,20 +6743,20 @@ msgid "left" msgstr "levo" -#: ../goffice/utils/go-glib-extras.c:919 +#: ../goffice/utils/go-glib-extras.c:960 msgid "yes" msgstr "da" -#: ../goffice/utils/go-glib-extras.c:925 +#: ../goffice/utils/go-glib-extras.c:966 msgid "no" msgstr "ne" -#: ../goffice/utils/go-glib-extras.c:1144 +#: ../goffice/utils/go-glib-extras.c:1185 #, c-format msgid "Quoted string not terminated" msgstr "Navedena nit ni končana" -#: ../goffice/utils/go-glib-extras.c:1151 +#: ../goffice/utils/go-glib-extras.c:1192 #, c-format msgid "Syntax error" msgstr "Napaka skladnje" @@ -6766,7 +6801,7 @@ msgid "Image height in pixels" msgstr "Višina slike v točkah" -#: ../goffice/utils/go-line.c:129 ../goffice/utils/go-pattern.c:82 +#: ../goffice/utils/go-line.c:129 ../goffice/utils/go-pattern.c:81 msgid "Solid" msgstr "Polno" @@ -6854,14 +6889,6 @@ msgid "Step to mean" msgstr "Korak do srednje vrednosti" -#: ../goffice/utils/go-locale.c:547 -msgid "TRUE" -msgstr "PRAV" - -#: ../goffice/utils/go-locale.c:548 -msgid "FALSE" -msgstr "NAPAK" - #: ../goffice/utils/go-marker.c:97 msgid "square" msgstr "kvadrat" @@ -6919,112 +6946,112 @@ msgstr "levi polovični palični" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:89 +#: ../goffice/utils/go-pattern.c:88 #, no-c-format msgid "75% Grey" msgstr "75 % sivo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:96 +#: ../goffice/utils/go-pattern.c:95 #, no-c-format msgid "50% Grey" msgstr "50 % sivo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:103 +#: ../goffice/utils/go-pattern.c:102 #, no-c-format msgid "25% Grey" msgstr "25 % sivo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:110 +#: ../goffice/utils/go-pattern.c:109 #, no-c-format msgid "12.5% Grey" msgstr "12.5 % sivo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:117 +#: ../goffice/utils/go-pattern.c:116 #, no-c-format msgid "6.25% Grey" msgstr "6.25 % sivo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:123 +#: ../goffice/utils/go-pattern.c:122 msgid "Horizontal Stripe" msgstr "vodoravno progasto" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:129 +#: ../goffice/utils/go-pattern.c:128 msgid "Vertical Stripe" msgstr "navpično progasto" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:135 +#: ../goffice/utils/go-pattern.c:134 msgid "Reverse Diagonal Stripe" msgstr "progasto diagonalno zgoraj v levo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:141 +#: ../goffice/utils/go-pattern.c:140 msgid "Diagonal Stripe" msgstr "progasto diagonalno zgoraj v desno" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:147 +#: ../goffice/utils/go-pattern.c:146 msgid "Diagonal Crosshatch" msgstr "diagonalno križno" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:153 +#: ../goffice/utils/go-pattern.c:152 msgid "Thick Diagonal Crosshatch" msgstr "debelo diagonalno križno" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:159 +#: ../goffice/utils/go-pattern.c:158 msgid "Thin Horizontal Stripe" msgstr "tanko vodoravno progasto" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:165 +#: ../goffice/utils/go-pattern.c:164 msgid "Thin Vertical Stripe" msgstr "tanko navpično progasto" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:171 +#: ../goffice/utils/go-pattern.c:170 msgid "Thin Reverse Diagonal Stripe" msgstr "tanko progasto diagonalno zgoraj v levo" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:177 +#: ../goffice/utils/go-pattern.c:176 msgid "Thin Diagonal Stripe" msgstr "tanko progasto diagonalno zgoraj v desno" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:183 +#: ../goffice/utils/go-pattern.c:182 msgid "Thin Horizontal Crosshatch" msgstr "tanko vodoravno križno" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:189 +#: ../goffice/utils/go-pattern.c:188 msgid "Thin Diagonal Crosshatch" msgstr "tanko diagonalno križno " # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:195 +#: ../goffice/utils/go-pattern.c:194 msgid "Foreground Solid" msgstr "polna barva" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:201 +#: ../goffice/utils/go-pattern.c:200 msgid "Small Circles" msgstr "majhni krožci" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:206 +#: ../goffice/utils/go-pattern.c:205 msgid "Semi Circles" msgstr "polkrožci" # vzorci diagramov in grafov -#: ../goffice/utils/go-pattern.c:218 +#: ../goffice/utils/go-pattern.c:217 msgid "Large Circles" msgstr "veliki krožci" @@ -7326,45 +7353,45 @@ msgid "Math equation component engine" msgstr "Programnik pisanja matematičnih enačb" -#: ../plugins/plot_barcol/gog-1.5d.c:353 +#: ../plugins/plot_barcol/gog-1.5d.c:356 msgid "How to group multiple series, normal, stacked, as_percentage" msgstr "" "Kako naj se v diagramu združujejo različni nizi; običajno, naloženo po " "vrednosti, naloženo po odstotnem deležu" -#: ../plugins/plot_barcol/gog-1.5d.c:358 ../plugins/plot_pie/gog-pie.c:323 +#: ../plugins/plot_barcol/gog-1.5d.c:361 ../plugins/plot_pie/gog-pie.c:323 #: ../plugins/plot_xy/gog-xy.c:565 msgid "In 3D" msgstr "V 3D" -#: ../plugins/plot_barcol/gog-1.5d.c:359 +#: ../plugins/plot_barcol/gog-1.5d.c:362 msgid "Placeholder to allow us to round trip pseudo 3D state" msgstr "Držalo, ki omogoča postavitev navideznega 3D stanja" -#: ../plugins/plot_barcol/gog-1.5d.c:367 +#: ../plugins/plot_barcol/gog-1.5d.c:370 #: ../plugins/plot_barcol/gog-dropbar.c:141 #: ../plugins/plot_barcol/gog-minmax.c:246 ../plugins/plot_pie/gog-pie.c:342 #: ../plugins/plot_radar/gog-radar.c:322 msgid "Labels" msgstr "Oznake" -#: ../plugins/plot_barcol/gog-1.5d.c:631 ../plugins/plot_barcol/gog-1.5d.c:694 +#: ../plugins/plot_barcol/gog-1.5d.c:634 ../plugins/plot_barcol/gog-1.5d.c:697 msgid "Error bars" msgstr "Razpon napake" -#: ../plugins/plot_barcol/gog-1.5d.c:658 +#: ../plugins/plot_barcol/gog-1.5d.c:661 #: ../plugins/plot_distrib/gog-histogram.c:1119 msgid "Drop lines" msgstr "Vretenasti" -#: ../plugins/plot_barcol/gog-1.5d.c:666 +#: ../plugins/plot_barcol/gog-1.5d.c:669 #: ../plugins/plot_barcol/plot-types.xml.in.h:13 msgid "Lines" msgstr "Črtni" -#: ../plugins/plot_barcol/gog-1.5d.c:695 ../plugins/plot_radar/gog-radar.c:1354 -#: ../plugins/plot_radar/gog-radar.c:1480 ../plugins/plot_xy/gog-xy.c:2180 -#: ../plugins/plot_xy/gog-xy.c:2186 +#: ../plugins/plot_barcol/gog-1.5d.c:698 ../plugins/plot_radar/gog-radar.c:1354 +#: ../plugins/plot_radar/gog-radar.c:1480 ../plugins/plot_xy/gog-xy.c:2187 +#: ../plugins/plot_xy/gog-xy.c:2193 msgid "GogErrorBar *" msgstr "Diagram" @@ -7450,22 +7477,22 @@ msgid "PlotDropBar" msgstr "Diagram - vretenasti" -#: ../plugins/plot_barcol/gog-line.c:342 ../plugins/plot_xy/gog-xy.c:2197 +#: ../plugins/plot_barcol/gog-line.c:342 ../plugins/plot_xy/gog-xy.c:2204 msgid "Clamp at start" msgstr "Reži na začetku" -#: ../plugins/plot_barcol/gog-line.c:343 ../plugins/plot_xy/gog-xy.c:2198 +#: ../plugins/plot_barcol/gog-line.c:343 ../plugins/plot_xy/gog-xy.c:2205 msgid "" "Slope at start of the interpolated curve when using clamped spline " "interpolation" msgstr "" "Naklon začetka interpolirane krivulje pri interpolaciji rezanih zlepkov" -#: ../plugins/plot_barcol/gog-line.c:348 ../plugins/plot_xy/gog-xy.c:2203 +#: ../plugins/plot_barcol/gog-line.c:348 ../plugins/plot_xy/gog-xy.c:2210 msgid "Clamp at end" msgstr "Reži na koncu" -#: ../plugins/plot_barcol/gog-line.c:349 ../plugins/plot_xy/gog-xy.c:2204 +#: ../plugins/plot_barcol/gog-line.c:349 ../plugins/plot_xy/gog-xy.c:2211 msgid "" "Slope at end of the interpolated curve when using clamped spline " "interpolation" @@ -8450,7 +8477,7 @@ #. xgettext : the base for how to name contour plot objects #. -#: ../plugins/plot_surface/gog-contour.c:133 +#: ../plugins/plot_surface/gog-contour.c:136 msgid "PlotContour" msgstr "Diagram - obrisni" @@ -8841,27 +8868,27 @@ msgid "XYColor" msgstr "Diagram - barvni XY" -#: ../plugins/plot_xy/gog-xy.c:2108 ../plugins/plot_xy/gog-xy.c:2179 +#: ../plugins/plot_xy/gog-xy.c:2115 ../plugins/plot_xy/gog-xy.c:2186 msgid "X error bars" msgstr "Stolpci intervala napake X" -#: ../plugins/plot_xy/gog-xy.c:2111 ../plugins/plot_xy/gog-xy.c:2185 +#: ../plugins/plot_xy/gog-xy.c:2118 ../plugins/plot_xy/gog-xy.c:2192 msgid "Y error bars" msgstr "Stolpci intervala napake Y" -#: ../plugins/plot_xy/gog-xy.c:2120 +#: ../plugins/plot_xy/gog-xy.c:2127 msgid "Horizontal drop lines" msgstr "Vodoravne spustne vrstice" -#: ../plugins/plot_xy/gog-xy.c:2128 +#: ../plugins/plot_xy/gog-xy.c:2135 msgid "Vertical drop lines" msgstr "Navpične spustne vrstice" -#: ../plugins/plot_xy/gog-xy.c:2191 +#: ../plugins/plot_xy/gog-xy.c:2198 msgid "Invalid as zero" msgstr "Neveljavno kot nič" -#: ../plugins/plot_xy/gog-xy.c:2192 +#: ../plugins/plot_xy/gog-xy.c:2199 msgid "Replace invalid values by 0 when drawing markers or bubbles" msgstr "Zamenjaj neveljavne vrednosti z 0 med izrisovanjem oznak ali mehurčkov" @@ -9085,12 +9112,16 @@ msgid "Exponential regression" msgstr "Potenčna regresija" -#: ../plugins/reg_linear/gog-lin-reg.c:158 -#: ../plugins/reg_linear/gog-lin-reg.c:271 +#: ../plugins/reg_linear/gog-lin-reg.c:114 +msgid "#days" +msgstr "#dni" + +#: ../plugins/reg_linear/gog-lin-reg.c:185 +#: ../plugins/reg_linear/gog-lin-reg.c:298 msgid "Affine" msgstr "Naklon" -#: ../plugins/reg_linear/gog-lin-reg.c:159 +#: ../plugins/reg_linear/gog-lin-reg.c:186 msgid "Uncheck to force zero intercept" msgstr "" "Izbrana možnost omogoča vsiljenje koordinatnega izhodišča osi pri vrednosti 0" @@ -9098,19 +9129,19 @@ #. xgettext : the base for how to name scatter plot objects #. * eg The 2nd plot in a chart will be called #. * Linear regression2 -#: ../plugins/reg_linear/gog-lin-reg.c:173 +#: ../plugins/reg_linear/gog-lin-reg.c:200 msgid "Linear regression" msgstr "Linearna regresija" -#: ../plugins/reg_linear/gog-lin-reg.c:272 +#: ../plugins/reg_linear/gog-lin-reg.c:299 msgid "If true, a non-zero constant is allowed" msgstr "Izbrana možnost dovoli uporabo konstante vrednosti ne-nič" -#: ../plugins/reg_linear/gog-lin-reg.c:277 +#: ../plugins/reg_linear/gog-lin-reg.c:304 msgid "Dims" msgstr "Mere" -#: ../plugins/reg_linear/gog-lin-reg.c:278 +#: ../plugins/reg_linear/gog-lin-reg.c:305 msgid "Number of x-vectors" msgstr "Število x-vektorjev" @@ -9210,7 +9241,7 @@ #. xgettext : the base for how to name logarithmic fits #. * eg The 2nd fit for a series will be called #. * Log fit2 -#: ../plugins/reg_logfit/gog-logfit.c:146 +#: ../plugins/reg_logfit/gog-logfit.c:147 msgid "Log fit" msgstr "Logaritemsko prilagajanje" @@ -9333,25 +9364,3 @@ #: ../plugins/smoothing/types.xml.in.h:2 msgid "Moving average smoothed curve" msgstr "Glajena krivulja premikajočega povprečja" - -#~ msgid "" -#~ "If an axis is used as reference, gives the ratio of the ticks distance, " -#~ "and it the metrix is absolute, the ticks distance. Defaults to 1.0" -#~ msgstr "" -#~ "Če je os uporabljena kot sklic, je podano razmerje razdalj točk osi in je " -#~ "merilo absolutno. Privzeto je izbrana vrenosti 1,0." - -#~ msgid "Matrics Unit" -#~ msgstr "Metrična enota" - -#~ msgid "The text to show for selecing no color" -#~ msgstr "Besedilo za prikaz izbire barv" - -#~ msgid "Phillipines/Filipino (fil_PH)" -#~ msgstr "Filipini/Filipinsko (fil_PH)" - -#~ msgid "Iceland, Krohur" -#~ msgstr "Islandija, krona" - -#~ msgid "Bond Markets Units, European Coposite Units (EURCO)" -#~ msgstr "Delniške tržne enote (EURCO)" diff -Nru goffice-0.10.53/tests/Makefile.in goffice-0.10.55/tests/Makefile.in --- goffice-0.10.53/tests/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/tests/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -94,16 +94,19 @@ subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -408,7 +411,8 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ - $(top_srcdir)/goffice.mk $(top_srcdir)/test-driver + $(top_srcdir)/goffice.mk $(top_srcdir)/mkinstalldirs \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -420,16 +424,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -446,11 +448,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -474,7 +477,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -496,11 +498,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -509,9 +515,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -531,10 +536,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -548,6 +550,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru goffice-0.10.53/tools/ChangeLog goffice-0.10.55/tools/ChangeLog --- goffice-0.10.53/tools/ChangeLog 2022-09-17 15:59:02.000000000 +0000 +++ goffice-0.10.55/tools/ChangeLog 2023-02-03 02:17:43.000000000 +0000 @@ -1,3 +1,11 @@ +2023-02-02 Morten Welinder + + * Release 0.10.55 + +2023-01-19 Morten Welinder + + * Release 0.10.54 + 2022-09-17 Morten Welinder * Release 0.10.53 diff -Nru goffice-0.10.53/tools/Makefile.in goffice-0.10.55/tools/Makefile.in --- goffice-0.10.53/tools/Makefile.in 2022-09-17 20:37:37.000000000 +0000 +++ goffice-0.10.55/tools/Makefile.in 2023-02-03 01:54:20.000000000 +0000 @@ -90,16 +90,19 @@ subdir = tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/goffice/goffice-config.h \ $(top_builddir)/goffice/goffice-features.h CONFIG_CLEAN_FILES = @@ -124,7 +127,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + ChangeLog DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -136,16 +140,14 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSCOPE = @CSCOPE@ CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -162,11 +164,12 @@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIRDIR = @GIRDIR@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOFFICE_API_VER = @GOFFICE_API_VER@ GOFFICE_API_VER_ = @GOFFICE_API_VER_@ GOFFICE_CFLAGS = @GOFFICE_CFLAGS@ @@ -190,7 +193,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ @@ -212,11 +214,15 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBEXE = @LIBEXE@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ Lasem_CFLAGS = @Lasem_CFLAGS@ @@ -225,9 +231,8 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -247,10 +252,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -264,6 +266,8 @@ WARN_CFLAGS = @WARN_CFLAGS@ WINDRES = @WINDRES@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@