diff -Nru gnome-system-tools-2.32.0/ABOUT-NLS gnome-system-tools-3.0.0/ABOUT-NLS --- gnome-system-tools-2.32.0/ABOUT-NLS 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/ABOUT-NLS 2010-10-16 10:17:56.000000000 +0000 @@ -0,0 +1,1068 @@ +1 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. + + 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 +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. + + 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. + +1.1 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'. + +1.2 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'. + + 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. If not, the included GNU +`gettext' 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, 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 not be 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 +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' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +1.3 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. + + 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 +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''. + + 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' +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. + +1.4 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. + + 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: + + 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 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. + +1.5 Available Packages +====================== + +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of November +2007. 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 ar az be bg bs ca cs cy da de el en en_GB eo + +----------------------------------------------------+ + Compendium | [] [] [] [] | + a2ps | [] [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | [] | + ap-utils | | + aspell | [] [] [] [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] | + bison-runtime | [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | | + cpplib | [] [] [] | + cryptonit | [] | + dialog | | + diffutils | [] [] [] [] [] [] | + doodle | [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + fetchmail | [] [] () [] [] | + findutils | [] | + findutils_stable | [] [] [] | + flex | [] [] [] | + fslint | | + gas | | + gawk | [] [] [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gip | [] | + gliv | [] [] | + glunarclock | [] | + gmult | [] [] | + gnubiff | () | + gnucash | [] [] () () [] | + gnuedu | | + gnulib | [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | | + gpe-edit | [] | + gpe-filemanager | | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-package | | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | | + gramadoir | [] [] | + grep | [] [] | + gretl | () | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gst-plugins-ugly | [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | () | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] [] | + indent | [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | [] | + jtag | | + jwhois | | + kbd | [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | () | + ld | [] | + leafpad | [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] | + libgsasl | | + libiconv | [] [] | + libidn | [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] | + man-db | [] [] [] | + minicom | [] [] [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] | + pwdutils | | + qof | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] | + shared-mime-info | [] [] [] [] () [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | | + skencil | [] () | + solfege | | + soundtracker | [] [] | + sp | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] | + texinfo | [] [] [] | + tin | () () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs cy da de el en en_GB eo + 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 + + es et eu fa fi fr ga gl gu he hi hr hu id is it + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | [] [] [] () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] [] | + aspell | [] [] [] | + bash | [] | + bfd | [] [] | + bibshelf | [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cpplib | [] [] | + cryptonit | [] | + dialog | [] [] [] | + diffutils | [] [] [] [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + fetchmail | [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] | + flex | [] [] [] | + fslint | | + gas | [] [] | + gawk | [] [] [] [] () | + gcal | [] [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] | + gliv | () | + glunarclock | [] [] [] | + gmult | [] [] [] | + gnubiff | () () | + gnucash | () () () | + gnuedu | [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] [] [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] [] [] | + gpe-filemanager | [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] [] [] | + gpsdrive | [] | + gramadoir | [] [] | + grep | [] [] [] | + gretl | [] [] [] () | + gsasl | [] [] | + gss | [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] | + gstreamer | [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] | + jpilot | [] [] | + jtag | [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] [] | + latrine | [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] | + libgsasl | [] [] | + libiconv | [] [] [] | + libidn | [] [] | + lifelines | () | + lilypond | [] [] [] | + lingoteach | [] [] [] | + lprng | | + lynx | [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] | + minicom | [] [] [] [] | + nano | [] [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | | + qof | [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] | + soundtracker | [] [] [] | + sp | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] () | + tuxpaint | [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] [] [] [] | + util-linux-ng | [] [] [] [] [] [] [] | + vorbis-tools | | + wastesedge | () | + wdiff | [] [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + es et eu fa fi fr ga gl gu he hi hr hu id is it + 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 + + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + +--------------------------------------------------+ + Compendium | [] | + a2ps | () [] [] | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | [] | + cpplib | [] | + cryptonit | [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + fetchmail | [] [] | + findutils | [] | + findutils_stable | [] | + flex | [] [] | + fslint | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] [] | + gnubiff | | + gnucash | () () () | + gnuedu | | + gnulib | [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | [] | + gpsdrive | [] | + gramadoir | () | + grep | [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] | + gtick | [] | + gtkam | [] [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] | + indent | [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | [] | + libidn | [] [] | + lifelines | [] | + lilypond | [] | + lingoteach | [] | + lprng | | + lynx | [] [] | + m4 | [] [] | + mailfromd | | + mailutils | | + make | [] [] [] | + man-db | | + minicom | [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] [] [] | + pwdutils | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + shared-mime-info | [] [] [] [] [] [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | () () | + soundtracker | | + sp | () | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] | + tin | | + tuxpaint | () [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + util-linux-ng | [] [] | + vorbis-tools | | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 + + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] [] | + bash | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + dialog | [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () [] | + gnucash | () [] | + gnuedu | | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + gretl | [] [] [] | + gsasl | [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + herrie | [] [] [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] [] | + libgpg-error | [] [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] [] [] [] | + minicom | [] [] [] [] [] | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | [] [] | + qof | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 + + tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + +---------------------------------------------------+ + Compendium | [] [] [] [] | 19 + a2ps | [] [] [] | 19 + aegis | [] | 1 + ant-phone | [] [] | 6 + anubis | [] [] [] | 11 + ap-utils | () [] | 4 + aspell | [] [] [] | 16 + bash | [] | 6 + bfd | | 2 + bibshelf | [] | 7 + binutils | [] [] [] [] | 9 + bison | [] [] [] [] | 20 + bison-runtime | [] [] [] [] | 18 + bluez-pin | [] [] [] [] [] [] | 28 + cflow | [] [] | 5 + clisp | | 9 + console-tools | [] [] | 5 + coreutils | [] [] [] | 18 + cpio | [] [] [] [] | 11 + cpplib | [] [] [] [] [] | 12 + cryptonit | [] | 6 + dialog | [] [] [] | 9 + diffutils | [] [] [] [] [] | 29 + doodle | [] | 6 + e2fsprogs | [] [] | 10 + enscript | [] [] [] | 16 + fetchmail | [] [] | 12 + findutils | [] [] [] | 11 + findutils_stable | [] [] [] [] | 18 + flex | [] [] | 15 + fslint | [] | 2 + gas | [] | 3 + gawk | [] [] [] | 16 + gcal | [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] | 29 + gettext-runtime | [] [] [] [] [] [] | 28 + gettext-tools | [] [] [] [] [] | 20 + gip | [] [] | 13 + gliv | [] [] | 11 + glunarclock | [] [] [] | 15 + gmult | [] [] [] [] | 16 + gnubiff | [] | 2 + gnucash | () [] | 5 + gnuedu | [] | 2 + gnulib | [] | 10 + gnunet | | 0 + gnunet-gtk | [] [] | 3 + gnutls | | 4 + gpe-aerial | [] [] | 14 + gpe-beam | [] [] | 14 + gpe-calendar | [] [] | 7 + gpe-clock | [] [] [] [] | 21 + gpe-conf | [] [] [] | 16 + gpe-contacts | [] [] | 10 + gpe-edit | [] [] [] [] [] | 22 + gpe-filemanager | [] [] | 7 + gpe-go | [] [] [] [] | 19 + gpe-login | [] [] [] [] [] | 21 + gpe-ownerinfo | [] [] [] [] | 21 + gpe-package | [] | 6 + gpe-sketchbook | [] [] | 16 + gpe-su | [] [] [] [] | 21 + gpe-taskmanager | [] [] [] [] | 21 + gpe-timesheet | [] [] [] [] | 18 + gpe-today | [] [] [] [] [] | 21 + gpe-todo | [] [] | 8 + gphoto2 | [] [] [] [] | 21 + gprof | [] [] | 13 + gpsdrive | [] | 5 + gramadoir | [] | 7 + grep | [] | 12 + gretl | | 6 + gsasl | [] [] [] | 9 + gss | [] | 7 + gst-plugins-bad | [] [] [] | 13 + gst-plugins-base | [] [] | 11 + gst-plugins-good | [] [] [] [] [] | 16 + gst-plugins-ugly | [] [] [] | 13 + gstreamer | [] [] [] | 18 + gtick | [] [] | 7 + gtkam | [] | 16 + gtkorphan | [] | 7 + gtkspell | [] [] [] [] [] [] | 27 + gutenprint | | 4 + hello | [] [] [] [] [] | 38 + herrie | [] [] | 8 + hylafax | | 0 + idutils | [] [] | 15 + indent | [] [] [] [] [] | 28 + iso_15924 | [] [] | 4 + iso_3166 | [] [] [] [] [] [] [] [] [] | 54 + iso_3166_2 | [] [] | 4 + iso_4217 | [] [] [] [] [] | 24 + iso_639 | [] [] [] [] [] | 26 + jpilot | [] [] [] [] | 7 + jtag | [] | 3 + jwhois | [] [] [] | 13 + kbd | [] [] [] | 13 + keytouch | [] | 8 + keytouch-editor | [] | 5 + keytouch-keyboa... | [] | 5 + latrine | [] [] | 5 + ld | [] [] [] [] | 10 + leafpad | [] [] [] [] [] | 24 + libc | [] [] [] | 19 + libexif | [] | 5 + libextractor | [] | 5 + libgpewidget | [] [] [] | 20 + libgpg-error | [] | 6 + libgphoto2 | [] [] | 9 + libgphoto2_port | [] [] [] | 11 + libgsasl | [] | 8 + libiconv | [] [] | 11 + libidn | [] [] | 11 + lifelines | | 4 + lilypond | [] | 6 + lingoteach | [] | 6 + lprng | [] | 2 + lynx | [] [] [] | 15 + m4 | [] [] [] | 18 + mailfromd | [] [] | 3 + mailutils | [] [] | 8 + make | [] [] [] | 20 + man-db | [] | 9 + minicom | [] | 14 + nano | [] [] [] | 20 + opcodes | [] [] | 10 + parted | [] [] [] | 11 + pilot-qof | [] | 1 + popt | [] [] [] [] | 18 + psmisc | [] [] | 10 + pwdutils | [] | 3 + qof | [] | 4 + radius | [] [] | 7 + recode | [] [] [] | 25 + rpm | [] [] [] [] | 13 + screem | [] | 2 + scrollkeeper | [] [] [] [] | 26 + sed | [] [] [] [] | 23 + shared-mime-info | [] [] [] | 29 + sharutils | [] [] [] | 23 + shishi | [] | 3 + skencil | [] | 7 + solfege | [] | 3 + soundtracker | [] [] | 9 + sp | [] | 3 + system-tools-ba... | [] [] [] [] [] [] [] | 38 + tar | [] [] [] | 17 + texinfo | [] [] [] | 15 + tin | | 1 + tuxpaint | [] [] [] | 19 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] [] | 20 + util-linux-ng | [] [] [] | 20 + vorbis-tools | [] [] | 4 + wastesedge | | 1 + wdiff | [] [] | 23 + wget | [] [] [] | 20 + xchat | [] [] [] [] | 29 + xkeyboard-config | [] [] [] | 14 + xpad | [] [] [] | 15 + +---------------------------------------------------+ + 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 + + 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 +used for implementing regional variants of languages, or language +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 November 2007 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'. + +1.6 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 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 +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. + diff -Nru gnome-system-tools-2.32.0/aclocal.m4 gnome-system-tools-3.0.0/aclocal.m4 --- gnome-system-tools-2.32.0/aclocal.m4 2010-09-27 16:15:51.000000000 +0000 +++ gnome-system-tools-3.0.0/aclocal.m4 2011-04-03 20:04:12.000000000 +0000 @@ -19,1760 +19,11830 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 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 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 package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2006, 2008-2010. -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +dnl Macro to add for using GNU gettext. -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +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 + ]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- + 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]) + ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. + dnl Set USE_NLS. + AC_REQUIRE([AM_NLS]) -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) + 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]) -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + 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 -# serial 4 + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_TRY_LINK([#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], + [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_TRY_LINK([#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *);], + [bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + [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_TRY_LINK([#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *);], + [bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi -# This was merged into AC_PROG_CC in Autoconf. + 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 -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc + 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]) ]) -AU_DEFUN([fp_PROG_CC_STDC]) -# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +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], []) +]) -# serial 9 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], +[ + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) +]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 10 +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +dnl Do not call GNOME_DOC_DEFINES directly. It is split out from +dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. +AC_DEFUN([GNOME_DOC_DEFINES], +[ +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, + [with_help_dir='${datadir}/gnome/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_WITH([omf-dir], + AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, + [with_omf_dir='${datadir}/omf']) +OMF_DIR="$with_omf_dir" +AC_SUBST(OMF_DIR) + +AC_ARG_WITH([help-formats], + AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, + [with_help_formats='']) +DOC_USER_FORMATS="$with_help_formats" +AC_SUBST(DOC_USER_FORMATS) + +AC_ARG_ENABLE([scrollkeeper], + [AC_HELP_STRING([--disable-scrollkeeper], + [do not make updates to the scrollkeeper database])],, + enable_scrollkeeper=yes) +AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +dnl disable scrollkeeper automatically for distcheck +DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) +AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) +]) -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. +# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +AC_DEFUN([GNOME_DOC_INIT], +[AC_REQUIRE([AC_PROG_LN_S])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) +PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], + [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +if test "$gdu_cv_have_gdu" = "yes"; then + AC_MSG_RESULT([yes]) + ifelse([$2],,[:],[$2]) +else + AC_MSG_RESULT([no]) + ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) +fi + +GNOME_DOC_DEFINES +]) + +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AC_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)" + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# iconv.m4 serial 11 (gettext-0.18.1) +dnl Copyright (C) 2000-2002, 2007-2010 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. + +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). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + 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_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) + 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]) +]) + +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])) +gl_iconv_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([ + $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 +]) + +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2010 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 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 package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#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 MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#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 MacOS 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]) +]) + + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [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 + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + + +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 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/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.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 ld's only accept -v. +case `$LD -v 2>&1 conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +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 GCC]) + 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. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path 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 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + 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 GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT([$LD]) +else + AC_MSG_RESULT([no]) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) + +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 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. + +AC_PREREQ([2.54]) + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + popdef([NAME]) + popdef([Name]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + LIB[]NAME[]_PREFIX= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + dnl Tell automake >= 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],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [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],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[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],[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]) +]) + +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 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" +]) + +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool 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. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) + +# serial 56 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN + + + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\[$]0 --fallback-echo"')dnl " + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` + ;; +esac + +_LT_OUTPUT_LIBTOOL_INIT +]) + + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. + +lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE + +exec AS_MESSAGE_FD>&1 +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2008 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec AS_MESSAGE_LOG_FD>>config.log + $lt_cl_success || AS_EXIT(1) +fi +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_XSI_SHELLFNS + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_SHELL_INIT + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[_LT_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +ECHO=${lt_ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +[$]* +_LT_EOF + exit 0 +fi + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi + + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(lt_ECHO) +]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], + [An echo program that does not interpret backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[AC_CHECK_TOOL(AR, ar, false) +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1]) + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line __oline__ "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix[[3-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +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(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_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 `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method == "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +AC_MSG_CHECKING([for $compiler option to produce PIC]) +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac +AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # 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 + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + 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 + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + 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]].*|aix[[5-9]]*) + 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 + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # 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. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE(int foo(void) {}, + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + ) + LDFLAGS="$save_LDFLAGS" + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [fix_srcfile_path], [1], + [Fix the shell variable $srcfile for the compiler]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _LT_PROG_CXX +# ------------ +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +# compiler, we have our own version here. +m4_defun([_LT_PROG_CXX], +[ +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +AC_PROG_CXX +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_CXX + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + 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 + exp_sym_flag='-Bexport' + no_entry_flag="" + 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]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + gnu*) + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +]) +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_PROG_F77 +# ------------ +# Since AC_PROG_F77 is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_F77], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +AC_PROG_F77 +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_F77 + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_F77], []) + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_REQUIRE([_LT_PROG_F77])dnl +AC_LANG_PUSH(Fortran 77) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${F77-"f77"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_PROG_FC +# ----------- +# Since AC_PROG_FC is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_FC], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +AC_PROG_FC +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_FC + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_FC], []) + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_REQUIRE([_LT_PROG_FC])dnl +AC_LANG_PUSH(Fortran) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${FC-"f95"} + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC="$lt_save_CC" +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC="$lt_save_CC" +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PROG_XSI_SHELLFNS +# --------------------- +# Bourne and XSI compatible variants of some useful shell functions. +m4_defun([_LT_PROG_XSI_SHELLFNS], +[case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} + +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} + +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + +dnl func_dirname_and_basename +dnl A portable version of this function is already defined in general.m4sh +dnl so there is no need for it here. + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} + +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF +esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]+=\$[2]" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} + +_LT_EOF + ;; + esac +]) + +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [0], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# Generated from ltversion.in. + +# serial 3017 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.2.6b' +macro_revision='1.3017' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) + +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 4 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl 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 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 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.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +pkg_failed=no +AC_MSG_CHECKING([for $1]) - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: +$$1_PKG_ERRORS -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Generate code to set up dependency tracking. -*- Autoconf -*- +_PKG_TEXT])dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_PKG_TEXT -#serial 5 +To get pkg-config, see .])dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 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 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 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.50]) + +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([AM_PROG_MKDIR_P])dnl defined by automake + 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.18]) + + 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 - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` +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" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/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 assigment 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 assigment 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 - continue + echo_func () { + cat < "$dirpart/$file" - done - done + fi + + # A sed script that extracts the value of VARIABLE from a Makefile. + sed_x_variable=' +# Test if the hold space is empty. +x +s/P/P/ +x +ta +# Yes it was empty. Look if we have the expected variable definition. +/^[ ]*VARIABLE[ ]*=/{ + # Seen the first line of the variable definition. + s/^[ ]*VARIABLE[ ]*=// + ba } -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +bd +:a +# Here we are processing a line from the variable definition. +# Remove comment, more precisely replace it with a space. +s/#.*$/ / +# See if the line ends in a backslash. +tb +:b +s/\\$// +# Print the line, without the trailing backslash. +p +tc +# There was no trailing backslash. The end of the variable definition is +# reached. Clear the hold space. +s/^.*$// +x +bd +:c +# A trailing backslash means that the variable definition continues in the +# next line. Put a nonempty string into the hold space to indicate this. +s/^.*$/P/ +x +:d +' +changequote([,])dnl + # Set POTFILES to the value of the Makefile variable POTFILES. + sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'` + POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"` + # Compute POTFILES_DEPS as + # $(foreach file, $(POTFILES), $(top_srcdir)/$(file)) + POTFILES_DEPS= + for file in $POTFILES; do + POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file" + done + POMAKEFILEDEPS="" -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + 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 + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. + sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` + ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` + fi + # Hide the ALL_LINGUAS assigment from automake < 1.5. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + # 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) + # Compute PROPERTIESFILES + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties) + # Compute CLASSFILES + # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class) + # Compute QMFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm) + # Compute MSGFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg) + # Compute RESOURCESDLLFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + PROPERTIESFILES= + CLASSFILES= + QMFILES= + MSGFILES= + RESOURCESDLLFILES= + 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" + PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties" + CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class" + QMFILES="$QMFILES $srcdirpre$lang.qm" + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" + 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/'` + RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" + 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= + JAVACATALOGS= + QTCATALOGS= + TCLCATALOGS= + CSHARPCATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties" + QTCATALOGS="$QTCATALOGS $lang.qm" + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" + 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/'` + CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" + done + fi -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + 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. -# serial 16 +AC_PREREQ([2.50]) -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# Search path for a program which passes the given test. -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +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 + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: fi + rm -f conf$$.sh fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - 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 -AC_SUBST([CYGPATH_W]) +rm -f conf$$.file -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +# 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 +]) -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) +# serial 4 -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# This was merged into AC_PROG_CC in Autoconf. + +AU_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +AC_DIAGNOSE([obsolete], [$0: + your code should no longer depend upon `am_cv_prog_cc_stdc', but upon + `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when + you adjust the code. You can also remove the above call to + AC_PROG_CC if you already called it elsewhere.]) +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +]) +AU_DEFUN([fp_PROG_CC_STDC]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 9 -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' else - am__leading_dot=_ + $1_TRUE='#' + $1_FALSE= fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# serial 10 -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# serial 6 + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " + cd .. + rm -rf conftest.dir else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + am_cv_$1_dependencies_compiler_type=none fi ]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +#serial 5 - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# serial 8 -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 16 -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# Check how to create a tarball. -*- Autoconf -*- +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -# serial 2 +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, 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 -# -# 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 +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# 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. - ;; +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; *) - 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) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -AC_SUBST($1)dnl -]) - -# 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= - - 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" - 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]) - ;; - *) - 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_SUBST(install_sh)]) - 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 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - 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) - ]) +# serial 2 -# 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 -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])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 +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) - 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 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering - 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) +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - 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 - ]) +# serial 5 -# 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]) -]) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -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 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# 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]) +# Check to see how 'make' treats includes. -*- Autoconf -*- +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl +# serial 4 -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AC_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -mostlyclean-am: clean-gsettings-schemas +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +# serial 6 -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas -.SECONDARY: $(gsettings_SCHEMAS) +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -gsettings__base_list = \ - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" - @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(gsettings__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ - done - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# Helper functions for option handling. -*- Autoconf -*- -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) +# serial 4 -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl 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 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 package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -AC_PREREQ([2.50]) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. # -# 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. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# serial 5 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + test "$[2]" = conftest.file + ) +then + # Ok. + : else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# +# Copyright (C) 2009 Free Software Foundation, Inc. # -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 2 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# Check how to create a tarball. -*- Autoconf -*- - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -$$1_PKG_ERRORS +# serial 2 -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -_PKG_TEXT])dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -_PKG_TEXT + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir -To get pkg-config, see .])dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -m4_include([m4/gnome-doc-utils.m4]) -m4_include([m4/intltool.m4]) -m4_include([m4/libtool.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) diff -Nru gnome-system-tools-2.32.0/config.h.in gnome-system-tools-3.0.0/config.h.in --- gnome-system-tools-2.32.0/config.h.in 2010-09-27 16:15:53.000000000 +0000 +++ gnome-system-tools-3.0.0/config.h.in 2011-04-03 20:04:27.000000000 +0000 @@ -1,15 +1,22 @@ /* config.h.in. Generated from configure.in 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 /* gettext package name */ #undef GETTEXT_PACKAGE -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + 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 header file. */ @@ -18,22 +25,19 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* whether libiw is available */ #undef HAVE_LIBIW_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* whether polkit-gtk was found */ +/* whether polkit was found */ #undef HAVE_POLKIT /* Define to 1 if you have the header file. */ diff -Nru gnome-system-tools-2.32.0/config.rpath gnome-system-tools-3.0.0/config.rpath --- gnome-system-tools-2.32.0/config.rpath 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/config.rpath 2010-10-16 10:17:56.000000000 +0000 @@ -0,0 +1,666 @@ +#! /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-2007 Free Software Foundation, Inc. +# Taken from GNU libtool, 2001 +# Originally by Gordon Matzigkeit , 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# 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 MSVC, +# 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 _LT_CC_BASENAME. + +for cc_temp in $CC""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` + +# 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,' + ;; + darwin*) + case $cc_basename in + xlc*) + wl='-Wl,' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' + ;; + irix5* | irix6* | nonstopux*) + wl='-Wl,' + ;; + newsos6) + ;; + linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + wl='-Wl,' + ;; + pgcc | pgf77 | pgf90) + wl='-Wl,' + ;; + ccc*) + wl='-Wl,' + ;; + como) + wl='-lopt=' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + wl='-Wl,' + ;; + esac + ;; + esac + ;; + osf3* | osf4* | osf5*) + wl='-Wl,' + ;; + rdos*) + ;; + solaris*) + wl='-Wl,' + ;; + sunos4*) + wl='-Qoption ld ' + ;; + sysv4 | sysv4.2uw2* | sysv4.3*) + wl='-Wl,' + ;; + sysv4*MP*) + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; + unicos*) + wl='-Wl,' + ;; + 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 + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes; then + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + # 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' + 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 cannot 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 + ;; + interix[3-9]*) + hardcode_direct=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) + ;; + solaris*) + 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 + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + else + ld_shlibs=no + fi + ;; + esac + ;; + 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" = no; then + hardcode_libdir_flag_spec= + 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 + : + 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 + ;; + bsdi[45]*) + ;; + 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*) + hardcode_direct=no + if test "$GCC" = yes ; then + : + else + case $cc_basename in + xlc*) + ;; + *) + ld_shlibs=no + ;; + esac + 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* | dragonfly*) + 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*) + if test "$with_gnu_ld" = no; then + 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 + fi + ;; + hpux11*) + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + ;; + *) + 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*) + if test -f /usr/libexec/ld.so; then + 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 + else + ld_shlibs=no + 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=: + ;; + 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*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + ;; + sysv5* | sco3.2v5* | sco5v6*) + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + ;; + 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. +# Unlike libtool.m4, here we don't care about _all_ names of the library, but +# only about the one the linker finds when passed -lNAME. This is the last +# element of library_names_spec in libtool.m4, or possibly two of them if the +# linker has special search rules. +library_names_spec= # the last element of library_names_spec in libtool.m4 +libname_spec='lib$name' +case "$host_os" in + aix3*) + library_names_spec='$libname.a' + ;; + aix4* | aix5*) + library_names_spec='$libname$shrext' + ;; + amigaos*) + library_names_spec='$libname.a' + ;; + beos*) + library_names_spec='$libname$shrext' + ;; + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; + cygwin* | mingw* | pw32*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; + darwin* | rhapsody*) + shrext=.dylib + library_names_spec='$libname$shrext' + ;; + dgux*) + library_names_spec='$libname$shrext' + ;; + freebsd1*) + ;; + freebsd* | dragonfly*) + case "$host_os" in + freebsd[123]*) + library_names_spec='$libname$shrext$versuffix' ;; + *) + library_names_spec='$libname$shrext' ;; + esac + ;; + gnu*) + library_names_spec='$libname$shrext' + ;; + hpux9* | hpux10* | hpux11*) + case $host_cpu in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac + library_names_spec='$libname$shrext' + ;; + interix[3-9]*) + library_names_spec='$libname$shrext' + ;; + irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' + 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* | k*bsd*-gnu) + library_names_spec='$libname$shrext' + ;; + knetbsd*-gnu) + library_names_spec='$libname$shrext' + ;; + netbsd*) + library_names_spec='$libname$shrext' + ;; + newsos6) + library_names_spec='$libname$shrext' + ;; + nto-qnx*) + library_names_spec='$libname$shrext' + ;; + openbsd*) + library_names_spec='$libname$shrext$versuffix' + ;; + os2*) + libname_spec='$name' + shrext=.dll + library_names_spec='$libname.a' + ;; + osf3* | osf4* | osf5*) + library_names_spec='$libname$shrext' + ;; + rdos*) + ;; + solaris*) + library_names_spec='$libname$shrext' + ;; + sunos4*) + library_names_spec='$libname$shrext$versuffix' + ;; + sysv4 | sysv4.3*) + library_names_spec='$libname$shrext' + ;; + sysv4*MP*) + library_names_spec='$libname$shrext' + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + library_names_spec='$libname$shrext' + ;; + uts4*) + library_names_spec='$libname$shrext' + ;; +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_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` + +LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='gnome-system-tools' PACKAGE_TARNAME='gnome-system-tools' -PACKAGE_VERSION='2.32.0' -PACKAGE_STRING='gnome-system-tools 2.32.0' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='gnome-system-tools 3.0.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools' PACKAGE_URL='' @@ -745,6 +745,7 @@ # include #endif" +gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -762,19 +763,19 @@ GST_TOOL_LIBS GST_CFLAGS GST_LIBS -gnomelocaledir -MKINSTALLDIRS +GETTEXT_PACKAGE POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE +LTLIBINTL +LIBINTL INTLLIBS -INSTOBJEXT -GMOFILES -CATOBJEXT -CATALOGS -MSGFMT_OPTS -GETTEXT_PACKAGE +LTLIBICONV +LIBICONV +INTL_MACOSX_LIBS +XGETTEXT_EXTRA_OPTIONS +XGETTEXT_015 +GMSGFMT_015 +MSGFMT_015 +GETTEXT_MACRO_VERSION BUILD_NAUTILUS_FALSE BUILD_NAUTILUS_TRUE BUILD_SHARES_FALSE @@ -789,10 +790,8 @@ BUILD_NETWORK_TRUE HAVE_POLKIT_FALSE HAVE_POLKIT_TRUE -POLKIT_CFLAGS POLKIT_LIBS -POLKIT_GTK_LIBS -POLKIT_GTK_CFLAGS +POLKIT_CFLAGS DBUS_LIBS DBUS_CFLAGS GST_DEPENDS_LIBS @@ -971,13 +970,16 @@ with_gnu_ld enable_libtool_lock enable_schemas_compile -enable_polkit_gtk +enable_polkit enable_network enable_services enable_time enable_users enable_shares enable_nautilus +enable_rpath +with_libiconv_prefix +with_libintl_prefix ' ac_precious_vars='build_alias host_alias @@ -995,8 +997,8 @@ GST_DEPENDS_LIBS DBUS_CFLAGS DBUS_LIBS -POLKIT_GTK_CFLAGS -POLKIT_GTK_LIBS +POLKIT_CFLAGS +POLKIT_LIBS NAUTILUS_CFLAGS NAUTILUS_LIBS' @@ -1541,7 +1543,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 gnome-system-tools 2.32.0 to adapt to many kinds of systems. +\`configure' configures gnome-system-tools 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1612,7 +1614,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-system-tools 2.32.0:";; + short | recursive ) echo "Configuration of gnome-system-tools 3.0.0:";; esac cat <<\_ACEOF @@ -1635,14 +1637,14 @@ --disable-libtool-lock avoid locking (might break parallel builds) --disable-schemas-compile Disable regeneration of gschemas.compiled on install - --enable-polkit-gtk Enable PolicyKit support using polkit-gtk (default - yes) + --enable-polkit Enable PolicyKit support (default yes) --enable-network Enable build network module (default yes) --enable-services Enable build services module (default yes) --enable-time Enable build time module (default yes) --enable-users Enable build users module (default yes) --enable-shares Enable build shares module (default yes) --enable-nautilus Enable build nautilus shares module (default yes) + --disable-rpath do not hardcode runtime library paths Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1654,6 +1656,11 @@ --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --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 Some influential environment variables: CC C compiler command @@ -1675,10 +1682,9 @@ linker flags for GST_DEPENDS, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config - POLKIT_GTK_CFLAGS - C compiler flags for POLKIT_GTK, overriding pkg-config - POLKIT_GTK_LIBS - linker flags for POLKIT_GTK, overriding pkg-config + POLKIT_CFLAGS + C compiler flags for POLKIT, overriding pkg-config + POLKIT_LIBS linker flags for POLKIT, overriding pkg-config NAUTILUS_CFLAGS C compiler flags for NAUTILUS, overriding pkg-config NAUTILUS_LIBS @@ -1750,7 +1756,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-system-tools configure 2.32.0 +gnome-system-tools configure 3.0.0 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2119,7 +2125,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-system-tools $as_me 2.32.0, which was +It was created by gnome-system-tools $as_me 3.0.0, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2399,6 +2405,7 @@ >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2936,7 +2943,7 @@ # Define the identity of the package. PACKAGE=gnome-system-tools - VERSION=2.32.0 + VERSION=3.0.0 cat >>confdefs.h <<_ACEOF @@ -5457,13 +5464,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5460: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5467: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5463: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5470: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5466: output\"" >&5) + (eval echo "\"\$as_me:5473: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6657,7 +6664,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6660 "configure"' > conftest.$ac_ext + echo '#line 6667 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8157,10 +8164,6 @@ $RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -8186,11 +8189,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8189: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8192: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8193: \$? = $ac_status" >&5 + echo "$as_me:8196: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8525,11 +8528,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8531: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8532: \$? = $ac_status" >&5 + echo "$as_me:8535: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8630,11 +8633,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8633: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8636: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8637: \$? = $ac_status" >&5 + echo "$as_me:8640: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8685,11 +8688,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8688: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8691: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8692: \$? = $ac_status" >&5 + echo "$as_me:8695: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11069,7 +11072,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11072 "configure" +#line 11075 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11165,7 +11168,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11168 "configure" +#line 11171 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13172,22 +13175,10 @@ .SECONDARY: $(gsettings_SCHEMAS) -gsettings__base_list = \ - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" - -install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) @$(NORMAL_INSTALL) test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" - @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(gsettings__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ - done + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)" test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) uninstall-gsettings-schemas: @@ -13215,12 +13206,11 @@ STB_REQUIRED=2.10.1 -LIBOOBS_REQUIRED=2.31.91 -GTK_REQUIRED=2.19.7 +LIBOOBS_REQUIRED=2.91.1 +GTK_REQUIRED=2.91 GLIB_REQUIRED=2.25.3 DBUS_REQUIRED=0.32 -POLICYKIT_GTK_REQUIRED=0.92 - +POLKIT_REQUIRED=0.97 @@ -13237,7 +13227,7 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= \$GTK_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= \$GLIB_REQUIRED pango @@ -13245,7 +13235,7 @@ system-tools-backends-2.0 >= \$STB_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13256,7 +13246,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_DEPENDS_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13274,7 +13264,7 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= \$GTK_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= \$GLIB_REQUIRED pango @@ -13282,7 +13272,7 @@ system-tools-backends-2.0 >= \$STB_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13293,7 +13283,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GST_DEPENDS_LIBS=`$PKG_CONFIG --libs " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13320,7 +13310,7 @@ fi if test $_pkg_short_errors_supported = yes; then GST_DEPENDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13329,7 +13319,7 @@ " 2>&1` else GST_DEPENDS_PKG_ERRORS=`$PKG_CONFIG --print-errors " - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13341,7 +13331,7 @@ echo "$GST_DEPENDS_PKG_ERRORS" >&5 as_fn_error $? "Package requirements ( - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -13494,46 +13484,46 @@ have_polkit=no -# Check whether --enable-polkit-gtk was given. -if test "${enable_polkit_gtk+set}" = set; then : - enableval=$enable_polkit_gtk; +# Check whether --enable-polkit was given. +if test "${enable_polkit+set}" = set; then : + enableval=$enable_polkit; else - enable_polkit_gtk=yes + enable_polkit=yes fi -if test "x$enable_polkit_gtk" = "xyes"; then +if test "x$enable_polkit" = "xyes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT_GTK" >&5 -$as_echo_n "checking for POLKIT_GTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5 +$as_echo_n "checking for POLKIT... " >&6; } -if test -n "$POLKIT_GTK_CFLAGS"; then - pkg_cv_POLKIT_GTK_CFLAGS="$POLKIT_GTK_CFLAGS" +if test -n "$POLKIT_CFLAGS"; then + pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gtk-1 >= \$POLICYKIT_GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_POLKIT_GTK_CFLAGS=`$PKG_CONFIG --cflags "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED" 2>/dev/null` + pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= $POLKIT_REQUIRED" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$POLKIT_GTK_LIBS"; then - pkg_cv_POLKIT_GTK_LIBS="$POLKIT_GTK_LIBS" +if test -n "$POLKIT_LIBS"; then + pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gtk-1 >= \$POLICYKIT_GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_POLKIT_GTK_LIBS=`$PKG_CONFIG --libs "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED" 2>/dev/null` + pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= $POLKIT_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13553,22 +13543,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POLKIT_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED" 2>&1` else - POLKIT_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$POLKIT_GTK_PKG_ERRORS" >&5 + echo "$POLKIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED) were not met: + as_fn_error $? "Package requirements (polkit-gobject-1 >= $POLKIT_REQUIRED) were not met: -$POLKIT_GTK_PKG_ERRORS +$POLKIT_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables POLKIT_GTK_CFLAGS -and POLKIT_GTK_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables POLKIT_CFLAGS +and POLKIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13579,15 +13569,15 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables POLKIT_GTK_CFLAGS -and POLKIT_GTK_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables POLKIT_CFLAGS +and POLKIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - POLKIT_GTK_CFLAGS=$pkg_cv_POLKIT_GTK_CFLAGS - POLKIT_GTK_LIBS=$pkg_cv_POLKIT_GTK_LIBS + POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS + POLKIT_LIBS=$pkg_cv_POLKIT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } have_polkit=yes @@ -13598,7 +13588,7 @@ $as_echo "#define HAVE_POLKIT 1" >>confdefs.h else - as_fn_error $? "PolicyKit support requested but polkit-gtk not found" "$LINENO" 5 + as_fn_error $? "PolicyKit support requested but policykit-1 not found" "$LINENO" 5 fi fi @@ -13711,721 +13701,2019 @@ -GETTEXT_PACKAGE=gnome-system-tools -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF + GETTEXT_MACRO_VERSION=0.18 + - for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 -_ACEOF +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -done +# 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 - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then : +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes + 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 +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - am_cv_val_LC_MESSAGES=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + 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 + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - fi - fi - USE_NLS=yes + 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 - gt_cv_have_gettext=no + 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 - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = x""yes; then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return !ngettext ("","", 1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_ngettext_libc=yes -else - gt_cv_func_ngettext_libc=no +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +# 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 -$as_echo "$gt_cv_func_ngettext_libc" >&6; } +rm -f conf$$.file - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then : +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include - -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes + 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - gt_cv_func_dgettext_libc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi + rm -f messages.po - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + 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 -fi -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 - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi -/* 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. */ -#ifdef __cplusplus -extern "C" -#endif -char bindtextdomain (); -int -main () -{ -return bindtextdomain (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_bindtextdomain=yes +# 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_cv_lib_intl_bindtextdomain=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_executable_p="test -f" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +rm -f conf$$.file -/* 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. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_cv_lib_intl_ngettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then : - $as_echo_n "(cached) " >&6 +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -/* 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. */ -#ifdef __cplusplus -extern "C" + + 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 + 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+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 +$as_echo_n "checking for ld used by GCC... " >&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. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if test "${acl_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + 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 GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi +fi + +LD="$acl_cv_path_LD" +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${acl_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$acl_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$acl_cv_prog_gnu_ld + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +$as_echo_n "checking for shared library run path origin... " >&6; } +if test "${acl_cv_rpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +$as_echo "$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+set}" = set; then : + enableval=$enable_rpath; : +else + enable_rpath=yes +fi + + + + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if test "${gl_cv_solaris_64bit+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits #endif -char dgettext (); + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$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" + + + + + + + + + + + + + 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+set}" = set; then : + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { -return dgettext (); +CFPreferencesCopyAppValue(NULL, NULL) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dgettext=yes + gt_cv_func_CFPreferencesCopyAppValue=yes else - ac_cv_lib_intl_dgettext=no + gt_cv_func_CFPreferencesCopyAppValue=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : - gt_cv_func_dgettext_libintl=yes + LIBS="$gt_save_LIBS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -fi +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#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 + + - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 -$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + + + 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 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $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. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); +#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; int main () { -return ngettext (); +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes + eval "$gt_func_gnugettext_libc=yes" else - ac_cv_lib_intl_ngettext=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + + + + + + 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 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if test "${am_cv_func_iconv+set}" = set; then : $as_echo_n "(cached) " >&6 else - 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. */ -#ifdef __cplusplus -extern "C" -#endif -char dcgettext (); + 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 () { -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 - ac_cv_lib_intl_dcgettext=no + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + 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. */ +#include +#include +int +main () +{ +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 : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if test "${am_cv_func_iconv_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes else - : + am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -else - : + LIBS="$am_save_LIBS" + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then - fi +$as_echo "#define HAVE_ICONV 1" >>confdefs.h - # - # 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 - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + fi + if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi -fi -done - 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" - fi - if test "$gt_cv_have_gettext" = "yes"; then -$as_echo "#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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - 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 + + + + 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+set}" = set; then : + 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF fi -done - MSGFMT_OPTS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 -$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF + 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 -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" + 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 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - 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 - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : $as_echo_n "(cached) " >&6 else - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); int main () { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - DATADIRNAME=share + eval "$gt_func_gnugettext_libintl=yes" else - 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" = x""yes; then : - CATOBJEXT=.gmo - DATADIRNAME=share -else - CATOBJEXT=.mo - DATADIRNAME=lib + eval "$gt_func_gnugettext_libintl=no" fi +rm -f core conftest.err conftest.$ac_objext \ + 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 +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +int +main () +{ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac fi rm -f core conftest.err conftest.$ac_objext \ 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$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 $as_echo "#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 - : ; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" + gt_source="libc" fi + else + gt_source="included intl directory" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$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 +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +$as_echo "#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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$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 +GETTEXT_PACKAGE=gnome-system-tools +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF -# AM_GNOME_GETTEXT above substs $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -gnomelocaledir='${prefix}/${DATADIRNAME}/locale' +GETTEXT_PACKAGE=GETTEXT_PACKAGE @@ -14484,8 +15772,8 @@ GST_DEPRECATED_FLAGS="" -GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_GTK_LIBS" -GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_GTK_CFLAGS $GST_DEPRECATED_FLAGS" +GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_LIBS" +GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_CFLAGS $GST_DEPRECATED_FLAGS" GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS" GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS" @@ -15278,7 +16566,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-system-tools $as_me 2.32.0, which was +This file was extended by gnome-system-tools $as_me 3.0.0, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15344,7 +16632,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-system-tools config.status 2.32.0 +gnome-system-tools config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -15719,6 +17007,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 @@ -15732,7 +17026,7 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "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" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/network/Makefile") CONFIG_FILES="$CONFIG_FILES doc/network/Makefile" ;; @@ -17097,9 +18391,119 @@ 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" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/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 assigment 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 assigment 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 @@ -17168,7 +18572,7 @@ Time tool: ${enable_time} Shares tool: ${enable_shares} Nautilus support: ${enable_nautilus} - Use PolKit-GTK: ${have_polkit} + Use PolicyKit: ${have_polkit} Compiler: ${CC} " diff -Nru gnome-system-tools-2.32.0/configure.in gnome-system-tools-3.0.0/configure.in --- gnome-system-tools-2.32.0/configure.in 2010-09-27 16:06:26.000000000 +0000 +++ gnome-system-tools-3.0.0/configure.in 2011-04-03 17:32:51.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(gnome-system-tools, 2.32.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools) +AC_INIT(gnome-system-tools, 3.0.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools) AC_CONFIG_SRCDIR(src/common/gst-tool.c) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -31,12 +31,11 @@ GLIB_GSETTINGS STB_REQUIRED=2.10.1 -LIBOOBS_REQUIRED=2.31.91 -GTK_REQUIRED=2.19.7 +LIBOOBS_REQUIRED=2.91.1 +GTK_REQUIRED=2.91 GLIB_REQUIRED=2.25.3 DBUS_REQUIRED=0.32 -POLICYKIT_GTK_REQUIRED=0.92 - +POLKIT_REQUIRED=0.97 dnl ===================================================== dnl Cracklib checking @@ -78,7 +77,7 @@ dnl ===================================================== PKG_CHECK_MODULES(GST_DEPENDS,[ - gtk+-2.0 >= $GTK_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED gmodule-export-2.0 gio-2.0 >= $GLIB_REQUIRED pango @@ -94,20 +93,20 @@ AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_CFLAGS) -dnl PolicyKit-GTK support +dnl PolicyKit support have_polkit=no -AC_ARG_ENABLE(polkit-gtk, - AS_HELP_STRING([--enable-polkit-gtk],[Enable PolicyKit support using polkit-gtk (default yes)]), - [], [enable_polkit_gtk=yes]) +AC_ARG_ENABLE(polkit, + AS_HELP_STRING([--enable-polkit],[Enable PolicyKit support (default yes)]), + [], [enable_polkit=yes]) -if test "x$enable_polkit_gtk" = "xyes"; then - PKG_CHECK_MODULES(POLKIT_GTK,[polkit-gtk-1 >= $POLICYKIT_GTK_REQUIRED], have_polkit=yes) +if test "x$enable_polkit" = "xyes"; then + PKG_CHECK_MODULES(POLKIT,[polkit-gobject-1 >= $POLKIT_REQUIRED], have_polkit=yes) if test "$have_polkit" = "yes"; then - AC_DEFINE(HAVE_POLKIT, [1], [whether polkit-gtk was found]) + AC_DEFINE(HAVE_POLKIT, [1], [whether polkit was found]) else - AC_MSG_ERROR([PolicyKit support requested but polkit-gtk not found]) + AC_MSG_ERROR([PolicyKit support requested but policykit-1 not found]) fi fi @@ -159,15 +158,11 @@ dnl Translations dnl ======================================================== +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.17]) GETTEXT_PACKAGE=gnome-system-tools -AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name]) -AM_GLIB_GNU_GETTEXT - -# AM_GNOME_GETTEXT above substs $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -gnomelocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(gnomelocaledir) +AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE) dnl ======================================================== dnl END : Translations @@ -234,8 +229,8 @@ dnl GST_DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" GST_DEPRECATED_FLAGS="" -GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_GTK_LIBS" -GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_GTK_CFLAGS $GST_DEPRECATED_FLAGS" +GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_LIBS" +GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_CFLAGS $GST_DEPRECATED_FLAGS" GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS" GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS" @@ -349,7 +344,7 @@ Time tool: ${enable_time} Shares tool: ${enable_shares} Nautilus support: ${enable_nautilus} - Use PolKit-GTK: ${have_polkit} + Use PolicyKit: ${have_polkit} Compiler: ${CC} " diff -Nru gnome-system-tools-2.32.0/debian/changelog gnome-system-tools-3.0.0/debian/changelog --- gnome-system-tools-2.32.0/debian/changelog 2011-12-05 22:14:13.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/changelog 2011-12-16 22:20:21.000000000 +0000 @@ -1,8 +1,63 @@ -gnome-system-tools (2.32.0-0ubuntu9) precise; urgency=low +gnome-system-tools (3.0.0-2ubuntu1) precise; urgency=low - * Fix build error with -Werror=format-security. + * Merge from Debian, remaining changes: + - Split out gnome-network-admin + - Split out gnome-time-admin + - Drop gnome-control-center to Suggests + - 25_sambashare_group_definition.patch + - 26_user_profiles_conf.patch + - 80_gst-packages-common.patch + - 81_gst-packages-shares-admin.patch + - 82_gst-packages-time-admin.patch + - 91_shares_services_detection.patch + - 95_timezone_point_selection.patch + - 96_ubuntu_ntp_pool.patch + - fix-missing-header-ftbfs-amd64.patch + * debian/patches/80_gst-packages-common.patch, + debian/patches/81_gst-packages-shares-admin.patch: + - Update for GTK+ 3 + * debian/patches/92_fix_add_needed_linking.patch, + debian/patches/97_fix_setting_password_from_random_entry.patch: + - Dropped, applied upstream + * debian/patches/remove_g_thread_init.patch: + - Remove obsolete and dropped API g_thread_init() + + -- Michael Terry Fri, 16 Dec 2011 17:08:20 -0500 + +gnome-system-tools (3.0.0-2) unstable; urgency=low + + * debian/patches/62_no_gettext.patch: + - Updated. Fix GETTEXT_PACKAGE variable substitution so the translations + are installed under the correct name. Closes: #647511 + + -- Michael Biebl Thu, 24 Nov 2011 20:55:06 +0100 + +gnome-system-tools (3.0.0-1) unstable; urgency=low + + * New upstream release. Closes: #642978 + * debian/watch: + - Track .bz2 tarballs. + * debian/control.in: + - Bump Build-Depends on liboobs-1-dev to (>= 2.91.1). + - Bump Build-Depends on libglib2.0-dev to (>= 2.25.3). + - Bump Build-Depends on system-tools-backends-dev to (>= 2.10.1). + - Replace Build-Depends on libgtk2.0-dev with libgtk-3-dev (>= 2.91). + - Replace Build-Depends on libpolkit-gtk-1-dev with + libpolkit-gobject-1-dev (>= 0.97). + - Drop Build-Depends on libgconf2-dev. + - Add Vcs-* fields. + - Bump Standards-Version to 3.9.2. No further changes. + * Bump debhelper compatibility level to 8. + * Use dh-autoreconf to update the build system: + - Add Build-Depends on dh-autoreconf. + - Drop debian/patches/90_relibtoolize.patch. + - Add autoreconf.mk include to debian/rules. + * debian/patches/62_no_gettext.patch: + - Don't use both intltool and gettext since newer versions of intltool + conflict with gettext. + * Refresh patches. - -- Matthias Klose Mon, 05 Dec 2011 23:13:34 +0100 + -- Michael Biebl Sat, 22 Oct 2011 20:24:21 +0200 gnome-system-tools (2.32.0-0ubuntu8) oneiric; urgency=low @@ -90,6 +145,14 @@ -- Robert Ancell Wed, 01 Sep 2010 18:17:22 +1000 +gnome-system-tools (2.30.2-2) unstable; urgency=low + + * debian/control.in: + - Remove cracklib2-dev from Build-Depends, it's not used since 2003. + Closes: #598172. + + -- Emilio Pozuelo Monfort Mon, 27 Sep 2010 14:18:04 +0200 + gnome-system-tools (2.30.2-1ubuntu4) maverick; urgency=low * Fix LP: #570828 - gnome-network-admin on UbuntuStudio doesnt allow diff -Nru gnome-system-tools-2.32.0/debian/compat gnome-system-tools-3.0.0/debian/compat --- gnome-system-tools-2.32.0/debian/compat 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/compat 2011-12-16 22:20:21.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru gnome-system-tools-2.32.0/debian/control gnome-system-tools-3.0.0/debian/control --- gnome-system-tools-2.32.0/debian/control 2011-12-05 22:14:57.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/control 2011-12-16 22:20:25.000000000 +0000 @@ -8,28 +8,26 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Jose Carlos Garcia Sogo -Uploaders: Debian GNOME Maintainers , +Uploaders: Debian GNOME Maintainers , Michael Biebl , Niv Sardi Build-Depends: cdbs (>= 0.4.41), autotools-dev, + dh-autoreconf, intltool (>= 0.35.0), - gnome-common, - debhelper (>= 5), - liboobs-1-dev (>= 2.31.91), - libgtk2.0-dev (>= 2.19.7), - libcrack2-dev, + debhelper (>= 8), + liboobs-1-dev (>= 2.91.1), + libgtk-3-dev (>= 2.91), libglib2.0-dev (>= 2.25.3), libdbus-1-dev (>= 0.32), - libpolkit-gtk-1-dev (>= 0.92), + libpolkit-gobject-1-dev (>= 0.97), system-tools-backends-dev (>= 2.10.1), gettext, libxml-parser-perl, gnome-pkg-tools, scrollkeeper, gnome-doc-utils (>= 0.3.2), - pkg-config, - libpango1.0-dev -Standards-Version: 3.8.4 + pkg-config +Standards-Version: 3.9.2 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-tools/ubuntu Package: gnome-system-tools @@ -37,9 +35,9 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, perl, - system-tools-backends (>= 2.9.4), + system-tools-backends (>= 2.10.1), policykit-1-gnome -Suggests: ntp, gnome-control-center +Suggests: ntp, gnome-control-center (>= 1:2.10.1-1) Replaces: ximian-setup-tools Description: Cross-platform configuration utilities for GNOME The GNOME System Tools are a fully integrated set of tools aimed to make easy diff -Nru gnome-system-tools-2.32.0/debian/control.in gnome-system-tools-3.0.0/debian/control.in --- gnome-system-tools-2.32.0/debian/control.in 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/control.in 2011-12-16 22:20:21.000000000 +0000 @@ -7,24 +7,22 @@ Niv Sardi Build-Depends: cdbs (>= 0.4.41), autotools-dev, + dh-autoreconf, intltool (>= 0.35.0), - gnome-common, - debhelper (>= 5), - liboobs-1-dev (>= 2.31.91), - libgtk2.0-dev (>= 2.19.7), - libcrack2-dev, + debhelper (>= 8), + liboobs-1-dev (>= 2.91.1), + libgtk-3-dev (>= 2.91), libglib2.0-dev (>= 2.25.3), libdbus-1-dev (>= 0.32), - libpolkit-gtk-1-dev (>= 0.92), + libpolkit-gobject-1-dev (>= 0.97), system-tools-backends-dev (>= 2.10.1), gettext, libxml-parser-perl, gnome-pkg-tools, scrollkeeper, gnome-doc-utils (>= 0.3.2), - pkg-config, - libpango1.0-dev -Standards-Version: 3.8.4 + pkg-config +Standards-Version: 3.9.2 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-system-tools/ubuntu Package: gnome-system-tools @@ -32,9 +30,9 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, perl, - system-tools-backends (>= 2.9.4), + system-tools-backends (>= 2.10.1), policykit-1-gnome -Suggests: ntp, gnome-control-center +Suggests: ntp, gnome-control-center (>= 1:2.10.1-1) Replaces: ximian-setup-tools Description: Cross-platform configuration utilities for GNOME The GNOME System Tools are a fully integrated set of tools aimed to make easy diff -Nru gnome-system-tools-2.32.0/debian/patches/01_wait_for_backends.patch gnome-system-tools-3.0.0/debian/patches/01_wait_for_backends.patch --- gnome-system-tools-2.32.0/debian/patches/01_wait_for_backends.patch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/01_wait_for_backends.patch 2011-12-16 22:20:21.000000000 +0000 @@ -1,7 +1,7 @@ -Index: gnome-system-tools-2.31.91/src/common/gst-tool.c +Index: gnome-system-tools-3.0.0/src/common/gst-tool.c =================================================================== ---- gnome-system-tools-2.31.91.orig/src/common/gst-tool.c 2010-05-25 03:09:57.000000000 +1000 -+++ gnome-system-tools-2.31.91/src/common/gst-tool.c 2010-09-01 18:34:58.412617000 +1000 +--- gnome-system-tools-3.0.0.orig/src/common/gst-tool.c 2011-02-26 18:52:42.000000000 +0100 ++++ gnome-system-tools-3.0.0/src/common/gst-tool.c 2011-10-22 18:23:29.742506332 +0200 @@ -221,6 +221,7 @@ gchar *widget_name; GtkWidget *dialog; diff -Nru gnome-system-tools-2.32.0/debian/patches/61_outdated_docs.patch gnome-system-tools-3.0.0/debian/patches/61_outdated_docs.patch --- gnome-system-tools-2.32.0/debian/patches/61_outdated_docs.patch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/61_outdated_docs.patch 2011-12-16 22:20:21.000000000 +0000 @@ -1,22 +1,22 @@ -Index: gnome-system-tools-2.31.91/doc/services/Makefile.am +Index: gnome-system-tools-3.0.0/doc/services/Makefile.am =================================================================== ---- gnome-system-tools-2.31.91.orig/doc/services/Makefile.am 2010-08-11 19:28:00.000000000 +1000 -+++ gnome-system-tools-2.31.91/doc/services/Makefile.am 2010-09-01 18:35:56.502617001 +1000 +--- gnome-system-tools-3.0.0.orig/doc/services/Makefile.am 2010-12-12 13:16:01.000000000 +0100 ++++ gnome-system-tools-3.0.0/doc/services/Makefile.am 2011-10-22 18:34:38.094104015 +0200 @@ -9,7 +9,4 @@ - DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sv it zh_CN + DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN -# this isn't still ported to gnome-doc-utils -SUBDIRS = nl - -include $(top_srcdir)/git.mk -Index: gnome-system-tools-2.31.91/doc/time/Makefile.am +Index: gnome-system-tools-3.0.0/doc/time/Makefile.am =================================================================== ---- gnome-system-tools-2.31.91.orig/doc/time/Makefile.am 2010-08-11 19:28:00.000000000 +1000 -+++ gnome-system-tools-2.31.91/doc/time/Makefile.am 2010-09-01 18:35:56.502617001 +1000 +--- gnome-system-tools-3.0.0.orig/doc/time/Makefile.am 2010-12-12 13:16:01.000000000 +0100 ++++ gnome-system-tools-3.0.0/doc/time/Makefile.am 2011-10-22 18:34:38.094104015 +0200 @@ -12,7 +12,4 @@ - DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sv zh_CN + DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN -# This isn't still ported to gnome-doc-utils -SUBDIRS = nl diff -Nru gnome-system-tools-2.32.0/debian/patches/62_no_gettext.patch gnome-system-tools-3.0.0/debian/patches/62_no_gettext.patch --- gnome-system-tools-2.32.0/debian/patches/62_no_gettext.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/62_no_gettext.patch 2011-12-16 22:20:21.000000000 +0000 @@ -0,0 +1,19 @@ +# Don't use both gettext and intltool since newer versions of intltool +# conflict with gettext +Index: gnome-system-tools-3.0.0/configure.in +=================================================================== +--- gnome-system-tools-3.0.0.orig/configure.in 2011-11-24 20:46:48.350903840 +0100 ++++ gnome-system-tools-3.0.0/configure.in 2011-11-24 20:49:01.374902540 +0100 +@@ -158,11 +158,9 @@ + dnl Translations + dnl ======================================================== + +-AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.17]) + GETTEXT_PACKAGE=gnome-system-tools + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name]) +-AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE) ++AC_SUBST([GETTEXT_PACKAGE]) + + dnl ======================================================== + dnl END : Translations diff -Nru gnome-system-tools-2.32.0/debian/patches/80_gst-packages-common.patch gnome-system-tools-3.0.0/debian/patches/80_gst-packages-common.patch --- gnome-system-tools-2.32.0/debian/patches/80_gst-packages-common.patch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/80_gst-packages-common.patch 2011-12-16 22:20:21.000000000 +0000 @@ -1,10 +1,10 @@ Description: Add functions for Ubuntu packaging Author: ? -Index: gnome-system-tools-2.31.91/src/common/Makefile.am +Index: gnome-system-tools-3.0.0/src/common/Makefile.am =================================================================== ---- gnome-system-tools-2.31.91.orig/src/common/Makefile.am 2010-05-25 03:09:57.000000000 +1000 -+++ gnome-system-tools-2.31.91/src/common/Makefile.am 2010-09-01 18:35:59.582617000 +1000 +--- gnome-system-tools-3.0.0.orig/src/common/Makefile.am 2010-12-12 12:39:02.000000000 -0500 ++++ gnome-system-tools-3.0.0/src/common/Makefile.am 2011-12-16 16:35:31.000000000 -0500 @@ -11,6 +11,7 @@ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" @@ -13,11 +13,11 @@ gst-dialog.c gst-dialog.h \ gst-tool.c gst-tool.h \ gst-platform-dialog.c gst-platform-dialog.h \ -Index: gnome-system-tools-2.31.91/src/common/gst-package.c +Index: gnome-system-tools-3.0.0/src/common/gst-package.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-system-tools-2.31.91/src/common/gst-package.c 2010-09-01 18:35:59.582617000 +1000 -@@ -0,0 +1,211 @@ ++++ gnome-system-tools-3.0.0/src/common/gst-package.c 2011-12-16 16:41:12.427282686 -0500 +@@ -0,0 +1,201 @@ +/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ +/* + * Copyright (C) 2004 Vincent Untz @@ -45,10 +45,9 @@ +# include +#endif + -+#include ++#include +#include -+#include -+#include ++#include +#include +#include +#include @@ -69,7 +68,7 @@ + GTK_BUTTONS_CLOSE, + _("Could not install package")); + -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} @@ -124,8 +123,9 @@ + + synaptic_path = g_find_program_in_path ("synaptic"); + command = g_strdup_printf ("%s --hide-main-window --non-interactive " -+ "--set-selections-file %s --parent-window-id %d", -+ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ "--set-selections-file %s --parent-window-id %ld", ++ synaptic_path, path, ++ (long)gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (window)))); + g_free (synaptic_path); + return command; +} @@ -133,7 +133,7 @@ +static gboolean +spawn_synaptic (GtkWindow *window, + const gchar *path, -+ gint *child_pid) ++ GPid *child_pid) +{ + gchar **argv; + GError *error = NULL; @@ -145,13 +145,14 @@ + argv[i++] = g_strdup ("--desktop"); + argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); + argv[i++] = g_strdup ("--disable-grab"); ++ argv[i++] = g_strdup ("--display"); ++ argv[i++] = gdk_screen_make_display_name (gtk_window_get_screen (window)); + argv[i++] = get_synaptic_command_line (window, path); + argv[i++] = NULL; + -+ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), -+ NULL, argv, NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, -+ NULL, NULL, child_pid, &error)) ++ if (!g_spawn_async (NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) + { + show_error_dialog (window, (error) ? error->message : ""); + g_error_free (error); @@ -163,43 +164,32 @@ + return retval; +} + -+gboolean -+on_wait_timeout (gpointer data) ++static void ++on_wait_timeout (GPid pid, gint status, gpointer data) +{ -+ gint pid, status; -+ -+ pid = GPOINTER_TO_INT (data); -+ -+ if (waitpid (pid, &status, WNOHANG) > 0) -+ { -+ /* FIXME: should show an error dialog if the installation fails, -+ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ -+ gtk_main_quit (); -+ return FALSE; -+ } -+ -+ return TRUE; ++ g_spawn_close_pid (pid); ++ /* FIXME: should show an error dialog if the installation fails, ++ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ ++ gtk_main_quit (); +} + +static gboolean -+wait_for_synaptic (GtkWindow *window, gint pid) ++wait_for_synaptic (GtkWindow *window, GPid pid) +{ + GdkCursor *cursor; -+ gint timer; + + cursor = gdk_cursor_new (GDK_WATCH); -+ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor); + gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); + + /* wait here a bit until the process has exited */ -+ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ g_child_watch_add (pid, on_wait_timeout, NULL); + gtk_main (); + -+ g_source_remove (timer); + gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); -+ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), NULL); + -+ gdk_cursor_unref (cursor); ++ g_object_unref (cursor); + + /* keep this until we can get status + * info from the launched process */ @@ -211,7 +201,7 @@ + const gchar *packages[]) +{ + gchar *path; -+ pid_t pid; ++ GPid pid; + gboolean retval = FALSE; + + g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); @@ -229,10 +219,10 @@ + + return retval; +} -Index: gnome-system-tools-2.31.91/src/common/gst-package.h +Index: gnome-system-tools-3.0.0/src/common/gst-package.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-system-tools-2.31.91/src/common/gst-package.h 2010-09-01 18:35:59.582617000 +1000 ++++ gnome-system-tools-3.0.0/src/common/gst-package.h 2011-12-16 16:35:31.000000000 -0500 @@ -0,0 +1,35 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* @@ -269,10 +259,10 @@ +G_END_DECLS + +#endif /* __GST_PACKAGES_H__ */ -Index: gnome-system-tools-2.31.91/src/common/gst.h +Index: gnome-system-tools-3.0.0/src/common/gst.h =================================================================== ---- gnome-system-tools-2.31.91.orig/src/common/gst.h 2010-05-25 03:09:57.000000000 +1000 -+++ gnome-system-tools-2.31.91/src/common/gst.h 2010-09-01 18:35:59.582617000 +1000 +--- gnome-system-tools-3.0.0.orig/src/common/gst.h 2010-10-06 05:54:53.000000000 -0400 ++++ gnome-system-tools-3.0.0/src/common/gst.h 2011-12-16 16:35:31.000000000 -0500 @@ -1,5 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include diff -Nru gnome-system-tools-2.32.0/debian/patches/81_gst-packages-shares-admin.patch gnome-system-tools-3.0.0/debian/patches/81_gst-packages-shares-admin.patch --- gnome-system-tools-2.32.0/debian/patches/81_gst-packages-shares-admin.patch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/81_gst-packages-shares-admin.patch 2011-12-16 22:20:21.000000000 +0000 @@ -1,10 +1,10 @@ Description: Install nfs-kernel-server and samba packages on demand Author: ? -Index: gnome-system-tools-2.29.90/src/shares/shares-tool.c +Index: gnome-system-tools-3.0.0/src/shares/shares-tool.c =================================================================== ---- gnome-system-tools-2.29.90.orig/src/shares/shares-tool.c 2010-02-08 18:05:51.000000000 +0000 -+++ gnome-system-tools-2.29.90/src/shares/shares-tool.c 2010-02-14 18:22:49.943247673 +0000 +--- gnome-system-tools-3.0.0.orig/src/shares/shares-tool.c 2011-12-16 16:49:47.751288140 -0500 ++++ gnome-system-tools-3.0.0/src/shares/shares-tool.c 2011-12-16 16:52:13.087289678 -0500 @@ -138,9 +138,36 @@ } @@ -54,14 +54,15 @@ + nfs_check = gtk_check_button_new_with_mnemonic (_("Install Unix networks support (_NFS)")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nfs_check), TRUE); + gtk_widget_show (nfs_check); -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), nfs_check); ++ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), nfs_check); + + /* add SMB checkbutton */ + smb_check = gtk_check_button_new_with_mnemonic (_("Install Windows networks support (_SMB)")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (smb_check), TRUE); + gtk_widget_show (smb_check); -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), smb_check); -+ ++ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), smb_check); + +- return FALSE; + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (dialog); + @@ -71,8 +72,7 @@ + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (smb_check)))) { + gst_tool_update_config (GST_TOOL (tool)); + gst_tool_update_gui (GST_TOOL (tool)); - -- return FALSE; ++ + retval = TRUE; + } + } diff -Nru gnome-system-tools-2.32.0/debian/patches/96_ubuntu_ntp_pool.patch gnome-system-tools-3.0.0/debian/patches/96_ubuntu_ntp_pool.patch --- gnome-system-tools-2.32.0/debian/patches/96_ubuntu_ntp_pool.patch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/96_ubuntu_ntp_pool.patch 2011-12-16 22:20:21.000000000 +0000 @@ -2,11 +2,11 @@ Author: Xavier Robin Bug-Ubuntu: https://launchpad.net/bugs/104525 -Index: gnome-system-tools-2.32.0/src/time/ntp-servers-list.c +Index: gnome-system-tools-3.0.0/src/time/ntp-servers-list.c =================================================================== ---- gnome-system-tools-2.32.0.orig/src/time/ntp-servers-list.c 2011-02-08 16:32:06.411971650 +0100 -+++ gnome-system-tools-2.32.0/src/time/ntp-servers-list.c 2011-02-08 16:33:37.912003021 +0100 -@@ -34,58 +34,12 @@ +--- gnome-system-tools-3.0.0.orig/src/time/ntp-servers-list.c 2010-12-12 07:16:01.000000000 -0500 ++++ gnome-system-tools-3.0.0/src/time/ntp-servers-list.c 2011-12-16 13:23:48.625087868 -0500 +@@ -34,33 +34,12 @@ struct NtpServer { const gchar *url; @@ -17,8 +17,6 @@ - { "ntp2.cmc.ec.gc.ca", "Eastern Canada" }, - { "wuarchive.wustl.edu", "Missouri, USA" }, - { "clock.psu.edu", "Pennsylvania, USA" }, -- { "gilbreth.ecn.purdue.edu", "Indiana, USA" }, -- { "molecule.ecn.purdue.edu", "Indiana, USA" }, - { "ntp.tmc.edu", "Texas, USA" }, - { "louie.udel.edu", "Delaware, USA" }, - { "ntp0.cornell.edu", "New York, USA" }, @@ -29,39 +27,16 @@ - { "ntp2b.mcc.ac.uk", "England, Europe" }, - { "ntp.maths.tcd.ie", "Ireland, Europe" }, - { "ntp.cs.strath.ac.uk", "Scotland, Europe" }, -- { "bernina.ethz.ch", "Switzerland, Europe" }, - { "ntp.univ-lyon1.fr", "France, Europe" }, - { "tick.keso.fi", "Finland, Europe" }, - { "fartein.ifi.uio.no", "Norway, Europe" }, -- { "ntp1.arnes.si", "Slovenia, Europe" }, -- { "ntp2.arnes.si", "Slovenia, Europe" }, -- { "time.esec.com.au", "Australia" }, - { "ntp.adelaide.edu.au", "South Australia" }, - { "time.nuri.net", "Korea, Asia" }, - { "ntp.cs.mu.oz.au", "Melbourne, Australia" }, - { "swisstime.ethz.ch", "Zurich, Switzerland" }, -- { "ntp.cesnet.cz", "Prague, Czech Republic" }, -- { "ntpa2.kph.uni-mainz.de", "Mainz, Germany" }, -- { "ntps1-0.cs.tu-berlin.de", "Berlin, Germany" }, -- { "ntps1-1.cs.tu-berlin.de", "Berlin, Germany" }, -- { "ntps1-2.uni-erlangen.de", "Erlangen, Germany" }, -- { "canon.inria.fr", "Rocquencourt, France" }, -- { "chronos.cru.fr", "Britany, France" }, - { "stdtime.gov.hk", "Hong Kong, China" }, -- { "clock.cuhk.edu.hk", "Hong Kong, China" }, -- { "time.ien.it", "Torino, Italy" }, - { "ntp.jst.mfeed.ad.jp", "Japan" }, -- { "cronos.cenam.mx", "Queretaro, Mexico" }, -- { "ntp0.nl.net", "Amsterdam, The Netherlands" }, -- { "ntp1.nl.net", "Amsterdam, The Netherlands" }, -- { "ntp2.nl.net", "Amsterdam, The Netherlands" }, - { "time.service.uit.no", "Norway" }, -- { "ntp.certum.pl", "Poland" }, -- { "vega.cbk.poznan.pl", "Borowiec, Poland" }, -- { "time1.stupi.se", "Stockholm, Sweden" }, -- { "goodtime.ijs.si", "Ljubljana, Slovenia" }, -- { "ntp2.ja.net", "United Kingdom" }, -- { "laikas.pfi.lt", "Lithuania" }, + { "0.ubuntu.pool.ntp.org" }, + { "1.ubuntu.pool.ntp.org" }, + { "2.ubuntu.pool.ntp.org" }, @@ -70,7 +45,7 @@ { NULL } }; -@@ -97,7 +51,7 @@ +@@ -72,7 +51,7 @@ gint i; for (i = 0; ntp_servers[i].url; i++) { diff -Nru gnome-system-tools-2.32.0/debian/patches/fix-format-security.diff gnome-system-tools-3.0.0/debian/patches/fix-format-security.diff --- gnome-system-tools-2.32.0/debian/patches/fix-format-security.diff 2011-12-05 22:13:31.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/fix-format-security.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: gnome-system-tools-2.32.0/src/common/gst-package.c -=================================================================== ---- gnome-system-tools-2.32.0.orig/src/common/gst-package.c 2011-12-05 22:10:32.000000000 +0000 -+++ gnome-system-tools-2.32.0/src/common/gst-package.c 2011-12-05 22:13:24.141648941 +0000 -@@ -49,7 +49,7 @@ - GTK_BUTTONS_CLOSE, - _("Could not install package")); - -- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), secondary_text); -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } diff -Nru gnome-system-tools-2.32.0/debian/patches/fix-missing-header-ftbfs-amd64.patch gnome-system-tools-3.0.0/debian/patches/fix-missing-header-ftbfs-amd64.patch --- gnome-system-tools-2.32.0/debian/patches/fix-missing-header-ftbfs-amd64.patch 2011-08-30 21:55:10.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/fix-missing-header-ftbfs-amd64.patch 2011-12-16 22:20:21.000000000 +0000 @@ -1,7 +1,7 @@ -Index: gnome-system-tools-2.32.0/src/network/connection.c +Index: gnome-system-tools-3.0.0/src/network/connection.c =================================================================== ---- gnome-system-tools-2.32.0.orig/src/network/connection.c 2011-08-30 17:52:10.000000000 -0400 -+++ gnome-system-tools-2.32.0/src/network/connection.c 2011-08-30 17:55:08.000000000 -0400 +--- gnome-system-tools-3.0.0.orig/src/network/connection.c 2011-12-16 16:24:06.283271825 -0500 ++++ gnome-system-tools-3.0.0/src/network/connection.c 2011-12-16 16:27:08.000000000 -0500 @@ -18,6 +18,7 @@ * Authors: Carlos Garnacho Parro */ diff -Nru gnome-system-tools-2.32.0/debian/patches/remove_g_thread_init.patch gnome-system-tools-3.0.0/debian/patches/remove_g_thread_init.patch --- gnome-system-tools-2.32.0/debian/patches/remove_g_thread_init.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/remove_g_thread_init.patch 2011-12-16 22:20:21.000000000 +0000 @@ -0,0 +1,24 @@ +Index: gnome-system-tools-3.0.0/src/network/main.c +=================================================================== +--- gnome-system-tools-3.0.0.orig/src/network/main.c 2009-05-16 10:49:19.000000000 -0400 ++++ gnome-system-tools-3.0.0/src/network/main.c 2011-12-16 16:46:50.419286263 -0500 +@@ -185,7 +185,6 @@ + { NULL } + }; + +- g_thread_init (NULL); + gst_init_tool ("network-admin", argc, argv, entries); + tool = gst_network_tool_new (); + +Index: gnome-system-tools-3.0.0/src/shares/main.c +=================================================================== +--- gnome-system-tools-3.0.0.orig/src/shares/main.c 2009-05-16 10:49:19.000000000 -0400 ++++ gnome-system-tools-3.0.0/src/shares/main.c 2011-12-16 16:46:55.203286314 -0500 +@@ -104,7 +104,6 @@ + { NULL } + }; + +- g_thread_init (NULL); + gst_init_tool ("shares-admin", argc, argv, entries); + tool = GST_TOOL (gst_shares_tool_new ()); + diff -Nru gnome-system-tools-2.32.0/debian/patches/series gnome-system-tools-3.0.0/debian/patches/series --- gnome-system-tools-2.32.0/debian/patches/series 2011-12-05 22:12:21.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/patches/series 2011-12-16 22:20:21.000000000 +0000 @@ -4,13 +4,12 @@ 25_sambashare_group_definition.patch 26_user_profiles_conf.patch 61_outdated_docs.patch +62_no_gettext.patch 80_gst-packages-common.patch 81_gst-packages-shares-admin.patch 82_gst-packages-time-admin.patch 91_shares_services_detection.patch -92_fix_add_needed_linking.patch 95_timezone_point_selection.patch 96_ubuntu_ntp_pool.patch -97_fix_setting_password_from_random_entry.patch fix-missing-header-ftbfs-amd64.patch -fix-format-security.diff +remove_g_thread_init.patch diff -Nru gnome-system-tools-2.32.0/debian/rules gnome-system-tools-3.0.0/debian/rules --- gnome-system-tools-2.32.0/debian/rules 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/rules 2011-12-16 22:20:21.000000000 +0000 @@ -1,16 +1,11 @@ #!/usr/bin/make -f include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_AUTO_UPDATE_LIBTOOL=pre -DEB_AUTO_UPDATE_ACLOCAL=1.11 -DEB_AUTO_UPDATE_AUTOCONF=1 -DEB_AUTO_UPDATE_AUTOHEADER=1 -DEB_AUTO_UPDATE_AUTOMAKE=1.11 - LDFLAGS += -Wl,-z,defs -Wl,-O1 DEB_CONFIGURE_EXTRA_FLAGS += --disable-schemas-install \ diff -Nru gnome-system-tools-2.32.0/debian/watch gnome-system-tools-3.0.0/debian/watch --- gnome-system-tools-2.32.0/debian/watch 2011-03-30 13:16:45.000000000 +0000 +++ gnome-system-tools-3.0.0/debian/watch 2011-12-16 22:20:21.000000000 +0000 @@ -1,3 +1,3 @@ -version=2 +version=3 http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/([\d\.]+[0-9])/ \ - gnome-system-tools-(.*)\.tar\.gz + gnome-system-tools-(.*)\.tar\.bz2 diff -Nru gnome-system-tools-2.32.0/doc/Makefile.in gnome-system-tools-3.0.0/doc/Makefile.in --- gnome-system-tools-2.32.0/doc/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -36,11 +36,7 @@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/doc/network/ChangeLog gnome-system-tools-3.0.0/doc/network/ChangeLog --- gnome-system-tools-2.32.0/doc/network/ChangeLog 2009-08-25 21:16:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/ChangeLog 2010-12-12 12:16:01.000000000 +0000 @@ -2,6 +2,11 @@ ==================== 2.22.2 ==================== +2010-11-08 Djavan Fagundes + + * Makefile.am: Added pt_BR to DOC_LINGUAS. + * pt_BR/pt_BR.po: Added Brazilian Portuguese translation. + 2009-03-16 Philip Withnall * Makefile.am: diff -Nru gnome-system-tools-2.32.0/doc/network/Makefile.am gnome-system-tools-3.0.0/doc/network/Makefile.am --- gnome-system-tools-2.32.0/doc/network/Makefile.am 2009-09-21 12:59:53.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/Makefile.am 2010-12-12 12:16:01.000000000 +0000 @@ -6,7 +6,7 @@ DOC_INCLUDES = DOC_FIGURES = figures/network-tool.png -DOC_LINGUAS = ca cs de el en_GB es fr oc sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR sl sv it zh_CN -include $(top_srcdir)/git.mk diff -Nru gnome-system-tools-2.32.0/doc/network/Makefile.in gnome-system-tools-3.0.0/doc/network/Makefile.in --- gnome-system-tools-2.32.0/doc/network/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -61,11 +61,7 @@ $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = doc/network ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -90,8 +86,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -113,11 +107,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -136,26 +131,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -178,14 +176,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -194,6 +187,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -217,7 +212,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -362,7 +356,7 @@ DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = figures/network-tool.png -DOC_LINGUAS = ca cs de el en_GB es fr oc sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR sl sv it zh_CN all: all-am .SUFFIXES: diff -Nru gnome-system-tools-2.32.0/doc/network/pt_BR/network-admin.xml gnome-system-tools-3.0.0/doc/network/pt_BR/network-admin.xml --- gnome-system-tools-2.32.0/doc/network/pt_BR/network-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/pt_BR/network-admin.xml 2011-04-03 20:04:27.000000000 +0000 @@ -0,0 +1,288 @@ + + + + + + +]> + + +
+ + + + Manual da Ferramenta de Administração de Rede + + 2004-2006 + Carlos Garnacho Parro + 2009Krix Apolinário (Krix Apolinário) + + + + + Carlos Garnacho Parro + + + + Permissão concedida para copiar, distribuir e/ou modificar este documento sob os termos da GNU Free Documentation License (GFDL), Versão 1.1 ou qualquer versão mais recente publicada pela Free Software Foundation sem seções invariantes, sem textos de capa frontal, e sem textos de contracapa. Você pode encontrar uma cópia da licença GFDL no link ou no arquivo COPYING-DOCS distribuído com este manual. + Este manual é parte da coleção de manuais do GNOME distribuído sob os termos da GFDL. Se você quizer distribuir este manual separadamente desta coleção, você pode fazer-lo adicionando ao manual uma cópia da licença, como descrito na seção 6 desta licença. + + Muitos dos nomes usados por empresas para distinguir seus produtos e serviços são reivindicados como marcas registradas. Onde esses nomes aparecem em qualquer documentação do GNOME e os membros do Projeto de Documentação do GNOME estiverem cientes dessas marcas registradas, os nomes aparecerão impressos em letras maiúsculas ou com iniciais em maiúsculas. + + O DOCUMENTO E VERSÕES MODIFICADAS DO DOCUMENTO SÃO FORNECIDOS SOB OS TERMOS DA GNU FREE DOCUMENTATION LICENSE COM O ENTENDIMENTO ADICIONAL DE QUE: + + O DOCUMENTO É FORNECIDO NA BASE "COMO ESTÁ", SEM GARANTIAS DE QUALQUER TIPO, TANTO EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS DE QUE O DOCUMENTO OU VERSÃO MODIFICADA DO DOCUMENTO SEJA COMERCIALIZÁVEL, LIVRE DE DEFEITOS, PRÓPRIO PARA UM PROPÓSITO ESPECÍFICO OU SEM INFRAÇÕES. TODO O RISCO A RESPEITO DA QUALIDADE, EXATIDÃO, E DESEMPENHO DO DOCUMENTO OU VERSÕES MODIFICADAS DO DOCUMENTO É DE SUA RESPONSABILIDADE. SE ALGUM DOCUMENTO OU VERSÃO MODIFICADA SE PROVAR DEFEITUOSO EM QUALQUER ASPECTO, VOCÊ (NÃO O ESCRITOR INICIAL, AUTOR OU QUALQUER CONTRIBUIDOR) ASSUME O CUSTO DE QUALQUER SERVIÇO NECESSÁRIO, REPARO OU CORREÇÃO. ESSA RENÚNCIA DE GARANTIAS CONSTITUI UMA PARTE ESSENCIAL DESTA LICENÇA. NENHUM USO DESTE DOCUMENTO OU VERSÃO MODIFICADA DESTE DOCUMENTO É AUTORIZADO SE NÃO FOR SOB ESSA RENÚNCIA; E + + + SOB NENHUMA CIRCUNSTÂNCIA E SOB NENHUMA TEORIA LEGAL, TANTO EM DANO (INCLUINDO NEGLIGÊNCIA), CONTRATO, OU OUTROS, DEVEM O AUTOR, ESCRITOR INICIAL, QUALQUER CONTRIBUIDOR, OU QUALQUER DISTRIBUIDOR DO DOCUMENTO OU VERSÃO MODIFICADA DO DOCUMENTO, OU QUALQUER FORNECEDOR DE ALGUMA DESSAS PARTES, SER CONSIDERADOS RESPONSÁVEIS A QUALQUER PESSOA POR QUALQUER DANO, SEJA DIRETO, INDIRETO, ESPECIAL, ACIDENTAL OU CONSEQÜENCIAL DE QUALQUER INDIVÍDUO, INCLUINDO, MAS NÃO LIMITADO A, DANOS POR PERDA DE BOA VONTADE, TRABALHO PARADO, FALHA OU MAU FUNCIONAMENTO DO COMPUTADOR, OU QUALQUER E TODOS OS OUTROS DANOS OU PERDAS RESULTANTES OU RELACIONADOS AO USO DO DOCUMENTO E VERSÕES MODIFICADAS, MESMO QUE TAL PARTE TENHA SIDO INFORMADA DA POSSIBILIDADE DE TAIS DANOS. + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Manual da Ferramenta de administração de rede V2.15.2 + Agosto 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + Manual da Ferramenta de administração de rede V0.35 + Junho 2004 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + Este manual descreve a versão 2.15.2 da Ferramenta de administração de rede. + + + Feedback + Para relatar um erro ou fazer uma sugestão relacionada à Ferramenta de administração de rede ou deste manual, visite a página de feedback do GNOME. + + + A Ferramenta de administração de rede permite que você especifique a forma como o sistema se conecta a outros computadores e à internet. + + + + + Ferramenta de administração de rede + + + + + Introdução + A Ferramenta de administração de rede permite que você especifique a forma como o sistema se conecta a outros computadores e à internet. + + + + Primeiros passos + + Você pode iniciar a Ferramenta de administração de rede das seguintes formas: + + + + Menu Sistema + + Selecione AdministraçãoRede. + + + + + Linha de comando + + Execute o seguinte comando: network-admin + + + + + Quando você iniciar a Ferramenta de administração de rede, será solicitada a senha do administrador, isso é necessário porque as alterações feitas com esta ferramenta afetarão todo o sistema. + + Após digitar a senha do administrador, a seguinte janela será exibida. + +
+ Janela principal da Ferramenta de administração de rede + + + + + + + Mostra a janela principal da Ferramenta de administração de rede. + + + +
+ + A janela principal da Ferramenta de administração de rede contém quatro seções tabuladas: + + + + Conexões + + Exibe todas as interfaces de rede, também permite que você altere suas configurações. + + + + + Geral + + Permite que você altere o nome de sua máquina e o nome do domínio. + + + + + DNS + + Contém duas seções, os servidores de DNS são o que o seu computador usa para resolver os endereços IP a partir dos nomes de domínio. Os domínios de busca são os domínios em que seu sistema irá buscar qualquer máquina quando nenhum domínio for especificado. + + + + + Máquinas + + Mostra a lista de apelidos para acessar outros computadores. + + + + + + + Uso + + + Para modificar uma configuração de conexão + Na seção Conexões, selecione a interface que quer modificar e pressione o botão Propriedades, dependendo do tipo de interface que for capaz de modificar dados diferentes. + + + + Interfaces Ethernet e IRLAN + + Você pode modificar a forma como a interface é configurada (DHCP ou manualmente), se a interface for configurada manualmente, você pode modificar também o endereço IP, máscara de sub-rede ou gateway da interface. + + + + + Interfaces de redes sem fio + + Você pode modificar a forma como a interface é configurada (DHCP ou manualmente), se a interface for configurada manualmente, você pode modificar também o endereço IP, a máscara de sub-rede e gateway da interface, você pode modificar também o nome da rede (ESSID) para esta interface. + + + + + Interface por linha paralela + + Você pode modificar o endereço IP da interface, assim como o endereço IP remoto. + + + + + Interfaces de Modem/PPP + + Você pode modificar o dispositivo de modem, se deseja discar utilizando tons ou pulsos, o volume do modem, o número do telefone, o usuário e senha que seu servidor ISP forneceu e outras configurações avançadas para PPP. + + + + + + + Para habilitar ou desativar uma interface + Na seção Conexões, habilite ou desabilite a caixa de seleção ao lado da interface. + + + + Para alterar o nome de sua máquina e nome de domínio + Na seção Geral, mude as caixas de texto nome da máquina ou nome do domínio. + + + + Para adicionar um novo servidor de nomes de domínio + Na seção Servidores DNS, pressione o botão Adicionar e preencha a nova linha da lista com o servidor de nome do domínio novo. + + + + Para excluir um servidor de nomes de domínio + Na seção Servidores DNS, selecione um endereço IP de DNS da lista e pressione o botão Excluir. + + + + Para adicionar um novo domínio de busca + Na seção Domínios de busca, pressione o botão Adicionar e preencha a nova linha da lista com o novo domínio de busca. + + + + Para excluir um domínio de busca + Na seção Domínios de busca, selecione um domínio de busca da lista e pressione o botão Excluir. + + + + Para adicionar um novo nome de máquina + Na seção Máquinas, pressione o botão Adicionar e digite um endereço IP e os apelidos para onde apontarão na janela que se abrir. + + + + Para modificar um nome de máquina + Na seção Máquinas, selecione um apelido, pressione o botão Propriedades da lista e modifique as configurações do apelido na janela que é aberta. + + + + Para excluir um nome de máquina + Na seção Máquinas, selecione um nome da lista e pressione o botão Excluir. + + + + Para salvar sua configuração de rede atual como "Localização" + Pressione o botão Adicionar ao lado do menu Localizações e especifique o nome do local na janela que é aberta. + + + + Para excluir a localização + Pressione o botão Remover ao lado do menu Localizações e o perfil selecionado será removido. + + + + Para alternar uma localização + Selecione uma localização do menu Localizações, toda a configuração será alternada automaticamente para a localização escolhida. + + +
diff -Nru gnome-system-tools-2.32.0/doc/network/pt_BR/pt_BR.po gnome-system-tools-3.0.0/doc/network/pt_BR/pt_BR.po --- gnome-system-tools-2.32.0/doc/network/pt_BR/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/pt_BR/pt_BR.po 2011-04-03 20:04:27.000000000 +0000 @@ -0,0 +1,552 @@ +# Brazilian Portuguese translation for gnome-system-tools. +# Copyright (C) 2009 gnome-system-tools's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# Krix Apolinário , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools master\n" +"POT-Creation-Date: 2009-09-29 17:27+0000\n" +"PO-Revision-Date: 2009-08-27 15:40-0300\n" +"Last-Translator: Krix Apolinário \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/network-admin.xml:133(None) +msgid "" +"@@image: 'figures/network-tool.png'; md5=e9904286838974928c40aa2c359290d6" +msgstr "" +"@@image: 'figures/network-tool.png'; md5=e9904286838974928c40aa2c359290d6" + +#: C/network-admin.xml:22(title) +msgid "Network Administration Tool Manual" +msgstr "Manual da Ferramenta de Administração de Rede" + +#: C/network-admin.xml:24(year) +msgid "2004-2006" +msgstr "2004-2006" + +#: C/network-admin.xml:25(holder) C/network-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "Carlos Garnacho Parro" + +#: C/network-admin.xml:2(para) +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " +"later version published by the Free Software Foundation with no Invariant " +"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " +"of the GFDL at this link or " +"in the file COPYING-DOCS distributed with this manual." +msgstr "" +"Permissão concedida para copiar, distribuir e/ou modificar este documento " +"sob os termos da GNU Free Documentation License (GFDL), Versão 1.1 ou " +"qualquer versão mais recente publicada pela Free Software Foundation sem " +"seções invariantes, sem textos de capa frontal, e sem textos de contracapa. " +"Você pode encontrar uma cópia da licença GFDL no link ou no arquivo COPYING-DOCS distribuído com este " +"manual." + +#: C/network-admin.xml:12(para) +msgid "" +"This manual is part of a collection of GNOME manuals distributed under the " +"GFDL. If you want to distribute this manual separately from the collection, " +"you can do so by adding a copy of the license to the manual, as described in " +"section 6 of the license." +msgstr "" +"Este manual é parte da coleção de manuais do GNOME distribuído sob os termos " +"da GFDL. Se você quizer distribuir este manual separadamente desta coleção, " +"você pode fazer-lo adicionando ao manual uma cópia da licença, como descrito " +"na seção 6 desta licença." + +#: C/network-admin.xml:19(para) +msgid "" +"Many of the names used by companies to distinguish their products and " +"services are claimed as trademarks. Where those names appear in any GNOME " +"documentation, and the members of the GNOME Documentation Project are made " +"aware of those trademarks, then the names are in capital letters or initial " +"capital letters." +msgstr "" +"Muitos dos nomes usados por empresas para distinguir seus produtos e " +"serviços são reivindicados como marcas registradas. Onde esses nomes " +"aparecem em qualquer documentação do GNOME e os membros do Projeto de " +"Documentação do GNOME estiverem cientes dessas marcas registradas, os nomes " +"aparecerão impressos em letras maiúsculas ou com iniciais em maiúsculas." + +#: C/network-admin.xml:35(para) +msgid "" +"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " +"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " +"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " +"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " +"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " +"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " +"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " +"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " +"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " +"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" +"O DOCUMENTO É FORNECIDO NA BASE \"COMO ESTÁ\", SEM GARANTIAS DE QUALQUER " +"TIPO, TANTO EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO LIMITADO A, GARANTIAS " +"DE QUE O DOCUMENTO OU VERSÃO MODIFICADA DO DOCUMENTO SEJA COMERCIALIZÁVEL, " +"LIVRE DE DEFEITOS, PRÓPRIO PARA UM PROPÓSITO ESPECÍFICO OU SEM INFRAÇÕES. " +"TODO O RISCO A RESPEITO DA QUALIDADE, EXATIDÃO, E DESEMPENHO DO DOCUMENTO OU " +"VERSÕES MODIFICADAS DO DOCUMENTO É DE SUA RESPONSABILIDADE. SE ALGUM " +"DOCUMENTO OU VERSÃO MODIFICADA SE PROVAR DEFEITUOSO EM QUALQUER ASPECTO, " +"VOCÊ (NÃO O ESCRITOR INICIAL, AUTOR OU QUALQUER CONTRIBUIDOR) ASSUME O CUSTO " +"DE QUALQUER SERVIÇO NECESSÁRIO, REPARO OU CORREÇÃO. ESSA RENÚNCIA DE " +"GARANTIAS CONSTITUI UMA PARTE ESSENCIAL DESTA LICENÇA. NENHUM USO DESTE " +"DOCUMENTO OU VERSÃO MODIFICADA DESTE DOCUMENTO É AUTORIZADO SE NÃO FOR SOB " +"ESSA RENÚNCIA; E" + +#: C/network-admin.xml:55(para) +msgid "" +"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " +"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " +"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " +"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " +"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " +"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " +"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " +"POSSIBILITY OF SUCH DAMAGES." +msgstr "" +"SOB NENHUMA CIRCUNSTÂNCIA E SOB NENHUMA TEORIA LEGAL, TANTO EM DANO " +"(INCLUINDO NEGLIGÊNCIA), CONTRATO, OU OUTROS, DEVEM O AUTOR, ESCRITOR " +"INICIAL, QUALQUER CONTRIBUIDOR, OU QUALQUER DISTRIBUIDOR DO DOCUMENTO OU " +"VERSÃO MODIFICADA DO DOCUMENTO, OU QUALQUER FORNECEDOR DE ALGUMA DESSAS " +"PARTES, SER CONSIDERADOS RESPONSÁVEIS A QUALQUER PESSOA POR QUALQUER DANO, " +"SEJA DIRETO, INDIRETO, ESPECIAL, ACIDENTAL OU CONSEQÜENCIAL DE QUALQUER " +"INDIVÍDUO, INCLUINDO, MAS NÃO LIMITADO A, DANOS POR PERDA DE BOA VONTADE, " +"TRABALHO PARADO, FALHA OU MAU FUNCIONAMENTO DO COMPUTADOR, OU QUALQUER E " +"TODOS OS OUTROS DANOS OU PERDAS RESULTANTES OU RELACIONADOS AO USO DO " +"DOCUMENTO E VERSÕES MODIFICADAS, MESMO QUE TAL PARTE TENHA SIDO INFORMADA DA " +"POSSIBILIDADE DE TAIS DANOS." + +#: C/network-admin.xml:28(para) +msgid "" +"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +"" +msgstr "" +"O DOCUMENTO E VERSÕES MODIFICADAS DO DOCUMENTO SÃO FORNECIDOS SOB OS TERMOS " +"DA GNU FREE DOCUMENTATION LICENSE COM O ENTENDIMENTO ADICIONAL DE QUE: " +"" + +#: C/network-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/network-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/network-admin.xml:65(revnumber) +msgid "Network Administration Tool Manual V2.15.2" +msgstr "Manual da Ferramenta de administração de rede V2.15.2" + +#: C/network-admin.xml:66(date) +msgid "August 2006" +msgstr "Agosto 2006" + +#: C/network-admin.xml:68(para) C/network-admin.xml:69(para) +#: C/network-admin.xml:76(para) C/network-admin.xml:77(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "carlosg@gnome.org (Carlos Garnacho Parro)" + +#: C/network-admin.xml:73(revnumber) +msgid "Network Administration Tool Manual V0.35" +msgstr "Manual da Ferramenta de administração de rede V0.35" + +#: C/network-admin.xml:74(date) +msgid "June 2004" +msgstr "Junho 2004" + +#: C/network-admin.xml:82(releaseinfo) +msgid "This manual describes version 2.15.2 of Network Administration Tool." +msgstr "" +"Este manual descreve a versão 2.15.2 da Ferramenta de administração de rede." + +#: C/network-admin.xml:85(title) +msgid "Feedback" +msgstr "Feedback" + +#: C/network-admin.xml:86(para) +msgid "" +"To report a bug or make a suggestion regarding the Network Administration " +"Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" +"Para relatar um erro ou fazer uma sugestão relacionada à Ferramenta de " +"administração de rede ou deste manual, visite a página de feedback do GNOME." + +#: C/network-admin.xml:89(para) +msgid "" +"The Network Administration Tool allows you to specify the way your system " +"connects to other computers and to internet." +msgstr "" +"A Ferramenta de administração de rede permite que você especifique a forma " +"como o sistema se conecta a outros computadores e à internet." + +#: C/network-admin.xml:94(primary) +msgid "Network Administration Tool" +msgstr "Ferramenta de administração de rede" + +#: C/network-admin.xml:99(title) +msgid "Introduction" +msgstr "Introdução" + +#: C/network-admin.xml:100(para) +msgid "" +"The Network Administration Tool allows you to " +"specify the way your system connects to other computers and to internet." +msgstr "" +"A Ferramenta de administração de rede permite que " +"você especifique a forma como o sistema se conecta a outros computadores e à " +"internet." + +#: C/network-admin.xml:104(title) +msgid "Getting started" +msgstr "Primeiros passos" + +#: C/network-admin.xml:106(para) +msgid "" +"You can start Network Administration Tool in the " +"following ways:" +msgstr "" +"Você pode iniciar a Ferramenta de administração de rede das seguintes formas:" + +#: C/network-admin.xml:110(term) +msgid "System menu" +msgstr "Menu Sistema" + +#: C/network-admin.xml:112(para) +msgid "" +"Choose AdministrationNetworking." +msgstr "" +"Selecione AdministraçãoRede." + +#: C/network-admin.xml:117(term) +msgid "Command line" +msgstr "Linha de comando" + +#: C/network-admin.xml:119(para) +msgid "Execute the following command: network-admin" +msgstr "Execute o seguinte comando: network-admin" + +#: C/network-admin.xml:124(para) +msgid "" +"When you start Network Administration Tool, you " +"will be prompted for the administrator password, this is necessary because " +"the changes done with this tool will affect the whole system." +msgstr "" +"Quando você iniciar a Ferramenta de administração de rede, será solicitada a senha do administrador, isso é necessário " +"porque as alterações feitas com esta ferramenta afetarão todo o sistema." + +#: C/network-admin.xml:126(para) +msgid "" +"After entering the administrator password, the following window is displayed." +msgstr "Após digitar a senha do administrador, a seguinte janela será exibida." + +#: C/network-admin.xml:129(title) +msgid "Network Administration Tool main window" +msgstr "Janela principal da Ferramenta de administração de rede" + +#: C/network-admin.xml:136(phrase) +msgid "Shows Network Administration Tool main window." +msgstr "Mostra a janela principal da Ferramenta de administração de rede." + +#: C/network-admin.xml:142(para) +msgid "" +"The Network Administration Tool main window " +"contains four tabbed sections:" +msgstr "" +"A janela principal da Ferramenta de administração de rede contém quatro seções tabuladas:" + +#: C/network-admin.xml:146(guilabel) +msgid "Connections" +msgstr "Conexões" + +#: C/network-admin.xml:148(para) +msgid "" +"Shows all network interfaces, it also allows you to modify their settings." +msgstr "" +"Exibe todas as interfaces de rede, também permite que você altere suas " +"configurações." + +#: C/network-admin.xml:153(guilabel) +msgid "General" +msgstr "Geral" + +#: C/network-admin.xml:155(para) +msgid "Allows you to modify your system host name and domain name." +msgstr "Permite que você altere o nome de sua máquina e o nome do domínio." + +#: C/network-admin.xml:160(guilabel) +msgid "DNS" +msgstr "DNS" + +#: C/network-admin.xml:162(para) +msgid "" +"Contains two sections, the DNS servers are what your " +"computer use for resolving the IP addresses from the domain names. The " +"search domains are the default domains in which your " +"system will search any host when no domain is specified." +msgstr "" +"Contém duas seções, os servidores de DNS são o que o " +"seu computador usa para resolver os endereços IP a partir dos nomes de " +"domínio. Os domínios de busca são os domínios em que " +"seu sistema irá buscar qualquer máquina quando nenhum domínio for " +"especificado." + +#: C/network-admin.xml:167(guilabel) +msgid "Hosts" +msgstr "Máquinas" + +#: C/network-admin.xml:169(para) +msgid "Shows the list of aliases for accessing other computers." +msgstr "Mostra a lista de apelidos para acessar outros computadores." + +#: C/network-admin.xml:176(title) +msgid "Usage" +msgstr "Uso" + +#: C/network-admin.xml:179(title) +msgid "To modify a connection settings" +msgstr "Para modificar uma configuração de conexão" + +#: C/network-admin.xml:180(para) +msgid "" +"In the Connections section, select the interface you " +"want to modify and press the Properties button, " +"depending on the interface type you will be able to modify different data." +msgstr "" +"Na seção Conexões, selecione a interface que quer " +"modificar e pressione o botão Propriedades, dependendo " +"do tipo de interface que for capaz de modificar dados diferentes." + +#: C/network-admin.xml:184(term) +msgid "Ethernet and IRLAN interfaces" +msgstr "Interfaces Ethernet e IRLAN" + +#: C/network-admin.xml:186(para) +msgid "" +"You can modify the way the interface is configured (DHCP or manually), if " +"the interface is configured manually, you can also modify the interface IP " +"address, netmask and gateway." +msgstr "" +"Você pode modificar a forma como a interface é configurada (DHCP ou " +"manualmente), se a interface for configurada manualmente, você pode " +"modificar também o endereço IP, máscara de sub-rede ou gateway da interface." + +#: C/network-admin.xml:191(term) +msgid "Wireless interfaces" +msgstr "Interfaces de redes sem fio" + +#: C/network-admin.xml:193(para) +msgid "" +"You can modify the way the interface is configured (DHCP or manually), if " +"the interface is configured manually, you can also modify the interface IP " +"address, netmask and gateway, you can also modify the network name (ESSID) " +"for this interface." +msgstr "" +"Você pode modificar a forma como a interface é configurada (DHCP ou " +"manualmente), se a interface for configurada manualmente, você pode " +"modificar também o endereço IP, a máscara de sub-rede e gateway da " +"interface, você pode modificar também o nome da rede (ESSID) para esta " +"interface." + +#: C/network-admin.xml:198(term) +msgid "Parallel line interfaces" +msgstr "Interface por linha paralela" + +#: C/network-admin.xml:200(para) +msgid "" +"You can modify the interface IP address, as well as the remote IP address." +msgstr "" +"Você pode modificar o endereço IP da interface, assim como o endereço IP " +"remoto." + +#: C/network-admin.xml:205(term) +msgid "PPP/Modem interfaces" +msgstr "Interfaces de Modem/PPP" + +#: C/network-admin.xml:207(para) +msgid "" +"You can modify the modem device, whether you want it to dial using tones or " +"pulses, the modem volume, the phone number, the username and password that " +"your ISP provided and other advanced settings for PPP." +msgstr "" +"Você pode modificar o dispositivo de modem, se deseja discar utilizando tons " +"ou pulsos, o volume do modem, o número do telefone, o usuário e senha que " +"seu servidor ISP forneceu e outras configurações avançadas para PPP." + +#: C/network-admin.xml:214(title) +msgid "To activate or deactivate an interface" +msgstr "Para habilitar ou desativar uma interface" + +#: C/network-admin.xml:215(para) +msgid "" +"In the Connections section, enable or disable the " +"checkbox beside the interface." +msgstr "" +"Na seção Conexões, habilite ou desabilite a caixa de " +"seleção ao lado da interface." + +#: C/network-admin.xml:219(title) +msgid "To change your host name and domain name" +msgstr "Para alterar o nome de sua máquina e nome de domínio" + +#: C/network-admin.xml:220(para) +msgid "" +"In the General section, change the hostname or domain " +"name text boxes." +msgstr "" +"Na seção Geral, mude as caixas de texto nome da máquina " +"ou nome do domínio." + +#: C/network-admin.xml:224(title) +msgid "To add a new domain name server" +msgstr "Para adicionar um novo servidor de nomes de domínio" + +#: C/network-admin.xml:225(para) +msgid "" +"In the DNS Servers section, press the Add button and fill in the new list row with the new domain name " +"server." +msgstr "" +"Na seção Servidores DNS, pressione o botão " +"Adicionar e preencha a nova linha da lista com o " +"servidor de nome do domínio novo." + +#: C/network-admin.xml:229(title) +msgid "To delete a domain name server" +msgstr "Para excluir um servidor de nomes de domínio" + +#: C/network-admin.xml:230(para) +msgid "" +"In the DNS Servers section, select a DNS IP address " +"from the list and press the Delete button." +msgstr "" +"Na seção Servidores DNS, selecione um endereço IP de " +"DNS da lista e pressione o botão Excluir." + +#: C/network-admin.xml:234(title) +msgid "To add a new search domain" +msgstr "Para adicionar um novo domínio de busca" + +#: C/network-admin.xml:235(para) +msgid "" +"In the Search Domains section, press the Add button and fill in the new list row with the new search domain." +msgstr "" +"Na seção Domínios de busca, pressione o botão " +"Adicionar e preencha a nova linha da lista com o novo " +"domínio de busca." + +#: C/network-admin.xml:239(title) +msgid "To delete a search domain" +msgstr "Para excluir um domínio de busca" + +#: C/network-admin.xml:240(para) +msgid "" +"In the Search Domains section, select a search domain " +"from the list and press the Delete button." +msgstr "" +"Na seção Domínios de busca, selecione um domínio de " +"busca da lista e pressione o botão Excluir." + +#: C/network-admin.xml:244(title) +msgid "To add a new host alias" +msgstr "Para adicionar um novo nome de máquina" + +#: C/network-admin.xml:245(para) +msgid "" +"In the Hosts section, press the Add button and type an IP address and the aliases that will point to " +"in the window that pops up." +msgstr "" +"Na seção Máquinas, pressione o botão " +"Adicionar e digite um endereço IP e os apelidos para " +"onde apontarão na janela que se abrir." + +#: C/network-admin.xml:249(title) +msgid "To modify a host alias" +msgstr "Para modificar um nome de máquina" + +#: C/network-admin.xml:250(para) +msgid "" +"In the Hosts section, select an alias, press the " +"Properties button from the list and modify the alias " +"settings in the window that pops up." +msgstr "" +"Na seção Máquinas, selecione um apelido, pressione o " +"botão Propriedades da lista e modifique as " +"configurações do apelido na janela que é aberta." + +#: C/network-admin.xml:254(title) +msgid "To delete a host alias" +msgstr "Para excluir um nome de máquina" + +#: C/network-admin.xml:255(para) +msgid "" +"In the Hosts section, select an alias from the list and " +"press the Delete button." +msgstr "" +"Na seção Máquinas, selecione um nome da lista e " +"pressione o botão Excluir." + +#: C/network-admin.xml:259(title) +msgid "To save your current network configuration as a \"Location\"" +msgstr "Para salvar sua configuração de rede atual como \"Localização\"" + +#: C/network-admin.xml:260(para) +msgid "" +"Press the Add button besides the Locations menu, specify the location name in the window that pops up." +msgstr "" +"Pressione o botão Adicionar ao lado do menu " +"Localizações e especifique o nome do local na janela " +"que é aberta." + +#: C/network-admin.xml:264(title) +msgid "To delete a location" +msgstr "Para excluir a localização" + +#: C/network-admin.xml:265(para) +msgid "" +"Press the Remove button besides the " +"Locations menu, the selected profile will be deleted." +msgstr "" +"Pressione o botão Remover ao lado do menu " +"Localizações e o perfil selecionado será removido." + +#: C/network-admin.xml:269(title) +msgid "To switch to a location" +msgstr "Para alternar uma localização" + +#: C/network-admin.xml:270(para) +msgid "" +"Select one location from the Locations menu, all the " +"configuration will be switched automatically to the chosen location." +msgstr "" +"Selecione uma localização do menu Localizações, toda a " +"configuração será alternada automaticamente para a localização escolhida." + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/network-admin.xml:0(None) +msgid "translator-credits" +msgstr "Krix Apolinário , 2009" diff -Nru gnome-system-tools-2.32.0/doc/network/sl/network-admin.xml gnome-system-tools-3.0.0/doc/network/sl/network-admin.xml --- gnome-system-tools-2.32.0/doc/network/sl/network-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/sl/network-admin.xml 2011-04-03 20:04:27.000000000 +0000 @@ -0,0 +1,347 @@ + + + + + + +]> + + +
+ + + + Network Administration Tool Manual + + 2004-2006 + Carlos Garnacho Parro + + + + + + Carlos Garnacho Parro + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You can find + a copy of the GFDL at this link or in the file COPYING-DOCS + distributed with this manual. + + This manual is part of a collection of GNOME manuals + distributed under the GFDL. If you want to distribute this + manual separately from the collection, you can do so by + adding a copy of the license to the manual, as described in + section 6 of the license. + + + + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and the members of + the GNOME Documentation Project are made aware of those + trademarks, then the names are in capital letters or initial + capital letters. + + + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED + UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE + WITH THE FURTHER UNDERSTANDING THAT: + + + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR + IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES + THAT THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR + A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE + RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE + OF THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR + MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY + CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED + VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER + EXCEPT UNDER THIS DISCLAIMER; AND + + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), + CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, + INITIAL WRITER, ANY CONTRIBUTOR, OR ANY + DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION + OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH + PARTIES, BE LIABLE TO ANY PERSON FOR ANY + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER + INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR + LOSSES ARISING OUT OF OR RELATING TO USE OF THE + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, + EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF + THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Network Administration Tool Manual V2.15.2 + August 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + Network Administration Tool Manual V0.35 + June 2004 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + This manual describes version 2.15.2 of Network Administration Tool. + + + Odziv + To report a bug or make a suggestion regarding the Network Administration Tool or this manual, follow the directions in the GNOME Feedback Page. + + + The Network Administration Tool allows you to specify the way your system connects to other computers and to internet. + + + + + Network Administration Tool + + + + + Uvod + The Network Administration Tool allows you to specify the way your system connects to other computers and to internet. + + + + Getting started + + You can start Network Administration Tool in the following ways: + + + + System menu + + Choose AdministrationNetworking. + + + + + Ukazna vrstica + + Execute the following command: network-admin + + + + + When you start Network Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system. + + After entering the administrator password, the following window is displayed. + +
+ Network Administration Tool main window + + + + + + + Shows Network Administration Tool main window. + + + +
+ + The Network Administration Tool main window contains four tabbed sections: + + + + Povezave + + Shows all network interfaces, it also allows you to modify their settings. + + + + + Splošno + + Allows you to modify your system host name and domain name. + + + + + DNS + + Contains two sections, the DNS servers are what your computer use for resolving the IP addresses from the domain names. The search domains are the default domains in which your system will search any host when no domain is specified. + + + + + Gostitelji + + Shows the list of aliases for accessing other computers. + + + + + + + Uporaba + + + To modify a connection settings + In the Connections section, select the interface you want to modify and press the Properties button, depending on the interface type you will be able to modify different data. + + + + Ethernet and IRLAN interfaces + + You can modify the way the interface is configured (DHCP or manually), if the interface is configured manually, you can also modify the interface IP address, netmask and gateway. + + + + + Wireless interfaces + + You can modify the way the interface is configured (DHCP or manually), if the interface is configured manually, you can also modify the interface IP address, netmask and gateway, you can also modify the network name (ESSID) for this interface. + + + + + Parallel line interfaces + + You can modify the interface IP address, as well as the remote IP address. + + + + + PPP/Modem interfaces + + You can modify the modem device, whether you want it to dial using tones or pulses, the modem volume, the phone number, the username and password that your ISP provided and other advanced settings for PPP. + + + + + + + To activate or deactivate an interface + In the Connections section, enable or disable the checkbox beside the interface. + + + + To change your host name and domain name + In the General section, change the hostname or domain name text boxes. + + + + To add a new domain name server + In the DNS Servers section, press the Add button and fill in the new list row with the new domain name server. + + + + To delete a domain name server + In the DNS Servers section, select a DNS IP address from the list and press the Delete button. + + + + To add a new search domain + In the Search Domains section, press the Add button and fill in the new list row with the new search domain. + + + + To delete a search domain + In the Search Domains section, select a search domain from the list and press the Delete button. + + + + To add a new host alias + In the Hosts section, press the Add button and type an IP address and the aliases that will point to in the window that pops up. + + + + To modify a host alias + In the Hosts section, select an alias, press the Properties button from the list and modify the alias settings in the window that pops up. + + + + To delete a host alias + In the Hosts section, select an alias from the list and press the Delete button. + + + + To save your current network configuration as a "Location" + Press the Add button besides the Locations menu, specify the location name in the window that pops up. + + + + To delete a location + Press the Remove button besides the Locations menu, the selected profile will be deleted. + + + + To switch to a location + Select one location from the Locations menu, all the configuration will be switched automatically to the chosen location. + + +
diff -Nru gnome-system-tools-2.32.0/doc/network/sl/sl.po gnome-system-tools-3.0.0/doc/network/sl/sl.po --- gnome-system-tools-2.32.0/doc/network/sl/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/network/sl/sl.po 2011-04-03 20:04:27.000000000 +0000 @@ -0,0 +1,345 @@ +# Slovenian translation for gnome-system-tools help. +# Copyright (C) 2010 gnome-system-tools COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# +# Ime Priimek , leto. +# Matej Urbančič , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools-gst-network help master\n" +"POT-Creation-Date: 2010-10-20 08:16+0000\n" +"PO-Revision-Date: 2010-10-21 20:05+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/network-admin.xml:133(None) +msgid "@@image: 'figures/network-tool.png'; md5=e9904286838974928c40aa2c359290d6" +msgstr "@@image: 'figures/network-tool.png'; md5=e9904286838974928c40aa2c359290d6" + +#: C/network-admin.xml:22(title) +msgid "Network Administration Tool Manual" +msgstr "" + +#: C/network-admin.xml:24(year) +msgid "2004-2006" +msgstr "2004-2006" + +#: C/network-admin.xml:25(holder) +#: C/network-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "Carlos Garnacho Parro" + +#: C/network-admin.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/network-admin.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/network-admin.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/network-admin.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/network-admin.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/network-admin.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/network-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/network-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/network-admin.xml:65(revnumber) +msgid "Network Administration Tool Manual V2.15.2" +msgstr "" + +#: C/network-admin.xml:66(date) +msgid "August 2006" +msgstr "" + +#: C/network-admin.xml:68(para) +#: C/network-admin.xml:69(para) +#: C/network-admin.xml:76(para) +#: C/network-admin.xml:77(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "carlosg@gnome.org (Carlos Garnacho Parro)" + +#: C/network-admin.xml:73(revnumber) +msgid "Network Administration Tool Manual V0.35" +msgstr "" + +#: C/network-admin.xml:74(date) +msgid "June 2004" +msgstr "" + +#: C/network-admin.xml:82(releaseinfo) +msgid "This manual describes version 2.15.2 of Network Administration Tool." +msgstr "" + +#: C/network-admin.xml:85(title) +msgid "Feedback" +msgstr "Odziv" + +#: C/network-admin.xml:86(para) +msgid "To report a bug or make a suggestion regarding the Network Administration Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" + +#: C/network-admin.xml:89(para) +msgid "The Network Administration Tool allows you to specify the way your system connects to other computers and to internet." +msgstr "" + +#: C/network-admin.xml:94(primary) +msgid "Network Administration Tool" +msgstr "" + +#: C/network-admin.xml:99(title) +msgid "Introduction" +msgstr "Uvod" + +#: C/network-admin.xml:100(para) +msgid "The Network Administration Tool allows you to specify the way your system connects to other computers and to internet." +msgstr "" + +#: C/network-admin.xml:104(title) +msgid "Getting started" +msgstr "" + +#: C/network-admin.xml:106(para) +msgid "You can start Network Administration Tool in the following ways:" +msgstr "" + +#: C/network-admin.xml:110(term) +msgid "System menu" +msgstr "" + +#: C/network-admin.xml:112(para) +msgid "Choose AdministrationNetworking." +msgstr "" + +#: C/network-admin.xml:117(term) +msgid "Command line" +msgstr "Ukazna vrstica" + +#: C/network-admin.xml:119(para) +msgid "Execute the following command: network-admin" +msgstr "" + +#: C/network-admin.xml:124(para) +msgid "When you start Network Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system." +msgstr "" + +#: C/network-admin.xml:126(para) +msgid "After entering the administrator password, the following window is displayed." +msgstr "" + +#: C/network-admin.xml:129(title) +msgid "Network Administration Tool main window" +msgstr "" + +#: C/network-admin.xml:136(phrase) +msgid "Shows Network Administration Tool main window." +msgstr "" + +#: C/network-admin.xml:142(para) +msgid "The Network Administration Tool main window contains four tabbed sections:" +msgstr "" + +#: C/network-admin.xml:146(guilabel) +msgid "Connections" +msgstr "Povezave" + +#: C/network-admin.xml:148(para) +msgid "Shows all network interfaces, it also allows you to modify their settings." +msgstr "" + +#: C/network-admin.xml:153(guilabel) +msgid "General" +msgstr "Splošno" + +#: C/network-admin.xml:155(para) +msgid "Allows you to modify your system host name and domain name." +msgstr "" + +#: C/network-admin.xml:160(guilabel) +msgid "DNS" +msgstr "" + +#: C/network-admin.xml:162(para) +msgid "Contains two sections, the DNS servers are what your computer use for resolving the IP addresses from the domain names. The search domains are the default domains in which your system will search any host when no domain is specified." +msgstr "" + +#: C/network-admin.xml:167(guilabel) +msgid "Hosts" +msgstr "Gostitelji" + +#: C/network-admin.xml:169(para) +msgid "Shows the list of aliases for accessing other computers." +msgstr "" + +#: C/network-admin.xml:176(title) +msgid "Usage" +msgstr "Uporaba" + +#: C/network-admin.xml:179(title) +msgid "To modify a connection settings" +msgstr "" + +#: C/network-admin.xml:180(para) +msgid "In the Connections section, select the interface you want to modify and press the Properties button, depending on the interface type you will be able to modify different data." +msgstr "" + +#: C/network-admin.xml:184(term) +msgid "Ethernet and IRLAN interfaces" +msgstr "" + +#: C/network-admin.xml:186(para) +msgid "You can modify the way the interface is configured (DHCP or manually), if the interface is configured manually, you can also modify the interface IP address, netmask and gateway." +msgstr "" + +#: C/network-admin.xml:191(term) +msgid "Wireless interfaces" +msgstr "" + +#: C/network-admin.xml:193(para) +msgid "You can modify the way the interface is configured (DHCP or manually), if the interface is configured manually, you can also modify the interface IP address, netmask and gateway, you can also modify the network name (ESSID) for this interface." +msgstr "" + +#: C/network-admin.xml:198(term) +msgid "Parallel line interfaces" +msgstr "" + +#: C/network-admin.xml:200(para) +msgid "You can modify the interface IP address, as well as the remote IP address." +msgstr "" + +#: C/network-admin.xml:205(term) +msgid "PPP/Modem interfaces" +msgstr "" + +#: C/network-admin.xml:207(para) +msgid "You can modify the modem device, whether you want it to dial using tones or pulses, the modem volume, the phone number, the username and password that your ISP provided and other advanced settings for PPP." +msgstr "" + +#: C/network-admin.xml:214(title) +msgid "To activate or deactivate an interface" +msgstr "" + +#: C/network-admin.xml:215(para) +msgid "In the Connections section, enable or disable the checkbox beside the interface." +msgstr "" + +#: C/network-admin.xml:219(title) +msgid "To change your host name and domain name" +msgstr "" + +#: C/network-admin.xml:220(para) +msgid "In the General section, change the hostname or domain name text boxes." +msgstr "" + +#: C/network-admin.xml:224(title) +msgid "To add a new domain name server" +msgstr "" + +#: C/network-admin.xml:225(para) +msgid "In the DNS Servers section, press the Add button and fill in the new list row with the new domain name server." +msgstr "" + +#: C/network-admin.xml:229(title) +msgid "To delete a domain name server" +msgstr "" + +#: C/network-admin.xml:230(para) +msgid "In the DNS Servers section, select a DNS IP address from the list and press the Delete button." +msgstr "" + +#: C/network-admin.xml:234(title) +msgid "To add a new search domain" +msgstr "" + +#: C/network-admin.xml:235(para) +msgid "In the Search Domains section, press the Add button and fill in the new list row with the new search domain." +msgstr "" + +#: C/network-admin.xml:239(title) +msgid "To delete a search domain" +msgstr "" + +#: C/network-admin.xml:240(para) +msgid "In the Search Domains section, select a search domain from the list and press the Delete button." +msgstr "" + +#: C/network-admin.xml:244(title) +msgid "To add a new host alias" +msgstr "" + +#: C/network-admin.xml:245(para) +msgid "In the Hosts section, press the Add button and type an IP address and the aliases that will point to in the window that pops up." +msgstr "" + +#: C/network-admin.xml:249(title) +msgid "To modify a host alias" +msgstr "" + +#: C/network-admin.xml:250(para) +msgid "In the Hosts section, select an alias, press the Properties button from the list and modify the alias settings in the window that pops up." +msgstr "" + +#: C/network-admin.xml:254(title) +msgid "To delete a host alias" +msgstr "" + +#: C/network-admin.xml:255(para) +msgid "In the Hosts section, select an alias from the list and press the Delete button." +msgstr "" + +#: C/network-admin.xml:259(title) +msgid "To save your current network configuration as a \"Location\"" +msgstr "" + +#: C/network-admin.xml:260(para) +msgid "Press the Add button besides the Locations menu, specify the location name in the window that pops up." +msgstr "" + +#: C/network-admin.xml:264(title) +msgid "To delete a location" +msgstr "" + +#: C/network-admin.xml:265(para) +msgid "Press the Remove button besides the Locations menu, the selected profile will be deleted." +msgstr "" + +#: C/network-admin.xml:269(title) +msgid "To switch to a location" +msgstr "" + +#: C/network-admin.xml:270(para) +msgid "Select one location from the Locations menu, all the configuration will be switched automatically to the chosen location." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/network-admin.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru gnome-system-tools-2.32.0/doc/services/gl/gl.po gnome-system-tools-3.0.0/doc/services/gl/gl.po --- gnome-system-tools-2.32.0/doc/services/gl/gl.po 2010-09-27 16:19:02.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/gl/gl.po 2011-04-03 20:04:28.000000000 +0000 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the gnome-system-tools package. # FIRST AUTHOR , YEAR. # Fran Dieguez , 2010. +# Fran Diéguez , 2010. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools master\n" "POT-Creation-Date: 2010-08-04 06:10+0000\n" -"PO-Revision-Date: 2010-08-07 16:39+0200\n" -"Last-Translator: Fran Dieguez \n" +"PO-Revision-Date: 2010-10-20 09:23+0200\n" +"Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -183,8 +184,8 @@ "You can start Services Administration Tool in the " "following ways:" msgstr "" -"Pode iniciar a Ferramenta de administración de " -"servizos das seguintes maneiras:" +"Pode iniciar a Ferramenta de administración de servizos das seguintes maneiras:" #: C/services-admin.xml:110(term) msgid "System menu" diff -Nru gnome-system-tools-2.32.0/doc/services/gl/services-admin.xml gnome-system-tools-3.0.0/doc/services/gl/services-admin.xml --- gnome-system-tools-2.32.0/doc/services/gl/services-admin.xml 2010-09-27 16:19:02.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/gl/services-admin.xml 2011-04-03 20:04:28.000000000 +0000 @@ -177,7 +177,7 @@ Para comezar - Pode iniciar a + Pode iniciar a Ferramenta de administración de servizos das seguintes maneiras: diff -Nru gnome-system-tools-2.32.0/doc/services/Makefile.am gnome-system-tools-3.0.0/doc/services/Makefile.am --- gnome-system-tools-2.32.0/doc/services/Makefile.am 2010-08-11 09:28:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/Makefile.am 2010-12-12 12:16:01.000000000 +0000 @@ -7,7 +7,7 @@ DOC_FIGURES = \ figures/services-tool.png -DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN # this isn't still ported to gnome-doc-utils SUBDIRS = nl diff -Nru gnome-system-tools-2.32.0/doc/services/Makefile.in gnome-system-tools-3.0.0/doc/services/Makefile.in --- gnome-system-tools-2.32.0/doc/services/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -61,11 +61,7 @@ $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = doc/services ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -130,8 +126,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -153,11 +147,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -176,26 +171,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -218,14 +216,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -234,6 +227,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -257,7 +252,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -404,7 +398,7 @@ DOC_FIGURES = \ figures/services-tool.png -DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN # this isn't still ported to gnome-doc-utils SUBDIRS = nl diff -Nru gnome-system-tools-2.32.0/doc/services/nl/Makefile.in gnome-system-tools-3.0.0/doc/services/nl/Makefile.in --- gnome-system-tools-2.32.0/doc/services/nl/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/nl/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -99,11 +99,7 @@ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make subdir = doc/services/nl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -128,8 +124,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -151,11 +145,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -174,26 +169,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -216,14 +214,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -232,6 +225,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -259,7 +254,6 @@ docdir = $(datadir)/gnome/help/$(docname)/$(lang) dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/doc/services/sl/services-admin.xml gnome-system-tools-3.0.0/doc/services/sl/services-admin.xml --- gnome-system-tools-2.32.0/doc/services/sl/services-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/sl/services-admin.xml 2011-04-03 20:04:28.000000000 +0000 @@ -0,0 +1,236 @@ + + + + + + +]> + + +
+ + + + Services Administration Tool Manual + + 2004-2006 + Carlos Garnacho Parro + + + + + + Carlos Garnacho Parro + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You can find + a copy of the GFDL at this link or in the file COPYING-DOCS + distributed with this manual. + + This manual is part of a collection of GNOME manuals + distributed under the GFDL. If you want to distribute this + manual separately from the collection, you can do so by + adding a copy of the license to the manual, as described in + section 6 of the license. + + + + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and the members of + the GNOME Documentation Project are made aware of those + trademarks, then the names are in capital letters or initial + capital letters. + + + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED + UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE + WITH THE FURTHER UNDERSTANDING THAT: + + + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR + IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES + THAT THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR + A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE + RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE + OF THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR + MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY + CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED + VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER + EXCEPT UNDER THIS DISCLAIMER; AND + + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), + CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, + INITIAL WRITER, ANY CONTRIBUTOR, OR ANY + DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION + OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH + PARTIES, BE LIABLE TO ANY PERSON FOR ANY + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER + INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR + LOSSES ARISING OUT OF OR RELATING TO USE OF THE + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, + EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF + THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Services Administration Tool Manual V2.15.2 + August 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + Services Administration Tool Manual V0.35 + June 2004 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + This manual describes version 2.15.2 of Services Administration Tool. + + + Odziv + To report a bug or make a suggestion regarding the Services Administration Tool or this manual, follow the directions in the GNOME Feedback Page. + + + The Services Administration Tool allows you to specify which services will be started during the system boot process. + + + + + Services Administration Tool + + + + + Uvod + The Services Administration Tool allows you to specify which services will be started during the system boot process. + + + + Getting started + + You can start Services Administration Tool in the following ways: + + + + System menu + + Choose AdministrationServices. + + + + + Ukazna vrstica + + Execute the following command: services-admin + + + + + When you start Services Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system. + + After entering the administrator password, the following window is displayed. + +
+ Services Administration Tool main window + + + + + + + Shows Services Administration Tool main window. + + + +
+ + The Services Administration Tool main window contains the following elements: + + + + Seznam storitev + + This is a list of the main services installed in the system, the checkbox indicates whether the service is active or not. + + + + + + + Uporaba + + + To enable or disable a service at boot time + Enable or disable the checkbox beside the service in the services list. + + +
diff -Nru gnome-system-tools-2.32.0/doc/services/sl/sl.po gnome-system-tools-3.0.0/doc/services/sl/sl.po --- gnome-system-tools-2.32.0/doc/services/sl/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/services/sl/sl.po 2011-04-03 20:04:28.000000000 +0000 @@ -0,0 +1,192 @@ +# Slovenian translation for gnome-system-tools help. +# Copyright (C) 2010 gnome-system-tools COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# +# Ime Priimek , leto. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools-gst-services help master\n" +"POT-Creation-Date: 2010-10-20 08:16+0000\n" +"PO-Revision-Date: 2010-10-21 20:05+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/services-admin.xml:133(None) +msgid "@@image: 'figures/services-tool.png'; md5=94ccf9e194168f89f2962e0c7ca64ee5" +msgstr "@@image: 'figures/services-tool.png'; md5=94ccf9e194168f89f2962e0c7ca64ee5" + +#: C/services-admin.xml:22(title) +msgid "Services Administration Tool Manual" +msgstr "" + +#: C/services-admin.xml:24(year) +msgid "2004-2006" +msgstr "2004-2006" + +#: C/services-admin.xml:25(holder) +#: C/services-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "Carlos Garnacho Parro" + +#: C/services-admin.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/services-admin.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/services-admin.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/services-admin.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/services-admin.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/services-admin.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/services-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/services-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/services-admin.xml:65(revnumber) +msgid "Services Administration Tool Manual V2.15.2" +msgstr "" + +#: C/services-admin.xml:66(date) +msgid "August 2006" +msgstr "" + +#: C/services-admin.xml:68(para) +#: C/services-admin.xml:69(para) +#: C/services-admin.xml:76(para) +#: C/services-admin.xml:77(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "carlosg@gnome.org (Carlos Garnacho Parro)" + +#: C/services-admin.xml:73(revnumber) +msgid "Services Administration Tool Manual V0.35" +msgstr "" + +#: C/services-admin.xml:74(date) +msgid "June 2004" +msgstr "" + +#: C/services-admin.xml:82(releaseinfo) +msgid "This manual describes version 2.15.2 of Services Administration Tool." +msgstr "" + +#: C/services-admin.xml:85(title) +msgid "Feedback" +msgstr "Odziv" + +#: C/services-admin.xml:86(para) +msgid "To report a bug or make a suggestion regarding the Services Administration Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" + +#: C/services-admin.xml:89(para) +msgid "The Services Administration Tool allows you to specify which services will be started during the system boot process." +msgstr "" + +#: C/services-admin.xml:94(primary) +msgid "Services Administration Tool" +msgstr "" + +#: C/services-admin.xml:99(title) +msgid "Introduction" +msgstr "Uvod" + +#: C/services-admin.xml:100(para) +msgid "The Services Administration Tool allows you to specify which services will be started during the system boot process." +msgstr "" + +#: C/services-admin.xml:104(title) +msgid "Getting started" +msgstr "" + +#: C/services-admin.xml:106(para) +msgid "You can start Services Administration Tool in the following ways:" +msgstr "" + +#: C/services-admin.xml:110(term) +msgid "System menu" +msgstr "" + +#: C/services-admin.xml:112(para) +msgid "Choose AdministrationServices." +msgstr "" + +#: C/services-admin.xml:117(term) +msgid "Command line" +msgstr "Ukazna vrstica" + +#: C/services-admin.xml:119(para) +msgid "Execute the following command: services-admin" +msgstr "" + +#: C/services-admin.xml:124(para) +msgid "When you start Services Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system." +msgstr "" + +#: C/services-admin.xml:126(para) +msgid "After entering the administrator password, the following window is displayed." +msgstr "" + +#: C/services-admin.xml:129(title) +msgid "Services Administration Tool main window" +msgstr "" + +#: C/services-admin.xml:136(phrase) +msgid "Shows Services Administration Tool main window." +msgstr "" + +#: C/services-admin.xml:142(para) +msgid "The Services Administration Tool main window contains the following elements:" +msgstr "" + +#: C/services-admin.xml:146(term) +msgid "Services list" +msgstr "Seznam storitev" + +#: C/services-admin.xml:148(para) +msgid "This is a list of the main services installed in the system, the checkbox indicates whether the service is active or not." +msgstr "" + +#: C/services-admin.xml:155(title) +msgid "Usage" +msgstr "Uporaba" + +#: C/services-admin.xml:158(title) +msgid "To enable or disable a service at boot time" +msgstr "" + +#: C/services-admin.xml:159(para) +msgid "Enable or disable the checkbox beside the service in the services list." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/services-admin.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru gnome-system-tools-2.32.0/doc/shares/gl/gl.po gnome-system-tools-3.0.0/doc/shares/gl/gl.po --- gnome-system-tools-2.32.0/doc/shares/gl/gl.po 2010-09-27 16:19:03.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/gl/gl.po 2011-04-03 20:04:28.000000000 +0000 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the gnome-system-tools package. # FIRST AUTHOR , YEAR. # Fran Dieguez , 2010. +# Fran Diéguez , 2010. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools master\n" "POT-Creation-Date: 2010-08-11 13:49+0000\n" -"PO-Revision-Date: 2010-08-12 20:56+0200\n" -"Last-Translator: Fran Dieguez \n" +"PO-Revision-Date: 2010-10-20 09:27+0200\n" +"Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -168,9 +169,9 @@ "The Shared Folders Administration Tool allows you " "to share folders to other computers in your network or in the internet." msgstr "" -"A Ferramenta de administración de cartafoles " -"compartidos permítelle compartir os seus cartafoles con outros " -"equipos na súa red local ou en Internet." +"A Ferramenta de administración de cartafoles compartidos permítelle compartir os seus cartafoles con outros equipos na " +"súa rede local ou en Internet." #: C/shares-admin.xml:96(title) msgid "Getting started" @@ -186,7 +187,7 @@ #: C/shares-admin.xml:102(term) msgid "System menu" -msgstr "Menú Sistema" +msgstr "Menú Sistema" #: C/shares-admin.xml:104(para) msgid "" @@ -326,8 +327,8 @@ "stop sharing and press the Delete button." msgstr "" "No separador Cartafoles compartidos seleccione o " -"cartafol que quere deixar de compartir e prema o botón " -"Borrar." +"cartafol que quere deixar de compartir e prema o botón Borrar." #: C/shares-admin.xml:178(para) msgid "" @@ -336,8 +337,9 @@ "not to share in the Share through combobox." msgstr "" "Prema co botón dereito do rato sobre un cartafol local e seleccione a opción " -", despois seleccione non compartir o cartafol na " -"caixa de verificación Compartir a través de:." +"Compartir cartafol, " +"despois seleccione non compartir o cartafol na caixa de verificación " +"Compartir a través de." #: C/shares-admin.xml:183(title) msgid "To modify a folder sharing properties" diff -Nru gnome-system-tools-2.32.0/doc/shares/gl/shares-admin.xml gnome-system-tools-3.0.0/doc/shares/gl/shares-admin.xml --- gnome-system-tools-2.32.0/doc/shares/gl/shares-admin.xml 2010-09-27 16:19:03.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/gl/shares-admin.xml 2011-04-03 20:04:28.000000000 +0000 @@ -158,7 +158,7 @@ Introdución - A + A Ferramenta de administración de cartafoles compartidos permítelle compartir os seus cartafoles con outros equipos na súa rede local ou en Internet. @@ -168,7 +168,7 @@ - Menú + Menú Sistema Seleccionen AdministraciónCartafoles compartidos. @@ -243,8 +243,8 @@ Como deixar de compartir un cartafol Hai dúas formas de deixar de compartir un cartafol: - No separador Cartafoles compartidos seleccione o cartafol que quere deixar de compartir e prema o botón Borrar. - Prema co botón dereito do rato sobre un cartafol local e seleccione a opción , despois seleccione non compartir o cartafol na caixa de verificación + No separador Cartafoles compartidos seleccione o cartafol que quere deixar de compartir e prema o botón Borrar. + Prema co botón dereito do rato sobre un cartafol local e seleccione a opción Compartir cartafol, despois seleccione non compartir o cartafol na caixa de verificación Compartir a través de. diff -Nru gnome-system-tools-2.32.0/doc/shares/Makefile.am gnome-system-tools-3.0.0/doc/shares/Makefile.am --- gnome-system-tools-2.32.0/doc/shares/Makefile.am 2010-08-22 12:40:55.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/Makefile.am 2010-12-12 12:16:01.000000000 +0000 @@ -5,6 +5,6 @@ DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = figures/shares-tool.png -DOC_LINGUAS = ca cs de el en_GB fr gl oc pt_BR sv es it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN -include $(top_srcdir)/git.mk diff -Nru gnome-system-tools-2.32.0/doc/shares/Makefile.in gnome-system-tools-3.0.0/doc/shares/Makefile.in --- gnome-system-tools-2.32.0/doc/shares/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -61,11 +61,7 @@ $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = doc/shares ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -90,8 +86,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -113,11 +107,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -136,26 +131,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -178,14 +176,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -194,6 +187,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -217,7 +212,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -362,7 +356,7 @@ DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = figures/shares-tool.png -DOC_LINGUAS = ca cs de el en_GB fr gl oc pt_BR sv es it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN all: all-am .SUFFIXES: diff -Nru gnome-system-tools-2.32.0/doc/shares/sl/shares-admin.xml gnome-system-tools-3.0.0/doc/shares/sl/shares-admin.xml --- gnome-system-tools-2.32.0/doc/shares/sl/shares-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/sl/shares-admin.xml 2011-04-03 20:04:28.000000000 +0000 @@ -0,0 +1,266 @@ + + + + + + +]> + + +
+ + + + Shared Folders Administration Tool Manual + + 2006 + Carlos Garnacho Parro + + + + + + Carlos Garnacho Parro + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You can find + a copy of the GFDL at this link or in the file COPYING-DOCS + distributed with this manual. + + This manual is part of a collection of GNOME manuals + distributed under the GFDL. If you want to distribute this + manual separately from the collection, you can do so by + adding a copy of the license to the manual, as described in + section 6 of the license. + + + + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and the members of + the GNOME Documentation Project are made aware of those + trademarks, then the names are in capital letters or initial + capital letters. + + + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED + UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE + WITH THE FURTHER UNDERSTANDING THAT: + + + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR + IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES + THAT THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR + A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE + RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE + OF THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR + MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY + CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED + VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER + EXCEPT UNDER THIS DISCLAIMER; AND + + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), + CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, + INITIAL WRITER, ANY CONTRIBUTOR, OR ANY + DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION + OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH + PARTIES, BE LIABLE TO ANY PERSON FOR ANY + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER + INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR + LOSSES ARISING OUT OF OR RELATING TO USE OF THE + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, + EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF + THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Shared Folders Administration Tool Manual V2.15.2 + August 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + This manual describes version 2.15.2 of Shared Folders Administration Tool. + + + Odziv + To report a bug or make a suggestion regarding the Shared Folders Administration Tool or this manual, follow the directions in the GNOME Feedback Page. + + + The Shared Folders Administration Tool allows you to share folders to other computers in your network or in the internet. + + + + + Services Administration Tool + + + + + Uvod + The Shared Folders Administration Tool allows you to share folders to other computers in your network or in the internet. + + + + Getting started + + You can start Shared Folders Administration Tool in the following ways: + + + + System menu + + Choose AdministrationShared Folders. + + + + + Nautilus Context Menu + + Press the right mouse button on any local folder and choose Share folder to share or stop sharing the folder. + + + + + Ukazna vrstica + + Execute the following command: shares-admin. + + + + + When you start Shared Folders Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system. + + After entering the administrator password, the following window is displayed. + +
+ Shared Folders Administration Tool main window + + + + + + + Shows Shared Folders Administration Tool main window. + + + +
+ + The Shared Folders Administration Tool main window contains the following elements: + + + + Shared folders + + This allows you to specify which folders are going to be shared through the network. + + + + + General properties + + Specifies global settings for a group of shared folders. + + + + + + + Uporaba + + + To share a folder + There are 3 ways of sharing a folder: + + In the Shared Folders tab press the Add button. In the Share Folders dialog fill in the folder you wish to share. + Right click on a local folder and select the option Share folder. + Drag a folder and drop it in the shared folders list in the main window. + + + + + To stop sharing a folder + There are 2 ways to stop sharing a folder: + + In the Shared Folders tab select the folder you want to stop sharing and press the Delete button. + Right click on a local folder and select the option Share folder, then select not to share in the Share through combobox. + + + + + To modify a folder sharing properties + In the Shared Folders tab select the folder you want to modify and press the Properties button. + + + + To modify global sharing properties + In the General Properties tab modify any of the values. + + +
diff -Nru gnome-system-tools-2.32.0/doc/shares/sl/sl.po gnome-system-tools-3.0.0/doc/shares/sl/sl.po --- gnome-system-tools-2.32.0/doc/shares/sl/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/shares/sl/sl.po 2011-04-03 20:04:28.000000000 +0000 @@ -0,0 +1,243 @@ +# Slovenian translation for gnome-system-tools help. +# Copyright (C) 2010 gnome-system-tools COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# +# Ime Priimek , leto. +# Matej Urbančič , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools-gst-shares help master\n" +"POT-Creation-Date: 2010-10-20 08:16+0000\n" +"PO-Revision-Date: 2010-10-21 20:05+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/shares-admin.xml:132(None) +msgid "@@image: 'figures/shares-tool.png'; md5=c69384fc08f28a0328bbe497d62d00f0" +msgstr "@@image: 'figures/shares-tool.png'; md5=c69384fc08f28a0328bbe497d62d00f0" + +#: C/shares-admin.xml:22(title) +msgid "Shared Folders Administration Tool Manual" +msgstr "" + +#: C/shares-admin.xml:24(year) +msgid "2006" +msgstr "2006" + +#: C/shares-admin.xml:25(holder) +#: C/shares-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "Carlos Garnacho Parro" + +#: C/shares-admin.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/shares-admin.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/shares-admin.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/shares-admin.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/shares-admin.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/shares-admin.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/shares-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/shares-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/shares-admin.xml:65(revnumber) +msgid "Shared Folders Administration Tool Manual V2.15.2" +msgstr "" + +#: C/shares-admin.xml:66(date) +msgid "August 2006" +msgstr "" + +#: C/shares-admin.xml:68(para) +#: C/shares-admin.xml:69(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "" + +#: C/shares-admin.xml:74(releaseinfo) +msgid "This manual describes version 2.15.2 of Shared Folders Administration Tool." +msgstr "" + +#: C/shares-admin.xml:77(title) +msgid "Feedback" +msgstr "Odziv" + +#: C/shares-admin.xml:78(para) +msgid "To report a bug or make a suggestion regarding the Shared Folders Administration Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" + +#: C/shares-admin.xml:81(para) +msgid "The Shared Folders Administration Tool allows you to share folders to other computers in your network or in the internet." +msgstr "" + +#: C/shares-admin.xml:86(primary) +msgid "Services Administration Tool" +msgstr "" + +#: C/shares-admin.xml:91(title) +msgid "Introduction" +msgstr "Uvod" + +#: C/shares-admin.xml:92(para) +msgid "The Shared Folders Administration Tool allows you to share folders to other computers in your network or in the internet." +msgstr "" + +#: C/shares-admin.xml:96(title) +msgid "Getting started" +msgstr "" + +#: C/shares-admin.xml:98(para) +msgid "You can start Shared Folders Administration Tool in the following ways:" +msgstr "" + +#: C/shares-admin.xml:102(term) +msgid "System menu" +msgstr "" + +#: C/shares-admin.xml:104(para) +msgid "Choose AdministrationShared Folders." +msgstr "" + +#: C/shares-admin.xml:109(term) +msgid "Nautilus Context Menu" +msgstr "" + +#: C/shares-admin.xml:111(para) +msgid "Press the right mouse button on any local folder and choose Share folder to share or stop sharing the folder." +msgstr "" + +#: C/shares-admin.xml:116(term) +msgid "Command line" +msgstr "Ukazna vrstica" + +#: C/shares-admin.xml:118(para) +msgid "Execute the following command: shares-admin." +msgstr "" + +#: C/shares-admin.xml:123(para) +msgid "When you start Shared Folders Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system." +msgstr "" + +#: C/shares-admin.xml:125(para) +msgid "After entering the administrator password, the following window is displayed." +msgstr "" + +#: C/shares-admin.xml:128(title) +msgid "Shared Folders Administration Tool main window" +msgstr "" + +#: C/shares-admin.xml:135(phrase) +msgid "Shows Shared Folders Administration Tool main window." +msgstr "" + +#: C/shares-admin.xml:141(para) +msgid "The Shared Folders Administration Tool main window contains the following elements:" +msgstr "" + +#: C/shares-admin.xml:145(term) +msgid "Shared folders" +msgstr "" + +#: C/shares-admin.xml:147(para) +msgid "This allows you to specify which folders are going to be shared through the network." +msgstr "" + +#: C/shares-admin.xml:152(term) +msgid "General properties" +msgstr "" + +#: C/shares-admin.xml:154(para) +msgid "Specifies global settings for a group of shared folders." +msgstr "" + +#: C/shares-admin.xml:161(title) +msgid "Usage" +msgstr "Uporaba" + +#: C/shares-admin.xml:164(title) +msgid "To share a folder" +msgstr "" + +#: C/shares-admin.xml:165(para) +msgid "There are 3 ways of sharing a folder:" +msgstr "" + +#: C/shares-admin.xml:167(para) +msgid "In the Shared Folders tab press the Add button. In the Share Folders dialog fill in the folder you wish to share." +msgstr "" + +#: C/shares-admin.xml:168(para) +msgid "Right click on a local folder and select the option Share folder." +msgstr "" + +#: C/shares-admin.xml:169(para) +msgid "Drag a folder and drop it in the shared folders list in the main window." +msgstr "" + +#: C/shares-admin.xml:174(title) +msgid "To stop sharing a folder" +msgstr "" + +#: C/shares-admin.xml:175(para) +msgid "There are 2 ways to stop sharing a folder:" +msgstr "" + +#: C/shares-admin.xml:177(para) +msgid "In the Shared Folders tab select the folder you want to stop sharing and press the Delete button." +msgstr "" + +#: C/shares-admin.xml:178(para) +msgid "Right click on a local folder and select the option Share folder, then select not to share in the Share through combobox." +msgstr "" + +#: C/shares-admin.xml:183(title) +msgid "To modify a folder sharing properties" +msgstr "" + +#: C/shares-admin.xml:184(para) +msgid "In the Shared Folders tab select the folder you want to modify and press the Properties button." +msgstr "" + +#: C/shares-admin.xml:188(title) +msgid "To modify global sharing properties" +msgstr "" + +#: C/shares-admin.xml:189(para) +msgid "In the General Properties tab modify any of the values." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/shares-admin.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru gnome-system-tools-2.32.0/doc/time/gl/gl.po gnome-system-tools-3.0.0/doc/time/gl/gl.po --- gnome-system-tools-2.32.0/doc/time/gl/gl.po 2010-09-27 16:19:04.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/gl/gl.po 2011-04-03 20:04:29.000000000 +0000 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the gnome-system-tools package. # FIRST AUTHOR , YEAR. # Fran Dieguez , 2010. +# Fran Diéguez , 2010. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools master\n" "POT-Creation-Date: 2010-08-04 06:10+0000\n" -"PO-Revision-Date: 2010-08-07 18:39+0200\n" -"Last-Translator: Fran Dieguez \n" +"PO-Revision-Date: 2010-10-20 10:16+0200\n" +"Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,6 +78,10 @@ "you can do so by adding a copy of the license to the manual, as described in " "section 6 of the license." msgstr "" +"Este manual é parte do conxunto de manuais de GNOME distribuído baixo a " +"GFDL. Se quere distribuir este manual de forma separada do conxunto, pode " +"facelo simplemente engadindo unha copia da licencia do manual, como se " +"describe na sección 6 da licenza." #: C/time-admin.xml:19(para) msgid "" @@ -86,6 +91,11 @@ "aware of those trademarks, then the names are in capital letters or initial " "capital letters." msgstr "" +"Algúns dos nomes empregados polas compañías para distinguir os seus produtos " +"e servizos son marcas rexistradas. Onde estes nomes aparezan en calquera " +"documentación de GNOME, os membros do Proxecto de documentación de GNOME " +"darán conta de estas marcas rexistradas, e sempre capitalizarán totalmente " +"ou só o inicio os nomes." #: C/time-admin.xml:35(para) msgid "" @@ -214,15 +224,15 @@ #: C/time-admin.xml:110(term) msgid "System menu" -msgstr "Menú Sistema" +msgstr "Menú Sistema" #: C/time-admin.xml:112(para) msgid "" "Choose AdministrationTime " "and Date." msgstr "" -"Seleccione AdministraciónData e hora." +"Seleccione AdministraciónData e Hora." #: C/time-admin.xml:117(term) msgid "Context menu in the clock applet" diff -Nru gnome-system-tools-2.32.0/doc/time/gl/time-admin.xml gnome-system-tools-3.0.0/doc/time/gl/time-admin.xml --- gnome-system-tools-2.32.0/doc/time/gl/time-admin.xml 2010-09-27 16:19:04.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/gl/time-admin.xml 2011-04-03 20:04:29.000000000 +0000 @@ -45,21 +45,9 @@ a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual. - This manual is part of a collection of GNOME manuals - distributed under the GFDL. If you want to distribute this - manual separately from the collection, you can do so by - adding a copy of the license to the manual, as described in - section 6 of the license. - + Este manual é parte do conxunto de manuais de GNOME distribuído baixo a GFDL. Se quere distribuir este manual de forma separada do conxunto, pode facelo simplemente engadindo unha copia da licencia do manual, como se describe na sección 6 da licenza. - - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and the members of - the GNOME Documentation Project are made aware of those - trademarks, then the names are in capital letters or initial - capital letters. - + Algúns dos nomes empregados polas compañías para distinguir os seus produtos e servizos son marcas rexistradas. Onde estes nomes aparezan en calquera documentación de GNOME, os membros do Proxecto de documentación de GNOME darán conta de estas marcas rexistradas, e sempre capitalizarán totalmente ou só o inicio os nomes. DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED @@ -181,9 +169,9 @@ - Menú + Menú Sistema - Seleccione + Seleccione AdministraciónData e Hora. diff -Nru gnome-system-tools-2.32.0/doc/time/Makefile.am gnome-system-tools-3.0.0/doc/time/Makefile.am --- gnome-system-tools-2.32.0/doc/time/Makefile.am 2010-08-11 09:28:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/Makefile.am 2010-12-12 12:16:01.000000000 +0000 @@ -10,7 +10,7 @@ figures/time-tool-automatic.png \ figures/time-tool-manual.png -DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sv zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN # This isn't still ported to gnome-doc-utils SUBDIRS = nl diff -Nru gnome-system-tools-2.32.0/doc/time/Makefile.in gnome-system-tools-3.0.0/doc/time/Makefile.in --- gnome-system-tools-2.32.0/doc/time/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -61,11 +61,7 @@ $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = doc/time ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -130,8 +126,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -153,11 +147,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -176,26 +171,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -218,14 +216,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -234,6 +227,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -257,7 +252,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -407,7 +401,7 @@ figures/time-tool-automatic.png \ figures/time-tool-manual.png -DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sv zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN # This isn't still ported to gnome-doc-utils SUBDIRS = nl diff -Nru gnome-system-tools-2.32.0/doc/time/nl/Makefile.in gnome-system-tools-3.0.0/doc/time/nl/Makefile.in --- gnome-system-tools-2.32.0/doc/time/nl/Makefile.in 2010-09-27 16:15:54.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/nl/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -99,11 +99,7 @@ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make subdir = doc/time/nl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -128,8 +124,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -151,11 +145,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -174,26 +169,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -216,14 +214,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -232,6 +225,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -259,7 +254,6 @@ docdir = $(datadir)/gnome/help/$(docname)/$(lang) dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/doc/time/sl/sl.po gnome-system-tools-3.0.0/doc/time/sl/sl.po --- gnome-system-tools-2.32.0/doc/time/sl/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/sl/sl.po 2011-04-03 20:04:29.000000000 +0000 @@ -0,0 +1,290 @@ +# Slovenian translation for gnome-system-tools help. +# Copyright (C) 2010 gnome-system-tools COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# +# Ime Priimek , leto. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools-gst-time help master\n" +"POT-Creation-Date: 2010-10-20 08:16+0000\n" +"PO-Revision-Date: 2010-10-21 20:06+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/time-admin.xml:140(None) +msgid "@@image: 'figures/time-tool-automatic.png'; md5=ce29e72944faea1899465faf57ca83ee" +msgstr "@@image: 'figures/time-tool-automatic.png'; md5=ce29e72944faea1899465faf57ca83ee" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/time-admin.xml:154(None) +msgid "@@image: 'figures/time-tool-manual.png'; md5=b870716d05d7d16401bf2704ca583c12" +msgstr "@@image: 'figures/time-tool-manual.png'; md5=b870716d05d7d16401bf2704ca583c12" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/time-admin.xml:220(None) +msgid "@@image: 'figures/time-map.png'; md5=cafb0cca39c594134b090e3f787dbeac" +msgstr "@@image: 'figures/time-map.png'; md5=cafb0cca39c594134b090e3f787dbeac" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/time-admin.xml:239(None) +msgid "@@image: 'figures/time-servers.png'; md5=9a9916f41920c5b5a6fbac407ccd32a2" +msgstr "@@image: 'figures/time-servers.png'; md5=9a9916f41920c5b5a6fbac407ccd32a2" + +#: C/time-admin.xml:22(title) +msgid "Time Administration Tool Manual" +msgstr "" + +#: C/time-admin.xml:24(year) +msgid "2004-2006" +msgstr "2004-2006" + +#: C/time-admin.xml:25(holder) +#: C/time-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "Carlos Garnacho Parro" + +#: C/time-admin.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/time-admin.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/time-admin.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/time-admin.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/time-admin.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/time-admin.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/time-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/time-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/time-admin.xml:65(revnumber) +msgid "Time Administration Tool Manual V2.15.2" +msgstr "" + +#: C/time-admin.xml:66(date) +msgid "August 2006" +msgstr "" + +#: C/time-admin.xml:68(para) +#: C/time-admin.xml:69(para) +#: C/time-admin.xml:76(para) +#: C/time-admin.xml:77(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "" + +#: C/time-admin.xml:73(revnumber) +msgid "Time Administration Tool Manual V0.35" +msgstr "" + +#: C/time-admin.xml:74(date) +msgid "June 2004" +msgstr "" + +#: C/time-admin.xml:82(releaseinfo) +msgid "This manual describes version 2.15.2 of Time Administration Tool." +msgstr "" + +#: C/time-admin.xml:85(title) +msgid "Feedback" +msgstr "Odziv" + +#: C/time-admin.xml:86(para) +msgid "To report a bug or make a suggestion regarding the Time Administration Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" + +#: C/time-admin.xml:89(para) +msgid "The Time Administration Tool allows you to set the time, date and timezone of your system, as well as setting any time server to synchronize your local time server." +msgstr "" + +#: C/time-admin.xml:94(primary) +msgid "Time Administration Tool" +msgstr "" + +#: C/time-admin.xml:99(title) +msgid "Introduction" +msgstr "Uvod" + +#: C/time-admin.xml:100(para) +msgid "The Time Administration Tool allows you to set the time, date and timezone of your system, as well as setting any time server to synchronize your local time server." +msgstr "" + +#: C/time-admin.xml:104(title) +msgid "Getting started" +msgstr "" + +#: C/time-admin.xml:106(para) +msgid "You can start Time Administration Tool in the following ways:" +msgstr "" + +#: C/time-admin.xml:110(term) +msgid "System menu" +msgstr "" + +#: C/time-admin.xml:112(para) +msgid "Choose AdministrationTime and Date." +msgstr "" + +#: C/time-admin.xml:117(term) +msgid "Context menu in the clock applet" +msgstr "" + +#: C/time-admin.xml:119(para) +msgid "Choose Adjust Date and Time." +msgstr "" + +#: C/time-admin.xml:124(term) +msgid "Command line" +msgstr "Ukazna vrstica" + +#: C/time-admin.xml:126(para) +msgid "Execute the following command: time-admin" +msgstr "" + +#: C/time-admin.xml:131(para) +msgid "When you start Time Administration Tool, you may be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system." +msgstr "" + +#: C/time-admin.xml:133(para) +msgid "After entering the administrator password, the time configuration window is displayed." +msgstr "" + +#: C/time-admin.xml:136(title) +msgid "Time Administration Tool main window, automatic configuration mode" +msgstr "" + +#: C/time-admin.xml:143(phrase) +msgid "Shows Time Administration Tool main window, automatic configuration mode." +msgstr "" + +#: C/time-admin.xml:150(title) +msgid "Time Administration Tool main window, manual configuration mode" +msgstr "" + +#: C/time-admin.xml:157(phrase) +msgid "Shows Time Administration Tool main window, manual configuration mode." +msgstr "" + +#: C/time-admin.xml:163(para) +msgid "The Time Administration Tool main window contains the following elements:" +msgstr "" + +#: C/time-admin.xml:167(term) +msgid "Time zone" +msgstr "Časovni pas" + +#: C/time-admin.xml:169(para) +msgid "Displays your current timezone, the button displays a map for selecting timezone." +msgstr "" + +#: C/time-admin.xml:174(term) +msgid "Configuration type" +msgstr "" + +#: C/time-admin.xml:176(para) +msgid "It can be either:" +msgstr "" + +#: C/time-admin.xml:179(guilabel) +msgid "Keep synchronized with Internet servers" +msgstr "" + +#: C/time-admin.xml:181(para) +msgid "You will be able to choose from a list of Internet servers to keep your computer clock synchronized automatically." +msgstr "" + +#: C/time-admin.xml:185(guilabel) +msgid "Manual" +msgstr "" + +#: C/time-admin.xml:187(para) +msgid "You will be able to fully specify date and time by hand." +msgstr "" + +#: C/time-admin.xml:195(term) +msgid "Synchronize now button" +msgstr "" + +#: C/time-admin.xml:197(para) +msgid "This will allow you to synchronize just once with the selected Internet servers." +msgstr "" + +#: C/time-admin.xml:204(title) +msgid "Usage" +msgstr "Uporaba" + +#: C/time-admin.xml:207(title) +msgid "To change your time or date" +msgstr "" + +#: C/time-admin.xml:208(para) +msgid "Just change the time spin buttons or the date in the calendar." +msgstr "" + +#: C/time-admin.xml:212(title) +msgid "To change your time zone" +msgstr "" + +#: C/time-admin.xml:213(para) +msgid "Click on the Select time zone button and select the new location, alternatively you can also select the new location from the list below." +msgstr "" + +#: C/time-admin.xml:216(title) +msgid "Time Administration Tool map" +msgstr "" + +#: C/time-admin.xml:223(phrase) +msgid "Shows Time Administration Tool map window." +msgstr "" + +#: C/time-admin.xml:231(title) +msgid "To synchronize your local time server with internet time servers" +msgstr "" + +#: C/time-admin.xml:232(para) +msgid "If the checkbox is disabled, enable it, then click on the Select servers button and select a new server in the list." +msgstr "" + +#: C/time-admin.xml:235(title) +msgid "Time Administration Tool servers window" +msgstr "" + +#: C/time-admin.xml:242(phrase) +msgid "Shows Time Administration Tool servers window." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/time-admin.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru gnome-system-tools-2.32.0/doc/time/sl/time-admin.xml gnome-system-tools-3.0.0/doc/time/sl/time-admin.xml --- gnome-system-tools-2.32.0/doc/time/sl/time-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/time/sl/time-admin.xml 2011-04-03 20:04:29.000000000 +0000 @@ -0,0 +1,323 @@ + + + + + + +]> + + +
+ + + + Time Administration Tool Manual + + 2004-2006 + Carlos Garnacho Parro + + + + + + Carlos Garnacho Parro + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You can find + a copy of the GFDL at this link or in the file COPYING-DOCS + distributed with this manual. + + This manual is part of a collection of GNOME manuals + distributed under the GFDL. If you want to distribute this + manual separately from the collection, you can do so by + adding a copy of the license to the manual, as described in + section 6 of the license. + + + + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and the members of + the GNOME Documentation Project are made aware of those + trademarks, then the names are in capital letters or initial + capital letters. + + + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED + UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE + WITH THE FURTHER UNDERSTANDING THAT: + + + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR + IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES + THAT THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR + A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE + RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE + OF THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR + MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY + CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED + VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER + EXCEPT UNDER THIS DISCLAIMER; AND + + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), + CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, + INITIAL WRITER, ANY CONTRIBUTOR, OR ANY + DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION + OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH + PARTIES, BE LIABLE TO ANY PERSON FOR ANY + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER + INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR + LOSSES ARISING OUT OF OR RELATING TO USE OF THE + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, + EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF + THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Time Administration Tool Manual V2.15.2 + August 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + Time Administration Tool Manual V0.35 + June 2004 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + This manual describes version 2.15.2 of Time Administration Tool. + + + Odziv + To report a bug or make a suggestion regarding the Time Administration Tool or this manual, follow the directions in the GNOME Feedback Page. + + + The Time Administration Tool allows you to set the time, date and timezone of your system, as well as setting any time server to synchronize your local time server. + + + + + Time Administration Tool + + + + + Uvod + The Time Administration Tool allows you to set the time, date and timezone of your system, as well as setting any time server to synchronize your local time server. + + + + Getting started + + You can start Time Administration Tool in the following ways: + + + + System menu + + Choose AdministrationTime and Date. + + + + + Context menu in the clock applet + + Choose Adjust Date and Time. + + + + + Ukazna vrstica + + Execute the following command: time-admin + + + + + When you start Time Administration Tool, you may be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system. + + After entering the administrator password, the time configuration window is displayed. + +
+ Time Administration Tool main window, automatic configuration mode + + + + + + + Shows Time Administration Tool main window, automatic configuration mode. + + + +
+ +
+ Time Administration Tool main window, manual configuration mode + + + + + + + Shows Time Administration Tool main window, manual configuration mode. + + + +
+ + The Time Administration Tool main window contains the following elements: + + + + Časovni pas + + Displays your current timezone, the button displays a map for selecting timezone. + + + + + Configuration type + + It can be either: + + + Keep synchronized with Internet servers + + You will be able to choose from a list of Internet servers to keep your computer clock synchronized automatically. + + + + Manual + + You will be able to fully specify date and time by hand. + + + + + + + + Synchronize now button + + This will allow you to synchronize just once with the selected Internet servers. + + + + + + + Uporaba + + + To change your time or date + Just change the time spin buttons or the date in the calendar. + + + + To change your time zone + Click on the Select time zone button and select the new location, alternatively you can also select the new location from the list below. + +
+ Time Administration Tool map + + + + + + + Shows Time Administration Tool map window. + + + +
+ + + + To synchronize your local time server with internet time servers + If the checkbox is disabled, enable it, then click on the Select servers button and select a new server in the list. + +
+ Time Administration Tool servers window + + + + + + + Shows Time Administration Tool servers window. + + + +
+ + +
diff -Nru gnome-system-tools-2.32.0/doc/users/gl/gl.po gnome-system-tools-3.0.0/doc/users/gl/gl.po --- gnome-system-tools-2.32.0/doc/users/gl/gl.po 2010-09-27 16:19:05.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/users/gl/gl.po 2011-04-03 20:04:30.000000000 +0000 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-users.master\n" -"POT-Creation-Date: 2009-09-29 17:27+0000\n" +"POT-Creation-Date: 2010-09-18 22:27+0000\n" "PO-Revision-Date: 2009-04-27 19:21+0200\n" "Last-Translator: <>\n" "Language-Team: American English \n" diff -Nru gnome-system-tools-2.32.0/doc/users/Makefile.am gnome-system-tools-3.0.0/doc/users/Makefile.am --- gnome-system-tools-2.32.0/doc/users/Makefile.am 2010-07-29 09:44:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/users/Makefile.am 2010-12-12 12:16:01.000000000 +0000 @@ -7,6 +7,6 @@ DOC_FIGURES = figures/users-tool.png \ figures/groups.png -DOC_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sl sv it zh_CN -include $(top_srcdir)/git.mk diff -Nru gnome-system-tools-2.32.0/doc/users/Makefile.in gnome-system-tools-3.0.0/doc/users/Makefile.in --- gnome-system-tools-2.32.0/doc/users/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/users/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -61,11 +61,7 @@ $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = doc/users ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -90,8 +86,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -113,11 +107,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -136,26 +131,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -178,14 +176,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -194,6 +187,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -217,7 +212,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -364,7 +358,7 @@ DOC_FIGURES = figures/users-tool.png \ figures/groups.png -DOC_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sv it zh_CN +DOC_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sl sv it zh_CN all: all-am .SUFFIXES: diff -Nru gnome-system-tools-2.32.0/doc/users/sl/sl.po gnome-system-tools-3.0.0/doc/users/sl/sl.po --- gnome-system-tools-2.32.0/doc/users/sl/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/users/sl/sl.po 2011-04-03 20:04:30.000000000 +0000 @@ -0,0 +1,270 @@ +# Slovenian translation for gnome-system-tools help. +# Copyright (C) 2010 gnome-system-tools COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-system-tools package. +# +# Ime Priimek , leto. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-system-tools-gst-users help master\n" +"POT-Creation-Date: 2010-10-20 08:16+0000\n" +"PO-Revision-Date: 2010-10-21 20:06+0100\n" +"Last-Translator: Matej Urbančič \n" +"Language-Team: Slovenian GNOME Translation Team \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/users-admin.xml:133(None) +msgid "@@image: 'figures/users-tool.png'; md5=3ce11dd8a6244be2d99fd14839e943b0" +msgstr "@@image: 'figures/users-tool.png'; md5=3ce11dd8a6244be2d99fd14839e943b0" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/users-admin.xml:171(None) +msgid "@@image: 'figures/groups.png'; md5=0c3a124e6dbeea5fedfc9c3c7efe1e7e" +msgstr "@@image: 'figures/groups.png'; md5=0c3a124e6dbeea5fedfc9c3c7efe1e7e" + +#: C/users-admin.xml:22(title) +msgid "Users Administration Tool Manual" +msgstr "" + +#: C/users-admin.xml:24(year) +msgid "2004" +msgstr "2004" + +#: C/users-admin.xml:25(holder) +#: C/users-admin.xml:36(publishername) +msgid "Carlos Garnacho Parro" +msgstr "" + +#: C/users-admin.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/users-admin.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/users-admin.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/users-admin.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/users-admin.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/users-admin.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/users-admin.xml:46(firstname) +msgid "Carlos" +msgstr "Carlos" + +#: C/users-admin.xml:47(surname) +msgid "Garnacho Parro" +msgstr "Garnacho Parro" + +#: C/users-admin.xml:65(revnumber) +msgid "Users Administration Tool Manual V2.15.2" +msgstr "" + +#: C/users-admin.xml:66(date) +msgid "August 2006" +msgstr "" + +#: C/users-admin.xml:68(para) +#: C/users-admin.xml:69(para) +#: C/users-admin.xml:76(para) +#: C/users-admin.xml:77(para) +msgid "carlosg@gnome.org (Carlos Garnacho Parro)" +msgstr "" + +#: C/users-admin.xml:73(revnumber) +msgid "Users Administration Tool Manual V0.35" +msgstr "" + +#: C/users-admin.xml:74(date) +msgid "June 2004" +msgstr "" + +#: C/users-admin.xml:82(releaseinfo) +msgid "This manual describes version 2.15.2 of Users Administration Tool." +msgstr "" + +#: C/users-admin.xml:85(title) +msgid "Feedback" +msgstr "Odziv" + +#: C/users-admin.xml:86(para) +msgid "To report a bug or make a suggestion regarding the Users Administration Tool or this manual, follow the directions in the GNOME Feedback Page." +msgstr "" + +#: C/users-admin.xml:89(para) +msgid "The Users Administration Tool allows you add, delete and modify the existing users and groups in your system." +msgstr "" + +#: C/users-admin.xml:94(primary) +msgid "Users Administration Tool" +msgstr "" + +#: C/users-admin.xml:99(title) +msgid "Introduction" +msgstr "Uvod" + +#: C/users-admin.xml:100(para) +msgid "The Users Administration Tool allows you add, delete and modify the existing users and groups in your system." +msgstr "" + +#: C/users-admin.xml:104(title) +msgid "Getting started" +msgstr "" + +#: C/users-admin.xml:106(para) +msgid "You can start Users Administration Tool in the following ways:" +msgstr "" + +#: C/users-admin.xml:110(term) +msgid "System menu" +msgstr "" + +#: C/users-admin.xml:112(para) +msgid "Choose AdministrationUsers and groups." +msgstr "" + +#: C/users-admin.xml:117(term) +msgid "Command line" +msgstr "Ukazna vrstica" + +#: C/users-admin.xml:119(para) +msgid "Execute the following command: users-admin" +msgstr "" + +#: C/users-admin.xml:124(para) +msgid "When you start Users Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system." +msgstr "" + +#: C/users-admin.xml:126(para) +msgid "After entering the administrator password, the following window is displayed." +msgstr "" + +#: C/users-admin.xml:129(title) +msgid "Users Administration Tool main window" +msgstr "" + +#: C/users-admin.xml:136(phrase) +msgid "Shows Users Administration Tool main window." +msgstr "" + +#: C/users-admin.xml:142(para) +msgid "The Users Administration Tool main window contains the following elements:" +msgstr "" + +#: C/users-admin.xml:146(guilabel) +msgid "Users list" +msgstr "Seznam uporabnikov" + +#: C/users-admin.xml:148(para) +msgid "Shows the available users. depending on the gconf key \"/apps/gnome-system-tools/users/showall\" it will show the system users too." +msgstr "" + +#: C/users-admin.xml:153(guilabel) +msgid "User manipulation buttons" +msgstr "" + +#: C/users-admin.xml:155(para) +msgid "Allows to add or delete users or modify user settings." +msgstr "" + +#: C/users-admin.xml:159(guilabel) +msgid "Manage groups button" +msgstr "" + +#: C/users-admin.xml:161(para) +msgid "Shows a similar dialog to modify group settings." +msgstr "" + +#: C/users-admin.xml:167(title) +msgid "Users Administration Tool groups editor" +msgstr "" + +#: C/users-admin.xml:174(phrase) +msgid "Groups editor." +msgstr "" + +#: C/users-admin.xml:182(title) +msgid "Usage" +msgstr "Uporaba" + +#: C/users-admin.xml:185(title) +msgid "To add a new user" +msgstr "" + +#: C/users-admin.xml:186(para) +msgid "Press the Add button in the main dialog, a new window will appear asking for the new user data. For adding a new user, you must provide at least the username and password (automatically generated or by hand). Optionally you can specify or modify real name, office location, work phone, home phone, main group, used shell, home directory, user ID and a list of the secondary groups for the user." +msgstr "" + +#: C/users-admin.xml:188(para) +msgid "Main group, used shell, home directory and user ID are automatically guessed depending on the selected profile." +msgstr "" + +#: C/users-admin.xml:192(title) +msgid "To modify an existing user" +msgstr "" + +#: C/users-admin.xml:193(para) +msgid "Select the user you want to modify and press the Properties button, a window similar to the one used for adding new users will appear with all the user data, allowing you to modify them." +msgstr "" + +#: C/users-admin.xml:197(title) +msgid "To delete an existing user" +msgstr "" + +#: C/users-admin.xml:198(para) +msgid "Select the user or users that you want to delete and press the Delete button in the Users tab, due to the importance of this data, you will be asked for confirmation for every user you want to delete." +msgstr "" + +#: C/users-admin.xml:200(para) +msgid "For security reasons, the home directory of the deleted users will not be deleted." +msgstr "" + +#: C/users-admin.xml:204(title) +msgid "To add a new group" +msgstr "" + +#: C/users-admin.xml:205(para) +msgid "Press the Add button in the groups dialog, a new window will appear asking for the new group data. For adding a new group, you must provide at least the group name and the group ID. Optionally you can specify the users that will belong to this group." +msgstr "" + +#: C/users-admin.xml:209(title) +msgid "To modify an existing group" +msgstr "" + +#: C/users-admin.xml:210(para) +msgid "Select the group you want to modify in the groups dialog and press the Properties button, A window will appear with the group's data allowing you to modify them." +msgstr "" + +#: C/users-admin.xml:214(title) +msgid "To delete an existing group" +msgstr "" + +#: C/users-admin.xml:215(para) +msgid "Select the group or groups that you want to delete in the groups dialog and press the Delete button in the Groups tab, due to the importance of this data, you will be asked for confirmation for every group you want to delete." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/users-admin.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru gnome-system-tools-2.32.0/doc/users/sl/users-admin.xml gnome-system-tools-3.0.0/doc/users/sl/users-admin.xml --- gnome-system-tools-2.32.0/doc/users/sl/users-admin.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/doc/users/sl/users-admin.xml 2011-04-03 20:04:30.000000000 +0000 @@ -0,0 +1,292 @@ + + + + + + +]> + + +
+ + + + Users Administration Tool Manual + + 2004 + Carlos Garnacho Parro + + + + + + Carlos Garnacho Parro + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation + License (GFDL), Version 1.1 or any later version published + by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You can find + a copy of the GFDL at this link or in the file COPYING-DOCS + distributed with this manual. + + This manual is part of a collection of GNOME manuals + distributed under the GFDL. If you want to distribute this + manual separately from the collection, you can do so by + adding a copy of the license to the manual, as described in + section 6 of the license. + + + + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and the members of + the GNOME Documentation Project are made aware of those + trademarks, then the names are in capital letters or initial + capital letters. + + + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED + UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE + WITH THE FURTHER UNDERSTANDING THAT: + + + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR + IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES + THAT THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR + A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE + RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE + OF THE DOCUMENT OR MODIFIED VERSION OF THE + DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR + MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY + CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY + SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS + LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED + VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER + EXCEPT UNDER THIS DISCLAIMER; AND + + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL + THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), + CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, + INITIAL WRITER, ANY CONTRIBUTOR, OR ANY + DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION + OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH + PARTIES, BE LIABLE TO ANY PERSON FOR ANY + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER + INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR + LOSSES ARISING OUT OF OR RELATING TO USE OF THE + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, + EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF + THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + + + Carlos + Garnacho Parro + + + + + + + Users Administration Tool Manual V2.15.2 + August 2006 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + Users Administration Tool Manual V0.35 + June 2004 + + carlosg@gnome.org (Carlos Garnacho Parro) + carlosg@gnome.org (Carlos Garnacho Parro) + + + + + This manual describes version 2.15.2 of Users Administration Tool. + + + Odziv + To report a bug or make a suggestion regarding the Users Administration Tool or this manual, follow the directions in the GNOME Feedback Page. + + + The Users Administration Tool allows you add, delete and modify the existing users and groups in your system. + + + + + Users Administration Tool + + + + + Uvod + The Users Administration Tool allows you add, delete and modify the existing users and groups in your system. + + + + Getting started + + You can start Users Administration Tool in the following ways: + + + + System menu + + Choose AdministrationUsers and groups. + + + + + Ukazna vrstica + + Execute the following command: users-admin + + + + + When you start Users Administration Tool, you will be prompted for the administrator password, this is necessary because the changes done with this tool will affect the whole system. + + After entering the administrator password, the following window is displayed. + +
+ Users Administration Tool main window + + + + + + + Shows Users Administration Tool main window. + + + +
+ + The Users Administration Tool main window contains the following elements: + + + + Seznam uporabnikov + + Shows the available users. depending on the gconf key "/apps/gnome-system-tools/users/showall" it will show the system users too. + + + + + User manipulation buttons + + Allows to add or delete users or modify user settings. + + + + Manage groups button + + Shows a similar dialog to modify group settings. + + + + +
+ Users Administration Tool groups editor + + + + + + + Groups editor. + + + +
+ + + + Uporaba + + + To add a new user + Press the Add button in the main dialog, a new window will appear asking for the new user data. For adding a new user, you must provide at least the username and password (automatically generated or by hand). Optionally you can specify or modify real name, office location, work phone, home phone, main group, used shell, home directory, user ID and a list of the secondary groups for the user. + + Main group, used shell, home directory and user ID are automatically guessed depending on the selected profile. + + + + To modify an existing user + Select the user you want to modify and press the Properties button, a window similar to the one used for adding new users will appear with all the user data, allowing you to modify them. + + + + To delete an existing user + Select the user or users that you want to delete and press the Delete button in the Users tab, due to the importance of this data, you will be asked for confirmation for every user you want to delete. + + For security reasons, the home directory of the deleted users will not be deleted. + + + + To add a new group + Press the Add button in the groups dialog, a new window will appear asking for the new group data. For adding a new group, you must provide at least the group name and the group ID. Optionally you can specify the users that will belong to this group. + + + + To modify an existing group + Select the group you want to modify in the groups dialog and press the Properties button, A window will appear with the group's data allowing you to modify them. + + + + To delete an existing group + Select the group or groups that you want to delete in the groups dialog and press the Delete button in the Groups tab, due to the importance of this data, you will be asked for confirmation for every group you want to delete. + + +
diff -Nru gnome-system-tools-2.32.0/icons/16x16/apps/Makefile.in gnome-system-tools-3.0.0/icons/16x16/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/16x16/apps/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/16x16/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/16x16/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/16x16/Makefile.in gnome-system-tools-3.0.0/icons/16x16/Makefile.in --- gnome-system-tools-2.32.0/icons/16x16/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/16x16/Makefile.in 2011-04-03 20:04:14.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/16x16 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/22x22/apps/Makefile.in gnome-system-tools-3.0.0/icons/22x22/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/22x22/apps/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/22x22/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/22x22/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/22x22/Makefile.in gnome-system-tools-3.0.0/icons/22x22/Makefile.in --- gnome-system-tools-2.32.0/icons/22x22/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/22x22/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/22x22 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/24x24/apps/Makefile.in gnome-system-tools-3.0.0/icons/24x24/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/24x24/apps/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/24x24/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/24x24/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/24x24/Makefile.in gnome-system-tools-3.0.0/icons/24x24/Makefile.in --- gnome-system-tools-2.32.0/icons/24x24/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/24x24/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/24x24 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/32x32/apps/Makefile.in gnome-system-tools-3.0.0/icons/32x32/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/32x32/apps/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/32x32/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/32x32/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/32x32/Makefile.in gnome-system-tools-3.0.0/icons/32x32/Makefile.in --- gnome-system-tools-2.32.0/icons/32x32/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/32x32/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/32x32 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/48x48/apps/Makefile.in gnome-system-tools-3.0.0/icons/48x48/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/48x48/apps/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/48x48/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/48x48/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/48x48/devices/Makefile.in gnome-system-tools-3.0.0/icons/48x48/devices/Makefile.in --- gnome-system-tools-2.32.0/icons/48x48/devices/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/48x48/devices/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/48x48/devices DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/48x48/Makefile.in gnome-system-tools-3.0.0/icons/48x48/Makefile.in --- gnome-system-tools-2.32.0/icons/48x48/Makefile.in 2010-09-27 16:15:55.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/48x48/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/48x48 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/Makefile.in gnome-system-tools-3.0.0/icons/Makefile.in --- gnome-system-tools-2.32.0/icons/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/scalable/apps/Makefile.in gnome-system-tools-3.0.0/icons/scalable/apps/Makefile.in --- gnome-system-tools-2.32.0/icons/scalable/apps/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/scalable/apps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = icons/scalable/apps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/icons/scalable/Makefile.in gnome-system-tools-3.0.0/icons/scalable/Makefile.in --- gnome-system-tools-2.32.0/icons/scalable/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/icons/scalable/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = icons/scalable DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/interfaces/Makefile.in gnome-system-tools-3.0.0/interfaces/Makefile.in --- gnome-system-tools-2.32.0/interfaces/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -42,11 +42,7 @@ $(top_srcdir)/DirsMakefile ChangeLog subdir = interfaces ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -94,8 +90,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -117,11 +111,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -140,26 +135,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -182,14 +180,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -198,6 +191,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -221,7 +216,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/interfaces/network.ui gnome-system-tools-3.0.0/interfaces/network.ui --- gnome-system-tools-2.32.0/interfaces/network.ui 2010-07-01 10:29:55.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/network.ui 2010-12-19 21:41:09.000000000 +0000 @@ -644,7 +644,6 @@ False True dialog - False True @@ -723,11 +722,13 @@ + False 2 + False 0 @@ -763,8 +764,9 @@ - + True + True 1 @@ -1410,15 +1412,11 @@ - + True + True + 0 liststore3 - - - - 0 - - 1 @@ -1683,7 +1681,6 @@ True center-on-parent dialog - False True diff -Nru gnome-system-tools-2.32.0/interfaces/services.ui gnome-system-tools-3.0.0/interfaces/services.ui --- gnome-system-tools-2.32.0/interfaces/services.ui 2010-07-01 10:29:55.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/services.ui 2010-12-12 17:35:29.000000000 +0000 @@ -51,7 +51,6 @@ True True dialog - False True diff -Nru gnome-system-tools-2.32.0/interfaces/shares.ui gnome-system-tools-3.0.0/interfaces/shares.ui --- gnome-system-tools-2.32.0/interfaces/shares.ui 2010-07-01 10:29:55.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/shares.ui 2010-12-12 17:35:29.000000000 +0000 @@ -12,7 +12,6 @@ True center-on-parent dialog - False True @@ -382,7 +381,6 @@ False True dialog - False True @@ -928,7 +926,6 @@ True center-on-parent dialog - False True diff -Nru gnome-system-tools-2.32.0/interfaces/time.ui gnome-system-tools-3.0.0/interfaces/time.ui --- gnome-system-tools-2.32.0/interfaces/time.ui 2010-07-01 10:29:55.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/time.ui 2011-02-12 16:45:51.000000000 +0000 @@ -20,7 +20,6 @@ Time zone dialog - False True @@ -112,9 +111,9 @@ - + True - location_model + 0 1 @@ -186,7 +185,6 @@ Time servers dialog - False True @@ -328,31 +326,10 @@ False - + True - 6 - - - True - 1 - stock_timezone - - - False - False - 0 - - - - - True - 0 - Unconfigured - - - 1 - - + 0 + Unconfigured diff -Nru gnome-system-tools-2.32.0/interfaces/users.ui gnome-system-tools-3.0.0/interfaces/users.ui --- gnome-system-tools-2.32.0/interfaces/users.ui 2010-08-11 09:51:44.000000000 +0000 +++ gnome-system-tools-3.0.0/interfaces/users.ui 2010-12-17 14:56:44.000000000 +0000 @@ -412,7 +412,6 @@ Group properties True dialog - False True @@ -643,7 +642,6 @@ False True dialog - False True @@ -856,8 +854,10 @@ - + True + True + 0 2 @@ -1324,7 +1324,6 @@ User profiles dialog - False True @@ -1506,7 +1505,6 @@ 300 Groups settings dialog - False True @@ -1535,6 +1533,7 @@ automatic automatic etched-in + True True @@ -1666,7 +1665,6 @@ dialog True True - False True @@ -1828,7 +1826,6 @@ dialog True True - False @@ -2225,7 +2222,6 @@ dialog True True - False True @@ -2320,6 +2316,7 @@ This account is using special settings that have been defined manually. Use the <i>Advanced Settings</i> dialog to tune them. True True + GTK_JUSTIFY_FILL @@ -2396,7 +2393,6 @@ dialog True True - False True @@ -2466,10 +2462,11 @@ - + True liststore2 - 0 + True + 0 @@ -2624,7 +2621,6 @@ dialog True True - False True @@ -2896,8 +2892,10 @@ - + True + True + 0 2 @@ -3000,9 +2998,10 @@ - + True 6 + False True @@ -3018,11 +3017,12 @@ - + True 0 - You can't change user ID while the user is logged in. True + GTK_JUSTIFY_FILL + False @@ -3068,6 +3068,7 @@ 3 1 2 + diff -Nru gnome-system-tools-2.32.0/m4/gnome-doc-utils.m4 gnome-system-tools-3.0.0/m4/gnome-doc-utils.m4 --- gnome-system-tools-2.32.0/m4/gnome-doc-utils.m4 2010-09-27 16:15:47.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/gnome-doc-utils.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - -if test "$gdu_cv_have_gdu" = "yes"; then - AC_MSG_RESULT([yes]) - ifelse([$2],,[:],[$2]) -else - AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi - -GNOME_DOC_DEFINES -]) diff -Nru gnome-system-tools-2.32.0/m4/intltool.m4 gnome-system-tools-3.0.0/m4/intltool.m4 --- gnome-system-tools-2.32.0/m4/intltool.m4 2010-09-27 16:15:47.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/intltool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak -## Kenneth Christiansen -## -## 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. - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [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 - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - diff -Nru gnome-system-tools-2.32.0/m4/libtool.m4 gnome-system-tools-3.0.0/m4/libtool.m4 --- gnome-system-tools-2.32.0/m4/libtool.m4 2010-09-27 16:15:46.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/libtool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,7377 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 56 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - -_LT_OUTPUT_LIBTOOL_INIT -]) - - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2008 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(lt_ECHO) -]) -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[AC_CHECK_TOOL(AR, ar, false) -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1]) - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[123]]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -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(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_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 `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method == "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # 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 - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - 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 - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - 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]].*|aix[[5-9]]*) - 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 - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # 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. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [fix_srcfile_path], [1], - [Fix the shell variable $srcfile for the compiler]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - 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 - exp_sym_flag='-Bexport' - no_entry_flag="" - 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]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${F77-"f77"} - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${FC-"f95"} - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC="$lt_save_CC" -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC="$lt_save_CC" -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_XSI_SHELLFNS -# --------------------- -# Bourne and XSI compatible variants of some useful shell functions. -m4_defun([_LT_PROG_XSI_SHELLFNS], -[case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $[*] )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -} - -dnl func_dirname_and_basename -dnl A portable version of this function is already defined in general.m4sh -dnl so there is no need for it here. - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[[^=]]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$[@]"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]+=\$[2]" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$[1]=\$$[1]\$[2]" -} - -_LT_EOF - ;; - esac -]) diff -Nru gnome-system-tools-2.32.0/m4/lt~obsolete.m4 gnome-system-tools-3.0.0/m4/lt~obsolete.m4 --- gnome-system-tools-2.32.0/m4/lt~obsolete.m4 2010-09-27 16:15:46.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/lt~obsolete.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) diff -Nru gnome-system-tools-2.32.0/m4/ltoptions.m4 gnome-system-tools-3.0.0/m4/ltoptions.m4 --- gnome-system-tools-2.32.0/m4/ltoptions.m4 2010-09-27 16:15:46.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/ltoptions.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,368 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT options. ## -## --------------------------------- ## - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) diff -Nru gnome-system-tools-2.32.0/m4/ltsugar.m4 gnome-system-tools-3.0.0/m4/ltsugar.m4 --- gnome-system-tools-2.32.0/m4/ltsugar.m4 2010-09-27 16:15:46.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/ltsugar.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) diff -Nru gnome-system-tools-2.32.0/m4/ltversion.m4 gnome-system-tools-3.0.0/m4/ltversion.m4 --- gnome-system-tools-2.32.0/m4/ltversion.m4 2010-09-27 16:15:46.000000000 +0000 +++ gnome-system-tools-3.0.0/m4/ltversion.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# Generated from ltversion.in. - -# serial 3017 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff -Nru gnome-system-tools-2.32.0/Makefile.in gnome-system-tools-3.0.0/Makefile.in --- gnome-system-tools-2.32.0/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/Makefile.in 2011-04-03 20:04:17.000000000 +0000 @@ -38,14 +38,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/gnome-system-tools.pc.in $(top_srcdir)/configure \ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ - config.sub depcomp install-sh ltmain.sh missing mkinstalldirs + ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \ + config.guess config.rpath config.sub depcomp install-sh \ + ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -144,8 +141,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -167,11 +162,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -190,26 +186,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -232,14 +231,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -248,6 +242,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -271,7 +267,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/NEWS gnome-system-tools-3.0.0/NEWS --- gnome-system-tools-2.32.0/NEWS 2010-09-27 16:07:26.000000000 +0000 +++ gnome-system-tools-3.0.0/NEWS 2011-04-03 20:03:35.000000000 +0000 @@ -1,3 +1,104 @@ +GNOME System Tools Version 3.0.0, 2011-04-03 +----------------------------------------------- + + General + ======= + - Update DOAP file + + Translation + =========== + - cs, courtesy of Marek Černocký + - de, courtesy of Mario Blättermann + - eo, courtesy of Kristjan SCHMIDT + - es, courtesy of Jorge González + - fr, courtesy of Bruno Brouard + - he, courtesy of Yaron Shahrabani + - lv, courtesy of Rūdofls Mazurs + - pl, courtesy of Piotr Drąg + - sl, courtesy of Andrej Žnidaršič + - zh_CN, courtesy of YunQiang Su + + +GNOME System Tools Version 2.91.90, 2011-02-26 +----------------------------------------------- + + General + ======= + - Fix build with final GTK+3 (bug 642912) + - Fix closing GstDialogs and launching the help + - Update README file + + Users + ===== + - Use /org/gnome/system-tools/ for GSettings schema path + + Time + ==== + - Fix libemap.a linking with --add-needed + - Remove useless time zone icon from main dialog + + Translation + =========== + - bg, courtesy of Alexander Shopov + - cs, courtesy of Marek Černocký + - de, courtesy of Mario Blättermann + - es, courtesy of Daniel Mustieles + - et, courtesy of Mattias Põldaru + - fr, courtesy of Claude Paroz + - gl, courtesy of Fran Diéguez + - he, courtesy of Yaron Shahrabani + - nb, courtesy of Torstein Adolf Winterseth + - sl, courtesy of Klemen Košir + - ug, courtesy of Sahran + - zh_HK, courtesy of Wei-Lun Chao + - zh_TW, courtesy of Wei-Lun Chao + + +GNOME System Tools Version 2.91.1, 2010-12-19 +----------------------------------------------- + + General + ======= + - Port to GTK+3, drop support for GTK+2 + - Move from PolkitLockButton to a temporary implementation based on GPermission + - Use upstream gettext instead of GLib's + + Users + ===== + - Fix setting password from random entry + - Fix editing newly created users + - Dramatic performance improvements when loading users and groups + - Hide custom user profile when not selected + - Fix cases where advanced settings cannot be edited + - Don't unref() user face if it's NULL + - Remove users search-bar code + + Time + ==== + - Rework EMap widget to use Cairo and new GTK+ API (Benjamin Otte) + - Various cleanups in EMap widget + - Remove unreachable NTP servers + - Don't suggest Stratum 1 NTP servers + + Network + ======= + - Fix markup in interfaces description + + Translation + =========== + - ca, courtesy of Joan Duran + - ca@valencia, courtesy of Joan Duran + - es, courtesy of Jorge González + - eu, courtesy of Iñaki Larrañaga Murgoitio + - he, courtesy of Yaron Shahrabani + - it, courtesy of Gianvito Cavasoli + - ko, courtesy of Changwoo Ryu + - nb, courtesy of Kjartan Maraas + - sk, courtesy of Pavol Klačanský + - sl, courtesy of Klemen Košir + - ug, courtesy of Sahran + + GNOME System Tools Version 2.32.0, 2010-09-27 ----------------------------------------------- diff -Nru gnome-system-tools-2.32.0/org.gnome.system-tools.gschema.xml.in gnome-system-tools-3.0.0/org.gnome.system-tools.gschema.xml.in --- gnome-system-tools-2.32.0/org.gnome.system-tools.gschema.xml.in 2010-06-07 21:52:08.000000000 +0000 +++ gnome-system-tools-3.0.0/org.gnome.system-tools.gschema.xml.in 2011-02-12 16:38:38.000000000 +0000 @@ -1,5 +1,5 @@ - + false <_summary>Show system users diff -Nru gnome-system-tools-2.32.0/pixmaps/Makefile.in gnome-system-tools-3.0.0/pixmaps/Makefile.in --- gnome-system-tools-2.32.0/pixmaps/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/pixmaps/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -37,11 +37,7 @@ subdir = pixmaps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -89,8 +85,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -112,11 +106,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -135,26 +130,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -177,14 +175,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -193,6 +186,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -216,7 +211,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/po/bg.po gnome-system-tools-3.0.0/po/bg.po --- gnome-system-tools-2.32.0/po/bg.po 2010-09-27 16:04:07.000000000 +0000 +++ gnome-system-tools-3.0.0/po/bg.po 2011-02-12 16:38:38.000000000 +0000 @@ -1,11 +1,11 @@ # Bulgarian translation of gnome-system-tools po-file. # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # Copyright (C) 2010 Damyan Ivanov. # This file is distributed under the same conditions as the gnome-system-tools package. # Peter "Peshka" Slavov , 2004. # Vladimir "Kaladan" Petkov , 2004, 2005. -# Alexander Shopov , 2006, 2007, 2009, 2010. +# Alexander Shopov , 2006, 2007, 2009, 2010, 2011. # Yavor Doganov , 2008. # Damyan Ivanov , 2010. # @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: gnome-system-tools master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-27 07:34+0300\n" -"PO-Revision-Date: 2010-09-27 07:34+0300\n" -"Last-Translator: Damyan Ivanov \n" +"POT-Creation-Date: 2011-01-14 06:55+0200\n" +"PO-Revision-Date: 2011-01-14 06:55+0200\n" +"Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -239,7 +239,7 @@ msgid "_Subnet mask:" msgstr "Ма_ска на мрежата:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "Потребителско _име:" @@ -669,82 +669,76 @@ msgstr "Потребителското име трябва да започва с буква!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"Не можете да промените идентификатора на потребител, който в момента е в " -"системата." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "Добавяне на про_фил" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "_Допълнителни настройки:" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Промяна…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Коментари" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Текуща парола:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Специфичен" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Дни между предупреждението и изтичането на паролата:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Включване на регистрация" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Шифриране на домашната папка за защита на данни" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Генериране" # Дублира се с бутона „_Добре“. -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "До_машна папка:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "До_машен телефон:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "_Главна група:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Управление на групите" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Име:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Парола:" # Дублира се с бутона „_Отказване“. -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "О_бвивка:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "_Служебен телефон:" @@ -770,6 +764,11 @@ "Дали инструментът за настройка на потребителите да показва и администратора " "в списъка с потребители." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Грешка при достъп до системните права: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Дистрибуцията, която използвате, не се поддържа от този инструмент" @@ -837,6 +836,42 @@ "Възникна грешка при проверката за идентификация: %s\n" "Молим, докладвайте тази грешка." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Заключване" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Отключване" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Заключен" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Прозорецът е отключен.\n" +"Натиснете с мишката, за да предотвратите допълнителни промени" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Прозорецът е заключен.\n" +"Натиснете с мишката, за да извършите промени" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Политиката на системата забранява промените.\n" +"Свържете се със системния администратор" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -883,51 +918,51 @@ msgid "Change _Host name" msgstr "Промяна на името на _хоста" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Автоматично настройване (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Локална мрежа за лесна настройка (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Статичен адрес по IP" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Ключ за WEP (в ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Ключ за WEP (шестнадесетичен)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "Ключ за WPA Personal" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "Ключ за WPA2 Personal" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Модем тип ISDN" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Сериен модем" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Настройки на %s" @@ -1611,11 +1646,11 @@ "folders." msgstr "За да споделяте папки, трябва да сте инсталирали поне Samba или NFS." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Карта на света" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1631,11 +1666,11 @@ msgid "Time and Date" msgstr "Дата и час" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "Липсва поддръжка на NTP" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1643,27 +1678,27 @@ "Инсталирайте и задействайте поддръжката на NTP, за да синхронизирате " "часовника на компютъра със сървърите за точно време в Интернет." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Включване на NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Изключване на NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Синхронизиране на системния часовник" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Синхронизиране на часовника през Интернет" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Ръчно" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Настройки на дата и час" @@ -1673,7 +1708,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Това ще направи системата неизползваема." @@ -1750,100 +1785,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Изберете различен числов идентификатор за групата „%s“." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Име на групата" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Без парола при влизане" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Искане на парола при влизане" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Наблюдение на системните дневници" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Администрация на системата" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Ползване на аудио устройства" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Ползване на CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Запис на CD/DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Ползване на модеми" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Свързване към Интернет през модем" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Изпращане и получаване на факсове" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Ползване на флопидискови устройства" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Монтиране на файлови системи извън ядрото (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Настройка на принтери" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Безжични мрежови връзки и Етернет" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Автоматичен достъп до външни устройства за съхранение" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Приспиване и дълбоко приспиване на компютъра" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Достъп до файловата система /proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Ползване на скенери" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Ползване на лентови устройства" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Ползване на устройства за USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Използване на VirtualBox за виртуализация" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Ползване на видео устройства" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Да можете да придобиете права на администратор" @@ -1943,15 +1978,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Проверете дали сте въвели една и съща парола в двете текстови полета." -#: ../src/users/user-password.c:445 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Изберете друга парола." -#: ../src/users/user-password.c:456 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Въведете отново текущата си парола." -#: ../src/users/user-password.c:463 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Паролата не бе сменена" @@ -2012,33 +2047,33 @@ msgid "Delete Files" msgstr "Изтриване на файлове" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Администратор" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Специфичен" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Няма" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Неправилен знак „%c“ в коментара" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Проверете дали този знак се използва." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Пътят за домашна папка не е пълен" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2046,11 +2081,11 @@ "Въведете пълния път до домашната папка\n" "например: /home/ivancho." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Домашната папка вече съществува. Да се използва ли?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2067,30 +2102,30 @@ "Препоръчително е да се запазят съществуващите файлове, за да не се загуби " "информация, а тези от старата папка да се копират по-късно." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Презаписване със старите файлове" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Отказване на промяната" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "Използване на файлове от _новата папка" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Потребителят да е _собственик на новата домашна папка" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "Из_триване на старата домашна папка" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2106,19 +2141,19 @@ "Препоръчително е съществуващите файлове да се запазят и по-късно да се " "изтрият, ако е необходимо." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Изтриване на файловете" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "Използване на _съществуващите файлове" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Да се копира ли старата домашна папка на новото място?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2135,35 +2170,35 @@ "Ако съдържанието се копира, старата домашна папка може спокойно да бъде " "изтрита." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "Да се _създаде ли празна папка" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "Ko_пиране на старите файлове" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "Идентификаторът на администратора не трябва да се променя" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Идентификаторът на потребител %d е зает от %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Изберете различен числов идентификатор за %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Непълен път в обвивката" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2171,11 +2206,11 @@ "Въведете пълния път за обвивката.\n" "например: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Не можете махнете права на администратор" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2185,11 +2220,11 @@ "администратор ще ви лиши от всякаква възможност за администриране на " "системата." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Ще премахнете собствените си права на администратор" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2198,14 +2233,35 @@ "%s няма да може да извършва административни задачи. Потребителят с тази " "регистрация няма да може сам да си върне правата на администратор." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Отказване от администраторски права" -#: ../src/users/user-settings.c:1469 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Не можете да промените идентификатора на администратора." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Не можете да изключите регистрацията си, да промените идентификатора или " +"домашната си папка. За да редактирате тези настройки, изпълнете програмата " +"от сесията на друг потребител." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Не можете да промените идентификатора или домашната папка на потребител, " +"който в момента е в системата." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Прилагане на промените в настройките на потребителя…" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Настройки на потребителите" diff -Nru gnome-system-tools-2.32.0/po/ca.po gnome-system-tools-3.0.0/po/ca.po --- gnome-system-tools-2.32.0/po/ca.po 2010-06-07 21:51:41.000000000 +0000 +++ gnome-system-tools-3.0.0/po/ca.po 2010-10-13 10:06:28.000000000 +0000 @@ -1,5 +1,5 @@ # Traducció del gnome-system-tools de l'equip de Softcatalà. -# Copyright © 2001-2009 Free Software Foundation, Inc. +# Copyright © 2001-2010 Free Software Foundation, Inc. # This file is distributed under the same license as the # gnome-system-tools package. # Softcatalà , 2001, 2002. @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-20 21:47+0100\n" -"PO-Revision-Date: 2010-04-02 18:17+0200\n" +"POT-Creation-Date: 2010-09-29 23:36+0200\n" +"PO-Revision-Date: 2010-09-29 23:37+0200\n" "Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -20,183 +20,170 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../gnome-system-tools.schemas.in.h:1 -msgid "Whether the users-admin tool should show system users in the users list" -msgstr "" -"Si l'eina d'administració d'usuaris hauria de mostrar els usuaris del " -"sistema a la llista d'usuaris" - -#: ../gnome-system-tools.schemas.in.h:2 -msgid "" -"Whether the users-admin tool should show the root user in the users list" -msgstr "" -"Si l'eina d'administració d'usuaris hauria de mostrar l'usuari primari a la " -"llista d'usuaris" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "Nom del punt d'accés:" -#: ../interfaces/network.ui.h:1 +#: ../interfaces/network.ui.h:2 msgid "Account data" msgstr "Dades del compte" -#: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "Paràmetres de la connexió" - #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "Servidors DNS" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "Paràmetres de l'ordinador central" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "Dades del proveïdor de serveis d'Internet" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "Paràmetres del mòdem" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "Dominis de cerca" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "Paràmetres de la xarxa sense fil" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "Nom del punt d'accés:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "Àlies:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "C_onfiguració:" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +msgid "Connection Settings" +msgstr "Paràmetres de la connexió" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "Tipus de connexió:" -#: ../interfaces/network.ui.h:13 +#: ../interfaces/network.ui.h:7 msgid "Connections" msgstr "Connexions" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNS" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +msgid "DNS Servers" +msgstr "Servidors DNS" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "Nom del d_omini:" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "Suprimeix aquesta ubicació" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "Habilita el mode _itinerant" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "Habilita aquesta co_nnexió" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "Interfície ethernet:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32 +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "General" -#: ../interfaces/network.ui.h:21 +#: ../interfaces/network.ui.h:16 msgid "Hexadecimal" msgstr "Hexadecimal" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "Paràmetres dels àlies dels ordinadors" -#: ../interfaces/network.ui.h:23 +#: ../interfaces/network.ui.h:18 +msgid "Host Settings" +msgstr "Paràmetres de l'ordinador central" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" msgstr "Ordinadors centrals" -#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "Adreça IP:" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "Propietats de la interfície" -#: ../interfaces/network.ui.h:26 +#: ../interfaces/network.ui.h:22 +msgid "Internet service provider data" +msgstr "Dades del proveïdor de serveis d'Internet" + +#: ../interfaces/network.ui.h:23 msgid "Location:" msgstr "Ubicació:" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:24 msgid "Loud" msgstr "Sorollós" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:25 msgid "Low" msgstr "Fluix" -#: ../interfaces/network.ui.h:29 +#: ../interfaces/network.ui.h:26 msgid "Medium" msgstr "Mitjà" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "Mòdem" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:28 +msgid "Modem Settings" +msgstr "Paràmetres del mòdem" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "C_ontrasenya de xarxa:" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "Nom de la xarxa (_ESSID):" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:31 msgid "Off" msgstr "Apagat" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "Opcions" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "Contr_asenya" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "Tipus de _contrasenya:" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:35 msgid "Plain (ASCII)" msgstr "Text (ASCII)" -#: ../interfaces/network.ui.h:38 +#: ../interfaces/network.ui.h:36 msgid "Pulses" msgstr "Polsos" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" msgstr "Desa la configuració de xarxa actual com a una ubicació" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:38 +msgid "Search Domains" +msgstr "Dominis de cerca" + +#: ../interfaces/network.ui.h:39 msgid "Tones" msgstr "Tons" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "Utilitza els servidors de domini del servidor de serveis d'Internet" +#: ../interfaces/network.ui.h:41 +msgid "Wireless Settings" +msgstr "Paràmetres de la xarxa sense fil" + #: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "_Autodetecta" @@ -249,7 +236,7 @@ msgid "_Subnet mask:" msgstr "Màscara de _subxarxa:" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 msgid "_Username:" msgstr "N_om d'usuari:" @@ -267,101 +254,99 @@ msgstr "Seleccioneu els serveis que vulgueu activar:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "Ordinadors permesos" +msgid "Add allowed hosts" +msgstr "Afegiu ordinadors permesos" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "Paràmetres dels ordinadors centrals" +msgid "Allowed Hosts" +msgstr "Ordinadors permesos" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "Propietats dels recursos compartits" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "Carpeta compartida" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "Compartició amb Windows" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"Introduïu la contrasenya per a " -"l'usuari:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "Afegiu ordinadors permesos" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "Ordinadors permesos:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "Comentari:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "Domini / _Grup de treball:" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "Introduïu la contrasenya per a l'usuari" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +msgid "Enter password for user:" +msgstr "Introduïu la contrasenya per a l'usuari:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "Propietats generals" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "Nom de l'ordinador:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +msgid "Hosts Settings" +msgstr "Paràmetres dels ordinadors centrals" + +#: ../interfaces/shares.ui.h:12 msgid "Name:" msgstr "Nom:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "Màscara de xarxa:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "Xarxa:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "Només lectura" -#: ../interfaces/shares.ui.h:19 +#: ../interfaces/shares.ui.h:16 msgid "Share" msgstr "Compartit" +#: ../interfaces/shares.ui.h:17 +msgid "Share Properties" +msgstr "Propietats dels recursos compartits" + # FIXME -#: ../interfaces/shares.ui.h:20 +#: ../interfaces/shares.ui.h:18 msgid "Share through:" msgstr "Comparteix per:" -#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2 +#: ../interfaces/shares.ui.h:19 +msgid "Shared Folder" +msgstr "Carpeta compartida" + +#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "Carpetes compartides" -#: ../interfaces/shares.ui.h:22 +#: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" msgstr "Aquest ordinador és un servidor _WINS" -#: ../interfaces/shares.ui.h:23 +#: ../interfaces/shares.ui.h:22 msgid "Users" msgstr "Usuaris" -#: ../interfaces/shares.ui.h:24 +#: ../interfaces/shares.ui.h:23 msgid "WINS _server:" msgstr "_Servidor WINS:" +#: ../interfaces/shares.ui.h:24 +msgid "Windows sharing" +msgstr "Compartició amb Windows" + #: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "_Camí:" @@ -371,29 +356,29 @@ msgstr "Només _lectura" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "Selecció" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "Fus horari" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "Afegeix un servidor NTP" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "Servidor NTP" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "Se_lecciona els servidors" -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +msgid "Selection" +msgstr "Selecció" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "Sincronitza ara" +#: ../interfaces/time.ui.h:6 +msgid "Time Zone" +msgstr "Fus horari" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "Servidors d'hora" @@ -402,6 +387,10 @@ msgid "Time servers:" msgstr "Servidors de temps:" +#: ../interfaces/time.ui.h:9 +msgid "Time zone" +msgstr "Fus horari" + #: ../interfaces/time.ui.h:10 msgid "Time zone:" msgstr "Fus horari:" @@ -423,120 +412,105 @@ msgstr "_Hora:" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "Paràmetres avançats" +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "" +"Ja existeix un usuari amb aquest nom. Trieu un altre nom per a l'usuari nou." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "UID/GID automàtic" +msgid "Account _type:" +msgstr "_Tipus de compte:" #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "Paràmetres bàsics" +msgid "Advanced" +msgstr "Avançat" #: ../interfaces/users.ui.h:4 -msgid "Group Members" -msgstr "Membres del grup" +msgid "Advanced Settings" +msgstr "Paràmetres avançats" #: ../interfaces/users.ui.h:5 -msgid "Optional Settings" -msgstr "Paràmetres opcionals" +msgid "Assign a random password by default" +msgstr "Assigna una contrasenya aleatòria per defecte" #: ../interfaces/users.ui.h:6 -msgid "Password Settings" -msgstr "Paràmetres de la contrasenya" +msgid "Automatic UID/GID" +msgstr "UID/GID automàtic" +#: ../interfaces/users.ui.h:7 +msgid "Basic Settings" +msgstr "Paràmetres bàsics" #: ../interfaces/users.ui.h:8 -msgid "System Defaults" -msgstr "Valors per defecte del sistema" - -#: ../interfaces/users.ui.h:9 -msgid "Account _type:" -msgstr "_Tipus de compte:" - -#: ../interfaces/users.ui.h:10 -msgid "Advanced" -msgstr "Avançat" - -#: ../interfaces/users.ui.h:11 -msgid "" -"A user with this name already exists. Please choose a different short " -"name for the new user." -msgstr "" -"Ja existeix un usuari amb aquest nom. Trieu un altre nom curt per a l'usuari " -"nou." - -#: ../interfaces/users.ui.h:12 -msgid "Assign a random password by default" -msgstr "Assigna una contrasenya aleatòria per defecte" - -#: ../interfaces/users.ui.h:13 msgid "Change Advanced User Settings" msgstr "Canvia els paràmetres avançats de l'usuari" -#: ../interfaces/users.ui.h:14 +#: ../interfaces/users.ui.h:9 msgid "Change User Account Type" msgstr "Canvia el tipus de compte d'usuari" -#: ../interfaces/users.ui.h:15 -msgid "Change User Name and Login" -msgstr "Canvia el nom d'usuari i d'entrada" +#: ../interfaces/users.ui.h:10 +msgid "Change User Name" +msgstr "Canvia el nom d'usuari" -#: ../interfaces/users.ui.h:16 +#: ../interfaces/users.ui.h:11 msgid "Change User Password" msgstr "Canvia la contrasenya d'usuari" -#: ../interfaces/users.ui.h:17 +#: ../interfaces/users.ui.h:12 msgid "Changing advanced settings for:" msgstr "S'estan canviant els paràmetres avançats per a:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:13 msgid "Changing user account type for:" msgstr "S'està canviant el tipus de compte d'usuari per a:" -#: ../interfaces/users.ui.h:19 +#: ../interfaces/users.ui.h:14 msgid "Changing user name for:" msgstr "S'està canviant el nom d'usuari per a:" -#: ../interfaces/users.ui.h:20 +#: ../interfaces/users.ui.h:15 msgid "Changing user password for:" msgstr "S'està canviant la contrasenya d'usuari per a:" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "Con_firmació:" +#: ../interfaces/users.ui.h:17 +msgid "Contact Information" +msgstr "Informació del contacte" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:18 msgid "Create New User" msgstr "Crea un usuari nou" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:19 msgid "Create a new user" msgstr "Crea un usuari nou" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" msgstr "Interval de dies entre l'avís i el venciment de la contrasenya:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" msgstr "_Grup per defecte:" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" msgstr "_Intèrpret d'ordres per defecte:" -#: ../interfaces/users.ui.h:28 +#: ../interfaces/users.ui.h:23 msgid "Disable _account" msgstr "Inhabilita el _compte" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:24 msgid "Don't ask for password on _login" msgstr "No demanis la contrasenya en _entrar" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:25 msgid "" "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " @@ -545,78 +519,98 @@ "Encripta tots els fitxers amb la contrasenya d'entrada per protegir-los de " "gent amb accés físic a l'ordinador, tot i que el sistema anirà més lent." -#: ../interfaces/users.ui.h:31 +#: ../interfaces/users.ui.h:26 msgid "Full _Name:" msgstr "_Nom complet:" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "Gene_ra una contrasenya aleatòria" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:29 +msgid "Group Members" +msgstr "Membres del grup" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" msgstr "_Identificador de grup:" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "_Nom del grup:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "Propietats del grup" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "Grups disponibles en el sistema:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Paràmetres dels grups" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Mà_xim de dies que es pot utilitzar una contrasenya:" -#: ../interfaces/users.ui.h:39 +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "GID màxim:" -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "UID màxim:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "Mí_nim de dies entre els canvis de contrasenya:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "GID mínim:" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "UID mínim:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Mínim de dies permesos entre els canvis de contrasenya:" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "C_ontrasenya nova:" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Nombre de dies que es pot utilitzar una contrasenya:" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "Ubicació de l'o_ficina:" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:45 +msgid "Optional Settings" +msgstr "Paràmetres opcionals" + +#: ../interfaces/users.ui.h:46 +msgid "Password Settings" +msgstr "Paràmetres de la contrasenya" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Contrasenya assignada a: " -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Privilegis" +#: ../interfaces/users.ui.h:49 +msgid "Profile Settings" +msgstr "Paràmetres del perfil" + #: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "_Nom del perfil:" @@ -625,28 +619,15 @@ msgid "Set password b_y hand" msgstr "Estableix la contrasen_ya manualment" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! -#: ../interfaces/users.ui.h:53 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"El nom curt ha de consistir en:\n" -" ➣ lletres en minúscules de l'abecedari\n" -" ➣ dígits\n" -" ➣ qualsevol dels caràcters «.», «-» i «_»" - -#: ../interfaces/users.ui.h:57 -msgid "Short name must start with a letter!" -msgstr "El nom curt ha de començar amb una lletra." +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "Valors per defecte del sistema" -#: ../interfaces/users.ui.h:58 +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "Aquest compte està inhabilitat." -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." @@ -654,99 +635,134 @@ "Aquest compte està utilitzant paràmetres especials que s'han definit " "manualment. Utilitzeu el diàleg Paràmetres avançats per ajustar-los." -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "Identificador d'usuari:" -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Privilegis d'usuari" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "Perfils d'usuari" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"El nom d'usuari ha de consistir en:\n" +" ➣ lletres en minúscules de l'abecedari\n" +" ➣ dígits\n" +" ➣ qualsevol dels caràcters «.», «-» i «_»" + #: ../interfaces/users.ui.h:63 +msgid "Username must start with a letter!" +msgstr "El nom d'usuari ha de començar amb una lletra." + +#: ../interfaces/users.ui.h:64 msgid "You can't change user ID while the user is logged in." msgstr "" "No podeu canviar l'identificador d'usuari mentre l'usuari està connectat." -#: ../interfaces/users.ui.h:64 +#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Afegeix un perfil" -#: ../interfaces/users.ui.h:65 +#: ../interfaces/users.ui.h:66 msgid "_Advanced Settings" msgstr "Paràmetres _avançats" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:67 msgid "_Change..." msgstr "_Canvia..." -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:68 msgid "_Comments" msgstr "_Comentaris" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:69 msgid "_Current password:" msgstr "_Contrasenya actual:" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:70 msgid "_Custom" msgstr "_Personalitzat" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:71 msgid "_Days between warning and password expiration:" msgstr "Interval de _dies entre l'avís i el venciment de la contrasenya:" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:72 msgid "_Enable Account" msgstr "_Habilita el compte" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:73 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Encripta la carpeta de l'usuari per protegir les dades sensibles" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:74 msgid "_Generate" msgstr "_Genera" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:75 msgid "_Home directory:" msgstr "Directori de l'_usuari:" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:76 msgid "_Home phone:" msgstr "Telèfon _particular:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:77 msgid "_Main group:" msgstr "G_rup principal:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:78 msgid "_Manage Groups" msgstr "_Gestiona els grups" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:79 msgid "_Name:" msgstr "_Nom:" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:80 msgid "_Password:" msgstr "_Contrasenya:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:81 msgid "_Shell:" msgstr "Intèrpret d'ordre_s:" -#: ../interfaces/users.ui.h:81 -msgid "_Short Name:" -msgstr "Nom _curt:" - -#: ../interfaces/users.ui.h:82 +#: ../interfaces/users.ui.h:83 msgid "_Work phone:" msgstr "Telè_fon de la feina:" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "Mostra l'usuari primari" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "Mostra els usuaris del sistema" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "" +"Si l'eina d'administració d'usuaris hauria de mostrar els usuaris del " +"sistema a la llista d'usuaris." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "" +"Si l'eina d'administració d'usuaris hauria de mostrar l'usuari primari a la " +"llista d'usuaris." + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Aquesta eina no funciona en la plataforma on l'esteu executant" @@ -767,47 +783,47 @@ msgid "Unsupported platform" msgstr "La plataforma no està implementada" -#: ../src/common/gst-tool.c:190 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "No s'ha pogut carregar la configuració" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:192 +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "No s'ha pogut desar la configuració" -#: ../src/common/gst-tool.c:196 +#: ../src/common/gst-tool.c:194 msgid "You are not allowed to access the system configuration." msgstr "No se us permet accedir a la configuració del sistema." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 msgid "You are not allowed to modify the system configuration." msgstr "No se us permet modificar la configuració del sistema." -#: ../src/common/gst-tool.c:201 +#: ../src/common/gst-tool.c:199 msgid "Invalid data was found." msgstr "S'han trobat dades no vàlides." #. OOBS_RESULT_ERROR -#: ../src/common/gst-tool.c:203 +#: ../src/common/gst-tool.c:201 msgid "An unknown error occurred." msgstr "S'ha produït un error desconegut." -#: ../src/common/gst-tool.c:427 +#: ../src/common/gst-tool.c:422 msgid "Could not display help" msgstr "No s'ha pogut mostrar l'ajuda" -#: ../src/common/gst-tool.c:621 +#: ../src/common/gst-tool.c:616 msgid "The system configuration has potentially changed." msgstr "La configuració del sistema ha canviat dràsticament." -#: ../src/common/gst-tool.c:623 +#: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." msgstr "" "Actualitzar els continguts? Us farà perdre qualsevol modificació no desada." -#: ../src/common/gst-tool.c:692 +#: ../src/common/gst-tool.c:687 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -826,7 +842,7 @@ msgid "_Delete" msgstr "_Suprimeix" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "Tipus d'adreça" @@ -934,62 +950,49 @@ #: ../src/network/ifaces-list.c:289 #, c-format -msgid "Essid: %s " -msgstr "ESSID: %s " - -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "Adreça: %s Màscara de subxarxa: %s" - -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "Adreça: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "Adreça: %s Adreça remota: %s" - -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "Tipus: %s Número de telèfon: %s" - -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "Tipus: %s Nom del punt d'accés: %s" - -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "Tipus: %s Interfície ethernet: %s" +msgid "Essid: %s " +msgstr "ESSID: %s " -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "Tipus: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +msgid "Address:" +msgstr "Adreça:" + +#: ../src/network/ifaces-list.c:298 +msgid "Subnet mask:" +msgstr "Màscara de subxarxa:" + +#: ../src/network/ifaces-list.c:308 +msgid "Remote address:" +msgstr "Adreça remota:" + +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "Tipus:" + +#: ../src/network/ifaces-list.c:321 +msgid "Phone number:" +msgstr "Número de telèfon:" -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "Connexió per xarxa sense fil" # FIXME -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "Connexió per infraroig" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" msgstr "Connexió per xarxa amb fil" -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" msgstr "Connexió per port paral·lel" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" msgstr "Connexió punt a punt" @@ -1064,12 +1067,12 @@ msgid "Settings for service \"%s\"" msgstr "Paràmetres del servei «%s»" -#: ../src/services/callbacks.c:125 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "Segur que voleu desactivar %s?" -#: ../src/services/callbacks.c:129 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1549,11 +1552,11 @@ msgid "PATH" msgstr "CAMÍ" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "_Comparteix una carpeta..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "Comparteix aquesta carpeta amb d'altres ordinadors" @@ -1614,6 +1617,19 @@ "Cal que instal·leu la darrera versió del Samba o bé d'NFS per poder " "compartir les vostres carpetes." +#: ../src/time/e-map/e-map.c:620 +msgid "World Map" +msgstr "Mapa mundial" + +#: ../src/time/e-map/e-map.c:622 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" +"Un giny de mapa interactiu basat en el ratolí per seleccionar el fus horari. " +"Els usuaris de teclat hauran de seleccionar el fus horari amb el quadre de " +"combinació desplegable de sota." + #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" msgstr "Canvieu l'hora, la data, i el fus horari del sistema" @@ -1622,11 +1638,11 @@ msgid "Time and Date" msgstr "Hora i data" -#: ../src/time/time-tool.c:402 +#: ../src/time/time-tool.c:398 msgid "NTP support is not installed" msgstr "L'NTP no està instal·lat" -#: ../src/time/time-tool.c:404 +#: ../src/time/time-tool.c:400 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1634,27 +1650,27 @@ "Instal·leu i activeu l'NTP per habilitar la sincronització del servidor " "local de temps amb servidors de temps d'Internet." -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Enabling NTP" msgstr "S'està habilitant l'NTP" -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Disabling NTP" msgstr "S'està inhabilitant l'NTP" -#: ../src/time/time-tool.c:445 +#: ../src/time/time-tool.c:441 msgid "Synchronizing system clock" msgstr "S'està sincronitzant el rellotge del sistema" -#: ../src/time/time-tool.c:525 +#: ../src/time/time-tool.c:521 msgid "Keep synchronized with Internet servers" msgstr "Mantén-lo sincronitzat amb els servidors d'Internet" -#: ../src/time/time-tool.c:526 +#: ../src/time/time-tool.c:522 msgid "Manual" msgstr "Manual" -#: ../src/time/time-tool.c:672 +#: ../src/time/time-tool.c:665 msgid "Time and Date Settings" msgstr "Paràmetres de l'hora i la data" @@ -1664,7 +1680,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/user-settings.c:605 msgid "This would leave the system unusable." msgstr "Això deixaria el sistema en un estat inservible." @@ -1744,6 +1760,15 @@ msgid "Group name" msgstr "Nom del grup" +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +msgid "Not asked on login" +msgstr "No la demanis per entrar" + +#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +msgid "Asked on login" +msgstr "Demana-la per entrar" + #: ../src/users/privileges-table.c:53 msgid "Monitor system logs" msgstr "Supervisió dels registres del sistema" @@ -1855,37 +1880,42 @@ msgid "Authentication failed" msgstr "Ha fallat l'autenticació" -#: ../src/users/run-passwd.c:494 +#: ../src/users/run-passwd.c:498 #, c-format msgid "The new password is too short" msgstr "La contrasenya nova és massa curta" -#: ../src/users/run-passwd.c:499 +#: ../src/users/run-passwd.c:504 #, c-format msgid "The new password is too simple" msgstr "La contrasenya nova és massa senzilla" -#: ../src/users/run-passwd.c:503 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "La contrasenya antiga i la nova són massa semblants" -#: ../src/users/run-passwd.c:506 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" msgstr "La contrasenya nova ha de contenir caràcters numèrics o especials" -#: ../src/users/run-passwd.c:510 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "La contrasenya antiga i la nova són la mateixa" -#: ../src/users/run-passwd.c:514 +#: ../src/users/run-passwd.c:520 +#, c-format +msgid "The new password has already been used recently." +msgstr "La contrasenya nova ja s'ha utilitzat recentment." + +#: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "S'ha modificat la vostra contrasenya des que us heu autenticat." -#: ../src/users/run-passwd.c:518 +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "Error desconegut" @@ -1904,10 +1934,10 @@ #: ../src/users/user-password.c:98 msgid "" -"User passwords must be longer than 6 characters and preferably formed by " +"User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." msgstr "" -"La contrasenya de l'usuari ha de ser de més de 6 caràcters, i és preferible " +"La contrasenya de l'usuari ha de ser de més de 5 caràcters, i és preferible " "que contingui nombres, lletres, i caràcters especials." #: ../src/users/user-password.c:101 @@ -1918,15 +1948,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Comproveu que heu introduït la mateixa contrasenya en els dos camps." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:445 msgid "Please choose another password." msgstr "Seleccioneu una altra contrasenya." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:456 msgid "Please type again your current password." msgstr "Introduïu un altre cop la contrasenya actual." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:463 msgid "Password could not be changed" msgstr "No s'ha pogut canviar la contrasenya" @@ -1999,15 +2029,6 @@ msgid "None" msgstr "Cap" -#. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/user-settings.c:347 -msgid "Not asked on login" -msgstr "No la demanis per entrar" - -#: ../src/users/user-settings.c:349 -msgid "Asked on login" -msgstr "Demana-la per entrar" - #: ../src/users/user-settings.c:393 #, c-format msgid "Invalid character \"%c\" in comment" @@ -2017,68 +2038,147 @@ msgid "Check that this character is not used." msgstr "Comproveu que no es faci servir aquest caràcter." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:426 msgid "Incomplete path in home directory" msgstr "El camí del directori de l'usuari no està complet" -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:427 msgid "" "Please enter full path for home directory\n" -"i.e.: /home/john." +"i.e.: /home/john." msgstr "" "Introduïu el camí sencer del directori de l'usuari\n" -"per exemple: /home/josep." +"per exemple: /home/josep." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "Ja existeix el directori de l'usuari" +#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +msgid "New home directory already exists, use it?" +msgstr "El directori de l'usuari nou ja existeix, voleu utilitzar-lo?" + +#: ../src/users/user-settings.c:449 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of %" +"s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" +"El directori de l'usuari de %s s'ha establert a %s, que ja " +"existeix. Voleu utilitzar els fitxers d'aquest directori o voleu copiar el " +"contingut de %s al nou directori, sobreescrivint-los?\n" +"\n" +"En cas de dubte, utilitzeu el directori nou per evitar la pèrdua de dades i " +"més endavant copieu els fitxers del directori antic." + +#: ../src/users/user-settings.c:461 +msgid "_Replace With Old Files" +msgstr "_Reemplaça amb els fitxers antics" + +#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 +#: ../src/users/user-settings.c:540 +msgid "_Cancel Change" +msgstr "_Cancel·la el canvi" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:465 +msgid "_Use New Files" +msgstr "_Utilitza els fitxers nous" + +#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +msgid "Make user the _owner of the new home directory" +msgstr "_Fes que l'usuari sigui el propietari del directori de l'usuari nou." + +#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +msgid "_Delete old home directory" +msgstr "_Suprimeix el directori antic" + +#: ../src/users/user-settings.c:493 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" +"El directori de l'usuari de %s s'ha establert a %s, que ja " +"existeix. Voleu utilitzar els fitxers d'aquest directori o voleu suprimir " +"tot el seu contingut i utilitzar un directori de l'usuari totalment buit?\n" +"\n" +"En cas de dubte, mantingueu els fitxers i suprimiu-los després si cal." + +#: ../src/users/user-settings.c:503 +msgid "_Delete Files" +msgstr "_Suprimeix els fitxers" + +#: ../src/users/user-settings.c:505 +msgid "_Use Existing Files" +msgstr "_Utilitza els fitxers existents" + +#: ../src/users/user-settings.c:526 +msgid "Copy old home directory to new location?" +msgstr "Voleu copiar el directori de l'usuari antic a la ubicació nova?" + +#: ../src/users/user-settings.c:528 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" +"El directori de l'usuari de %s s'ha establert a %s, que no " +"existeix. Voleu copiar el contingut del directori de l'usuari antic (%s) o voleu utilitzar un directori de l'usuari totalment buit?\n" +"\n" +"Si trieu de copiar els fitxers a la ubicació nova, llavors és segur suprimir " +"el directori antic." + +#: ../src/users/user-settings.c:539 +msgid "_Use Empty Directory" +msgstr "_Utilitza un directori buit" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:542 +msgid "Co_py Old Files" +msgstr "Cop_ia els fitxers antics" -#: ../src/users/user-settings.c:434 -#, c-format -msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" -msgstr "" -"Ja existeix el directori %s. Pot ser que l'usuari no tingui els " -"permisos necessaris per llegir o escriure en aquest directori. El voleu " -"utilitzar igualment?" - -#: ../src/users/user-settings.c:440 -msgid "Use this directory" -msgstr "Utilitza'l" - -#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:604 msgid "ID for the root user should not be modified" msgstr "L'identificador de l'usuari primari no s'hauria de modificar" #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:608 #, c-format msgid "User ID %d is already used by user %s" msgstr "L'identificador d'usuari %d ja l'està utilitzant l'usuari %s" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:610 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Seleccioneu un identificador numèric diferent per a %s." -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:628 msgid "Incomplete path in shell" msgstr "El camí de l'intèrpret d'ordres no està complet" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:629 msgid "" "Please enter full path for shell\n" -"i.e.: /bin/bash." +"i.e.: /bin/bash." msgstr "" "Introduïu el camí complet a l'intèrpret d'ordres\n" -"p.ex.: /bin/bash." +"p.ex.: /bin/bash." -#: ../src/users/user-settings.c:534 +#: ../src/users/user-settings.c:663 msgid "Can't revoke administration rights" msgstr "No es poden revocar els drets d'administració" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:666 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2087,11 +2187,11 @@ "%s és l'únic administrador d'aquest ordinador. Revocar els drets " "d'administració d'aquest compte deixaria sense administració el sistema." -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:683 msgid "You are about to revoke your own administration rights" msgstr "Esteu a punt de revocar els vostres drets d'administració" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:686 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2100,14 +2200,48 @@ "%s no podrà realitzar més tasques administratives. Aquest compte no podrà " "tornar a obtenir els drets d'administració pel seu compte." -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:691 msgid "Give up administration rights" msgstr "Renuncia als drets d'administració" -#: ../src/users/users-tool.c:284 +#: ../src/users/user-settings.c:1469 +msgid "Applying changes to user settings..." +msgstr "S'estan aplicant els canvis als paràmetres de l'usuari..." + +#: ../src/users/users-tool.c:288 msgid "Users Settings" msgstr "Paràmetres dels usuaris" +#~ msgid "_Short Name:" +#~ msgstr "Nom _curt:" + +#~ msgid "Address: %s Subnet mask: %s" +#~ msgstr "Adreça: %s Màscara de subxarxa: %s" + +#~ msgid "Address: %s Remote address: %s" +#~ msgstr "Adreça: %s Adreça remota: %s" + +#~ msgid "Type: %s Phone number: %s" +#~ msgstr "Tipus: %s Número de telèfon: %s" + +#~ msgid "Type: %s Access point name: %s" +#~ msgstr "Tipus: %s Nom del punt d'accés: %s" + +#~ msgid "Type: %s Ethernet interface: %s" +#~ msgstr "Tipus: %s Interfície ethernet: %s" + +#~ msgid "Type: %s" +#~ msgstr "Tipus: %s" + +#~ msgid "" +#~ "The directory %s already exists. User may not have the " +#~ "permissions required to read or write in that directory. Do you want to " +#~ "use it anyway?" +#~ msgstr "" +#~ "Ja existeix el directori %s. Pot ser que l'usuari no tingui els " +#~ "permisos necessaris per llegir o escriure en aquest directori. El voleu " +#~ "utilitzar igualment?" + #~ msgid "" #~ "Allow this user to open a local session without entering his password. " #~ "The password will still be required to perform administrative tasks." @@ -2376,13 +2510,11 @@ #~ msgstr "Seguretat" #~ msgid "" -#~ "Several bootloaders have been " -#~ "found\n" +#~ "Several bootloaders have been found\n" #~ "\n" #~ "please select which do you want to configure" #~ msgstr "" -#~ "S'han trobat diversos carregadors " -#~ "de l'arrencada\n" +#~ "S'han trobat diversos carregadors de l'arrencada\n" #~ "\n" #~ "seleccioneu el que vulgueu configurar" @@ -2713,15 +2845,15 @@ #~ msgid "" #~ "This is still a work in progress, and so it may have serious bugs. Due to " #~ "the nature of these tools, bugs may render your computer practically useless, costing time, effort and sanity " -#~ "points. You have been warned. Thank you for trying out this prerelease of " -#~ "the GNOME System Tools!" +#~ "\"bold\">practically useless, costing time, effort and sanity points. You " +#~ "have been warned. Thank you for trying out this prerelease of the GNOME " +#~ "System Tools!" #~ msgstr "" #~ "Atès que el desenvolupament d'aquestes eines encara continua, es poden " #~ "produir errors greus que poden fer que aquest ordinador quedi pràcticament inutilitzable, i us pot costar temps, " -#~ "esforç i salut. Ja esteu avisat. Gràcies per provar aquesta versió " -#~ "preliminar de les eines de sistema del GNOME (GNOME System Tools)." +#~ "weigth=\"bold\">pràcticament inutilitzable, i us pot costar temps, esforç " +#~ "i salut. Ja esteu avisat. Gràcies per provar aquesta versió preliminar de " +#~ "les eines de sistema del GNOME (GNOME System Tools)." #~ msgid "Warning" #~ msgstr "Avís" @@ -2882,9 +3014,6 @@ #~ msgid "Home directory should not be empty" #~ msgstr "El directori de l'usuari no es pot deixar buit" -#~ msgid "Make sure you provide a home directory." -#~ msgstr "Assegureu-vos d'introduir el directori de l'usuari." - #~ msgid "Invalid user ID" #~ msgstr "L'identificador d'usuari no és vàlid" @@ -2937,9 +3066,6 @@ #~ msgid "This device is _configured" #~ msgstr "Aquest dispositiu està _configurat" -#~ msgid "Service Settings" -#~ msgstr "Paràmetres del servei" - #~ msgid "Description:" #~ msgstr "Descripció:" @@ -2984,8 +3110,7 @@ #~ "Use this tool to specify which operating systems users can choose at " #~ "startup" #~ msgstr "" -#~ "Paràmetres del carregador de " -#~ "l'arrencada\n" +#~ "Paràmetres del carregador de l'arrencada\n" #~ "Utilitzeu aquesta eina per especificar quins sistemes operatius podran " #~ "seleccionar els usuaris durant la inicialització" @@ -3179,9 +3304,6 @@ #~ msgid "_Primary:" #~ msgstr "_Primari:" -#~ msgid "_Remote IP address:" -#~ msgstr "Adreça IP _remota:" - #~ msgid "_Save Current" #~ msgstr "De_sa l'actual" @@ -3226,8 +3348,7 @@ #~ "Time and date settings\n" #~ "Use this tool for setting your current date, time and time zone" #~ msgstr "" -#~ "Paràmetres de l'hora i la data\n" +#~ "Paràmetres de l'hora i la data\n" #~ "Utilitzeu aquesta eina per configurar la data actual, l'hora, i el fus " #~ "horari" @@ -3715,9 +3836,6 @@ #~ msgid "Speed:" #~ msgstr "Velocitat:" -#~ msgid "Type:" -#~ msgstr "Tipus:" - #~ msgid "Type: " #~ msgstr "Tipus: " diff -Nru gnome-system-tools-2.32.0/po/ca@valencia.po gnome-system-tools-3.0.0/po/ca@valencia.po --- gnome-system-tools-2.32.0/po/ca@valencia.po 2010-06-07 21:51:41.000000000 +0000 +++ gnome-system-tools-3.0.0/po/ca@valencia.po 2010-12-12 12:16:01.000000000 +0000 @@ -1,5 +1,5 @@ # Traducció del gnome-system-tools de l'equip de Softcatalà. -# Copyright © 2001-2009 Free Software Foundation, Inc. +# Copyright © 2001-2010 Free Software Foundation, Inc. # This file is distributed under the same license as the # gnome-system-tools package. # Softcatalà , 2001, 2002. @@ -11,192 +11,180 @@ msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-21 23:19+0200\n" -"PO-Revision-Date: 2010-04-02 18:17+0200\n" +"POT-Creation-Date: 2010-10-29 01:23+0100\n" +"PO-Revision-Date: 2010-09-29 23:37+0200\n" "Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../gnome-system-tools.schemas.in.h:1 -msgid "Whether the users-admin tool should show system users in the users list" -msgstr "" -"Si l'eina d'administració d'usuaris hauria de mostrar els usuaris del " -"sistema a la llista d'usuaris" - -#: ../gnome-system-tools.schemas.in.h:2 -msgid "" -"Whether the users-admin tool should show the root user in the users list" -msgstr "" -"Si l'eina d'administració d'usuaris hauria de mostrar l'usuari primari a la " -"llista d'usuaris" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "Nom del punt d'accés:" -#: ../interfaces/network.ui.h:1 +#: ../interfaces/network.ui.h:2 msgid "Account data" msgstr "Dades del compte" -#: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "Paràmetres de la connexió" - #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "Servidors DNS" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "Paràmetres de l'ordinador central" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "Dades del proveïdor de serveis d'Internet" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "Paràmetres del mòdem" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "Dominis de cerca" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "Paràmetres de la xarxa sense fil" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "Nom del punt d'accés:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "Àlies:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "C_onfiguració:" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +msgid "Connection Settings" +msgstr "Paràmetres de la connexió" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "Tipus de connexió:" -#: ../interfaces/network.ui.h:13 +#: ../interfaces/network.ui.h:7 msgid "Connections" msgstr "Connexions" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNS" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +msgid "DNS Servers" +msgstr "Servidors DNS" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "Nom del d_omini:" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "Suprimeix esta ubicació" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "Habilita el mode _itinerant" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "Habilita esta co_nnexió" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "Interfície ethernet:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32 +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "General" -#: ../interfaces/network.ui.h:21 +#: ../interfaces/network.ui.h:16 msgid "Hexadecimal" msgstr "Hexadecimal" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "Paràmetres dels àlies dels ordinadors" -#: ../interfaces/network.ui.h:23 +#: ../interfaces/network.ui.h:18 +msgid "Host Settings" +msgstr "Paràmetres de l'ordinador central" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" msgstr "Ordinadors centrals" -#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "Adreça IP:" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "Propietats de la interfície" -#: ../interfaces/network.ui.h:26 +#: ../interfaces/network.ui.h:22 +msgid "Internet service provider data" +msgstr "Dades del proveïdor de serveis d'Internet" + +#: ../interfaces/network.ui.h:23 msgid "Location:" msgstr "Ubicació:" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:24 msgid "Loud" msgstr "Sorollós" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:25 msgid "Low" msgstr "Fluix" -#: ../interfaces/network.ui.h:29 +#: ../interfaces/network.ui.h:26 msgid "Medium" msgstr "Mitjà" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "Mòdem" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:28 +msgid "Modem Settings" +msgstr "Paràmetres del mòdem" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "C_ontrasenya de xarxa:" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "Nom de la xarxa (_ESSID):" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:31 msgid "Off" msgstr "Apagat" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "Opcions" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "Contr_asenya" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "Tipus de _contrasenya:" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:35 msgid "Plain (ASCII)" msgstr "Text (ASCII)" -#: ../interfaces/network.ui.h:38 +#: ../interfaces/network.ui.h:36 msgid "Pulses" msgstr "Polsos" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" msgstr "Alça la configuració de xarxa actual com a una ubicació" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:38 +msgid "Search Domains" +msgstr "Dominis de cerca" + +#: ../interfaces/network.ui.h:39 msgid "Tones" msgstr "Tons" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "Utilitza els servidors de domini del servidor de serveis d'Internet" +#: ../interfaces/network.ui.h:41 +msgid "Wireless Settings" +msgstr "Paràmetres de la xarxa sense fil" + #: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "_Autodetecta" @@ -249,7 +237,7 @@ msgid "_Subnet mask:" msgstr "Màscara de _subxarxa:" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 msgid "_Username:" msgstr "N_om d'usuari:" @@ -267,101 +255,99 @@ msgstr "Seleccioneu els serveis que vulgueu activar:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "Ordinadors permesos" +msgid "Add allowed hosts" +msgstr "Afegiu ordinadors permesos" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "Paràmetres dels ordinadors centrals" +msgid "Allowed Hosts" +msgstr "Ordinadors permesos" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "Propietats dels recursos compartits" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "Carpeta compartida" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "Compartició amb Windows" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"Introduïu la contrasenya per a " -"l'usuari:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "Afegiu ordinadors permesos" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "Ordinadors permesos:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "Comentari:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "Domini / _Grup de treball:" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "Introduïu la contrasenya per a l'usuari" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +msgid "Enter password for user:" +msgstr "Introduïu la contrasenya per a l'usuari:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "Propietats generals" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "Nom de l'ordinador:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +msgid "Hosts Settings" +msgstr "Paràmetres dels ordinadors centrals" + +#: ../interfaces/shares.ui.h:12 msgid "Name:" msgstr "Nom:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "Màscara de xarxa:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "Xarxa:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "Només lectura" -#: ../interfaces/shares.ui.h:19 +#: ../interfaces/shares.ui.h:16 msgid "Share" msgstr "Compartit" +#: ../interfaces/shares.ui.h:17 +msgid "Share Properties" +msgstr "Propietats dels recursos compartits" + # FIXME -#: ../interfaces/shares.ui.h:20 +#: ../interfaces/shares.ui.h:18 msgid "Share through:" msgstr "Comparteix per:" -#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2 +#: ../interfaces/shares.ui.h:19 +msgid "Shared Folder" +msgstr "Carpeta compartida" + +#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "Carpetes compartides" -#: ../interfaces/shares.ui.h:22 +#: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" msgstr "Este ordinador és un servidor _WINS" -#: ../interfaces/shares.ui.h:23 +#: ../interfaces/shares.ui.h:22 msgid "Users" msgstr "Usuaris" -#: ../interfaces/shares.ui.h:24 +#: ../interfaces/shares.ui.h:23 msgid "WINS _server:" msgstr "_Servidor WINS:" +#: ../interfaces/shares.ui.h:24 +msgid "Windows sharing" +msgstr "Compartició amb Windows" + #: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "_Camí:" @@ -371,29 +357,29 @@ msgstr "Només _lectura" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "Selecció" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "Fus horari" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "Afig un servidor NTP" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "Servidor NTP" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "Se_lecciona els servidors" -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +msgid "Selection" +msgstr "Selecció" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "Sincronitza ara" +#: ../interfaces/time.ui.h:6 +msgid "Time Zone" +msgstr "Fus horari" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "Servidors d'hora" @@ -402,6 +388,10 @@ msgid "Time servers:" msgstr "Servidors de temps:" +#: ../interfaces/time.ui.h:9 +msgid "Time zone" +msgstr "Fus horari" + #: ../interfaces/time.ui.h:10 msgid "Time zone:" msgstr "Fus horari:" @@ -423,120 +413,105 @@ msgstr "_Hora:" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "Paràmetres avançats" +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "" +"Ja existeix un usuari amb este nom. Trieu un altre nom per a l'usuari nou." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "UID/GID automàtic" +msgid "Account _type:" +msgstr "_Tipus de compte:" #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "Paràmetres bàsics" +msgid "Advanced" +msgstr "Avançat" #: ../interfaces/users.ui.h:4 -msgid "Group Members" -msgstr "Membres del grup" +msgid "Advanced Settings" +msgstr "Paràmetres avançats" #: ../interfaces/users.ui.h:5 -msgid "Optional Settings" -msgstr "Paràmetres opcionals" +msgid "Assign a random password by default" +msgstr "Assigna una contrasenya aleatòria per defecte" #: ../interfaces/users.ui.h:6 -msgid "Password Settings" -msgstr "Paràmetres de la contrasenya" +msgid "Automatic UID/GID" +msgstr "UID/GID automàtic" +#: ../interfaces/users.ui.h:7 +msgid "Basic Settings" +msgstr "Paràmetres bàsics" #: ../interfaces/users.ui.h:8 -msgid "System Defaults" -msgstr "Valors per defecte del sistema" - -#: ../interfaces/users.ui.h:9 -msgid "" -"A user with this name already exists. Please choose a different short name " -"for the new user." -msgstr "" -"Ja existeix un usuari amb este nom. Trieu un altre nom curt per a l'usuari " -"nou." - -#: ../interfaces/users.ui.h:10 -msgid "Account _type:" -msgstr "_Tipus de compte:" - -#: ../interfaces/users.ui.h:11 -msgid "Advanced" -msgstr "Avançat" - -#: ../interfaces/users.ui.h:12 -msgid "Assign a random password by default" -msgstr "Assigna una contrasenya aleatòria per defecte" - -#: ../interfaces/users.ui.h:13 msgid "Change Advanced User Settings" msgstr "Canvia els paràmetres avançats de l'usuari" -#: ../interfaces/users.ui.h:14 +#: ../interfaces/users.ui.h:9 msgid "Change User Account Type" msgstr "Canvia el tipus de compte d'usuari" -#: ../interfaces/users.ui.h:15 -msgid "Change User Name and Login" -msgstr "Canvia el nom d'usuari i d'entrada" +#: ../interfaces/users.ui.h:10 +msgid "Change User Name" +msgstr "Canvia el nom d'usuari" -#: ../interfaces/users.ui.h:16 +#: ../interfaces/users.ui.h:11 msgid "Change User Password" msgstr "Canvia la contrasenya d'usuari" -#: ../interfaces/users.ui.h:17 +#: ../interfaces/users.ui.h:12 msgid "Changing advanced settings for:" msgstr "S'estan canviant els paràmetres avançats per a:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:13 msgid "Changing user account type for:" msgstr "S'està canviant el tipus de compte d'usuari per a:" -#: ../interfaces/users.ui.h:19 +#: ../interfaces/users.ui.h:14 msgid "Changing user name for:" msgstr "S'està canviant el nom d'usuari per a:" -#: ../interfaces/users.ui.h:20 +#: ../interfaces/users.ui.h:15 msgid "Changing user password for:" msgstr "S'està canviant la contrasenya d'usuari per a:" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "Con_firmació:" +#: ../interfaces/users.ui.h:17 +msgid "Contact Information" +msgstr "Informació del contacte" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:18 msgid "Create New User" msgstr "Crea un usuari nou" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:19 msgid "Create a new user" msgstr "Crea un usuari nou" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" msgstr "Interval de dies entre l'avís i el venciment de la contrasenya:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" msgstr "_Grup per defecte:" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" msgstr "_Intèrpret d'ordes per defecte:" -#: ../interfaces/users.ui.h:28 +#: ../interfaces/users.ui.h:23 msgid "Disable _account" msgstr "Inhabilita el _compte" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:24 msgid "Don't ask for password on _login" msgstr "No demanes la contrasenya en _entrar" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:25 msgid "" "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " @@ -545,78 +520,98 @@ "Encripta tots els fitxers amb la contrasenya d'entrada per protegir-los de " "gent amb accés físic a l'ordinador, tot i que el sistema anirà més lent." -#: ../interfaces/users.ui.h:31 +#: ../interfaces/users.ui.h:26 msgid "Full _Name:" msgstr "_Nom complet:" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "Gene_ra una contrasenya aleatòria" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:29 +msgid "Group Members" +msgstr "Membres del grup" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" msgstr "_Identificador de grup:" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "_Nom del grup:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "Propietats del grup" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "Grups disponibles en el sistema:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Paràmetres dels grups" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Mà_xim de dies que es pot utilitzar una contrasenya:" -#: ../interfaces/users.ui.h:39 +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "GID màxim:" -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "UID màxim:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "Mí_nim de dies entre els canvis de contrasenya:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "GID mínim:" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "UID mínim:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Mínim de dies permesos entre els canvis de contrasenya:" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "C_ontrasenya nova:" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Nombre de dies que es pot utilitzar una contrasenya:" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "Ubicació de l'o_ficina:" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:45 +msgid "Optional Settings" +msgstr "Paràmetres opcionals" + +#: ../interfaces/users.ui.h:46 +msgid "Password Settings" +msgstr "Paràmetres de la contrasenya" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Contrasenya assignada a: " -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Privilegis" +#: ../interfaces/users.ui.h:49 +msgid "Profile Settings" +msgstr "Paràmetres del perfil" + #: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "_Nom del perfil:" @@ -625,28 +620,15 @@ msgid "Set password b_y hand" msgstr "Estableix la contrasen_ya manualment" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! -#: ../interfaces/users.ui.h:53 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"El nom curt ha de consistir en:\n" -" ➣ lletres en minúscules de l'abecedari\n" -" ➣ dígits\n" -" ➣ qualsevol dels caràcters «.», «-» i «_»" - -#: ../interfaces/users.ui.h:57 -msgid "Short name must start with a letter!" -msgstr "El nom curt ha de començar amb una lletra." +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "Valors per defecte del sistema" -#: ../interfaces/users.ui.h:58 +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "Este compte està inhabilitat." -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." @@ -654,99 +636,134 @@ "Este compte està utilitzant paràmetres especials que s'han definit " "manualment. Utilitzeu el diàleg Paràmetres avançats per ajustar-los." -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "Identificador d'usuari:" -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Privilegis d'usuari" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "Perfils d'usuari" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"El nom d'usuari ha de consistir en:\n" +" ➣ lletres en minúscules de l'abecedari\n" +" ➣ dígits\n" +" ➣ qualsevol dels caràcters «.», «-» i «_»" + #: ../interfaces/users.ui.h:63 +msgid "Username must start with a letter!" +msgstr "El nom d'usuari ha de començar amb una lletra." + +#: ../interfaces/users.ui.h:64 msgid "You can't change user ID while the user is logged in." msgstr "" "No podeu canviar l'identificador d'usuari mentre l'usuari està connectat." -#: ../interfaces/users.ui.h:64 +#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Afig un perfil" -#: ../interfaces/users.ui.h:65 +#: ../interfaces/users.ui.h:66 msgid "_Advanced Settings" msgstr "Paràmetres _avançats" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:67 msgid "_Change..." msgstr "_Canvia..." -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:68 msgid "_Comments" msgstr "_Comentaris" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:69 msgid "_Current password:" msgstr "_Contrasenya actual:" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:70 msgid "_Custom" msgstr "_Personalitzat" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:71 msgid "_Days between warning and password expiration:" msgstr "Interval de _dies entre l'avís i el venciment de la contrasenya:" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:72 msgid "_Enable Account" msgstr "_Habilita el compte" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:73 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Encripta la carpeta de l'usuari per protegir les dades sensibles" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:74 msgid "_Generate" msgstr "_Genera" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:75 msgid "_Home directory:" msgstr "Directori de l'_usuari:" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:76 msgid "_Home phone:" msgstr "Telèfon _particular:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:77 msgid "_Main group:" msgstr "G_rup principal:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:78 msgid "_Manage Groups" msgstr "_Gestiona els grups" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:79 msgid "_Name:" msgstr "_Nom:" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:80 msgid "_Password:" msgstr "_Contrasenya:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:81 msgid "_Shell:" msgstr "Intèrpret d'orde_s:" -#: ../interfaces/users.ui.h:81 -msgid "_Short Name:" -msgstr "Nom _curt:" - -#: ../interfaces/users.ui.h:82 +#: ../interfaces/users.ui.h:83 msgid "_Work phone:" msgstr "Telè_fon de la faena:" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "Mostra l'usuari primari" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "Mostra els usuaris del sistema" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "" +"Si l'eina d'administració d'usuaris hauria de mostrar els usuaris del " +"sistema a la llista d'usuaris." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "" +"Si l'eina d'administració d'usuaris hauria de mostrar l'usuari primari a la " +"llista d'usuaris." + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Esta eina no funciona en la plataforma on l'esteu executant" @@ -767,47 +784,47 @@ msgid "Unsupported platform" msgstr "La plataforma no està implementada" -#: ../src/common/gst-tool.c:190 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "No s'ha pogut carregar la configuració" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:192 +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "No s'ha pogut alçar la configuració" -#: ../src/common/gst-tool.c:196 +#: ../src/common/gst-tool.c:194 msgid "You are not allowed to access the system configuration." msgstr "No se vos permet accedir a la configuració del sistema." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 msgid "You are not allowed to modify the system configuration." msgstr "No se vos permet modificar la configuració del sistema." -#: ../src/common/gst-tool.c:201 +#: ../src/common/gst-tool.c:199 msgid "Invalid data was found." msgstr "S'han trobat dades no vàlides." #. OOBS_RESULT_ERROR -#: ../src/common/gst-tool.c:203 +#: ../src/common/gst-tool.c:201 msgid "An unknown error occurred." msgstr "S'ha produït un error desconegut." -#: ../src/common/gst-tool.c:427 +#: ../src/common/gst-tool.c:422 msgid "Could not display help" msgstr "No s'ha pogut mostrar l'ajuda" -#: ../src/common/gst-tool.c:621 +#: ../src/common/gst-tool.c:616 msgid "The system configuration has potentially changed." msgstr "La configuració del sistema ha canviat dràsticament." -#: ../src/common/gst-tool.c:623 +#: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." msgstr "" "Actualitzar els continguts? Vos farà perdre qualsevol modificació no alçada." -#: ../src/common/gst-tool.c:692 +#: ../src/common/gst-tool.c:687 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -826,7 +843,7 @@ msgid "_Delete" msgstr "_Suprimeix" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "Tipus d'adreça" @@ -934,62 +951,49 @@ #: ../src/network/ifaces-list.c:289 #, c-format -msgid "Essid: %s " -msgstr "ESSID: %s " - -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "Adreça: %s Màscara de subxarxa: %s" - -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "Adreça: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "Adreça: %s Adreça remota: %s" +msgid "Essid: %s " +msgstr "ESSID: %s " -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "Tipus: %s Número de telèfon: %s" - -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "Tipus: %s Nom del punt d'accés: %s" - -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "Tipus: %s Interfície ethernet: %s" - -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "Tipus: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +msgid "Address:" +msgstr "Adreça:" + +#: ../src/network/ifaces-list.c:298 +msgid "Subnet mask:" +msgstr "Màscara de subxarxa:" + +#: ../src/network/ifaces-list.c:308 +msgid "Remote address:" +msgstr "Adreça remota:" + +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "Tipus:" + +#: ../src/network/ifaces-list.c:321 +msgid "Phone number:" +msgstr "Número de telèfon:" -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "Connexió per xarxa sense fil" # FIXME -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "Connexió per infraroig" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" msgstr "Connexió per xarxa amb fil" -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" msgstr "Connexió per port paral·lel" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" msgstr "Connexió punt a punt" @@ -1064,12 +1068,12 @@ msgid "Settings for service \"%s\"" msgstr "Paràmetres del servei «%s»" -#: ../src/services/callbacks.c:125 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "Segur que voleu desactivar %s?" -#: ../src/services/callbacks.c:129 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1549,11 +1553,11 @@ msgid "PATH" msgstr "CAMÍ" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "_Comparteix una carpeta..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "Comparteix esta carpeta amb d'altres ordinadors" @@ -1614,6 +1618,19 @@ "Cal que instal·leu la darrera versió del Samba o bé d'NFS per poder " "compartir les vostres carpetes." +#: ../src/time/e-map/e-map.c:620 +msgid "World Map" +msgstr "Mapa mundial" + +#: ../src/time/e-map/e-map.c:622 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" +"Un giny de mapa interactiu basat en el ratolí per seleccionar el fus horari. " +"Els usuaris de teclat hauran de seleccionar el fus horari amb el quadre de " +"combinació desplegable de sota." + #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" msgstr "Canvieu l'hora, la data, i el fus horari del sistema" @@ -1622,11 +1639,11 @@ msgid "Time and Date" msgstr "Hora i data" -#: ../src/time/time-tool.c:402 +#: ../src/time/time-tool.c:398 msgid "NTP support is not installed" msgstr "L'NTP no està instal·lat" -#: ../src/time/time-tool.c:404 +#: ../src/time/time-tool.c:400 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1634,27 +1651,27 @@ "Instal·leu i activeu l'NTP per habilitar la sincronització del servidor " "local de temps amb servidors de temps d'Internet." -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Enabling NTP" msgstr "S'està habilitant l'NTP" -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Disabling NTP" msgstr "S'està inhabilitant l'NTP" -#: ../src/time/time-tool.c:445 +#: ../src/time/time-tool.c:441 msgid "Synchronizing system clock" msgstr "S'està sincronitzant el rellotge del sistema" -#: ../src/time/time-tool.c:525 +#: ../src/time/time-tool.c:521 msgid "Keep synchronized with Internet servers" msgstr "Mantén-lo sincronitzat amb els servidors d'Internet" -#: ../src/time/time-tool.c:526 +#: ../src/time/time-tool.c:522 msgid "Manual" msgstr "Manual" -#: ../src/time/time-tool.c:672 +#: ../src/time/time-tool.c:665 msgid "Time and Date Settings" msgstr "Paràmetres de l'hora i la data" @@ -1664,7 +1681,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/user-settings.c:606 msgid "This would leave the system unusable." msgstr "Això deixaria el sistema en un estat inservible." @@ -1744,6 +1761,15 @@ msgid "Group name" msgstr "Nom del grup" +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:348 +msgid "Not asked on login" +msgstr "No la demanes per entrar" + +#: ../src/users/main.c:74 ../src/users/user-settings.c:350 +msgid "Asked on login" +msgstr "Demana-la per entrar" + #: ../src/users/privileges-table.c:53 msgid "Monitor system logs" msgstr "Supervisió dels registres del sistema" @@ -1855,37 +1881,42 @@ msgid "Authentication failed" msgstr "Ha fallat l'autenticació" -#: ../src/users/run-passwd.c:495 +#: ../src/users/run-passwd.c:498 #, c-format msgid "The new password is too short" msgstr "La contrasenya nova és massa curta" -#: ../src/users/run-passwd.c:500 +#: ../src/users/run-passwd.c:504 #, c-format msgid "The new password is too simple" msgstr "La contrasenya nova és massa senzilla" -#: ../src/users/run-passwd.c:505 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "La contrasenya antiga i la nova són massa semblants" -#: ../src/users/run-passwd.c:508 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" msgstr "La contrasenya nova ha de contindre caràcters numèrics o especials" -#: ../src/users/run-passwd.c:512 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "La contrasenya antiga i la nova són la mateixa" -#: ../src/users/run-passwd.c:516 +#: ../src/users/run-passwd.c:520 +#, c-format +msgid "The new password has already been used recently." +msgstr "La contrasenya nova ja s'ha utilitzat recentment." + +#: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "S'ha modificat la vostra contrasenya des que vos heu autenticat." -#: ../src/users/run-passwd.c:520 +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "Error desconegut" @@ -1904,10 +1935,10 @@ #: ../src/users/user-password.c:98 msgid "" -"User passwords must be longer than 6 characters and preferably formed by " +"User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." msgstr "" -"La contrasenya de l'usuari ha de ser de més de 6 caràcters, i és preferible " +"La contrasenya de l'usuari ha de ser de més de 5 caràcters, i és preferible " "que continga nombres, lletres, i caràcters especials." #: ../src/users/user-password.c:101 @@ -1918,15 +1949,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Comproveu que heu introduït la mateixa contrasenya en els dos camps." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:445 msgid "Please choose another password." msgstr "Seleccioneu una altra contrasenya." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:456 msgid "Please type again your current password." msgstr "Introduïu un altre cop la contrasenya actual." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:463 msgid "Password could not be changed" msgstr "No s'ha pogut canviar la contrasenya" @@ -1986,99 +2017,169 @@ msgid "Delete Files" msgstr "Suprimeix els fitxers" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:331 msgid "Superuser" msgstr "Superusuari" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:336 msgid "Custom" msgstr "Personalitzat" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:345 msgid "None" msgstr "Cap" -#. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/user-settings.c:347 -msgid "Not asked on login" -msgstr "No la demanes per entrar" - -#: ../src/users/user-settings.c:349 -msgid "Asked on login" -msgstr "Demana-la per entrar" - -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:394 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "El comentari conté el caràcter invàlid «%c»" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:395 msgid "Check that this character is not used." msgstr "Comproveu que no es faça servir este caràcter." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:427 msgid "Incomplete path in home directory" msgstr "El camí del directori de l'usuari no està complet" -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:428 msgid "" "Please enter full path for home directory\n" -"i.e.: /home/john." +"i.e.: /home/john." msgstr "" "Introduïu el camí sencer del directori de l'usuari\n" -"per exemple: /home/josep." +"per exemple: /home/josep." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "Ja existeix el directori de l'usuari" +#: ../src/users/user-settings.c:448 ../src/users/user-settings.c:492 +msgid "New home directory already exists, use it?" +msgstr "El directori de l'usuari nou ja existeix, voleu utilitzar-lo?" + +#: ../src/users/user-settings.c:450 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" +"El directori de l'usuari de %s s'ha establit a %s, que ja existeix. " +"Voleu utilitzar els fitxers d'este directori o voleu copiar el contingut de " +"%s al nou directori, sobreescrivint-los?\n" +"\n" +"En cas de dubte, utilitzeu el directori nou per evitar la pèrdua de dades i " +"més avant copieu els fitxers del directori antic." + +#: ../src/users/user-settings.c:462 +msgid "_Replace With Old Files" +msgstr "_Reemplaça amb els fitxers antics" + +#: ../src/users/user-settings.c:463 ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:541 +msgid "_Cancel Change" +msgstr "_Cancel·la el canvi" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:466 +msgid "_Use New Files" +msgstr "_Utilitza els fitxers nous" + +#: ../src/users/user-settings.c:471 ../src/users/user-settings.c:511 +msgid "Make user the _owner of the new home directory" +msgstr "_Fes que l'usuari siga el propietari del directori de l'usuari nou." + +#: ../src/users/user-settings.c:474 ../src/users/user-settings.c:548 +msgid "_Delete old home directory" +msgstr "_Suprimeix el directori antic" + +#: ../src/users/user-settings.c:494 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" +"El directori de l'usuari de %s s'ha establit a %s, que ja existeix. " +"Voleu utilitzar els fitxers d'este directori o voleu suprimir tot el seu " +"contingut i utilitzar un directori de l'usuari totalment buit?\n" +"\n" +"En cas de dubte, mantingueu els fitxers i suprimiu-los després si cal." + +#: ../src/users/user-settings.c:504 +msgid "_Delete Files" +msgstr "_Suprimeix els fitxers" + +#: ../src/users/user-settings.c:506 +msgid "_Use Existing Files" +msgstr "_Utilitza els fitxers existents" + +#: ../src/users/user-settings.c:527 +msgid "Copy old home directory to new location?" +msgstr "Voleu copiar el directori de l'usuari antic a la ubicació nova?" + +#: ../src/users/user-settings.c:529 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" +"El directori de l'usuari de %s s'ha establit a %s, que no existeix. " +"Voleu copiar el contingut del directori de l'usuari antic (%s) o " +"voleu utilitzar un directori de l'usuari totalment buit?\n" +"\n" +"Si trieu de copiar els fitxers a la ubicació nova, llavors és segur suprimir " +"el directori antic." + +#: ../src/users/user-settings.c:540 +msgid "_Use Empty Directory" +msgstr "_Utilitza un directori buit" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:543 +msgid "Co_py Old Files" +msgstr "Cop_ia els fitxers antics" -#: ../src/users/user-settings.c:434 -#, c-format -msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" -msgstr "" -"Ja existeix el directori %s. Pot ser que l'usuari no tinga els " -"permisos necessaris per llegir o escriure en este directori. El voleu " -"utilitzar igualment?" - -#: ../src/users/user-settings.c:440 -msgid "Use this directory" -msgstr "Utilitza'l" - -#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:605 msgid "ID for the root user should not be modified" msgstr "L'identificador de l'usuari primari no s'hauria de modificar" #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:609 #, c-format msgid "User ID %d is already used by user %s" msgstr "L'identificador d'usuari %d ja l'està utilitzant l'usuari %s" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:611 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Seleccioneu un identificador numèric diferent per a %s." -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:629 msgid "Incomplete path in shell" msgstr "El camí de l'intèrpret d'ordes no està complet" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:630 msgid "" "Please enter full path for shell\n" -"i.e.: /bin/bash." +"i.e.: /bin/bash." msgstr "" "Introduïu el camí complet a l'intèrpret d'ordes\n" -"p.ex.: /bin/bash." +"p.ex.: /bin/bash." -#: ../src/users/user-settings.c:534 +#: ../src/users/user-settings.c:664 msgid "Can't revoke administration rights" msgstr "No es poden revocar els drets d'administració" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:667 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2087,11 +2188,11 @@ "%s és l'únic administrador d'este ordinador. Revocar els drets " "d'administració d'este compte deixaria sense administració el sistema." -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:684 msgid "You are about to revoke your own administration rights" msgstr "Esteu a punt de revocar els vostres drets d'administració" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:687 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2100,14 +2201,48 @@ "%s no podrà realitzar més tasques administratives. Este compte no podrà " "tornar a obtindre els drets d'administració pel seu compte." -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:692 msgid "Give up administration rights" msgstr "Renuncia als drets d'administració" -#: ../src/users/users-tool.c:284 +#: ../src/users/user-settings.c:1470 +msgid "Applying changes to user settings..." +msgstr "S'estan aplicant els canvis als paràmetres de l'usuari..." + +#: ../src/users/users-tool.c:288 msgid "Users Settings" msgstr "Paràmetres dels usuaris" +#~ msgid "_Short Name:" +#~ msgstr "Nom _curt:" + +#~ msgid "Address: %s Subnet mask: %s" +#~ msgstr "Adreça: %s Màscara de subxarxa: %s" + +#~ msgid "Address: %s Remote address: %s" +#~ msgstr "Adreça: %s Adreça remota: %s" + +#~ msgid "Type: %s Phone number: %s" +#~ msgstr "Tipus: %s Número de telèfon: %s" + +#~ msgid "Type: %s Access point name: %s" +#~ msgstr "Tipus: %s Nom del punt d'accés: %s" + +#~ msgid "Type: %s Ethernet interface: %s" +#~ msgstr "Tipus: %s Interfície ethernet: %s" + +#~ msgid "Type: %s" +#~ msgstr "Tipus: %s" + +#~ msgid "" +#~ "The directory %s already exists. User may not have the " +#~ "permissions required to read or write in that directory. Do you want to " +#~ "use it anyway?" +#~ msgstr "" +#~ "Ja existeix el directori %s. Pot ser que l'usuari no tingui els " +#~ "permisos necessaris per llegir o escriure en aquest directori. El voleu " +#~ "utilitzar igualment?" + #~ msgid "" #~ "Allow this user to open a local session without entering his password. " #~ "The password will still be required to perform administrative tasks." @@ -2376,13 +2511,11 @@ #~ msgstr "Seguretat" #~ msgid "" -#~ "Several bootloaders have been " -#~ "found\n" +#~ "Several bootloaders have been found\n" #~ "\n" #~ "please select which do you want to configure" #~ msgstr "" -#~ "S'han trobat diversos carregadors " -#~ "de l'arrencada\n" +#~ "S'han trobat diversos carregadors de l'arrencada\n" #~ "\n" #~ "seleccioneu el que vulgueu configurar" @@ -2713,15 +2846,15 @@ #~ msgid "" #~ "This is still a work in progress, and so it may have serious bugs. Due to " #~ "the nature of these tools, bugs may render your computer practically useless, costing time, effort and sanity " -#~ "points. You have been warned. Thank you for trying out this prerelease of " -#~ "the GNOME System Tools!" +#~ "\"bold\">practically useless, costing time, effort and sanity points. You " +#~ "have been warned. Thank you for trying out this prerelease of the GNOME " +#~ "System Tools!" #~ msgstr "" #~ "Atès que el desenvolupament d'aquestes eines encara continua, es poden " #~ "produir errors greus que poden fer que aquest ordinador quedi pràcticament inutilitzable, i us pot costar temps, " -#~ "esforç i salut. Ja esteu avisat. Gràcies per provar aquesta versió " -#~ "preliminar de les eines de sistema del GNOME (GNOME System Tools)." +#~ "weigth=\"bold\">pràcticament inutilitzable, i us pot costar temps, esforç " +#~ "i salut. Ja esteu avisat. Gràcies per provar aquesta versió preliminar de " +#~ "les eines de sistema del GNOME (GNOME System Tools)." #~ msgid "Warning" #~ msgstr "Avís" @@ -2847,7 +2980,8 @@ #~ msgid "" #~ "You will not be able to recover this profile after pressing \"apply\"." -#~ msgstr "No podreu recuperar aquest perfil un cop hagueu fet clic a «aplica»." +#~ msgstr "" +#~ "No podreu recuperar aquest perfil un cop hagueu fet clic a «aplica»." #~ msgid "Profile" #~ msgstr "Perfil" @@ -2882,9 +3016,6 @@ #~ msgid "Home directory should not be empty" #~ msgstr "El directori de l'usuari no es pot deixar buit" -#~ msgid "Make sure you provide a home directory." -#~ msgstr "Assegureu-vos d'introduir el directori de l'usuari." - #~ msgid "Invalid user ID" #~ msgstr "L'identificador d'usuari no és vàlid" @@ -2937,9 +3068,6 @@ #~ msgid "This device is _configured" #~ msgstr "Aquest dispositiu està _configurat" -#~ msgid "Service Settings" -#~ msgstr "Paràmetres del servei" - #~ msgid "Description:" #~ msgstr "Descripció:" @@ -2984,8 +3112,7 @@ #~ "Use this tool to specify which operating systems users can choose at " #~ "startup" #~ msgstr "" -#~ "Paràmetres del carregador de " -#~ "l'arrencada\n" +#~ "Paràmetres del carregador de l'arrencada\n" #~ "Utilitzeu aquesta eina per especificar quins sistemes operatius podran " #~ "seleccionar els usuaris durant la inicialització" @@ -3179,9 +3306,6 @@ #~ msgid "_Primary:" #~ msgstr "_Primari:" -#~ msgid "_Remote IP address:" -#~ msgstr "Adreça IP _remota:" - #~ msgid "_Save Current" #~ msgstr "De_sa l'actual" @@ -3226,8 +3350,7 @@ #~ "Time and date settings\n" #~ "Use this tool for setting your current date, time and time zone" #~ msgstr "" -#~ "Paràmetres de l'hora i la data\n" +#~ "Paràmetres de l'hora i la data\n" #~ "Utilitzeu aquesta eina per configurar la data actual, l'hora, i el fus " #~ "horari" @@ -3715,9 +3838,6 @@ #~ msgid "Speed:" #~ msgstr "Velocitat:" -#~ msgid "Type:" -#~ msgstr "Tipus:" - #~ msgid "Type: " #~ msgstr "Tipus: " diff -Nru gnome-system-tools-2.32.0/po/cs.po gnome-system-tools-3.0.0/po/cs.po --- gnome-system-tools-2.32.0/po/cs.po 2010-09-13 09:28:10.000000000 +0000 +++ gnome-system-tools-3.0.0/po/cs.po 2011-04-02 12:55:08.000000000 +0000 @@ -2,26 +2,28 @@ # Copyright (C) 2002, 2008, 2009, 2010 the author(s) of gnome-system-tools. # Copyright (C) 2003, 2004, 2005, 2006 Miloslav Trmac . # This file is distributed under the same license as the gnome-system-tools package. +# # Michal Bukovjan , 2002, 2003. # Miloslav Trmac , 2003, 2004, 2005, 2006. # Petr Tomeš , 2003, 2004, 2005, 2006. # Kamil Páral , 2008. # Petr Kovar , 2008. # Jiri Eischmann , 2009. -# Marek Černocký , 2010. +# Marek Černocký , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-10 22:30+0200\n" -"PO-Revision-Date: 2010-08-30 21:18+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"system-tools&component=general\n" +"POT-Creation-Date: 2011-02-26 18:04+0000\n" +"PO-Revision-Date: 2011-02-27 11:04+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 @@ -240,7 +242,7 @@ msgid "_Subnet mask:" msgstr "Maska pod_sítě:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Uživatelské jméno:" @@ -670,78 +672,74 @@ msgstr "Jméno uživatele musí začínat písmenem!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "Nemůžete změnit ID uživatele, dokud je tento uživatel přihlášen." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "Přid_at profil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "Pokročilá n_astavení" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Změnit…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Komentář" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Současné heslo:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Vlastní" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Dní mezi varováním a vypršením hesla:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Povolit účet" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Zašifrovat domovskou složku kvůli ochraně citlivých dat" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "Vy_generovat" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "_Domovská složka:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Telefon _domů:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "Hlavní _skupina:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Spravovat skupiny" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "Jmé_no:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Heslo:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Telefon do _práce:" @@ -767,6 +765,11 @@ "Zda by měl nástroj pro správu uživatelů zobrazovat v seznamu uživatelů " "uživatele root." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Chyba přístupu k systémovým oprávněním: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Platforma vašeho počítače není tímto nástrojem podporována" @@ -801,7 +804,7 @@ msgstr "Nemáte oprávnění přistupovat k nastavení systému." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Nemáte oprávnění k úpravám nastavení systému." @@ -814,19 +817,23 @@ msgid "An unknown error occurred." msgstr "Došlo k neznámé chybě." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Nápověda" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Nelze zobrazit nápovědu" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "Systémové nastavení se případně změnilo." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "Aktualizovat obsah? Způsobí to ztrátu všech neuložených změn." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -835,6 +842,42 @@ "Vyskytla se chyba při ověřování oprávnění: %s\n" "Můžete to nahlásit jako chybu." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Zamknout" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Odemknout" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Zamčeno" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Dialogové okno je odemknuto.\n" +"Klikněte, abyste zabránili změnám." + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Dialogové okno je uzamknuto.\n" +"Klikněte, abyste mohli dělat změny." + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Systémová politika zabránila změnám.\n" +"Kontaktujte svého správce systému." + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -880,51 +923,51 @@ msgid "Change _Host name" msgstr "Změnit _název počítače" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Automatické nastavení (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Místní síť v režimu Zeroconf (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statická adresa IP" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Klíč WEP (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Klíč WEP (šestnáctkově)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "Osobní režim WPA" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "Osobní režim WPA2" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Modem ISDN" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Sériový modem" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Vlastnosti %s" @@ -1607,11 +1650,11 @@ "folders." msgstr "Pro sdílení svých složek je nutné nainstalovat buď Sambu nebo NFS." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mapa světa" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1628,11 +1671,11 @@ msgid "Time and Date" msgstr "Datum a čas" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "Podpora NTP není nainstalována" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1640,27 +1683,27 @@ "Pro umožnění synchronizace vašeho lokálního časového serveru s časovými " "servery v Internetu je nutné nainstalovat a aktivovat podporu NTP." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Zapíná se NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Vypíná se NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Synchronizují se systémové hodiny" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Udržovat synchronizované se servery v Internetu" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Ruční" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Nastavení data a času" @@ -1670,7 +1713,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Systém by pak nebyl použitelný." @@ -1744,100 +1787,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Zvolte prosím pro skupinu „%s“ jiný číselný identifikátor." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Název skupiny" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Neptat se při přihlášení" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Dotázat při přihlášení" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Sledovat systémové protokoly" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Spravovat systém" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Používat zvuková zařízení" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Používat mechaniky CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Vypalovat CD / DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Používat modemy" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Připojovat se k Internetu přes modem" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Odesílat a přijímat faxy" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Používat disketové mechaniky" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Připojovat souborové systémy v uživatelském prostoru (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Nastavovat tiskárny" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Připojovat se k bezdrátovým a ethernetovým sítím" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Automatický přistupovat k externím úložným zařízením" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Uspávat počítač do paměti nebo na disk" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Přistupovat k souborovému systému /proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Používat skenery" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Používat páskové mechaniky" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Používat zařízení USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Používat virtualizační řešení VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Používat video zařízení" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Mít možnost získat oprávnění správce" @@ -1936,15 +1979,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Zkontrolujte, že jste v obou textových polích zadali stejné heslo." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Zvolte prosím jiné heslo." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Napište prosím své současné heslo znovu." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Heslo nelze změnit" @@ -2003,34 +2046,34 @@ msgid "Delete Files" msgstr "Smazat soubory" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Superuživatel" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Vlastní" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Žádné" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Neplatný znak „%c“ v komentáři" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Zkontrolujte, že se tento znak nepoužívá." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Neúplná cesta k domovské složce" # FIXME: s/i.e./e.g./ -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2038,11 +2081,11 @@ "Zadejte prosím plnou cestu k domovské složce\n" "např.: /home/honza." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Nová domovská složka již existuje, použít ji?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2059,30 +2102,30 @@ "Pokud si nejste jisti, co zvolit, použijte novou složku, abyste předešli " "ztrátě dat, a soubory ze staré složky nakopírujte dodatečně." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "Nah_radit starými soubory" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Zrušit změny" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "Po_užít nové soubory" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Nastavit uživatele jak_o vlastníka nové domovské složky" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Smazat starou domovskou složku" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2098,19 +2141,19 @@ "Pokud si nejste jisti, co zvolit, tak soubory zachovejte a když bude třeba, " "odstraňte je dodatečně." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Smazat soubory" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "Po_užít stávající soubory" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Zkopírovat starou domovskou složku do nového umístění?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2127,35 +2170,35 @@ "Pokud zvolíte zkopírování souborů do nového umístění, můžete starou složku " "bezpečně smazat." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "Po_užít prázdnou složku" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "_Kopírovat staré soubory" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "ID uživatele root nelze měnit" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Uživatelské ID %d již existuje pro uživatele %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Zvolte prosím jiný číselný identifikátor pro uživatele %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Neúplná cesta v shellu" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2163,11 +2206,11 @@ "Zadejte prosím plnou cestu k shellu\n" "např.: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Nelze odejmout správcovská oprávnění" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2176,11 +2219,11 @@ "%s je jediný správce na tomto počítači. Odejmutí oprávnění správce tomuto " "účtu by mohlo zablokovat správu systému." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Chystáte se odejmout svá vlastní oprávnění správce" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2189,14 +2232,35 @@ "Uživatel %s nebude moci nadále provádět správcovské úkoly. Tomuto účtu " "nebude umožněno získat správcovská oprávnění zpět vlastními silami." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Vzdát se správcovských oprávnění" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Nemůžete změnit ID účtu superuživatele." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Nemůžete zakázat svůj vlastní účet, změnit svoji vlastní domovskou složku " +"nebo své uživatelské ID. Abyste mohli provést takovéto změny, spusťte tento " +"program v sezení jiného uživatele." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Nemůžete změnit domovskou složku účtu nebo ID uživatele, dokud je tento " +"uživatel přihlášen." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Změny se zanášejí do uživatelova nastavení…" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Nastavení uživatelů" diff -Nru gnome-system-tools-2.32.0/po/de.po gnome-system-tools-3.0.0/po/de.po --- gnome-system-tools-2.32.0/po/de.po 2010-09-13 09:28:10.000000000 +0000 +++ gnome-system-tools-3.0.0/po/de.po 2011-04-02 12:55:08.000000000 +0000 @@ -8,7 +8,7 @@ # Hendrik Richter , 2006, 2007. # Jochen Skulj , 2006. # Philipp Kerling , 2008. -# Mario Blättermann , 2010. +# Mario Blättermann , 2010, 2011. # Christian Kirbach , 2009, 2010. # msgid "" @@ -16,9 +16,9 @@ "Project-Id-Version: gnome-system-tools master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2010-09-11 09:52+0000\n" -"PO-Revision-Date: 2010-09-12 15:38+0200\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2011-02-26 18:04+0000\n" +"PO-Revision-Date: 2011-02-27 15:53+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -247,7 +247,7 @@ msgid "_Subnet mask:" msgstr "_Subnetzmaske:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Benutzername:" @@ -523,9 +523,9 @@ #: ../interfaces/users.ui.h:25 msgid "" -"Encrypt all your files with your login password to strongly protect them " -"from people with physical access to your computer, at the expense of a " -"slightly reduced performance." +"Encrypt all your files with your login password to strongly protect them from " +"people with physical access to your computer, at the expense of a slightly " +"reduced performance." msgstr "" "Alle Ihre Dateien mit Ihrem Benutzerpasswort verschlüsseln, um diese vor dem " "Zugriff durch Personen zu schützen, die physischen Zugriff auf Ihren Rechner " @@ -678,80 +678,74 @@ msgstr "Der Benutzername muss mit einem Buchstaben beginnen!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"Sie können die Benutzerkennung nicht ändern, während der Benutzer angemeldet " -"ist." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "Profil _hinzufügen" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "_Erweiterte Einstellungen" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "Ä_ndern …" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Kommentar" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "A_ktuelles Passwort:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Benutzerdefiniert" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Tage zwischen Warnung und Verfall des Passwort:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "Konto aktivi_eren" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "P_ersönlichen Ordner verschlüsseln, um empfindliche Daten zu schützen" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Erzeugen" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "Persönlicher _Ordner:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Telefon (pri_vat):" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "_Hauptgruppe:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Gruppen verwalten" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Name:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Passwort:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Befehlszeile:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Telefon (_Arbeit):" @@ -764,8 +758,7 @@ msgstr "Systembenutzer anzeigen" #: ../org.gnome.system-tools.gschema.xml.in.h:3 -msgid "" -"Whether the users-admin tool should show system users in the users list." +msgid "Whether the users-admin tool should show system users in the users list." msgstr "" "Legt fest, ob das Benutzer-Administrationswerkzeug die Systembenutzer in der " "Benutzerliste anzeigen soll." @@ -777,6 +770,11 @@ "Legt fest, ob das Benutzer-Administrationswerkzeug den Root-Benutzer " "(Systemverwalter) in der Benutzerliste anzeigen soll." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Fehler beim Erlangen der System-Zugriffsrechte: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "" @@ -811,7 +809,7 @@ msgstr "Sie haben keine Berechtigung, auf die Systemkonfiguration zuzugreifen." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Sie haben keine Berechtigung, die Systemkonfiguration zu ändern." @@ -824,21 +822,25 @@ msgid "An unknown error occurred." msgstr "Es ist ein unbekannter Fehler aufgetreten." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Hilfe" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Hilfe konnte nicht angezeigt werden" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "Die Systemkonfiguration hat sich eventuell verändert." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "" -"Soll der Inhalt neu geladen werden? Dies wird jede zwischenzeitliche " -"Änderung verwerfen." +"Soll der Inhalt neu geladen werden? Dies wird jede zwischenzeitliche Änderung " +"verwerfen." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -847,6 +849,44 @@ "Ein Fehler trat beim Prüfen der Legitimierung auf: %s\n" "Sie können dies als einen Fehler melden." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Sperren" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Entsperren" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Gesperrt" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Der Dialog ist entsperrt.\n" +"Anklicken, um Änderungen\n" +"zu verhindern" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Der Dialog ist gesperrt.\n" +"Anklicken, um Änderungen\n" +"zu ermöglichen" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Systemrichtlinien verhindern Änderungen.\n" +"Kontaktieren Sie Ihren Systemverwalter" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -893,51 +933,51 @@ msgid "Change _Host name" msgstr "_Rechnername ändern" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Automatische Konfiguration (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Lokales konfigurationsfreies Netzwerk (Zeroconf, IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statische IP-Adresse" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP-Schlüssel (ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP-Schlüssel (hexadezimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA-Personal" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2-Personal" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN-Modem" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Serielles Modem" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Eigenschaften von %s" @@ -1044,8 +1084,8 @@ "Check that it is correctly typed and that it is correctly supported by your " "system." msgstr "" -"Stellen Sie sicher, dass es richtig geschrieben und dass es korrekt von " -"Ihrem System unterstützt wird." +"Stellen Sie sicher, dass es richtig geschrieben und dass es korrekt von Ihrem " +"System unterstützt wird." #: ../src/network/main.c:183 msgid "Configure a network interface" @@ -1090,8 +1130,8 @@ "This may affect your system behavior in several ways, possibly leading to " "data loss." msgstr "" -"Dies kann das Verhalten Ihres Systems auf verschiedene Arten beeinflussen " -"und möglicherweise zu Datenverlust führen." +"Dies kann das Verhalten Ihres Systems auf verschiedene Arten beeinflussen und " +"möglicherweise zu Datenverlust führen." #: ../src/services/service.c:32 msgid "Web server" @@ -1627,11 +1667,11 @@ "Sie müssen zumindest entweder Samba oder NFS installieren, um Ihre Ordner " "freigeben zu können." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Weltkarte" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1648,11 +1688,11 @@ msgid "Time and Date" msgstr "Datum und Uhrzeit" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP-Unterstützung ist nicht installiert" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1660,27 +1700,27 @@ "Bitte installieren und aktivieren Sie die NTP-Unterstützung auf dem System, " "um den Abgleich der lokalen Zeit über Internet-Zeit-Server zu ermöglichen." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "NTP aktivieren" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "NTP deaktivieren" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Systemuhr wird abgeglichen" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Abgleich mit Internet-Servern aufrecht erhalten" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Manuell" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Zeit- und Datumseinstellungen" @@ -1690,7 +1730,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Dies würde das System in einem unbrauchbaren Zustand zurücklassen." @@ -1768,100 +1808,100 @@ msgstr "" "Bitte wählen Sie einen anderen numerischen Bezeichner für die Gruppe »%s«." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Gruppenname:" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Bei Anmeldung nicht erfragen" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Beim Anmelden erfragen" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Systemprotokolle überwachen" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "System administrieren" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Audiogeräte verwenden" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "CD-ROM-Laufwerke verwenden" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "CDs / DVDs brennen" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Modems verwenden" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Internet-Verbindungen mit Modem aufbauen" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Faxe senden und empfangen" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Diskettenlaufwerke benutzen" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Dateisysteme im User-Space einhängen (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Drucker konfigurieren" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Mit drahtlosen und Ethernet-Netzwerken verbinden" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Automatisch auf externe Speicherlaufwerke zugreifen" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Den Rechner in Bereitschaft und Ruhezustand versetzen" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Auf das Dateisystem »/proc« zugreifen" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Scanner verwenden" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Bandlaufwerke verwenden" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "USB-Geräte verwenden" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Die Virtualisierungslösung VirtualBox verwenden" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Videogeräte verwenden" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "In der Lage sein, Administratorrechte erlangen" @@ -1879,8 +1919,8 @@ #: ../src/users/user-profiles.conf.in.h:3 msgid "" -"Can perform common tasks. Can't install software or change settings " -"affecting all users." +"Can perform common tasks. Can't install software or change settings affecting " +"all users." msgstr "" "Kann allgemeine Aufgaben ausführen. Darf keine Software installieren oder " "Einstellungen ändern, die sich auf alle Benutzer auswirken." @@ -1926,8 +1966,7 @@ #: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" -msgstr "" -"Ihr Passwort wurde geändert, seit Sie sich erstmalig legitimiert haben!" +msgstr "Ihr Passwort wurde geändert, seit Sie sich erstmalig legitimiert haben!" #: ../src/users/run-passwd.c:528 #, c-format @@ -1964,15 +2003,15 @@ "Stellen Sie sicher, dass Sie das selbe Passwort in beiden Textfeldern " "angegeben haben." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Bitte wählen Sie ein anderes Passwort." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Bitte geben Sie Ihr aktuelles Passwort erneut ein." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Passwort konnte nicht geändert werden" @@ -2033,35 +2072,35 @@ msgid "Delete Files" msgstr "Dateien löschen" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Administrator" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Benutzerdefiniert" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Kein" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Ungültiges Zeichen »%c« im Kommentar" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Stellen Sie sicher, dass dieses Zeichen nicht verwendet wird." # CHECK: # Übersetzung wird in GUI nicht angezeigt! -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Pfad zum persönlichen Ordner unvollständig" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2069,19 +2108,19 @@ "Bitte geben Sie den vollständigen Pfad zum persönlichen Ordner an,\n" "z.B.: /home/hans." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Der neue persönliche Ordner existiert bereits, diesen verwenden?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of %s to the new home, overwriting it?\n" "\n" -"In doubt, use the new directory to avoid losing data, and copy files from " -"the old directory later." +"In doubt, use the new directory to avoid losing data, and copy files from the " +"old directory later." msgstr "" "Der persönliche Ordner für %s wurde auf %s gesetzt, welcher bereits " "existiert. Wollen Sie die Dateien dieses Ordners verwenden oder den Inhalt " @@ -2091,32 +2130,32 @@ "Im Zweifelsfall sollten Sie den neuen Ordner verwenden, um Datenverlust zu " "vermeiden, und später Dateien aus dem alten Ordner an den neuen Ort kopieren." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "Du_rch alte Dateien ersetzen" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "Änderungen _verwerfen" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "Ne_ue Dateien verwenden" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Den Benutzer zum Eigentümer des neuen persönlichen _Ordners machen" # CHECK: # Übersetzung wird in GUI nicht angezeigt! -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Den alten persönlichen Ordner löschen" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2132,19 +2171,19 @@ "Im Zweifelsfall sollten Sie die Dateien behalten und später löschen, falls " "nötig." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "Dateien _löschen" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "V_orhandene Dateien verwenden" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Den persönlichen Ordner an den neuen Ort kopieren?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2161,35 +2200,35 @@ "Falls Sie die Dateien an den neuen Ort kopieren, können Sie den alten Ordner " "sicher löschen." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Leeren Ordner verwenden" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "Alte Dateien ko_pieren" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "Die Benutzerkennung des Benutzers »root« darf nicht geändert werden" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Die Benutzerkennung »%d« wird bereits vom Benutzer »%s« verwendet" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Bitte wählen Sie einen anderen numerischen Bezeichner für %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Ungültiger Pfad zur Befehlszeile" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2197,42 +2236,64 @@ "Bitte geben Sie den gesamten Pfad zur Befehlszeile an,\n" "z.B.: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Administratorrechte können nicht widerrufen werden" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" -"%s is the only administrator on this computer. Revoking administration " -"rights for this account would lock you out of administrating the system." +"%s is the only administrator on this computer. Revoking administration rights " +"for this account would lock you out of administrating the system." msgstr "" "%s ist der einzige Administrator dieses Rechners. Das Verweigern von " "Administratorrechten für dieses Konto würde Sie vom Administrieren dieses " "Systems aussperren." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Sie sind dabei, Ihre eigenen Administratorrechte zu widerrufen" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" -"%s will no longer be able to perform administrative tasks. This account " -"won't be allowed to get administration rights back on its own." +"%s will no longer be able to perform administrative tasks. This account won't " +"be allowed to get administration rights back on its own." msgstr "" "%s ist nun nicht mehr in der Lage, Administratoraufgaben auszuführen. Für " "dieses Konto können die Administratorrechte nicht zurückgegeben werden." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Administratorrechte aufgeben" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "" +"Sie können die Benutzerkennung für das Systemverwalterkonto nicht ändern." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Sie können weder Ihr eigenes Benutzerkonto ändern, noch den Ort Ihres " +"persönlichen Ordners oder Ihre Benutzerkennung. Führen Sie dieses Programm in " +"der Sitzung eines anderen Benutzers aus, um diese Einstellungen zu ändern." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Sie können die Benutzerkennung oder den Ort des persönlichen Ordners nicht " +"ändern, während der Benutzer angemeldet ist." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Änderungen werden auf Benutzereinstellungen angewendet …" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Benutzereinstellungen" @@ -2264,8 +2325,8 @@ #~ msgstr "Typ: %s Ethernet-Schnittstelle: %s" #~ msgid "" -#~ "Allow this user to open a local session without entering his password. " -#~ "The password will still be required to perform administrative tasks." +#~ "Allow this user to open a local session without entering his password. The " +#~ "password will still be required to perform administrative tasks." #~ msgstr "" #~ "Diesem Benutzer erlauben, eine lokale Sitzung ohne Eingabe eines " #~ "Kennwortes zu öffnen. Das Kennwort für administrative Aufgaben wird " @@ -2316,8 +2377,8 @@ #~ msgstr "Benutzername enthält ungültige Zeichen" #~ msgid "" -#~ "Please set a valid user name consisting of a lower case letter followed " -#~ "by lower case letters and numbers." +#~ "Please set a valid user name consisting of a lower case letter followed by " +#~ "lower case letters and numbers." #~ msgstr "" #~ "Bitte geben Sie einen gültigen Benutzernamen an, der aus Kleinbuchstaben " #~ "und Ziffern besteht, wobei das erste Zeichen ein Buchstabe sein muss." @@ -2354,9 +2415,6 @@ #~ "Um dieses Werkzeug zu verwenden, benötigen Sie Administratorrechte. Bitte " #~ "geben Sie ein Passwort ein, um Ihre Systemkonfiguration zu ändern." -#~ msgid "_Unlock" -#~ msgstr "_Entsperren" - #~ msgid "This action is not allowed" #~ msgstr "Diese Aktion ist nicht erlaubt" @@ -2394,8 +2452,8 @@ #~ msgstr "WPA" #~ msgid "" -#~ "Comma separated list of hosts that the GST will be able to access when " -#~ "the remote configuration option is enabled" +#~ "Comma separated list of hosts that the GST will be able to access when the " +#~ "remote configuration option is enabled" #~ msgstr "" #~ "Durch Kommas unterteilte Liste von Rechnern auf die GST zugreifen können " #~ "soll, wenn die entfernte Konfiguration aktiviert ist" @@ -2420,9 +2478,9 @@ #~ msgstr "Die zuletzt auf diesem Computer ausgeführte GST-Version" #~ msgid "" -#~ "This key stores the bootloader that boot-admin will configure if there " -#~ "are more than one installed, if it's not set or isn't valid, then boot-" -#~ "admin will ask the user" +#~ "This key stores the bootloader that boot-admin will configure if there are " +#~ "more than one installed, if it's not set or isn't valid, then boot-admin " +#~ "will ask the user" #~ msgstr "" #~ "Dieser Schlüssel legt den Bootloader fest, den boot-admin konfigurieren " #~ "soll, falls mehrere installiert sind. Falls keiner festgelegt wurde oder " @@ -2540,9 +2598,9 @@ #~ "partition. Optionally, you may also enter parameters passed to the kernel " #~ "at boot time." #~ msgstr "" -#~ "Wählen Sie ein zu bootendes Kernel-Abbild und eine einzuhängende " -#~ "Partition als Wurzelpartition. Optional können Sie auch Optionen angeben, " -#~ "die dem Kernel beim Booten übergeben werden." +#~ "Wählen Sie ein zu bootendes Kernel-Abbild und eine einzuhängende Partition " +#~ "als Wurzelpartition. Optional können Sie auch Optionen angeben, die dem " +#~ "Kernel beim Booten übergeben werden." #~ msgid "Click \"Forward\" to continue" #~ msgstr "Klicken Sie »Weiter« an, um fortzufahren" @@ -2551,8 +2609,8 @@ #~ msgstr "IDE-SCSI-Emulation aktivieren" #~ msgid "" -#~ "Enter a name for the boot image, and specify what kind of operating " -#~ "system it is." +#~ "Enter a name for the boot image, and specify what kind of operating system " +#~ "it is." #~ msgstr "" #~ "Legen Sie einen Namen für das Boot-Abbild fest. Geben Sie außerdem an, um " #~ "welches Betriebssystem es sich handelt." diff -Nru gnome-system-tools-2.32.0/po/eo.po gnome-system-tools-3.0.0/po/eo.po --- gnome-system-tools-2.32.0/po/eo.po 2010-06-27 10:49:31.000000000 +0000 +++ gnome-system-tools-3.0.0/po/eo.po 2011-04-03 17:32:51.000000000 +0000 @@ -1,24 +1,25 @@ # Esperanto translation for gnome-system-tools -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# Copyright (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the gnome-system-tools package. # Joop EGGEN , 2006. # Michael MORONI, , 2009. -# Kristjan SCHMIDT , 2010. +# Kristjan SCHMIDT , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"system-tools&component=general\n" -"POT-Creation-Date: 2010-06-22 21:13+0000\n" -"PO-Revision-Date: 2010-06-26 12:20+0200\n" +"system-tools&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-04-02 13:05+0000\n" +"PO-Revision-Date: 2011-04-03 09:46+0200\n" "Last-Translator: Kristjan SCHMIDT \n" "Language-Team: Esperanto \n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-26 08:48+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-04-03 07:28+0000\n" +"X-Generator: Launchpad (build 12710)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 @@ -35,7 +36,7 @@ #: ../interfaces/network.ui.h:4 msgid "Con_figuration:" -msgstr "Agordo:" +msgstr "_Agordo:" #: ../interfaces/network.ui.h:5 msgid "Connection Settings" @@ -67,7 +68,7 @@ #: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" -msgstr "Ebligi retmigro-reĝimon" +msgstr "_Ebligi retmigro-reĝimon" #: ../interfaces/network.ui.h:13 msgid "E_nable this connection" @@ -119,11 +120,11 @@ #: ../interfaces/network.ui.h:25 msgid "Low" -msgstr "Malalta" +msgstr "Malalte" #: ../interfaces/network.ui.h:26 msgid "Medium" -msgstr "Meza" +msgstr "Meze" #: ../interfaces/network.ui.h:27 msgid "Modem" @@ -147,7 +148,7 @@ #: ../interfaces/network.ui.h:32 msgid "Options" -msgstr "Opcioj" +msgstr "Agordoj" #: ../interfaces/network.ui.h:33 msgid "P_assword" @@ -167,7 +168,7 @@ #: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" -msgstr "" +msgstr "Konservi nunan retan agordon kiel lokon" #: ../interfaces/network.ui.h:38 msgid "Search Domains" @@ -237,9 +238,9 @@ msgid "_Subnet mask:" msgstr "_Subreta masko:" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" -msgstr "_Uzantnomo:" +msgstr "_Uzantonomo:" #. TRANSLATORS: Volume as in loudness #: ../interfaces/network.ui.h:57 @@ -369,7 +370,7 @@ #: ../interfaces/time.ui.h:4 msgid "Selection" -msgstr "Elektaĵo" +msgstr "Elektaĵo" #: ../interfaces/time.ui.h:5 msgid "Synchronize now" @@ -377,23 +378,23 @@ #: ../interfaces/time.ui.h:6 msgid "Time Zone" -msgstr "Tempozono" +msgstr "Horzono" #: ../interfaces/time.ui.h:7 msgid "Time servers" -msgstr "Temposerviloj" +msgstr "Horserviloj" #: ../interfaces/time.ui.h:8 msgid "Time servers:" -msgstr "Temposerviloj:" +msgstr "Horserviloj:" #: ../interfaces/time.ui.h:9 msgid "Time zone" -msgstr "Tempozono" +msgstr "Horzono" #: ../interfaces/time.ui.h:10 msgid "Time zone:" -msgstr "Tempozono:" +msgstr "Horzono:" #: ../interfaces/time.ui.h:11 msgid "Unconfigured" @@ -409,13 +410,15 @@ #: ../interfaces/time.ui.h:14 msgid "_Time:" -msgstr "_Tempo:" +msgstr "_Horo:" #: ../interfaces/users.ui.h:1 msgid "" -"A user with this name already exists. Please choose a different short name " -"for the new user." +"A user with this name already exists. Please choose a different name for the " +"new user." msgstr "" +"Uzanto kun tiu nomo jam ekzistas. Bonvolu elekti alian nomon por la nova " +"uzanto." #: ../interfaces/users.ui.h:2 msgid "Account _type:" @@ -435,7 +438,7 @@ #: ../interfaces/users.ui.h:6 msgid "Automatic UID/GID" -msgstr "" +msgstr "Aŭtomata UID/GID" #: ../interfaces/users.ui.h:7 msgid "Basic Settings" @@ -450,8 +453,8 @@ msgstr "Ŝanĝi uzantokonto-tipon" #: ../interfaces/users.ui.h:10 -msgid "Change User Name and Login" -msgstr "Ŝanĝi uzantonomon kaj ensaluti" +msgid "Change User Name" +msgstr "Ŝanĝi uzantonomon" #: ../interfaces/users.ui.h:11 msgid "Change User Password" @@ -515,6 +518,9 @@ "from people with physical access to your computer, at the expense of a " "slightly reduced performance." msgstr "" +"Ĉifri ĉiujn viajn dosierojn per via ensalutadpasvorto por forte protekti ili " +"el personoj kiu povas akiri al via komputilo. Ĝi iomete malrapidos la " +"sistemon." #: ../interfaces/users.ui.h:26 msgid "Full _Name:" @@ -541,119 +547,123 @@ msgstr "Grupaj ecoj" #: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "Grupoj disponeblaj en la sistemo:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Agordaro de grupoj" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Ma_ksimumo da tagoj pasvorto uzeblas:" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "Plej granda GID:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "Maksimuma UID:" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "Mi_nimumo da tagoj inter pasvortŝanĝoj:" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "Minimuma GID:" -#: ../interfaces/users.ui.h:39 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "Minimuma UID:" -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Minimumo da tagoj permesataj inter pasvortŝanĝoj:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "Nova _pasvorto:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Nombro de tagoj kiom pasvorto uzeblas:" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "O_ficeja loko:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:45 msgid "Optional Settings" msgstr "Malnepraj agordoj" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:46 msgid "Password Settings" msgstr "Pasvort-agordoj" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Pasvorto agordita al: " -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Privilegioj" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:49 msgid "Profile Settings" msgstr "Konto-agordoj" -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "Profil_nomo:" -#: ../interfaces/users.ui.h:50 +#: ../interfaces/users.ui.h:51 msgid "Set password b_y hand" msgstr "Agordi pasvorton _permane" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! #: ../interfaces/users.ui.h:52 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" - -#: ../interfaces/users.ui.h:56 -msgid "Short name must start with a letter!" -msgstr "" - -#: ../interfaces/users.ui.h:57 msgid "System Defaults" msgstr "Sistem-defaŭltoj" -#: ../interfaces/users.ui.h:58 +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "Tiu konto estas malebligite." -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." msgstr "" -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "Uzanto-ID:" -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Uzanto-privilegioj" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "Uzanto-profiloj" -#: ../interfaces/users.ui.h:63 -msgid "You can't change user ID while the user is logged in." +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" msgstr "" +"Uzantonomo enhavas:\n" +" ➣ malmajusklajn literojn el angla alfabeto\n" +" ➣ numerojn\n" +" ➣ la karakterojn \".\", \"-\" kaj \"_\"" + +#: ../interfaces/users.ui.h:63 +msgid "Username must start with a letter!" +msgstr "Uzantonomo komencu per litero!" #: ../interfaces/users.ui.h:64 msgid "_Add Profile" @@ -689,7 +699,7 @@ #: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" -msgstr "" +msgstr "Ĉifri vian h_ejmdosieron por protekti gravajn datumojn" #: ../interfaces/users.ui.h:73 msgid "_Generate" @@ -723,14 +733,33 @@ msgid "_Shell:" msgstr "Ŝ_elo:" -#: ../interfaces/users.ui.h:81 -msgid "_Short Name:" -msgstr "_Mallonga nomo:" - #: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "_Laboreja telefono:" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "Montri ĉefuzanton" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "Montri sistemuzantojn" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "" + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "" + +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "La platformo kiun vi rulas, ne estas subtenata de ĉi tiu ilo" @@ -764,7 +793,7 @@ msgstr "Al vi ne estas permesata atingi la sisteman aordon." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Vi ne rajtas modifi la sisteman agordaron." @@ -777,24 +806,60 @@ msgid "An unknown error occurred." msgstr "Okazis nekonata eraro" -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Helpo" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Ne povis montri helpon" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "La sistemagordaro eventuale ŝanĝiĝis." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "Ĉu ĝisdatigi enhavon? Tio perdigos iun ajn modifon." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" "You may report this as a bug." msgstr "" +"Eraro okazis dum kontrolado por aŭtentigadoj: %s\n" +"Vi povas raporti ĝin kiel cimo" + +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Ŝlosi" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Malŝlosi" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Ŝlosite" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 @@ -812,17 +877,19 @@ #: ../src/network/callbacks.c:237 ../src/network/callbacks.c:487 msgid "Changing interface configuration" -msgstr "" +msgstr "Ŝanĝante interfacan agordon" #: ../src/network/callbacks.c:299 msgid "Could not autodetect modem device" -msgstr "" +msgstr "Ne eblis aŭtomate detekti modemaparaton" #: ../src/network/callbacks.c:302 msgid "" "Check that the device is not busy and that is correctly attached to the " "computer." msgstr "" +"Kontrolu ke la aparato ne estas okupata kaj ke ĝi estas korekte konektata al " +"la komputilo." #: ../src/network/callbacks.c:523 msgid "The host name has changed" @@ -840,53 +907,53 @@ msgid "Change _Host name" msgstr "Ŝanĝi ĉef_komputilan nomon" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Aŭtomata agordo (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "" "Copy text \t\r\n" "Loka Zeroconf-reto (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Fiksa IP-adreso" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP-ŝlosilo (askia)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP-ŝlosilo (deksesuma)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA persona" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 persona" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN-modemo" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Seria modemo" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Ecoj de %s" @@ -898,7 +965,7 @@ #: ../src/network/hosts.c:89 msgid "IP Address" -msgstr "IP-Adreso" +msgstr "IP-adreso" #: ../src/network/hosts.c:97 msgid "Aliases" @@ -910,7 +977,7 @@ #: ../src/network/ifaces-list.c:282 msgid "Roaming mode enabled" -msgstr "Vagoreĝimo ŝaltita" +msgstr "Vagoreĝimo enŝaltita" #: ../src/network/ifaces-list.c:289 #, c-format @@ -977,7 +1044,7 @@ #: ../src/network/locations-combo.c:370 msgid "_Location name:" -msgstr "_Loknomon:" +msgstr "_Loknomo:" #: ../src/network/locations-combo.c:422 #, c-format @@ -993,6 +1060,8 @@ "Check that it is correctly typed and that it is correctly supported by your " "system." msgstr "" +"Kontrolu ke ĝi estas korekte tajpita kaj ke ĝi estas korekte subtenata de " +"via sistemo." #: ../src/network/main.c:183 msgid "Configure a network interface" @@ -1004,7 +1073,7 @@ #: ../src/network/main.c:184 msgid "Configure the first network interface with a specific type" -msgstr "" +msgstr "Agordi la unuan retan interfacon per specifa tipo" #: ../src/network/main.c:184 msgid "TYPE" @@ -1135,12 +1204,12 @@ #: ../src/services/service.c:44 msgid "Synchronizes your computer clock with Internet time servers" -msgstr "Sinkronigas vian komputilan horloĝon kun interretaj temposerviloj" +msgstr "Sinkronigas vian komputilan horloĝon kun interretaj horserviloj" #. GST_ROLE_NTP_SERVER #: ../src/services/service.c:46 msgid "Antivirus" -msgstr "Kontraŭvirusa" +msgstr "Kontraŭviruse" #: ../src/services/service.c:46 msgid "Analyzes your incoming mail for virus" @@ -1568,11 +1637,11 @@ msgstr "" "Vi devas instali minimume ĉu Samba ĉu NFS por publikigi viajn dosierujojn." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mondmapo" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1580,47 +1649,47 @@ #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" -msgstr "Ŝanĝi sistemajn tempon, daton kaj tempozonon" +msgstr "Ŝanĝi sistemajn horon, daton kaj horzonon" #: ../src/time/time.desktop.in.in.h:2 msgid "Time and Date" -msgstr "Tempo kaj dato" +msgstr "Horo kaj dato" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP-subteno ne estas instalita" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." msgstr "" "Bonvole instalu kaj aktivigu NTP-subtenon en la sistemo por ebligi " -"sinkronigon de via loka temposervilo kun la interretaj temposerviloj." +"sinkronigon de via loka horoservilo kun la interretaj horoserviloj." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" -msgstr "Ŝaltante NTP" +msgstr "Enŝaltante NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" -msgstr "Malŝaltante NTP" +msgstr "Elŝaltante NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Sinkronigi sistemhorloĝon" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Teni sinkronizata kun interretaj serviloj" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Mane" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" -msgstr "Agordaro de tempo kaj dato" +msgstr "Agordaro de horo kaj dato" #: ../src/users/group-settings.c:55 msgid "Administrator group can not be deleted" @@ -1628,7 +1697,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Ĉi tio lasus la sistemon neuzebla" @@ -1693,111 +1762,111 @@ #: ../src/users/group-settings.c:261 #, c-format msgid "Group ID %d is already used by group \"%s\"" -msgstr "" +msgstr "Grup-ID %d estas jam uzata de grupo \"%s\"" #: ../src/users/group-settings.c:264 msgid "Please choose a different numeric identifier for the new group." -msgstr "" +msgstr "Bonvolu uzi malsaman numeridentigilon por la nova grupo." #: ../src/users/group-settings.c:266 #, c-format msgid "Please choose a different numeric identifier for group \"%s\"." -msgstr "" +msgstr "Bonvolu uzi malsaman numeridentigilon por la grupo \"%s\"." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Grupnomo" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Ne demandi ĉe ensaluto" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Demandi ĉe ensaluto" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Monitori sistemprotokolojn" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administri la sistemon" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Uzi saon-aparatojn" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Uzi CD-ROM-diskingojn" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Registri KD/DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Uzi modemojn" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Konekti al interreto pere de modemo" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Sendi kaj ricevi faksojn" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Uzi disketingojn" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Surmeti uzantspacajn dosiersistemojn (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" -msgstr "Seti la printilojn" +msgstr "Seti la presilojn" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Konekti al sendrataj kaj eterretaj retoj" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Aŭtomate atingi eksternajn memoraparatojn" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Haltigi kaj bloki la komputilon" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Atingo al /proc dosiersistemo" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Uzi skanilojn" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Uzi bendingojn" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Uzi USB aparatojn" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" -msgstr "" +msgstr "Uzi VirtualBox kiel virtualig-solvo" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Uzi videajn aparatojn" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Ebligi akiri administrajn privilegiojn" @@ -1825,37 +1894,42 @@ msgid "Authentication failed" msgstr "Aŭtentokontrolo malsukcesis" -#: ../src/users/run-passwd.c:496 +#: ../src/users/run-passwd.c:498 #, c-format msgid "The new password is too short" msgstr "La nova pasvorto estas tro mallonge" -#: ../src/users/run-passwd.c:501 +#: ../src/users/run-passwd.c:504 #, c-format msgid "The new password is too simple" msgstr "La nova pasvorto estas tro simple" -#: ../src/users/run-passwd.c:507 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "La malnova kaj la nova pasvortoj estas tro simile" -#: ../src/users/run-passwd.c:510 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" -msgstr "" +msgstr "La nova pasvorto enhavu numeran aŭ specialan signon" -#: ../src/users/run-passwd.c:514 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "La malnova kaj la nova pasvortoj estas samaj" -#: ../src/users/run-passwd.c:518 +#: ../src/users/run-passwd.c:520 #, c-format -msgid "Your password has been changed since you initially authenticated!" +msgid "The new password has already been used recently." msgstr "" -#: ../src/users/run-passwd.c:522 +#: ../src/users/run-passwd.c:524 +#, c-format +msgid "Your password has been changed since you initially authenticated!" +msgstr "Via pasvorto estas ŝanĝita ekde kiam vi unuafoje aŭtentiĝis!" + +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "Nekonata eraro" @@ -1888,15 +1962,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Konfirmi ke vi provizis la saman pasvorton en ambaŭ tekstkampoj." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Bonvole elektu alian pasvorton." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Bonvole tajpi vian aktualan pasvorton denove." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Ne eblis ŝanĝi pasvorton." @@ -1949,33 +2023,33 @@ msgid "Delete Files" msgstr "Forigi dosierojn" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Ĉefuzanto" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Propre" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Nenio" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Nevalida signo \"%c\" en komento" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Kontrolu ke ĉi tiu signo ne estas uzata." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Nekompleta vojindiko en hejma dosierujo" -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -1983,41 +2057,106 @@ "Bonvole entajpu plenan vojindikon por hejma dosierujo\n" "ekz.: /home/aleksandro." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "Hejma dosierujo jam ekzistas" +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 +msgid "New home directory already exists, use it?" +msgstr "Nova hejmdosierujo jam ekzistas, ĉu uzi ĝin?" + +#: ../src/users/user-settings.c:454 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" + +#: ../src/users/user-settings.c:466 +msgid "_Replace With Old Files" +msgstr "Anstataŭigu per malnovaj dosieroj" + +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 +msgid "_Cancel Change" +msgstr "Nuligu ŝanĝojn" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:470 +msgid "_Use New Files" +msgstr "_Uzu novajn dosierojn" -#: ../src/users/user-settings.c:434 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 +msgid "Make user the _owner of the new home directory" +msgstr "" + +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 +msgid "_Delete old home directory" +msgstr "Forigu malnovan hejmon" + +#: ../src/users/user-settings.c:498 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" + +#: ../src/users/user-settings.c:508 +msgid "_Delete Files" +msgstr "Forigu _dosierojn" + +#: ../src/users/user-settings.c:510 +msgid "_Use Existing Files" +msgstr "_Uzu ekzistantajn dosierojn" + +#: ../src/users/user-settings.c:531 +msgid "Copy old home directory to new location?" +msgstr "Ĉu kopiu malnovan hejmdosierujon al nova loko?" + +#: ../src/users/user-settings.c:533 #, c-format msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." msgstr "" -#: ../src/users/user-settings.c:440 -msgid "Use this directory" -msgstr "Uzi tiun dosierujon" +#: ../src/users/user-settings.c:544 +msgid "_Use Empty Directory" +msgstr "_Uzu malplenan dosierujon" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:547 +msgid "Co_py Old Files" +msgstr "Ko_piu malnvajn dosierojn" -#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "" #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Uzanto-ID %d jam estas uzate de uzanto %s" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "" -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Nekompleta vojindiko en ŝelo" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2025,97 +2164,57 @@ "Bonvole entajpu plenan vojindikon por ŝelo\n" "ekz.: /bin/bash." -#: ../src/users/user-settings.c:534 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." msgstr "" -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." msgstr "" -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "" -#: ../src/users/users-tool.c:288 -msgid "Users Settings" -msgstr "Agordoj de uzantoj" - -#~ msgid "Allowed Hosts" -#~ msgstr "Permesataj gastigaj komputiloj" - -#~ msgid "Shared Folder" -#~ msgstr "Publika dosierujo" - -#~ msgid "" -#~ "Enter password for user:" -#~ msgstr "" -#~ "Tajpu pasvorton por uzanto:" - -#~ msgid "Selection" -#~ msgstr "Elekto" - -#~ msgid "Time Zone" -#~ msgstr "Tempozono" - -#~ msgid "Advanced Settings" -#~ msgstr "Progresita agordaro" - -#~ msgid "Automatic UID/GID" -#~ msgstr "Aŭtomata UID/GID" - -#~ msgid "Basic Settings" -#~ msgstr "Bazaj agordaĵoj" - -#~ msgid "Group Members" -#~ msgstr "Grupanoj" - -#~ msgid "Optional Settings" -#~ msgstr "Ekstra agordaro" - -#~ msgid "Password Settings" -#~ msgstr "Pasvorta agordaro" +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Vi ne povas ŝanĝi la uzanto-ID-n de la superuzantokonto." -#~ msgid "Profile Settings" -#~ msgstr "Profila agordaro" - -#~ msgid "System Defaults" -#~ msgstr "Implicitaj sistemvaloroj" - -#~ msgid "Address: %s Subnet mask: %s" -#~ msgstr "Adreso: %s Subreta masko: %s" - -#~ msgid "Address: %s" -#~ msgstr "Adreso: %s" - -#~ msgid "Address: %s Remote address: %s" -#~ msgstr "Adreso: %s Fora adreso: %s" - -#~ msgid "Type: %s Phone number: %s" -#~ msgstr "Tipo: %s Telefonnumero: %s" +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" -#~ msgid "Type: %s Access point name: %s" -#~ msgstr "Tipo: %s Alirpunkta nomo: %s" +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Vi ne povas ŝanĝi la kontan hejmdosierujon aŭ uzanto-ID-n dum la uzanto " +"estas ensalutite." -#~ msgid "Type: %s Ethernet interface: %s" -#~ msgstr "Tipo: %s Eterreta interfaco: %s" +#: ../src/users/user-settings.c:1512 +msgid "Applying changes to user settings..." +msgstr "" -#~ msgid "Type: %s" -#~ msgstr "Tipo: %s" +#: ../src/users/users-tool.c:300 +msgid "Users Settings" +msgstr "Agordoj de uzantoj" #~ msgid "Install services" #~ msgstr "Instali servojn" diff -Nru gnome-system-tools-2.32.0/po/es.po gnome-system-tools-3.0.0/po/es.po --- gnome-system-tools-2.32.0/po/es.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/es.po 2011-04-02 12:55:08.000000000 +0000 @@ -10,15 +10,16 @@ # Pablo del Campo , 2003. # Francisco Javier F. Serrador , 2004, 2005, 2006. # Rodrigo Marcos Fombellida , 2007. -# Jorge González , 2007, 2008, 2009, 2010. +# Daniel Mustieles , 2010. +# Jorge González , 2007, 2008, 2009, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2010-08-20 09:55+0000\n" -"PO-Revision-Date: 2010-08-22 21:15+0200\n" +"POT-Creation-Date: 2011-02-26 18:04+0000\n" +"PO-Revision-Date: 2011-02-27 13:23+0100\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -243,7 +244,7 @@ msgid "_Subnet mask:" msgstr "Máscara de _subred:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Usuario:" @@ -673,79 +674,74 @@ msgstr "El nombre de usuario debe comenzar por una letra." #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"No puede cambiar el ID del usuario cuando el usuario ha iniciado sesión." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Añadir perfil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "Ajustes _avanzados" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Cambiar…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Comentarios" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "Contraseña _actual:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Personalizado" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Días entre la advertencia y la expiración de la contraseña:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Activar cuenta" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "Ci_frar la carpeta personal para proteger los datos sensibles" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Generar" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "Directorio per_sonal:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Teléfono del _domicilio:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "Grupo pri_ncipal:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "Gestionar g_rupos" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Nombre:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Contraseña:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Teléfono del _trabajo:" @@ -771,6 +767,11 @@ "Indica si la herramienta de administración de usuarios debe mostrar el " "usuario root en la lista de usuarios." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Error al acceder a los permisos del sistema: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "" @@ -807,7 +808,7 @@ msgstr "No se le permite acceder a la configuración del sistema." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "No se le permite modificar la configuración del sistema." @@ -820,19 +821,23 @@ msgid "An unknown error occurred." msgstr "Ocurrió un error desconocido." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Ayuda" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "No se pudo mostrar la ayuda" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "La configuración del sistema ha cambiado." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "¿Actualizar el contenido? Se perderá cualquier modificación en curso." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -841,6 +846,42 @@ "Ocurrió un error al comprobar las actualizaciones: %s\n" "Puede informar de esto como un error." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Bloquear" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Desbloquear" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Bloqueado" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"El diálogo está desbloqueado.\n" +"Pulse para evitar posibles cambios" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"El diálogo está bloqueado.\n" +"Pulse para realizar cambios." + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"La política del sistema impide los cambios.\n" +"Contacte con el administrador de su sistema" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -887,51 +928,51 @@ msgid "Change _Host name" msgstr "Cambiar nombre del _equipo" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Configuración automática (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Red local Zeroconf (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Dirección IP estática" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Clave WEP (ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Clave WEP (hexadecimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA personal" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 personal" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Módem RDSI" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Módem serie" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Propiedades de %s" @@ -1615,11 +1656,11 @@ "folders." msgstr "Necesita instalar al menos Samba o NFS para compartir sus carpetas." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mapa del mundo" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1636,11 +1677,11 @@ msgid "Time and Date" msgstr "Hora y fecha" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "El soporte NTP no está instalado" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1648,27 +1689,27 @@ "Instale y active el soporte NTP en el sistema para activar la sincronización " "con su servidor de hora local con los servidores de hora de Internet." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Activando NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Desactivando NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Sincronizando reloj del sistema" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Mantener sincronizado con los servidores de Internet" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Manual" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Ajustes de hora y fecha" @@ -1678,7 +1719,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Esto podría dejar el sistema inutilizable." @@ -1753,100 +1794,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Elija un identificador numérico diferente para el grupo «%s»." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Nombre del grupo" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "No preguntar al iniciar sesión" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Preguntar al iniciar sesión" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Monitorizar los registros del sistema" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administrar el sistema" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Usar dispositivos de sonido" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Usar unidades de CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Grabar CD / DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Usar módems" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Conectar a Internet con un módem" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Enviar y recibir faxes" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Usar disqueteras" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Montar sistemas de archivo de espacio de usuario (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Configurar impresoras" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Conectar con una red inalámbrica y otras redes ethernet" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Acceder automáticamente a dispositivos de almacenamiento externo" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Suspender e hibernar el equipo" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Acceder al sistema de archivos /proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Usar escáneres" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Usar unidades de cinta" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Usar dispositivos USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Usar la solución de virtualización de VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Usar dispositivos de vídeo" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Poder obtener privilegios de administrador" @@ -1947,15 +1988,15 @@ msgstr "" "Compruebe que ha proporcionado la misma contraseña en ambos campos de texto." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Elija otra contraseña." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Escriba de nuevo su contraseña actual." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "No se pudo cambiar la contraseña" @@ -2016,33 +2057,33 @@ msgid "Delete Files" msgstr "Eliminar archivos" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Superusuario" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Ninguna" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Carácter inválido «%c» en comentario" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Compruebe que este carácter no se use." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Ruta incompleta en el directorio personal" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2050,17 +2091,16 @@ "Escriba la ruta completa para el directorio personal\n" "ej: /home/juan." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 -#| msgid "Home directory already exists" +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "La carpeta personal ya existe, ¿quiere usarlo?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." @@ -2072,32 +2112,30 @@ "Si duda, use la nueva carpeta personal para evitar la pérdida de datos, y " "copie los archivos de la carpeta antigua más tarde." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Reemplazar con los archivos antiguos" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Cancelar el cambio" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 -#| msgid "Keep Files" +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "_Usar archivos nuevos" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Hacer que el _usuario sea el propietario de la nueva carpeta personal" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 -#| msgid "Incomplete path in home directory" +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Eliminar la carpeta personal antigua" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2112,20 +2150,19 @@ "\n" "Si duda, mantenga los archivos y elimínelos luego si es necesario." -#: ../src/users/user-settings.c:503 -#| msgid "Delete Files" +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Eliminar archivos" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "_Usar archivos existentes" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "¿Copiar la carpeta personal antigua a la nueva ubicación?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2142,36 +2179,35 @@ "Si elije copiar los archivos a la ubicación nueva, es más seguro eliminar la " "carpeta antigua." -#: ../src/users/user-settings.c:539 -#| msgid "Use this directory" +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Usar carpeta vacía" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "C_opiar archivos antiguos" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "No se debe modificar el ID para el usuario root" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "El ID de usuario %d ya se está usando para el usuario %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Elija un identificador numérico diferente para %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Ruta incompleta en el shell" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2179,11 +2215,11 @@ "Introduzca una ruta completa para la shell\n" "ej: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "No se pueden revocar los privilegios de administración" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2193,11 +2229,11 @@ "administración para esta cuenta le dejará sin privilegios de administración " "en el sistema." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Está a punto de revocar sus propios privilegios de administración" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2206,15 +2242,36 @@ "%s no podrá realizar tareas administrativas. No se permitirá que esta cuenta " "obtenga privilegios de administración por si misma." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Renunciar a los privilegios de administración" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "No puede cambiar el ID del usuario para la cuenta de superusuario." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"No puede desactivar su propia cuenta, ni tampoco cambiar su propia carpeta " +"personal o ID de usuario. Para editar estos ajustes ejecute este programa " +"desde la sesión de otro usuario." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"No puede cambiar la carpeta personal o el ID de un usuario mientras el " +"usuario haya iniciado sesión en el sistema." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Aplicar cambios a la configuración del usuario…" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Ajustes de los usuarios" @@ -2335,9 +2392,6 @@ #~ "Introduzca una contraseña para modificar\n" #~ "la configuración de su sistema." -#~ msgid "_Unlock" -#~ msgstr "_Desbloquear" - #~ msgid "This action is not allowed" #~ msgstr "Esta acción no está permitida" diff -Nru gnome-system-tools-2.32.0/po/et.po gnome-system-tools-3.0.0/po/et.po --- gnome-system-tools-2.32.0/po/et.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/et.po 2011-02-12 16:38:38.000000000 +0000 @@ -2,27 +2,28 @@ # Estonian translation of Gnome System Tools. # # Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. -# Copyright (C) 2007–2010 The GNOME Project +# Copyright (C) 2007–2011 The GNOME Project # This file is distributed under the same license as the gnome-system-tools # package. # # Tõivo Leedjärv , 2002. # Ivar Smolin , 2005–2010. # Priit Laes , 2006. -# Mattias Põldaru , 2010. +# Mattias Põldaru , 2010–2011. # msgid "" msgstr "" "Project-Id-Version: GNOME System Tools MASTER\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2010-08-20 09:55+0000\n" -"PO-Revision-Date: 2010-08-27 13:47+0300\n" -"Last-Translator: Ivar Smolin \n" +"POT-Creation-Date: 2010-12-20 12:09+0000\n" +"PO-Revision-Date: 2011-01-07 11:14+0300\n" +"Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Access point name:" @@ -514,10 +515,6 @@ msgid "Username must start with a letter!" msgstr "Kasutajanimi peab algama tähega!" -msgid "You can't change user ID while the user is logged in." -msgstr "" -"Kasutaja ID-d pole võimalik muuta sel ajal, kui kasutaja on sisse logitud." - msgid "_Add Profile" msgstr "_Lisa profiil" @@ -590,6 +587,10 @@ "Kas kasutajate haldamise vahend peab kasutajate nimekirjas näitama ka " "juurkasutajat või mitte." +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Viga süsteemi õigustele ligipääsemisel: %s" + msgid "The platform you are running is not supported by this tool" msgstr "Sinu poolt kasutatav platvorm pole käesoleva vahendi poolt toetatud" @@ -645,6 +646,36 @@ "Autoriseeringute kontrollil esines viga: %s\n" "Võid sellest veast raporteerida." +msgid "Lock" +msgstr "Lukusta" + +msgid "Unlock" +msgstr "Võta lukust lahti" + +msgid "Locked" +msgstr "Lukus" + +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Dialoog on lukust lahti.\n" +"Muutmise keelamiseks klõpsa siin" + +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Dialoog on lukus.\n" +"Muutuste tegemiseks klõpsa siin" + +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Süsteemi eeskirjad takistavad muutuste tegemist.\n" +"Palun võta ühendust oma süsteemihalduriga" + msgid "_Add" msgstr "_Lisa" @@ -1116,7 +1147,7 @@ #. GST_ROLE_RAID_MANAGEMENT msgid "Graphic tablets management" -msgstr "Graafiliste digitahvlite haldus" +msgstr "Graafikalaudade haldus" #. GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT msgid "CPU Frequency manager" @@ -1586,10 +1617,9 @@ "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." msgstr "" -"Kasutaja %s kodukataloogiks on määratud juba olemas olev kataloog " -"%s. " -"Kas soovid kasutada selles kataloogis olevaid faile või asendada need failid " -"kataloogist %s kopeeritavate failidega?\n" +"Kasutaja %s kodukataloogiks on määratud juba olemas olev kataloog %s. Kas soovid kasutada selles kataloogis olevaid faile või asendada need " +"failid kataloogist %s kopeeritavate failidega?\n" "\n" "Kõhkluste korral kasuta andmete kaotsimineku vältimiseks uues kodukataloogis " "olevaid faile ja lükka vanast kataloogist failide kopeerimine edasi." @@ -1619,10 +1649,9 @@ "\n" "In doubt, keep the files, and remove them later if needed." msgstr "" -"Kasutaja %s kodukataloogiks on määratud juba olemas olev kataloog " -"%s. " -"Kas soovid kasutada selles kataloogis olevaid faile või tuleb see kataloog " -"tühjendada ja kasutada täiesti tühja kodukataloogi?\n" +"Kasutaja %s kodukataloogiks on määratud juba olemas olev kataloog %s. Kas soovid kasutada selles kataloogis olevaid faile või tuleb see " +"kataloog tühjendada ja kasutada täiesti tühja kodukataloogi?\n" "\n" "Kõhkluste korral säilita olemasolevad failid ja vajadusel kustuta need " "hiljem." @@ -1645,9 +1674,9 @@ "If you choose to copy the files to the new location, it's safe to delete the " "old directory." msgstr "" -"Kasutaja %s kodukataloogiks on määratud olematu kataloog %s. " -"Kas soovid sinna kopeerida vana kodukataloogi (%s) failid või " -"soovid luua täiesti tühja kodukataloogi?\n" +"Kasutaja %s kodukataloogiks on määratud olematu kataloog %s. Kas " +"soovid sinna kopeerida vana kodukataloogi (%s) failid või soovid " +"luua täiesti tühja kodukataloogi?\n" "\n" "Kui valida vanade failide kopeerimine, siis ei tohiks vana kodukataloogi " "kustutamisest probleeme tekkida." @@ -1707,6 +1736,24 @@ msgid "Give up administration rights" msgstr "Ütle administraatori õigustest lahti" +msgid "You cannot change the user ID for the superuser account." +msgstr "Juurkasutaja kontol pole võimalik kasutaja ID-d muuta." + +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Oma kasutajakontot pole võimalik keelata. Samuti pole võimalik muuta enda " +"kodukataloogi ega kasutaja ID-d. Oma kasutaja sätete muutmiseks käivita " +"programm mõne teise kasutaja seansi alt." + +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Kasutaja ID-d ega kodukataloogi pole võimalik muuta ajal, mil kasutaja on " +"sisse logitud." + msgid "Applying changes to user settings..." msgstr "Muudatuste rakendamine kasutaja sätetele..." diff -Nru gnome-system-tools-2.32.0/po/eu.po gnome-system-tools-3.0.0/po/eu.po --- gnome-system-tools-2.32.0/po/eu.po 2010-06-07 21:51:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/eu.po 2010-10-13 10:06:28.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-27 18:01+0100\n" -"PO-Revision-Date: 2010-03-27 18:01+0100\n" +"POT-Creation-Date: 2010-09-30 21:03+0200\n" +"PO-Revision-Date: 2010-09-30 23:37+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" @@ -20,182 +20,170 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../gnome-system-tools.schemas.in.h:1 -msgid "Whether the users-admin tool should show system users in the users list" -msgstr "" -"Erabiltzaileak administratzeko tresnak sistemako erabiltzaileak erakutsiko " -"dituen erabiltzaileen zerrendan ala ez adierazten du" - -#: ../gnome-system-tools.schemas.in.h:2 -msgid "Whether the users-admin tool should show the root user in the users list" -msgstr "" -"Erabiltzaileak administratzeko tresnak root erabiltzailea erakutsiko duen " -"erabiltzaileen zerrendan ala ez adierazten du" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "Atzipen-puntuaren izena:" -#: ../interfaces/network.ui.h:1 +#: ../interfaces/network.ui.h:2 msgid "Account data" msgstr "Kontuaren datuak" -#: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "Konexioaren ezarpenak" - #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "DNS zerbitzariak" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "Ostalariaren ezarpenak" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "Interneteko Zerbitzu-Hornitzailearen (ISP) datuak" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "Modemaren ezarpenak" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "Bilaketako domeinuak" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "Hari gabeko sare-ezarpenak" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "Atzipen-puntuaren izena:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "Aliasak:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "_Konfigurazioa:" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +msgid "Connection Settings" +msgstr "Konexioaren ezarpenak" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "Konexio mota:" -#: ../interfaces/network.ui.h:13 +#: ../interfaces/network.ui.h:7 msgid "Connections" msgstr "Konexioak" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNSa" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +msgid "DNS Servers" +msgstr "DNS zerbitzariak" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "_Domeinuaren izena:" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "Ezabatu uneko helbidea" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "_Gaitu ibiltari-modua" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "_Gaitu konexio hau" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "Ethernet interfazea:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32 +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "Orokorra" -#: ../interfaces/network.ui.h:21 +#: ../interfaces/network.ui.h:16 msgid "Hexadecimal" msgstr "Hamaseitarra" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "Ostalarien aliasen propietateak" -#: ../interfaces/network.ui.h:23 +#: ../interfaces/network.ui.h:18 +msgid "Host Settings" +msgstr "Ostalariaren ezarpenak" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" msgstr "Ostalariak" -#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "IP helbidea:" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "Interfazearen propietateak" -#: ../interfaces/network.ui.h:26 +#: ../interfaces/network.ui.h:22 +msgid "Internet service provider data" +msgstr "Interneteko Zerbitzu-Hornitzailearen (ISP) datuak" + +#: ../interfaces/network.ui.h:23 msgid "Location:" msgstr "Helbidea:" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:24 msgid "Loud" msgstr "Altua" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:25 msgid "Low" msgstr "Baxua" -#: ../interfaces/network.ui.h:29 +#: ../interfaces/network.ui.h:26 msgid "Medium" msgstr "Tartekoa" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "Modema" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:28 +msgid "Modem Settings" +msgstr "Modemaren ezarpenak" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "Sareko _pasahitza:" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "Sarearen izena (_ESSID):" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:31 msgid "Off" msgstr "Itzalita" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "Aukerak" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "_Pasahitza" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "Pasahitz _mota:" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:35 msgid "Plain (ASCII)" msgstr "Soila (ASCII)" -#: ../interfaces/network.ui.h:38 +#: ../interfaces/network.ui.h:36 msgid "Pulses" msgstr "Pultsuak" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" msgstr "Gorde sarearen uneko konfigurazioa helbide gisa" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:38 +msgid "Search Domains" +msgstr "Bilaketako domeinuak" + +#: ../interfaces/network.ui.h:39 msgid "Tones" msgstr "Tonuak" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "Erabili Interneteko Zerbitzu-Hornitzailearen (ISP) izen-zerbitzariak" +#: ../interfaces/network.ui.h:41 +msgid "Wireless Settings" +msgstr "Hari gabeko sare-ezarpenak" + #: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "_Autodetektatu" @@ -248,7 +236,7 @@ msgid "_Subnet mask:" msgstr "A_zpisareko maskara:" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 msgid "_Username:" msgstr "_Erabiltzaile-izena:" @@ -266,100 +254,98 @@ msgstr "Hautatu aktibatzea nahi dituzun zerbitzuak:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "Baimendutako ostalariak" +msgid "Add allowed hosts" +msgstr "Gehitu baimendutako ostalariak" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "Ostalarien ezarpenak" +msgid "Allowed Hosts" +msgstr "Baimendutako ostalariak" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "Partekatze-propietateak" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "Partekatutako karpeta" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "Windows-ek partekatzea" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"Sartu erabiltzailearen pasahitza:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "Gehitu baimendutako ostalariak" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "Baimendutako ostalariak:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "Iruzkina:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "Domeinua / _Lan-taldea:" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "Sartu erabiltzailearen pasahitza" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +msgid "Enter password for user:" +msgstr "Sartu erabiltzailearen pasahitza:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "Propietate orokorrak" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "Ostalari-izena:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +msgid "Hosts Settings" +msgstr "Ostalarien ezarpenak" + +#: ../interfaces/shares.ui.h:12 msgid "Name:" msgstr "Izena:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "Sare-maskara:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "Sarea:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "Irakurtzeko soilik" -#: ../interfaces/shares.ui.h:19 +#: ../interfaces/shares.ui.h:16 msgid "Share" msgstr "Partekatu" -#: ../interfaces/shares.ui.h:20 +#: ../interfaces/shares.ui.h:17 +msgid "Share Properties" +msgstr "Partekatze-propietateak" + +#: ../interfaces/shares.ui.h:18 msgid "Share through:" msgstr "Partekatu honen bidez:" -#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2 +#: ../interfaces/shares.ui.h:19 +msgid "Shared Folder" +msgstr "Partekatutako karpeta" + +#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "Partekatutako karpetak" -#: ../interfaces/shares.ui.h:22 +#: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" msgstr "Ordenagailu hau _WINS zerbitzaria da" -#: ../interfaces/shares.ui.h:23 +#: ../interfaces/shares.ui.h:22 msgid "Users" msgstr "Erabiltzaileak" -#: ../interfaces/shares.ui.h:24 +#: ../interfaces/shares.ui.h:23 msgid "WINS _server:" msgstr "WI_NS zerbitzaria:" +#: ../interfaces/shares.ui.h:24 +msgid "Windows sharing" +msgstr "Windows-ek partekatzea" + #: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "_Bide-izena:" @@ -369,29 +355,29 @@ msgstr "_Irakurtzeko soilik" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "Hautapena" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "Ordu-zona" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "Gehitu NTP zerbitzaria" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "NTP zerbitzaria" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "_Hautatu zerbitzariak..." -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +msgid "Selection" +msgstr "Hautapena" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "Sinkronizatu orain" +#: ../interfaces/time.ui.h:6 +msgid "Time Zone" +msgstr "Ordu-zona" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "Ordu-zerbitzariak" @@ -425,120 +411,106 @@ msgstr "_Ordua:" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "Ezarpen aurreratuak" +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "" +"Izen berdineko erabiltzaile bat badago lehendik ere. Aukeratu beste izen " +"labur bat erabiltzaile berriarentzako." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "UID/GID automatikoa" +msgid "Account _type:" +msgstr "Kontu _mota:" #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "Oinarrizko ezarpenak" +msgid "Advanced" +msgstr "Aurreratua" #: ../interfaces/users.ui.h:4 -msgid "Group Members" -msgstr "Taldeko kideak" +msgid "Advanced Settings" +msgstr "Ezarpen aurreratuak" #: ../interfaces/users.ui.h:5 -msgid "Optional Settings" -msgstr "Aukerako ezarpenak" +msgid "Assign a random password by default" +msgstr "Esleitu ausazko pasahitza lehenetsi gisa" #: ../interfaces/users.ui.h:6 -msgid "Password Settings" -msgstr "Pasahitzaren ezarpenak" +msgid "Automatic UID/GID" +msgstr "UID/GID automatikoa" +#: ../interfaces/users.ui.h:7 +msgid "Basic Settings" +msgstr "Oinarrizko ezarpenak" #: ../interfaces/users.ui.h:8 -msgid "System Defaults" -msgstr "Sistemako lehenetsiak" - -#: ../interfaces/users.ui.h:9 -msgid "Account _type:" -msgstr "Kontu _mota:" - -#: ../interfaces/users.ui.h:10 -msgid "Advanced" -msgstr "Aurreratua" - -#: ../interfaces/users.ui.h:11 -msgid "" -"A user with this name already exists. Please choose a different short " -"name for the new user." -msgstr "" -"Izen berdineko erabiltzaile bat badago lehendik ere. Aukeratu beste izen " -"labur bat erabiltzaile berriarentzako." - -#: ../interfaces/users.ui.h:12 -msgid "Assign a random password by default" -msgstr "Esleitu ausazko pasahitza lehenetsi gisa" - -#: ../interfaces/users.ui.h:13 msgid "Change Advanced User Settings" msgstr "Aldatu erabiltzailearen ezarpen aurreratuak" -#: ../interfaces/users.ui.h:14 +#: ../interfaces/users.ui.h:9 msgid "Change User Account Type" msgstr "Aldatu erabiltzailearen kontu mota" -#: ../interfaces/users.ui.h:15 -msgid "Change User Name and Login" -msgstr "Aldatu erabiltzailearen izen eta saio-hasierako izena" +#: ../interfaces/users.ui.h:10 +msgid "Change User Name" +msgstr "Aldatu erabiltzailearen izena" -#: ../interfaces/users.ui.h:16 +#: ../interfaces/users.ui.h:11 msgid "Change User Password" msgstr "Aldatu erabiltzailearen pasahitza" -#: ../interfaces/users.ui.h:17 +#: ../interfaces/users.ui.h:12 msgid "Changing advanced settings for:" msgstr "Honen ezarpen aurreratuak aldatzen:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:13 msgid "Changing user account type for:" msgstr "Erabiltzaile honen kontu mota aldatzen:" -#: ../interfaces/users.ui.h:19 +#: ../interfaces/users.ui.h:14 msgid "Changing user name for:" msgstr "Honen erabiltzaile-izena aldatzen:" -#: ../interfaces/users.ui.h:20 +#: ../interfaces/users.ui.h:15 msgid "Changing user password for:" msgstr "Erabiltzaile honen pasahitza aldatzen:" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "_Baieztapena:" +#: ../interfaces/users.ui.h:17 +msgid "Contact Information" +msgstr "Kontaktuaren informazioa" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:18 msgid "Create New User" msgstr "Sortu erabiltzaile berria" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:19 msgid "Create a new user" msgstr "Sortu erabiltzaile berria" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" msgstr "Jakinarazpen eta pasahitzaren iraungitzearen arteko egunak:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" msgstr "_Talde lehenetsia:" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" msgstr "Komando-lerro lehenetsia:" -#: ../interfaces/users.ui.h:28 +#: ../interfaces/users.ui.h:23 msgid "Disable _account" msgstr "Desgaitu _kontua" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:24 msgid "Don't ask for password on _login" msgstr "Ez eskatu pasahitza _saio-hasieran" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:25 msgid "" "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " @@ -549,78 +521,98 @@ "erabiltzaileengandik babesteko. Jakin ezazu babesak errendimendua piska bat " "moteltzen duela." -#: ../interfaces/users.ui.h:31 +#: ../interfaces/users.ui.h:26 msgid "Full _Name:" msgstr "Izen _osoa:" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "Sortu _ausazko pasahitza" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:29 +msgid "Group Members" +msgstr "Taldeko kideak" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" msgstr "Talde _IDa:" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "Taldearen ize_na:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "Taldearen propietateak" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "Sisteman erabilgarri dauden taldeak:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Taldearen ezarpenak" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Pasahitz bat erabil daitekeen ge_hienezko egun-kopurua:" -#: ../interfaces/users.ui.h:39 +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "Gehienezko GIDa:" -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "Gehienezko UIDa:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "Pasahitz aldaketen arteko g_utxieneko egun-kopurua:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "Gutxieneko GIDa:" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "Gutxieneko UIDa:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Pasahitz aldaketen arteko gutxieneko egun-kopurua:" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "Pasahitz _berria:" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Pasahitz bat erabil daitekeen egun-kopurua:" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "_Bulegoaren kokalekua:" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:45 +msgid "Optional Settings" +msgstr "Aukerako ezarpenak" + +#: ../interfaces/users.ui.h:46 +msgid "Password Settings" +msgstr "Pasahitzaren ezarpenak" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Pasahitza ezarri da: " -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Pribilegioak" +#: ../interfaces/users.ui.h:49 +msgid "Profile Settings" +msgstr "Profilaren ezarpenak" + #: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "Profila-_izena:" @@ -629,28 +621,15 @@ msgid "Set password b_y hand" msgstr "Ezarri pasahitza _eskuz" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! -#: ../interfaces/users.ui.h:53 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"Izen laburraren osagaiak:\n" -" ➣ Ingelera alfabetoko letra minuskulak\n" -" ➣ digituak\n" -" ➣ hauetariko beste edozein karaktere: \".\", \"-\" eta \"_\"" - -#: ../interfaces/users.ui.h:57 -msgid "Short name must start with a letter!" -msgstr "Izen laburra letra batekin hasi behar da." +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "Sistemako lehenetsiak" -#: ../interfaces/users.ui.h:58 +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "Kontu hau desgaitu egin da." -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." @@ -658,100 +637,133 @@ "Kontu honek eskuz definitutako ezarpen berezi batzuk darabilzki. Erabili " "Ezarpen aurreratuak elkarrizketa-koadroa doitzeko." -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "Erabiltzailearen IDa:" -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Erabiltzaile-pribilegioak" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "Erabiltzaile-profilak" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"Erabiltzaile-izenaren osagaiak:\n" +" ➣ Ingelera alfabetoko letra minuskulak\n" +" ➣ digituak\n" +" ➣ hauetariko beste edozein karaktere: \".\", \"-\" eta \"_\"" + #: ../interfaces/users.ui.h:63 +msgid "Username must start with a letter!" +msgstr "Erabiltzaile-izena letra batekin hasi behar da." + +#: ../interfaces/users.ui.h:64 msgid "You can't change user ID while the user is logged in." msgstr "" "Ezin duzu erabiltzailearen IDa aldatu erabiltzaileak saioa hasita duen " "bitartean." -#: ../interfaces/users.ui.h:64 +#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Gehitu profila" -#: ../interfaces/users.ui.h:65 +#: ../interfaces/users.ui.h:66 msgid "_Advanced Settings" msgstr "_Ezarpen aurreratuak" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:67 msgid "_Change..." msgstr "_Aldatu..." -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:68 msgid "_Comments" msgstr "_Iruzkinak" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:69 msgid "_Current password:" msgstr "_Uneko pasahitza:" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:70 msgid "_Custom" msgstr "_Pertsonalizatua" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:71 msgid "_Days between warning and password expiration:" msgstr "Jakinarazpen eta pasahitza iraungitzearen arteko _egunak:" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:72 msgid "_Enable Account" msgstr "_Gaitu kontua" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:73 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Enkriptatu karpeta nagusia datu sentikorrak babesteko" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:74 msgid "_Generate" msgstr "_Sortu" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:75 msgid "_Home directory:" msgstr "_Karpeta nagusia:" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:76 msgid "_Home phone:" msgstr "_Etxeko telefonoa:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:77 msgid "_Main group:" msgstr "_Talde nagusia:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:78 msgid "_Manage Groups" msgstr "Kudeatu _taldeak" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:79 msgid "_Name:" msgstr "_Izena:" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:80 msgid "_Password:" msgstr "_Pasahitza:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:81 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:81 -msgid "_Short Name:" -msgstr "Izen _laburra:" - -#: ../interfaces/users.ui.h:82 +#: ../interfaces/users.ui.h:83 msgid "_Work phone:" msgstr "_Laneko telefonoa:" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "Erakutsi 'root' erabiltzailea" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "Erakutsi sistemako erabiltzaileak" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +msgid "Whether the users-admin tool should show system users in the users list." +msgstr "" +"Erabiltzaileak administratzeko tresnak sistemako erabiltzaileak erakutsiko " +"dituen erabiltzaileen zerrendan ala ez adierazten du." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +msgid "Whether the users-admin tool should show the root user in the users list." +msgstr "" +"Erabiltzaileak administratzeko tresnak root erabiltzailea erakutsiko duen " +"erabiltzaileen zerrendan ala ez adierazten du." + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Tresna honek ez du onartzen exekutatzen ari zaren plataforma" @@ -772,46 +784,46 @@ msgid "Unsupported platform" msgstr "Plataforma ezezaguna" -#: ../src/common/gst-tool.c:190 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "Konfigurazioa ezin izan da kargatu" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:192 +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "Konfigurazioa ezin izan da gorde" -#: ../src/common/gst-tool.c:196 +#: ../src/common/gst-tool.c:194 msgid "You are not allowed to access the system configuration." msgstr "Ez duzu baimenik sistemako konfigurazioan sarbidetzeko." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 msgid "You are not allowed to modify the system configuration." msgstr "Ez duzu baimenik sistemako konfigurazioa aldatzeko." -#: ../src/common/gst-tool.c:201 +#: ../src/common/gst-tool.c:199 msgid "Invalid data was found." msgstr "Baliogabeko datuak aurkitu dira." #. OOBS_RESULT_ERROR -#: ../src/common/gst-tool.c:203 +#: ../src/common/gst-tool.c:201 msgid "An unknown error occurred." msgstr "Errore ezezaguna gertatu da." -#: ../src/common/gst-tool.c:427 +#: ../src/common/gst-tool.c:422 msgid "Could not display help" msgstr "Ezin izan da laguntza bistaratu" -#: ../src/common/gst-tool.c:621 +#: ../src/common/gst-tool.c:616 msgid "The system configuration has potentially changed." msgstr "Sistemako konfigurazioa aldatu egin da." -#: ../src/common/gst-tool.c:623 +#: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." msgstr "Eguneratu edukia? Uneko aldaketak galdu egingo dira." -#: ../src/common/gst-tool.c:692 +#: ../src/common/gst-tool.c:687 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -830,7 +842,7 @@ msgid "_Delete" msgstr "_Ezabatu" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "Helbide mota" @@ -938,61 +950,48 @@ #: ../src/network/ifaces-list.c:289 #, c-format -msgid "Essid: %s " -msgstr "Essid: %s " - -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "Helbidea: %s Azpisareko maskara: %s" - -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "Helbidea: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "Helbidea: %s Urruneko helbidea: %s" - -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "Mota: %s Telefono zenbakia: %s" +msgid "Essid: %s " +msgstr "Essid: %s " -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "Mota: %s Sarbide-puntuaren izena: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +msgid "Address:" +msgstr "Helbidea:" -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "Mota: %s Ethernet interfazea: %s" +#: ../src/network/ifaces-list.c:298 +msgid "Subnet mask:" +msgstr "Azpisareko maskara:" + +#: ../src/network/ifaces-list.c:308 +msgid "Remote address:" +msgstr "Urruneko helbidea:" + +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "Mota:" + +#: ../src/network/ifaces-list.c:321 +msgid "Phone number:" +msgstr "Telefono zenbakia:" -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "Mota: %s" - -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "Hari gabeko konexioa." -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "Konexio infragorria" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" msgstr "Haridun konexioa." -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" msgstr "Ataka paraleloko konexioa" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" msgstr "Puntutik punturako konexioa" @@ -1064,12 +1063,12 @@ msgid "Settings for service \"%s\"" msgstr "\"%s\" zerbitzuaren ezarpenak" -#: ../src/services/callbacks.c:125 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "Ziur %s desaktibatu nahi duzula?" -#: ../src/services/callbacks.c:129 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1541,11 +1540,11 @@ msgid "PATH" msgstr "BIDE-IZENA" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "_Partekatu karpeta..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "Partekatu karpeta hau beste ordenagailuekin" @@ -1604,6 +1603,19 @@ "folders." msgstr "Samba edo NFS instalatu behar duzu zure karpetak partekatu ahal izateko." +#: ../src/time/e-map/e-map.c:620 +msgid "World Map" +msgstr "Munduaren mapa" + +#: ../src/time/e-map/e-map.c:622 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" +"Saguan oinarritutako maparen trepeta elkarreragilea ordu-zona hautatzeko. " +"Teklatuaren bidez hautatu ordu-zona azpiko goitibeherako konbinazio-" +"koadrotik." + #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" msgstr "Aldatu sistemako ordua, data eta ordu-zona." @@ -1612,11 +1624,11 @@ msgid "Time and Date" msgstr "Ordua eta data" -#: ../src/time/time-tool.c:402 +#: ../src/time/time-tool.c:398 msgid "NTP support is not installed" msgstr "NTP euskarria ez dago instalatuta" -#: ../src/time/time-tool.c:404 +#: ../src/time/time-tool.c:400 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1624,27 +1636,27 @@ "Instalatu eta aktibatu NTP euskarria zure lokaleko denbora-zerbitzaria " "interneteko denbora-zerbitzariekin sinkronizatzeko." -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Enabling NTP" msgstr "NTP gaitzen" -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Disabling NTP" msgstr "NTP desgaitzen" -#: ../src/time/time-tool.c:445 +#: ../src/time/time-tool.c:441 msgid "Synchronizing system clock" msgstr "Sistemaren ordua sinkronizatzen" -#: ../src/time/time-tool.c:525 +#: ../src/time/time-tool.c:521 msgid "Keep synchronized with Internet servers" msgstr "Mantendu sinkronizatua interneteko zerbitzariekin" -#: ../src/time/time-tool.c:526 +#: ../src/time/time-tool.c:522 msgid "Manual" msgstr "Eskuz" -#: ../src/time/time-tool.c:672 +#: ../src/time/time-tool.c:665 msgid "Time and Date Settings" msgstr "Ordu eta data ezarpenak" @@ -1654,7 +1666,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/user-settings.c:605 msgid "This would leave the system unusable." msgstr "Honek sistema erabilkaitza utziko du." @@ -1732,6 +1744,15 @@ msgid "Group name" msgstr "Taldearen izena" +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +msgid "Not asked on login" +msgstr "Ez galdetu saio-hasieran" + +#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +msgid "Asked on login" +msgstr "Galdetu saio-hasieran" + #: ../src/users/privileges-table.c:53 msgid "Monitor system logs" msgstr "Monitorizatu sistemako egunkariak" @@ -1844,37 +1865,42 @@ msgid "Authentication failed" msgstr "Autentifikazioak huts egin du" -#: ../src/users/run-passwd.c:495 +#: ../src/users/run-passwd.c:498 #, c-format msgid "The new password is too short" msgstr "Pasahitz berria laburregia da" -#: ../src/users/run-passwd.c:500 +#: ../src/users/run-passwd.c:504 #, c-format msgid "The new password is too simple" msgstr "Pasahitz berria bakunegia da" -#: ../src/users/run-passwd.c:505 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "Pasahitz zaharra eta berria oso antzekoak dira" -#: ../src/users/run-passwd.c:508 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" msgstr "Pasahitz berriak karaktere numeriko edo bereziak eduki behar ditu" -#: ../src/users/run-passwd.c:512 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "Pasahitz zaharra eta berria berdinak dira." -#: ../src/users/run-passwd.c:516 +#: ../src/users/run-passwd.c:520 +#, c-format +msgid "The new password has already been used recently." +msgstr "Pasahitz berria azken aldian erabili izan da." + +#: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "Zure pasahitza aldatu egin da hasieran autentifikatu zarenetik!" -#: ../src/users/run-passwd.c:520 +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "Errore ezezaguna" @@ -1893,10 +1919,10 @@ #: ../src/users/user-password.c:98 msgid "" -"User passwords must be longer than 6 characters and preferably formed by " +"User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." msgstr "" -"Erabiltzailearen pasahitzak 6 karaktere baino gehiago eduki behar ditu. " +"Erabiltzailearen pasahitzak 5 karaktere baino gehiago eduki behar ditu. " "Pasahitzak hizki, zenbaki eta karaktere bereziak edukitzea gomendatzen da." #: ../src/users/user-password.c:101 @@ -1907,15 +1933,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Egiaztatu testu eremu bietan pasahitz berdina idatzi duzula." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:445 msgid "Please choose another password." msgstr "Aukeratu pasahitz desberdin bat." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:456 msgid "Please type again your current password." msgstr "Idatzi berriro zure uneko pasahitza." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:463 msgid "Password could not be changed" msgstr "Pasahitza ezin izan da aldatu" @@ -1987,15 +2013,6 @@ msgid "None" msgstr "Bat ere ez" -#. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/user-settings.c:347 -msgid "Not asked on login" -msgstr "Ez galdetu saio-hasieran" - -#: ../src/users/user-settings.c:349 -msgid "Asked on login" -msgstr "Galdetu saio-hasieran" - #: ../src/users/user-settings.c:393 #, c-format msgid "Invalid character \"%c\" in comment" @@ -2005,68 +2022,148 @@ msgid "Check that this character is not used." msgstr "Egiaztatu karaktere hau ez dela erabiltzen." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:426 msgid "Incomplete path in home directory" -msgstr "Etxe-direktoriorako bide-izena ez dago osatua" +msgstr "Karpeta nagusiaren bide-izena ez dago osatua" -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:427 msgid "" "Please enter full path for home directory\n" -"i.e.: /home/john." +"i.e.: /home/john." msgstr "" -"Sartu etxe-direktorioaren bide-izen osoa.\n" -"adib: /home/araitz" +"Sartu karpeta nagusiaren bide-izen osoa.\n" +"adib: /home/araitz." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "Etxeko direktorioa badago lehendik ere" +#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +msgid "New home directory already exists, use it?" +msgstr "Karpeta nagusi berria badago lehendik ere. Erabili hori?" + +#: ../src/users/user-settings.c:449 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of %" +"s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" +"%s(r)en karpeta nagusia %s ezarri da, baina badago lehendik ere. " +"Zer nahiago duzu, direktorio honetako fitxategiak erabiltzea, edo %s" +"(e)ko edukia karpeta nagusi berrian kopiatzea (hura gainidatziz)?\n" +"\n" +"Zalantzaren aurrean, erabili direktorio berria datuak galtzea saihesteko, " +"eta kopiatu fitxategiak direktorio zaharretik beranduago." + +#: ../src/users/user-settings.c:461 +msgid "_Replace With Old Files" +msgstr "_Ordeztu fitxategi zaharrekin" + +#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 +#: ../src/users/user-settings.c:540 +msgid "_Cancel Change" +msgstr "_Utzi aldaketa" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:465 +msgid "_Use New Files" +msgstr "_Erabili fitxategi berriak" + +#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +msgid "Make user the _owner of the new home directory" +msgstr "Egin erabiltzailea karpeta nagusiaren _jabe" + +#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +msgid "_Delete old home directory" +msgstr "_Ezabatu karpeta nagusi zaharra" + +#: ../src/users/user-settings.c:493 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" +"%s(r)en karpeta nagusia %s ezarri da, baina badago lehendik ere. " +"Zer nahiago duzu, direktorio honetako fitxategiak erabiltzea, edo bere " +"edukia ezabatu eta karpeta nagusia erabat hutsik erabiltzea?\n" +"\n" +"Zalantzaren aurrean mantendu fitxategiak, eta kendu beranduago beharrezkoa " +"izanez gero." + +#: ../src/users/user-settings.c:503 +msgid "_Delete Files" +msgstr "_Ezabatu fitxategiak" + +#: ../src/users/user-settings.c:505 +msgid "_Use Existing Files" +msgstr "_Erabili dauden fitxategiak" + +#: ../src/users/user-settings.c:526 +msgid "Copy old home directory to new location?" +msgstr "Kopiatu karpeta nagusi zaharra kokaleku berrira?" + +#: ../src/users/user-settings.c:528 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" +"%s(r)en karpeta nagusia %s ezarri da, baina ez da existitzen. Zer " +"nahiago duzu, karpeta nagusi zaharreko (%s) edukia kopiatzea, edo " +"karpeta nagusia erabat hutsik erabiltzea?\n" +"\n" +"Fitxategiak kokaleku berrian kopiatzea aukeratzen baduzu, segurua da " +"direktorio zaharra ezabatzea." + +#: ../src/users/user-settings.c:539 +msgid "_Use Empty Directory" +msgstr "_Erabili direktorio hutsa" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:542 +msgid "Co_py Old Files" +msgstr "_Kopiatu fitxategi zaharrak" -#: ../src/users/user-settings.c:434 -#, c-format -msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" -msgstr "" -"%s direktorioa badago lehendik ere. Erabiltzaileak ez dauka " -"baimenik direktorio horretan irakurtzeko edo idazteko. Hala ere, erabiltzea " -"nahi duzu?" - -#: ../src/users/user-settings.c:440 -msgid "Use this directory" -msgstr "Erabili direktorio hau" - -#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:604 msgid "ID for the root user should not be modified" msgstr "'root' erabiltzailearen IDa ez litzateke aldatu behar." #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:608 #, c-format msgid "User ID %d is already used by user %s" msgstr "%d erabiltzaile-IDa lehendik ere %s erabiltzaileak darabil" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:610 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Aukeratu zenbakizko beste identifikatzaile bat \"%s\"(r)entzako." -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:628 msgid "Incomplete path in shell" msgstr "Komando-lerroaren bide-izena ez dago osatua" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:629 msgid "" "Please enter full path for shell\n" -"i.e.: /bin/bash." +"i.e.: /bin/bash." msgstr "" -"Sartu bide-izen osoa komando-lerroan\n" -"adib.: /bin/bash" +"Sartu shell-aren bide-izen osoa\n" +"adib.: /bin/bash." -#: ../src/users/user-settings.c:534 +#: ../src/users/user-settings.c:663 msgid "Can't revoke administration rights" msgstr "Ezin dira administrazioko baimenak indargabetu" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:666 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2076,11 +2173,11 @@ "administratzailearen baimenak indargabetzeak sistemako administrazioa " "blokeatuko luke." -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:683 msgid "You are about to revoke your own administration rights" msgstr "Zure administrazioko baimenak indargabetzera zoaz" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:686 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2089,11 +2186,15 @@ "Aurrerantzean, %s(e)k ezin izango du administrazioko zereginik egingo. Kontu " "honek ez du baimenik izango administrazioko eskubideak bere kasa eskuratzeko." -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:691 msgid "Give up administration rights" msgstr "Eman administrazioko baimenak" -#: ../src/users/users-tool.c:284 +#: ../src/users/user-settings.c:1469 +msgid "Applying changes to user settings..." +msgstr "Aldaketak erabiltzailearen ezarpenetan aplikatzen..." + +#: ../src/users/users-tool.c:288 msgid "Users Settings" msgstr "Erabiltzaileen ezarpenak" diff -Nru gnome-system-tools-2.32.0/po/fr.po gnome-system-tools-3.0.0/po/fr.po --- gnome-system-tools-2.32.0/po/fr.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/fr.po 2011-04-02 12:55:08.000000000 +0000 @@ -1,5 +1,5 @@ # French translation of gnome-system-tools. -# Copyright (C) 2001-2010 Free Software Foundation, Inc. +# Copyright (C) 2001-2011 Free Software Foundation, Inc. # This file is distributed under the GNU General Public License Version 2. # # Christophe Merlet , 2001-2006. @@ -17,9 +17,9 @@ "Project-Id-Version: gnome-system-tools HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2010-08-20 09:55+0000\n" -"PO-Revision-Date: 2010-07-20 22:38+0200\n" -"Last-Translator: Claude Paroz \n" +"POT-Creation-Date: 2011-03-10 17:19+0000\n" +"PO-Revision-Date: 2011-03-20 11:45+0100\n" +"Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -242,7 +242,7 @@ msgid "_Subnet mask:" msgstr "Masque de _sous-réseau :" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Utilisateur :" @@ -676,81 +676,76 @@ msgstr "Le nom d'utilisateur doit débuter par une lettre !" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"Vous ne pouvez pas changer l'ID d'un utilisateur lorsqu'il est connecté." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "A_jouter un profil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "P_aramètres avancés" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Modifier..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Commentaires" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "Mot de passe _actuel :" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Personnalisé" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "Nombre de _jours entre l'avertissement et l'expiration :" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Activer le compte" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "C_hiffrer le dossier personnel pour protéger les données sensibles" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Générer" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "Dossier _personnel :" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Téléphone _personnel :" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "Groupe _principal :" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Gérer les groupes" # _n utilisé par A_nnuler -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "No_m :" # _m utilisé par _Modifier -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "Mot de _passe :" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell :" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Téléphone _bureau :" @@ -766,15 +761,20 @@ msgid "" "Whether the users-admin tool should show system users in the users list." msgstr "" -"Indique si l'outil users-admin doit afficher les utilisateurs système " -"dans la liste des utilisateurs." +"Indique si l'outil users-admin doit afficher les utilisateurs système dans " +"la liste des utilisateurs." #: ../org.gnome.system-tools.gschema.xml.in.h:4 msgid "" "Whether the users-admin tool should show the root user in the users list." msgstr "" -"Indique si l'outil users-admin doit afficher l'utilisateur root " -"dans la liste des utilisateurs." +"Indique si l'outil users-admin doit afficher l'utilisateur root dans la " +"liste des utilisateurs." + +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Erreur d'accès aux permissions du système : %s" #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" @@ -810,7 +810,7 @@ msgstr "Vous n'êtes pas autorisé à accéder à la configuration du système." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Vous n'êtes pas autorisé à modifier la configuration du système." @@ -823,21 +823,25 @@ msgid "An unknown error occurred." msgstr "Une erreur imprévue est survenue." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Aide" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Impossible d'afficher l'aide" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "La configuration du système a peut-être été modifiée." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "" "Voulez-vous mettre à jour le contenu ? Toutes les modifications en cours " "seront perdues." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -846,6 +850,42 @@ "Une erreur est survenue lors de la vérification des autorisations : %s\n" "Vous pouvez signaler ce problème comme une anomalie." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Verrouiller" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Déverrouiller" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Verrouillé" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"La boîte de dialogue est déverrouillée.\n" +"Cliquez pour empêcher des modifications ultérieures" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"La boîte de dialogue est verrouillée.\n" +"Cliquez pour permettre des modifications" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Une politique système empêche les modifications.\n" +"Contactez votre administrateur système" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -892,51 +932,51 @@ msgid "Change _Host name" msgstr "Changer le nom d'_hôte" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Configuration automatique (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Réseau local Zeroconf (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Adresse IP statique" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Clé WEP (ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Clé WEP (hexadécimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA personnel" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 personnel" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Modem RNIS" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Modem série" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Propriétés de %s" @@ -1625,11 +1665,11 @@ msgstr "" "Vous devez installer Samba ou NFS afin de pouvoir partager vos dossiers." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mappemonde" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1646,11 +1686,11 @@ msgid "Time and Date" msgstr "Date et heure" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "Support NTP manquant" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1658,27 +1698,27 @@ "Veuillez installer et activer le support NTP afin de synchroniser l'horloge " "locale de votre système avec des serveurs de temps Internet." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Activation de NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Désactivation de NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Synchronisation de l'horloge système" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Rester synchronisé avec les serveurs sur Internet" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Manuel" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Configuration de la date et de l'heure" @@ -1688,7 +1728,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Cette opération peut rendre le système inutilisable." @@ -1767,101 +1807,101 @@ msgstr "" "Veuillez choisir un identificateur numérique différent pour le groupe « %s »." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Nom du groupe" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Non demandé lors de la connexion" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Demandé lors de la connexion" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Surveiller les journaux systèmes" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administrer le système" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Utiliser des périphériques audio" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Utiliser des lecteurs CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Graver des CD ou des DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Utiliser des modems" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Se connecter à Internet en utilisant un modem" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Envoyer et recevoir des fax" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Utiliser des lecteurs de disquettes" # from wikipedia -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Monter des systèmes de fichiers en espace utilisateur (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Configurer des imprimantes" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Se connecter à des réseaux sans fil ou Ethernet" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Accéder automatiquement à des périphériques de stockage externes" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Mettre l'ordinateur en veille ou en hibernation" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Accéder au système de fichiers /proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Utiliser des scanners" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Utiliser des lecteurs de bandes" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Utiliser des périphériques USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Utiliser le système de virtualisation VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Utiliser des périphériques vidéo" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Être capable d'obtenir les privilèges d'administrateur" @@ -1965,15 +2005,15 @@ "Veuillez vérifier que vous avez saisi le même mot de passe dans les deux " "champs." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Veuillez choisir un autre mot de passe." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Saisissez une nouvelle fois votre mot de passe actuel." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Le mot de passe n'a pas pu être changé" @@ -2033,33 +2073,33 @@ msgid "Delete Files" msgstr "Supprimer les fichiers" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Superutilisateur" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Personnalisé" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Aucun" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Caractère « %c » non valide dans le commentaire" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Vérifiez que ce caractère n'est pas utilisé." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Chemin d'accès au dossier personnel incorrect" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2067,11 +2107,11 @@ "Veuillez saisir le chemin d'accès complet au dossier personnel\n" "ex : /home/casimir." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Le nouveau dossier personnel existe déjà, voulez-vous l'utiliser ?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2088,30 +2128,30 @@ "En cas de doute, utilisez le nouveau dossier personnel pour éviter de perdre " "des données et copiez les fichiers de l'ancien répertoire plus tard." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Remplacer par les anciens fichiers" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Annuler les modifications" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "_Utiliser les nouveaux fichiers" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Rendre l'utilisateur _propriétaire du nouveau dossier personnel" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Supprimer l'ancien dossier personnel" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2121,24 +2161,24 @@ "In doubt, keep the files, and remove them later if needed." msgstr "" "Le dossier personnel de %s a été défini à %s qui existe déjà. " -"Voulez-vous utiliser les fichiers de ce répertoire ou supprimer tout son contenu " -"et utiliser un dossier personnel complètement vide ?\n" +"Voulez-vous utiliser les fichiers de ce répertoire ou supprimer tout son " +"contenu et utiliser un dossier personnel complètement vide ?\n" "\n" "En cas de doute, conservez les fichiers et supprimez-les plus tard au besoin." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Supprimer les fichiers" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "_Utiliser les fichiers existants" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Copier l'ancien dossier personnel dans le nouvel emplacement ?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2149,41 +2189,41 @@ "old directory." msgstr "" "Le dossier personnel de %s a été défini à %s qui n'existe pas. " -"Voulez-vous copier le contenu de l'ancien dossier personnel (%s) " -"ou utiliser un dossier personnel complètement vide ?\n" +"Voulez-vous copier le contenu de l'ancien dossier personnel (%s) ou " +"utiliser un dossier personnel complètement vide ?\n" "\n" -"Si vous choisissez de copier les fichiers dans le nouvel emplacement, il " -"est prudent de supprimer l'ancien répertoire." +"Si vous choisissez de copier les fichiers dans le nouvel emplacement, il est " +"prudent de supprimer l'ancien répertoire." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Utiliser le répertoire vide" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "Co_pier les anciens fichiers" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "L'ID de l'utilisateur root ne doit pas être modifié" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "L'ID d'utilisateur %d est déjà utilisé par l'utilisateur %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Veuillez choisir un identificateur numérique différent pour %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Chemin incomplet dans le shell" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2191,11 +2231,11 @@ "Veuillez saisir le chemin complet du shell\n" "ex : /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Impossible de retirer les privilèges d'administrateur" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2204,11 +2244,11 @@ "%s est le seul administrateur sur cet ordinateur. Le retrait des droits " "d'administration de ce compte empêcherait toute administration du système." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Vous êtes sur le point de retirer vos propres droits d'administrateur" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2217,16 +2257,36 @@ "%s ne pourra plus effectuer de tâches d'administration. Ce compte n'est pas " "autorisé à s'attribuer lui-même les privilèges d'administrateur." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Abandonner les droits d'administration" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "" +"Vous ne pouvez pas modifier l'ID utilisateur du compte superutilisateur." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Vous ne pouvez pas désactiver votre propre compte, ni modifier votre propre " +"dossier personnel ou ID utilisateur. Lancez ce programme à partir d'une " +"autre session d'utilisateur pour pouvoir modifier ces réglages." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Vous ne pouvez pas modifier le dossier personnel d'un compte ou l'ID " +"utilisateur tant que celui-ci est connecté." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Application des modifications des paramètres utilisateurs..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Paramètres utilisateurs" - - diff -Nru gnome-system-tools-2.32.0/po/gl.po gnome-system-tools-3.0.0/po/gl.po --- gnome-system-tools-2.32.0/po/gl.po 2010-08-22 12:40:55.000000000 +0000 +++ gnome-system-tools-3.0.0/po/gl.po 2011-02-12 16:38:38.000000000 +0000 @@ -9,21 +9,21 @@ # Mancomún - Centro de Referencia e Servizos de Software Libre , 2009. # Antón Méixome , 2009. # Antón Méixome , 2010. -# Fran Diéguez , 2010. # Fran Dieguez , 2010. +# Fran Diéguez , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools-master-po-gl-76140.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-20 12:39+0200\n" -"PO-Revision-Date: 2010-08-20 12:45+0200\n" -"Last-Translator: Fran Dieguez \n" +"POT-Creation-Date: 2011-01-09 00:20+0100\n" +"PO-Revision-Date: 2011-01-09 00:23+0100\n" +"Last-Translator: Fran Diéguez \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" @@ -244,7 +244,7 @@ msgstr "Máscara de _subrede:" # (pofilter) accelerators: accelerator _ is missing from translation -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "Nome de _usuario:" @@ -674,80 +674,74 @@ msgstr "O nome de usuario debe comezar por unha letra!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"Non ten permiso para cambiar o ID do usuario mentres o usuario ten a sesión " -"iniciada." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Engadir un perfil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "Configuracións _avanzadas" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Cambiar..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Comentarios" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Contrasinal actual:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Personalizadas" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Días entre o aviso e a expiración do contrasinal:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Activar a conta" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Cifrar o cartafol persoal para protexer os datos sensíbeis" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Xerar" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "Cartafol _persoal:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Teléfono _persoal:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "Grupo _principal:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "X_estionar os grupos" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Nome:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Contrasinal:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Intérprete de ordes:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Teléfono do _traballo:" @@ -773,6 +767,11 @@ "Indica se a ferramenta de administración de usuarios debe mostrar o usuario " "root na lista de usuarios." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Erro ao acceder aos permisos do sistema: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "" @@ -844,6 +843,42 @@ "Produciuse un erro ao verificar as autorizacións: %s\n" "Debería informar isto como un erro." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Bloquear" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Desbloquear" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Bloqueado" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"O diálogo está desbloqueado.\n" +"Prema para evitar posíbeis cambios" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"O diálogo está bloqueado.\n" +"Prema para realizar cambios." + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"A normativa do sistema impide os cambios.\n" +"Contacte co administrador do seu sistema" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -890,51 +925,51 @@ msgid "Change _Host name" msgstr "Cambiar o nome do _host" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Configuración automática (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Rede Zeroconf local (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Enderezo IP estático" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Chave WEP (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Chave WEP (hexadecimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA persoal" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 Persoal" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Módem ISDN" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Módem de serie" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Propiedades de %s" @@ -1620,11 +1655,11 @@ "Ten que instalar polo menos Samba ou NFS para poder compartir os seus " "cartafoles." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mapa do mundo" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1641,11 +1676,11 @@ msgid "Time and Date" msgstr "Hora e data" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "A compatibilidade con NTP non está instalada" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1654,27 +1689,27 @@ "sincronización do seu servidor de hora local cos servidores de hora da " "Internet." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Activando o NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Desactivando o NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Sincronizando o reloxo do sistema" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Manter sincronizado cos servidores da Internet" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Manual" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Definicións de hora e data" @@ -1684,7 +1719,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Isto podería inutilizar o sistema." @@ -1760,100 +1795,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Seleccione un identificador numérico diferente para o grupo «%s»." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Nome do grupo" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Non preguntar ao iniciar sesión" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Preguntar ao iniciar sesión" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Monitorizar os rexistros do sistema" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administrar o sistema" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Usar dispositivos de audio" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Usar dispositivos CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Gravar CD/DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Usar módems" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Conectar á Internet usando un módem" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Enviar e recibir faxes" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Usar disqueteiras" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Montar sistema de ficheiros en espazo de usuario (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Configurar impresoras" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Conectar a redes ethernet ou inarámicas" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Acceder aos dispositivos de almacenamento externo automaticamente" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Suspende e hiberna o computador" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Acceder ao sistema de ficheiros /proc " -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Usar escáneres" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Usar unidades de fita" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Usar dispositivos USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Empregar a solución de virtualización VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Usar dispositivos de video" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Conseguir obter os privilexios do administrador" @@ -1954,15 +1989,15 @@ msgstr "" "Verifique que proporcionou o mesmo contrasinal nos dous campos de texto." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Seleccione outro contrasinal." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Insira o seu contrasinal de novo." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "O contrasinal non cambiou" @@ -2021,33 +2056,33 @@ msgid "Delete Files" msgstr "Eliminar os ficheiros" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Superusuario" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Ningún" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Carácter non válido \"%c\" no comentario" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Verifique que este carácter non estea en uso." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Camiño incompleto no cartafol persoal" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2055,16 +2090,16 @@ "Introduza o camiño completo para o cartafol persoal\n" "p.e.: /home/alba." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "O novo cartafol persoal xa existe, desexa usar o existente?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." @@ -2076,30 +2111,30 @@ "Se ten dúbidas, use un novo cartafol para evitar a perda de datos e copie os " "ficheiros desde o antigo cartafol." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Substituír cos ficheiros antigos" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Cancelar o cambio" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "_Usar novos ficheiros" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Facer ao usuario o _propietario do novo cartafol persoal" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Eliminar o cartafol persoal antigo" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2114,19 +2149,19 @@ "\n" "Se ten dúbidas, manteña os ficheiros e elimíneos máis tarde se o precisa." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Eliminar os ficheiros" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "_Usar os ficheiros existentes" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Desexa copiar o cartafol persoal a un lugar novo?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2143,35 +2178,35 @@ "Se escolle copiar os ficheiros a unha nova localización será seguro eliminar " "o cartafol antigo." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Usar un cartafol baleiro" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "Co_piar os ficheiros antigos" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "Non se debe modificar o ID para o usuario administrador" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "O ID de usuario %d xa se está usando polo usuario %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Seleccione un identificador numérico diferente para %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Camiño incompleto no intérprete de ordes" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2179,11 +2214,11 @@ "Introduza un camiño completo para o intérprete de ordes\n" "p.ex.: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Non é posíbel revocar os dereitos de administración" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2192,11 +2227,11 @@ "%s é o último administrador neste computador. Se revoca os dereitos de " "administración para esta conta pode bloquear a administración do sistema." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Vostede vai revocar os seus propios dereitos de administración" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2205,15 +2240,36 @@ "%s non poderá levar a cabo tarefas de administración. Esta conta non poderá " "obter de administración de novo por si mesma." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Darlle permisos de administración" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Non pode cambiar o ID do usuario para a conta de superusuario." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Non pode desactivar a súa propia conta, nin tampouco cambiar o seu propio " +"cartafol persoal ou ID de usuario. Para editar estes axustes execute o " +"programa desde a sesión doutro usuario." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Non pode cambiar o cartafol de usuario ou o ID do usuario mentres o usuario " +"ten a sesión iniciada." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Aplicar os cambios ás configuracións do usuario..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Configuracións de usuario" diff -Nru gnome-system-tools-2.32.0/po/he.po gnome-system-tools-3.0.0/po/he.po --- gnome-system-tools-2.32.0/po/he.po 2010-08-22 12:40:55.000000000 +0000 +++ gnome-system-tools-3.0.0/po/he.po 2011-04-02 12:55:08.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-21 02:38+0300\n" -"PO-Revision-Date: 2010-08-21 02:50+0200\n" +"POT-Creation-Date: 2011-02-28 19:23+0200\n" +"PO-Revision-Date: 2011-02-28 19:24+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -232,7 +232,7 @@ msgid "_Subnet mask:" msgstr "מסיכת _תת רשת:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_שם משתמש:" @@ -659,78 +659,74 @@ msgstr "שם משתמש חייב להתחיל באות!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "לא ניתן לשנות את מזהה המשתמש כשהוא מחובר." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "הוספת _פרופיל" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "ה_גדרות מתקדמות:" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_שינוי..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "ה_ערות" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "הססמה ה_נוכחית:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "ה_תאמה אישית" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_מספר ימים לפני תפוגת הסיסמה לשליחת אזהרה:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "ה_פעלת חשבון" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "ה_צפנת תיקיית הבית כדי להגן על נתונים רגישים" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_יצירה" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "ספריית ה_בית:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "טלפון ב_בית:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "קבוצה _ראשית" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_ניהול קבוצות" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_שם:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_ססמה:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_מעטפת:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "טלפון ב_עבודה:" @@ -754,6 +750,11 @@ msgstr "" "Whether the users-admin tool should show the root user in the users list." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "אירעה שגיאה בעת הגישה להרשאות המערכת: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "המערכת המופעלת אינה נתמכת על ידי כלי זה" @@ -787,7 +788,7 @@ msgstr "אינך בעל הרשאת גישה לתצורת המערכת." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "אין לך הרשאה לשנות את תצורת המערכת." @@ -800,19 +801,23 @@ msgid "An unknown error occurred." msgstr "התרחשה שגיאה בלתי צפויה." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "עזרה" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "לא ניתן להציג עזרה" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "יתכן שתצורת המערכת השתנתה." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "האם לעדכן את התוכן? שינויים שבוצעו עד כה לא ישמרו." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -821,6 +826,42 @@ "ארעה שגיאה בעת בדיקת האימות: %s\n" "ניתן לדווח על באג זה." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "נעילה" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "שחרור" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "נעול" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"תיבת הדו־שיח משוחררת.\n" +"יש ללחוץ כדי למנוע שינויים נוספים" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"תיבת הדו־שיח נעולה.\n" +"יש ללחוץ כדי לערוך שינויים" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"מדיניות המערכת מונעת עריכת שינויים.\n" +"יש ליצור קשר עם מנהל המערכת שלך" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -865,51 +906,51 @@ msgid "Change _Host name" msgstr "שינוי שם המ_ארח" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "הגדרה אוטומטית (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "רשת מקומית של Zeroconf‏ (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "כתובת IP קבועה" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "מפתח WEP (טקסטואלי)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "מפתח WEP (הקסדצימלי)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA אישי" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 אישי" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "מודם ISDN" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "מודם טורי" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "מאפייני %s" @@ -1588,11 +1629,11 @@ "folders." msgstr "עליך להתקין את Samba או את NFS כדי לשתף תיקיות." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "מפת העולם" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1608,11 +1649,11 @@ msgid "Time and Date" msgstr "זמן ותאריך" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "התמיכה בשרותי זמן (NTP) אינה מותקנת" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1620,27 +1661,27 @@ "יש להתקין ולהפעיל את התמיכה בשרותי הזמן (NTP) כדי לאפשר את כיוון השעון " "המקומי שלך לפי שרתי זמן מהאינטרנט." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "NTP מופעל" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "NTP נכבה" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "מכוון את שעון המערכת" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "שמירה על סנכרון מול שרתי האינטרנט" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "ידני" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "הגדרות זמן ותאריך" @@ -1650,7 +1691,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "פעולה זו תשאיר את המערכת במצב בלתי שמיש." @@ -1722,100 +1763,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "נא לבחור מזהה מספרי אחר עבור הקבוצה \"%s\"." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "שם קבוצה" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "לא התבקשה בעת הכניסה" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "התבקשה עם הכניסה" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "מעקב אחר רישום המערכת" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "ניהול המערכת" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "שימוש בהתקני שמע" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "שימוש בכונני CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "צריבת דיסקים" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "שימוש במודמים" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "חיבור לאינטרנט באמצעות מודם" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "שליחה וקבלה של פקסים" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "שימוש בכונני דיסקטים" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "עיגון מערכות קבצים במרחב המשתמש (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "הגדרת מדפסות" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "חיבור לרשתות קוויות ואל־חוטיות" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "גישה להתקני אחסון באופן אוטומטי" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "השהייה והרדמת המערכת" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "גישה למערכת הקבצים ‎/proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "שימוש בסורקים" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "שימוש בכונני קלטות" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "שימוש בהתקני USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "שימוש בפתרון הווירטואליזציה של VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "שימוש בהתקני וידאו" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "מסוגל לקבל הרשאות מנהל מערכת" @@ -1913,15 +1954,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "נא לבדוק שהקולדה אותה הססמה בשתי התיבות." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "יש לבחור ססמה אחרת." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "יש להזין את הססמה הנוכחית שלך בשנית." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "לא ניתן לשנות את הססמה" @@ -1979,33 +2020,33 @@ msgid "Delete Files" msgstr "מחיקת קבצים" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "משתמש־על" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "מותאם אישית" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "ללא" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "התו \"%c\" בהערה לא חוקי" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "נא לוודא שלא נעשה שימוש בתו זה" -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "נתיב לא מלא בתיקייה הבית" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2013,11 +2054,11 @@ "יש להזין את הנתיב המלא אל תיקיית הבית\n" "לדוגמה: /home/yaron." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "כבר קיימת תיקיית בית חדשה, האם להשתמש בה?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2034,30 +2075,30 @@ "במידת הספק, כדאי להשתמש בתיקייה החדשה כדי להימנע מאבדן נתונים ולהעתיק את " "הקבצים מהתיקייה הישנה בשלב מאוחר יותר." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "ה_חלפה בקבצים הישנים" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_ביטול השינוי" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "שימוש בקבצים _חדשים" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "הפיכת המשתמש _לבעלים של תיקיית הביתה החדשה" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "מחיקת תיקיית הבית ה_ישנה" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2071,19 +2112,19 @@ "\n" "במידת הספק, כדאי לשמור את הקבצים ולהסיר אותם בשלב מאוחר יותר במידת הצורך." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_מחיקת הקבצים" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "שימוש בקבצים ה_קיימים" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "האם להעתיק את תיקייה הבית למיקום חדש?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2099,35 +2140,35 @@ "\n" "אם תתבצע בחירה להעתקת הקבצים למיקום החדש, ניתן למחוק את התיקייה הישנה בבטחה." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "שימוש בתיקייה _ריקה" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "ה_עתקת קבצים ישנים" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "לא ניתן לשנות את מזהה משתמש העל" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "מזהה המשתמש %d כבר נמצא בשימוש על ידי המשתמש %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "יש לבחור מזהה מספרי אחר עבור %s" -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "נתיב לא מלא עבור המעטפת" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2135,11 +2176,11 @@ "יש להזין את נתיב המעטפת המלא\n" "לדוגמה: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "לא ניתן לשלול את הרשאות הניהול" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2148,11 +2189,11 @@ "%s הוא המנהל היחידי במחשב זה. שלילת זכויות הניהול לחשבון זה עלולה לנעול אותך " "מפני ניהול המערכת." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "הרשאות הניהול שלך עומדות להישלל על ידיך" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2161,15 +2202,33 @@ "%s לא יוכל עוד לבצע פעולות ניהוליות. חשבון זה לא יורשה לקבל את הרשאות הניהול " "בחזרה בכוחות עצמו." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "ויתור על זכויות ניהול" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "לא ניתן לשנות את מזהה המשתמש לחשבון משתמש העל." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"אין באפשרותך לנטרל את חשבונך או לשנות את תיקיית הבית או את מזהה המשתמש שלך. " +"יש להריץ תכנית זו מהפעלה של משתמש אחר כדי לערוך הגדרות אלו." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "לא ניתן לשנות את תיקיית הבית או את מזהה המשתמש כשזה מחובר." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "השינויים בהגדרות המשתמש מוחלות..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "הגדרות משתמשים" @@ -2301,9 +2360,6 @@ #~ msgid "/dev/ttyS3" #~ msgstr "/dev/ttyS3" -#~ msgid "_Unlock" -#~ msgstr "_בטל נעילה" - #~ msgid "This action is not allowed" #~ msgstr "אין הרשאה לביצוע פעולה זו" diff -Nru gnome-system-tools-2.32.0/po/it.po gnome-system-tools-3.0.0/po/it.po --- gnome-system-tools-2.32.0/po/it.po 2010-09-27 16:04:07.000000000 +0000 +++ gnome-system-tools-3.0.0/po/it.po 2010-12-12 12:16:01.000000000 +0000 @@ -5,20 +5,19 @@ # Francesco Marletta , 2004-2009. # Gianvito Cavasoli , 2008, 2009, 2010. # -# msgid "" msgstr "" "Project-Id-Version: gnome-system-tools 2.29.x\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2010-09-21 19:16+0000\n" -"PO-Revision-Date: 2010-09-22 14:05+0200\n" +"POT-Creation-Date: 2010-10-25 17:48+0000\n" +"PO-Revision-Date: 2010-10-26 12:52+0200\n" "Last-Translator: Gianvito Cavasoli \n" "Language-Team: Italiana \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 msgid "Access point name:" @@ -1677,7 +1676,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:606 msgid "This would leave the system unusable." msgstr "Questo lascerebbe il sistema inutilizzabile." @@ -1760,93 +1759,93 @@ msgstr "Nome del gruppo" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:348 msgid "Not asked on login" msgstr "Non chiedere all'accesso" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:350 msgid "Asked on login" msgstr "Chiedere all'accesso" #: ../src/users/privileges-table.c:53 msgid "Monitor system logs" -msgstr "Monitora i registri di sistema" +msgstr "Monitorare i registri di sistema" #: ../src/users/privileges-table.c:54 msgid "Administer the system" -msgstr "Amministra il sistema" +msgstr "Amministrare il sistema" #: ../src/users/privileges-table.c:55 msgid "Use audio devices" -msgstr "Usa i dispositivi audio" +msgstr "Usare i dispositivi audio" #: ../src/users/privileges-table.c:56 msgid "Use CD-ROM drives" -msgstr "Usa le unità CD-ROM" +msgstr "Usare le unità CD-ROM" #: ../src/users/privileges-table.c:57 msgid "Burn CDs / DVDs" -msgstr "Masterizza CD e DVD" +msgstr "Masterizzare CD e DVD" #: ../src/users/privileges-table.c:58 msgid "Use modems" -msgstr "Usa i modem" +msgstr "Usare i modem" #: ../src/users/privileges-table.c:59 msgid "Connect to Internet using a modem" -msgstr "Connette a Internet usando un modem" +msgstr "Connettere a Internet usando un modem" #: ../src/users/privileges-table.c:60 msgid "Send and receive faxes" -msgstr "Invia e riceve fax" +msgstr "Inviare e ricevere fax" #: ../src/users/privileges-table.c:61 msgid "Use floppy drives" -msgstr "Usa le unità floppy" +msgstr "Usare le unità floppy" #: ../src/users/privileges-table.c:62 msgid "Mount user-space filesystems (FUSE)" -msgstr "Monta file system in user space (FUSE)" +msgstr "Montare file system in user space (FUSE)" #: ../src/users/privileges-table.c:63 msgid "Configure printers" -msgstr "Configura le stampanti" +msgstr "Configurare le stampanti" #: ../src/users/privileges-table.c:64 msgid "Connect to wireless and ethernet networks" -msgstr "Connette alle reti via cavo e senza fili" +msgstr "Connettere alle reti via cavo e senza fili" #: ../src/users/privileges-table.c:65 msgid "Access external storage devices automatically" -msgstr "Accede automaticamente ai dispositivi di memoria esterni" +msgstr "Accedere automaticamente ai dispositivi di memoria esterni" #: ../src/users/privileges-table.c:66 msgid "Suspend and hibernate the computer" -msgstr "Sospende e iberna il computer" +msgstr "Sospendere e ibernare il computer" #: ../src/users/privileges-table.c:67 msgid "Access /proc filesystem" -msgstr "Accede al file system /proc" +msgstr "Accedere al file system /proc" #: ../src/users/privileges-table.c:68 msgid "Use scanners" -msgstr "Usa gli scanner" +msgstr "Usare gli scanner" #: ../src/users/privileges-table.c:69 msgid "Use tape drives" -msgstr "Usa le unità a nastro" +msgstr "Usare le unità a nastro" #: ../src/users/privileges-table.c:70 msgid "Use USB devices" -msgstr "Usa i dispositivi USB" +msgstr "Usare i dispositivi USB" #: ../src/users/privileges-table.c:71 msgid "Use VirtualBox virtualization solution" -msgstr "Usa la soluzione di virtualizzazione VirtualBox" +msgstr "Usare la soluzione di virtualizzazione VirtualBox" #: ../src/users/privileges-table.c:72 msgid "Use video devices" -msgstr "Usa i dispositivi video" +msgstr "Usare i dispositivi video" #: ../src/users/privileges-table.c:73 msgid "Be able to get administrator privileges" @@ -2017,34 +2016,34 @@ msgid "Delete Files" msgstr "Elimina file" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:331 msgid "Superuser" msgstr "Super utente" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:336 msgid "Custom" msgstr "Personalizzato" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:345 msgid "None" msgstr "Nessuna" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:394 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Carattere «%c» nel commento non valido" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:395 msgid "Check that this character is not used." msgstr "Controllare che questo carattere non sia usato." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:427 msgid "Incomplete path in home directory" msgstr "Percorso della directory home incompleto" # NDT: se mi è permesso... :D -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:428 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2052,11 +2051,11 @@ "Inserire il percorso completo per la directory home\n" "es.: /home/gianvito." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:448 ../src/users/user-settings.c:492 msgid "New home directory already exists, use it?" msgstr "La nuova directory home esiste già, usarla?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:450 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2073,30 +2072,30 @@ "Nel dubbio, usare la nuova directory per evitare la perdita di dati e " "copiare i file dalla vecchia directory successivamente." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:462 msgid "_Replace With Old Files" msgstr "_Sostituisci con i vecchi file" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:463 ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:541 msgid "_Cancel Change" msgstr "_Annulla modifica" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:466 msgid "_Use New Files" msgstr "_Usa file nuovi" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:471 ../src/users/user-settings.c:511 msgid "Make user the _owner of the new home directory" msgstr "Rendi l'utente il _proprietario della nuova directory home" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:474 ../src/users/user-settings.c:548 msgid "_Delete old home directory" msgstr "_Elimina la vecchia directory home" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:494 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2111,19 +2110,19 @@ "\n" "Nel dubbio, mantenere i file, e se necessario rimuoverli successivamente." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:504 msgid "_Delete Files" msgstr "_Elimina file" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:506 msgid "_Use Existing Files" msgstr "_Usa file esistenti" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:527 msgid "Copy old home directory to new location?" msgstr "Copiare la vecchia directory home nella nuova posizione?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:529 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2140,35 +2139,35 @@ "Se si sceglie di copiare i file nella nuova posizione, si può eliminare la " "vecchia directory senza rischi." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:540 msgid "_Use Empty Directory" msgstr "_Usa directory vuota" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:543 msgid "Co_py Old Files" msgstr "Co_pia vecchi file" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:605 msgid "ID for the root user should not be modified" msgstr "L'ID per l'utente root non dovrebbe essere modificato" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:609 #, c-format msgid "User ID %d is already used by user %s" msgstr "L'ID dell'utente %d è già in uso dall'utente %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:611 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Scegliere un numero identificativo differente per %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:629 msgid "Incomplete path in shell" msgstr "Percorso della shell incompleto" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:630 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2176,11 +2175,11 @@ "Inserire il percorso completo per la shell\n" "es.: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:664 msgid "Can't revoke administration rights" msgstr "Non è possibile revocare i diritti di amministrazione" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:667 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2190,11 +2189,11 @@ "amministrazione per questo account l'attività di amministrazione sarebbe " "impossibile." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:684 msgid "You are about to revoke your own administration rights" msgstr "Si stanno revocando i propri diritti di amministrazione" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:687 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2204,11 +2203,11 @@ "account non sarà consentito riprendere i diritti di amministrazione di " "propria iniziativa." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:692 msgid "Give up administration rights" msgstr "Rinuncia ai diritti di amministrazione" -#: ../src/users/user-settings.c:1469 +#: ../src/users/user-settings.c:1470 msgid "Applying changes to user settings..." msgstr "Applicazione modifiche alle impostazioni dell'utente..." diff -Nru gnome-system-tools-2.32.0/po/ko.po gnome-system-tools-3.0.0/po/ko.po --- gnome-system-tools-2.32.0/po/ko.po 2010-06-07 21:51:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/ko.po 2010-12-12 12:16:01.000000000 +0000 @@ -7,188 +7,180 @@ msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools&component=general\n" -"POT-Creation-Date: 2010-03-14 00:09+0900\n" -"PO-Revision-Date: 2010-03-14 01:19+0900\n" +"POT-Creation-Date: 2010-10-09 06:14+0900\n" +"PO-Revision-Date: 2010-10-09 06:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" +"Language: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../gnome-system-tools.schemas.in.h:1 -msgid "Whether the users-admin tool should show system users in the users list" -msgstr "사용자 관리 도구의 사용자 목록에서 시스템 사용자를 표시할지 여부" - -#: ../gnome-system-tools.schemas.in.h:2 -msgid "" -"Whether the users-admin tool should show the root user in the users list" -msgstr "사용자 관리 도구의 사용자 목록에서 루트 사용자를 표시할지 여부" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "액세스 포인트 이름:" -#: ../interfaces/network.ui.h:1 +#: ../interfaces/network.ui.h:2 msgid "Account data" msgstr "계정 데이터" -#: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "연결 설정" - #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "DNS 서버" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "호스트 설정" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "인터넷 서비스 제공자 설정" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "모뎀 설정" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "검색 도메인" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "무선 네트워크 설정" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "액세스 포인트 이름:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "별명:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "설정(_F):" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +msgid "Connection Settings" +msgstr "연결 설정" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "연결 종류:" -#: ../interfaces/network.ui.h:13 +#: ../interfaces/network.ui.h:7 msgid "Connections" msgstr "연결" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNS" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +msgid "DNS Servers" +msgstr "DNS 서버" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "도메인 이름(_O):" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "현재 도메인 삭제" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "로밍 모드 사용(_N)" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "연결 사용(_N)" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "이더넷 인터페이스:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32 +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "일반" -#: ../interfaces/network.ui.h:21 +#: ../interfaces/network.ui.h:16 msgid "Hexadecimal" msgstr "16진수" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "호스트 별명 설정" -#: ../interfaces/network.ui.h:23 +#: ../interfaces/network.ui.h:18 +msgid "Host Settings" +msgstr "호스트 설정" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" msgstr "호스트" -#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "IP 주소:" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "인터페이스 속성" -#: ../interfaces/network.ui.h:26 +#: ../interfaces/network.ui.h:22 +msgid "Internet service provider data" +msgstr "인터넷 서비스 제공자 설정" + +#: ../interfaces/network.ui.h:23 msgid "Location:" msgstr "위치:" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:24 msgid "Loud" msgstr "높음" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:25 msgid "Low" msgstr "낮음" -#: ../interfaces/network.ui.h:29 +#: ../interfaces/network.ui.h:26 msgid "Medium" msgstr "중간" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "모뎀" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:28 +msgid "Modem Settings" +msgstr "모뎀 설정" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "네트워크 암호(_P):" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "네트워크 이름 (_ESSID):" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:31 msgid "Off" msgstr "끄기" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "옵션" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "암호(_A)" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "암호 종류(_T):" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:35 msgid "Plain (ASCII)" msgstr "보통 (ASCII)" -#: ../interfaces/network.ui.h:38 +#: ../interfaces/network.ui.h:36 msgid "Pulses" msgstr "펄스" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" msgstr "현재 네트워크 설정을 위치로 저장" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:38 +msgid "Search Domains" +msgstr "검색 도메인" + +#: ../interfaces/network.ui.h:39 msgid "Tones" msgstr "톤" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "인터넷 서비스 제공자의 네임서버 사용" +#: ../interfaces/network.ui.h:41 +msgid "Wireless Settings" +msgstr "무선 네트워크 설정" + #: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "자동 찾기(_A)" @@ -241,7 +233,7 @@ msgid "_Subnet mask:" msgstr "서브넷 마스크(_S):" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 msgid "_Username:" msgstr "사용자이름(_U):" @@ -259,99 +251,98 @@ msgstr "활성화 하려는 서비스를 선택:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "허용한 호스트" +msgid "Add allowed hosts" +msgstr "허용할 호스트 추가" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "호스트 설정" +msgid "Allowed Hosts" +msgstr "허용한 호스트" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "공유 속성" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "공유 폴더" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "윈도우즈 공유" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"사용자 암호를 입력하십시오:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "허용할 호스트 추가" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "허용한 호스트:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "설명:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "도메인 / 작업그룹(_W):" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "사용자 암호를 입력하십시오" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +msgid "Enter password for user:" +msgstr "사용자 암호를 입력하십시오:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "일반 속성" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "호스트 이름:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +msgid "Hosts Settings" +msgstr "호스트 설정" + +#: ../interfaces/shares.ui.h:12 msgid "Name:" msgstr "이름:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "네트마스크:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "네트워크:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "읽기 전용" -#: ../interfaces/shares.ui.h:19 +#: ../interfaces/shares.ui.h:16 msgid "Share" msgstr "공유" -#: ../interfaces/shares.ui.h:20 +#: ../interfaces/shares.ui.h:17 +msgid "Share Properties" +msgstr "공유 속성" + +#: ../interfaces/shares.ui.h:18 msgid "Share through:" msgstr "공유 경로:" -#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2 +#: ../interfaces/shares.ui.h:19 +msgid "Shared Folder" +msgstr "공유 폴더" + +#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "공유 폴더" -#: ../interfaces/shares.ui.h:22 +#: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" msgstr "이 컴퓨터가 WINS서버(_W)" -#: ../interfaces/shares.ui.h:23 +#: ../interfaces/shares.ui.h:22 msgid "Users" msgstr "사용자" -#: ../interfaces/shares.ui.h:24 +#: ../interfaces/shares.ui.h:23 msgid "WINS _server:" msgstr "WINS 서버(_S):" +#: ../interfaces/shares.ui.h:24 +msgid "Windows sharing" +msgstr "윈도우즈 공유" + #: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "경로(_P):" @@ -361,29 +352,29 @@ msgstr "읽기 전용(_R)" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "선택" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "시간대" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "NTP 서버 추가" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "NTP 서버" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "서버 선택(_L)" -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +msgid "Selection" +msgstr "선택" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "지금 동기화" +#: ../interfaces/time.ui.h:6 +msgid "Time Zone" +msgstr "시간대" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "시간 서버" @@ -417,247 +408,257 @@ msgstr "시간(_T):" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "고급 설정" +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "해당 이름의 사용자가 이미 있습니다. 새 사용자 이름으로 다른 이름을 사용하십시오." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "자동 UID/GID" +msgid "Account _type:" +msgstr "계정 종류(_T):" #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "기본 설정" +msgid "Advanced" +msgstr "고급" #: ../interfaces/users.ui.h:4 -msgid "Group Members" -msgstr "그룹 구성원" +msgid "Advanced Settings" +msgstr "고급 설정" #: ../interfaces/users.ui.h:5 -msgid "Optional Settings" -msgstr "기타 설정" +msgid "Assign a random password by default" +msgstr "기본으로 무작위 암호 지정" #: ../interfaces/users.ui.h:6 -msgid "Password Settings" -msgstr "암호 설정" +msgid "Automatic UID/GID" +msgstr "자동 UID/GID" +#: ../interfaces/users.ui.h:7 +msgid "Basic Settings" +msgstr "기본 설정" #: ../interfaces/users.ui.h:8 -msgid "System Defaults" -msgstr "시스템 기본값" - -#: ../interfaces/users.ui.h:9 -msgid "Account _type:" -msgstr "계정 종류(_T):" - -#: ../interfaces/users.ui.h:10 -msgid "Advanced" -msgstr "고급" - -#: ../interfaces/users.ui.h:11 -msgid "" -"A user with this name already exists. Please choose a different short " -"name for the new user." -msgstr "해당 이름의 사용자가 이미 있습니다. 다른 짧은 이름을 사용하십시오." - -#: ../interfaces/users.ui.h:12 -msgid "Assign a random password by default" -msgstr "기본으로 무작위 암호 지정" - -#: ../interfaces/users.ui.h:13 msgid "Change Advanced User Settings" msgstr "고급 사용자 설정 바꾸기" -#: ../interfaces/users.ui.h:14 +#: ../interfaces/users.ui.h:9 msgid "Change User Account Type" msgstr "사용자 계정 종류 바꾸기" -#: ../interfaces/users.ui.h:15 -msgid "Change User Name and Login" -msgstr "사용자 이름과 로그인 바꾸기" +#: ../interfaces/users.ui.h:10 +msgid "Change User Name" +msgstr "사용자 이름 바꾸기" -#: ../interfaces/users.ui.h:16 +#: ../interfaces/users.ui.h:11 msgid "Change User Password" msgstr "사용자 암호 바꾸기" -#: ../interfaces/users.ui.h:17 +#: ../interfaces/users.ui.h:12 msgid "Changing advanced settings for:" msgstr "고급 설정 바꾸기:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:13 msgid "Changing user account type for:" msgstr "사용자 계정 종류 바꾸기:" -#: ../interfaces/users.ui.h:19 +#: ../interfaces/users.ui.h:14 msgid "Changing user name for:" msgstr "사용자 이름 바꾸기:" -#: ../interfaces/users.ui.h:20 +#: ../interfaces/users.ui.h:15 msgid "Changing user password for:" msgstr "사용자 암호 바꾸기:" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "확인(_F):" +#: ../interfaces/users.ui.h:17 +msgid "Contact Information" +msgstr "연락처 정보" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:18 msgid "Create New User" msgstr "새 사용자 만들기" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:19 msgid "Create a new user" msgstr "새 사용자를 만듭니다" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" msgstr "암호 만료 경고일:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" msgstr "기본 그룹(_G):" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" msgstr "기본 셸(_S):" -#: ../interfaces/users.ui.h:28 +#: ../interfaces/users.ui.h:23 msgid "Disable _account" msgstr "계정 사용 막기(_A)" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:24 msgid "Don't ask for password on _login" msgstr "로그인할 때 암호 묻지 않기(_L)" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:25 msgid "" "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " "slightly reduced performance." -msgstr "모든 파일을 로그인 암호로 암호화합니다. 그러면 컴퓨터에 물리적으로 접근할 수 있는 사람도 파일을 읽지 못하게 할 수 있습니다. 대신 효율이 약간 떨어집니다." +msgstr "" +"모든 파일을 로그인 암호로 암호화합니다. 그러면 컴퓨터에 물리적으로 접근할 수 " +"있는 사람도 파일을 읽지 못하게 할 수 있습니다. 대신 효율이 약간 떨어집니다." -#: ../interfaces/users.ui.h:31 +#: ../interfaces/users.ui.h:26 msgid "Full _Name:" msgstr "전체 이름(_N):" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "무작위 암호 만들기(_R)" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:29 +msgid "Group Members" +msgstr "그룹 구성원" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" msgstr "그룹 ID(_I):" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "그룹 이름(_N):" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "그룹 속성" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "시스템에 있는 그룹:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "그룹 설정" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "암호 최대 사용 가능 일수(_X):" -#: ../interfaces/users.ui.h:39 ../src/time/time-tool.c:526 -msgid "Manual" -msgstr "수동" - -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "최대 GID 값:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "최대 UID 값:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "암호 바꿀 때 최소 일수(_N):" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "최소 GID 값:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "최소 UID 값:" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "암호 바꿀 때 허용하는 최소 일수:" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "새 암호(_P):" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "암호를 사용 가능한 일수:" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "사무실 위치(_F):" -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:45 +msgid "Optional Settings" +msgstr "기타 설정" + +#: ../interfaces/users.ui.h:46 +msgid "Password Settings" +msgstr "암호 설정" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "설정할 암호: " -#: ../interfaces/users.ui.h:50 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "권한" -#: ../interfaces/users.ui.h:51 +#: ../interfaces/users.ui.h:49 +msgid "Profile Settings" +msgstr "프로파일 설정" + +#: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "프로파일 이름(_N):" -#: ../interfaces/users.ui.h:52 +#: ../interfaces/users.ui.h:51 msgid "Set password b_y hand" msgstr "수동으로 암호 설정(_Y)" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! -#: ../interfaces/users.ui.h:54 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"짧은 이름은 다음 문자로만 이루어져야 합니다:\n" -" ➣ 영어 알파벳 소문자\n" -" ➣ 숫자\n" -" ➣ \".\", \"-\", \"_\" 문자" - -#: ../interfaces/users.ui.h:58 -msgid "Short name must start with a letter!" -msgstr "짧은 이름은 알파벳 문자로 시작해야 합니다!" +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "시스템 기본값" -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "이 계정은 사용이 막혀 있습니다." -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." -msgstr "이 계정은 수동으로 정의한 설정을 사용하고 있습니다. 고급 설정 창에서 자세히 설정할 수 있습니다." +msgstr "" +"이 계정은 수동으로 정의한 설정을 사용하고 있습니다. 고급 설정 창에서 " +"자세히 설정할 수 있습니다." -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "사용자 ID:" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "사용자 권한" -#: ../interfaces/users.ui.h:63 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "사용자 프로파일" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"사용자 이름은 다음 문자로만 이루어져야 합니다:\n" +" ➣ 영어 알파벳 소문자\n" +" ➣ 숫자\n" +" ➣ \".\", \"-\", \"_\" 문자" + +#: ../interfaces/users.ui.h:63 +msgid "Username must start with a letter!" +msgstr "사용자 이름은 알파벳 문자로 시작해야 합니다!" + #: ../interfaces/users.ui.h:64 msgid "You can't change user ID while the user is logged in." msgstr "사용자가 로그인하고 있는 중에는 사용자 ID를 바꿀 수 없습니다." @@ -671,69 +672,87 @@ msgstr "고급 설정(_A):" #: ../interfaces/users.ui.h:67 +msgid "_Change..." +msgstr "바꾸기(_C)..." + +#: ../interfaces/users.ui.h:68 msgid "_Comments" msgstr "설명(_C)" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:69 msgid "_Current password:" msgstr "현재 암호(_C):" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:70 msgid "_Custom" msgstr "사용자 지정(_C)" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:71 msgid "_Days between warning and password expiration:" msgstr "암호 만료 주의 날짜(_D):" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:72 msgid "_Enable Account" msgstr "계정 사용 가능하게 하기(_E)" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:73 msgid "_Encrypt home folder to protect sensitive data" msgstr "비밀 데이터 보호를 위해 홈 폴더 암호화(_E)" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:74 msgid "_Generate" msgstr "만들기(_G)" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:75 msgid "_Home directory:" msgstr "홈 디렉터리(_H):" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:76 msgid "_Home phone:" msgstr "집 전화(_H):" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:77 msgid "_Main group:" msgstr "메인 그룹(_M):" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:78 msgid "_Manage Groups" msgstr "그룹 관리(_M):" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:79 msgid "_Name:" msgstr "이름(_N):" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:80 msgid "_Password:" msgstr "암호(_P):" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:81 msgid "_Shell:" msgstr "셸(_S):" -#: ../interfaces/users.ui.h:81 -msgid "_Short Name:" -msgstr "짧은 이름(_S):" - -#: ../interfaces/users.ui.h:82 +#: ../interfaces/users.ui.h:83 msgid "_Work phone:" msgstr "직장 전화(_W):" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "루트 사용자 표시" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "시스템 사용자 표시" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "사용자 관리 도구의 사용자 목록에서 시스템 사용자를 표시할지 여부." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "사용자 관리 도구의 사용자 목록에서 루트 사용자를 표시할지 여부." + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "현재 사용하는 플랫폼은 이 프로그램에서 지원하지 않습니다" @@ -752,46 +771,46 @@ msgid "Unsupported platform" msgstr "지원하지 않는 플랫폼" -#: ../src/common/gst-tool.c:190 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "설정을 읽을 수 없습니다" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:192 +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "설정을 저장할 수 없습니다" -#: ../src/common/gst-tool.c:196 +#: ../src/common/gst-tool.c:194 msgid "You are not allowed to access the system configuration." msgstr "시스템 설정에 접근할 수 없습니다." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:691 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 msgid "You are not allowed to modify the system configuration." msgstr "시스템 설정의 수정을 허용하지 않습니다." -#: ../src/common/gst-tool.c:201 +#: ../src/common/gst-tool.c:199 msgid "Invalid data was found." msgstr "올바르지 않은 데이터를 찾았습니다." #. OOBS_RESULT_ERROR -#: ../src/common/gst-tool.c:203 +#: ../src/common/gst-tool.c:201 msgid "An unknown error occurred." msgstr "알 수 없는 오류가 발생했습니다." -#: ../src/common/gst-tool.c:428 +#: ../src/common/gst-tool.c:422 msgid "Could not display help" msgstr "도움말을 보여줄 수 없습니다" -#: ../src/common/gst-tool.c:622 +#: ../src/common/gst-tool.c:616 msgid "The system configuration has potentially changed." msgstr "시스템 설정이 바뀌었습니다." -#: ../src/common/gst-tool.c:624 +#: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." msgstr "업데이트할까요? 업데이트하면 지금 바꾼 사항을 잃어버립니다." -#: ../src/common/gst-tool.c:693 +#: ../src/common/gst-tool.c:687 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -810,7 +829,7 @@ msgid "_Delete" msgstr "삭제(_D)" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "주소 입력" @@ -916,61 +935,48 @@ #: ../src/network/ifaces-list.c:289 #, c-format -msgid "Essid: %s " -msgstr "ESSID: %s " +msgid "Essid: %s " +msgstr "ESSID: %s " -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "주소: %s 서브네트마스크: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +msgid "Address:" +msgstr "주소:" + +#: ../src/network/ifaces-list.c:298 +msgid "Subnet mask:" +msgstr "서브넷 마스크:" + +#: ../src/network/ifaces-list.c:308 +msgid "Remote address:" +msgstr "원격 주소:" + +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "종류:" + +#: ../src/network/ifaces-list.c:321 +msgid "Phone number:" +msgstr "전화 번호:" -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "주소: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "주소: %s 원격 주소: %s" - -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "종류: %s 전화번호: %s" - -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "종류: %s 액세스 포인트 이름: %s" - -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "종류: %s 이더넷 인터페이스: %s" - -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "종류: %s" - -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "무선 연결" -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "적외선 연결" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" msgstr "유선 연결" -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" msgstr "병렬 포트 연결" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" msgstr "포인트 투 포인트 연결" @@ -1042,12 +1048,12 @@ msgid "Settings for service \"%s\"" msgstr "\"%s\" 서비스의 설정" -#: ../src/services/callbacks.c:125 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "정말로 \"%s\"을(를) 비활성화하시겠습니까?" -#: ../src/services/callbacks.c:129 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1519,11 +1525,11 @@ msgid "PATH" msgstr "<경로>" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "공유 폴더(_S)..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "이 폴더를 다른 컴퓨터와 공유합니다" @@ -1582,6 +1588,17 @@ "folders." msgstr "폴더를 공유하려면 Samba나 NFS를 설치해야 합니다." +#: ../src/time/e-map/e-map.c:620 +msgid "World Map" +msgstr "세계 지도" + +# ATK 메시지 +#: ../src/time/e-map/e-map.c:622 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "마우스로 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래 드롭다운 메뉴에서 시간대를 선택하십시오." + #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" msgstr "시간, 날짜와 시간대를 설정합니다" @@ -1590,11 +1607,11 @@ msgid "Time and Date" msgstr "시간과 날짜" -#: ../src/time/time-tool.c:402 +#: ../src/time/time-tool.c:398 msgid "NTP support is not installed" msgstr "NTP 기능을 설치하지 않았습니다" -#: ../src/time/time-tool.c:404 +#: ../src/time/time-tool.c:400 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1602,23 +1619,27 @@ "로컬 시간서버와 인터넷 시간서버의 시계를 똑같이 맞추기 위해서는 시스템에서 " "NTP 기능을 설치하고 실행해야 합니다." -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Enabling NTP" msgstr "NTP 사용하기" -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:429 msgid "Disabling NTP" msgstr "NTP 사용하지 않기" -#: ../src/time/time-tool.c:445 +#: ../src/time/time-tool.c:441 msgid "Synchronizing system clock" msgstr "시스템 시계와 동기화" -#: ../src/time/time-tool.c:525 +#: ../src/time/time-tool.c:521 msgid "Keep synchronized with Internet servers" msgstr "인터넷 서버와 동기화 유지" -#: ../src/time/time-tool.c:672 +#: ../src/time/time-tool.c:522 +msgid "Manual" +msgstr "수동" + +#: ../src/time/time-tool.c:665 msgid "Time and Date Settings" msgstr "시간과 날짜 설정" @@ -1626,9 +1647,9 @@ msgid "Administrator group can not be deleted" msgstr "관리자 그룹은 삭제할 수 없습니다" -#: ../src/users/group-settings.c:58 ../src/users/group-settings.c:228 -#: ../src/users/group-settings.c:265 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 +#: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 +#: ../src/users/user-settings.c:605 msgid "This would leave the system unusable." msgstr "시스템을 쓰지 못하게 할 것입니다." @@ -1641,32 +1662,32 @@ msgid "This may leave files with invalid group ID in the filesystem." msgstr "파일 시스템에 잘못된 그룹 ID를 가진 파일을 남기게 할 수 있습니다." -#: ../src/users/group-settings.c:151 +#: ../src/users/group-settings.c:144 msgid "New group" msgstr "새 그룹" -#: ../src/users/group-settings.c:158 +#: ../src/users/group-settings.c:151 #, c-format msgid "Group '%s' Properties" msgstr "그룹 '%s' 속성" -#: ../src/users/group-settings.c:224 +#: ../src/users/group-settings.c:217 msgid "Group name is empty" msgstr "그룹 이름이 비어있습니다" -#: ../src/users/group-settings.c:225 +#: ../src/users/group-settings.c:218 msgid "A group name must be specified." msgstr "그룹 이름을 지정해야 합니다." -#: ../src/users/group-settings.c:227 +#: ../src/users/group-settings.c:220 msgid "Group name of the administrator group user should not be modified" msgstr "관리자 그룹의 그룹 이름은 고칠 수 없습니다" -#: ../src/users/group-settings.c:230 +#: ../src/users/group-settings.c:223 msgid "Group name has invalid characters" msgstr "그룹이름에 잘못된 글자가 있습니다" -#: ../src/users/group-settings.c:231 +#: ../src/users/group-settings.c:224 msgid "" "Please set a valid group name consisting of a lower case letter followed by " "lower case letters and numbers." @@ -1674,30 +1695,30 @@ "올바른 그룹 이름을 설정해 주십시오. 그룹 이름은 소문자로 시작해서 소문자와 숫" "자로 이루어져야 합니다." -#: ../src/users/group-settings.c:236 +#: ../src/users/group-settings.c:229 #, c-format msgid "Group \"%s\" already exists" msgstr "\"%s\" 그룹이 이미 있습니다." -#: ../src/users/group-settings.c:237 +#: ../src/users/group-settings.c:230 msgid "Please choose a different group name." msgstr "다른 그룹 이름을 선택하십시오." -#: ../src/users/group-settings.c:264 +#: ../src/users/group-settings.c:257 msgid "Group ID of the Administrator account should not be modified" msgstr "관리자 계정의 그룹 ID는 고칠 수 없습니다" #. check that GID is free -#: ../src/users/group-settings.c:268 +#: ../src/users/group-settings.c:261 #, c-format msgid "Group ID %d is already used by group \"%s\"" msgstr "그룹 ID %d번은 이미 %s 그룹이 사용하고 있습니다" -#: ../src/users/group-settings.c:271 +#: ../src/users/group-settings.c:264 msgid "Please choose a different numeric identifier for the new group." msgstr "새 그룹에 다른 ID 번호를 사용하십시오." -#: ../src/users/group-settings.c:273 +#: ../src/users/group-settings.c:266 #, c-format msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "\"%s\" 그룹에 다른 ID 번호를 사용하십시오." @@ -1706,6 +1727,15 @@ msgid "Group name" msgstr "그룹 이름" +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +msgid "Not asked on login" +msgstr "로그인할 때 묻지 않기" + +#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +msgid "Asked on login" +msgstr "로그인할 때 묻기" + #: ../src/users/privileges-table.c:53 msgid "Monitor system logs" msgstr "시스템 로그 보기" @@ -1798,13 +1828,17 @@ msgid "" "Can change anything on the system, including installing and upgrading " "software." -msgstr "시스템의 모든 것을 바꿀 수 있습니다. 소프트웨어 설치 업그레이드도 할 수 있습니다." +msgstr "" +"시스템의 모든 것을 바꿀 수 있습니다. 소프트웨어 설치 업그레이드도 할 수 있습" +"니다." #: ../src/users/user-profiles.conf.in.h:3 msgid "" "Can perform common tasks. Can't install software or change settings " "affecting all users." -msgstr "일반적인 작업을 할 수 있습니다. 소프트웨어를 설치하거나 다른 사용자에 영향을 미치는 설정을 할 수 없습니다." +msgstr "" +"일반적인 작업을 할 수 있습니다. 소프트웨어를 설치하거나 다른 사용자에 영향을 " +"미치는 설정을 할 수 없습니다." #: ../src/users/user-profiles.conf.in.h:4 msgid "Desktop user" @@ -1814,37 +1848,42 @@ msgid "Authentication failed" msgstr "인증이 실패했습니다" -#: ../src/users/run-passwd.c:494 +#: ../src/users/run-passwd.c:498 #, c-format msgid "The new password is too short" msgstr "새 암호가 너무 짧습니다" -#: ../src/users/run-passwd.c:499 +#: ../src/users/run-passwd.c:504 #, c-format msgid "The new password is too simple" msgstr "새 암호가 너무 간단합니다" -#: ../src/users/run-passwd.c:503 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "예전 암호와 새 암호가 너무 비슷합니다" -#: ../src/users/run-passwd.c:506 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" msgstr "새 암호에 숫자나 특수 문자가 들어가야 합니다" -#: ../src/users/run-passwd.c:510 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "예전 암호와 새 암호가 같습니다" -#: ../src/users/run-passwd.c:514 +#: ../src/users/run-passwd.c:520 +#, c-format +msgid "The new password has already been used recently." +msgstr "새 암호가 최근에 사용된 암호입니다." + +#: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "최초에 로그인한 이후 암호가 바뀌었습니다!" -#: ../src/users/run-passwd.c:518 +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "알 수 없는 오류" @@ -1863,10 +1902,9 @@ #: ../src/users/user-password.c:98 msgid "" -"User passwords must be longer than 6 characters and preferably formed by " +"User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." -msgstr "" -"사용자 암호는 6자보다 길어야 하며, 숫자, 문자 특수문자로 이루어져야 합니다." +msgstr "사용자 암호는 5자보다 길어야 하고 숫자, 문자, 특수문자로 이루어져야 합니다." #: ../src/users/user-password.c:101 msgid "Password confirmation is not correct" @@ -1876,15 +1914,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "암호를 똑같이 입력하여야 합니다." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:445 msgid "Please choose another password." msgstr "다른 암호를 입력하십시오." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:456 msgid "Please type again your current password." msgstr "현재 암호를 다시 입력하십시오." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:463 msgid "Password could not be changed" msgstr "암호를 바꿀 수 없습니다" @@ -1910,7 +1948,9 @@ msgid "" "%s is the only administrator on this computer. Deleting this account would " "lock you out of administrating the system." -msgstr "%s 사용자는 이 컴퓨터에 유일하게 남은 관리자입니다. 이 계정을 지우면 시스템을 관리할 방법이 없어집니다." +msgstr "" +"%s 사용자는 이 컴퓨터에 유일하게 남은 관리자입니다. 이 계정을 지우면 시스템" +"을 관리할 방법이 없어집니다." #: ../src/users/user-settings.c:121 #, c-format @@ -1923,7 +1963,10 @@ "Files owned by user %s in %s can be completely removed if you don't " "need them anymore. You may want to back them up before deleting the account, " "or keep them so that an administrator can save them later." -msgstr "%2$s 안에 %1$s 사용자 소유의 파일을 필요 없으면 완전히 제거합니다. 계정을 삭제하기 전에 백업할 수도 있고, 아니면 나중에 사용하도록 이 파일을 유지할 수도 있습니다." +msgstr "" +"%2$s 안에 %1$s 사용자 소유의 파일을 필요 없으면 완전히 제거합니다. " +"계정을 삭제하기 전에 백업할 수도 있고, 아니면 나중에 사용하도록 이 파일을 유" +"지할 수도 있습니다." #: ../src/users/user-settings.c:132 msgid "Keep Files" @@ -1951,15 +1994,6 @@ msgid "None" msgstr "없음" -#. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/user-settings.c:347 -msgid "Not asked on login" -msgstr "로그인할 때 묻지 않기" - -#: ../src/users/user-settings.c:349 -msgid "Asked on login" -msgstr "로그인할 때 묻기" - #: ../src/users/user-settings.c:393 #, c-format msgid "Invalid character \"%c\" in comment" @@ -1969,86 +2003,168 @@ msgid "Check that this character is not used." msgstr "이 글자가 쓰이지 않는지 확인하십시오." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:426 msgid "Incomplete path in home directory" msgstr "홈 디렉터리의 전체 경로를 입력하십시오." -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:427 msgid "" "Please enter full path for home directory\n" -"i.e.: /home/john." +"i.e.: /home/john." msgstr "" "홈 디렉터리의 전체 경로를 입력하십시오\n" -"예: /home/john." +"i.e.: /home/john." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "홈 디렉터리가 이미 있습니다" +#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +msgid "New home directory already exists, use it?" +msgstr "해당 홈 디렉터리가 이미 있습니다. 이 디렉터리를 사용하시겠습니까?" -#: ../src/users/user-settings.c:434 +#: ../src/users/user-settings.c:449 #, c-format msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" -msgstr "%s 디렉터리가 이미 있습니다. 이 디렉터리를 읽거나 쓰는데 필요한 권한이 사용자에게 없을 수도 있습니다. 그래도 이 디렉터리를 사용하시겠습니까?" - -#: ../src/users/user-settings.c:440 -msgid "Use this directory" -msgstr "이 디렉터리 사용" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" +"%s의 홈 디렉터리가 %s 디렉터리로 설정되었지만 이 디렉터리가 이미 있습니다. 이 디렉터리의 파일을 사용하시겠습니까? 아니면 %s의 내용을 새 홈 디렉터리로 옮겨서 덮어 쓰시겠습니까?\n" +"\n" +"잘 모르겠으면 새 디렉터리를 그대로 사용하십시오. 그래야 데이터를 잃어버릴 염려가 없고, 예전 디렉터리의 파일은 나중에 복사할 수 있습니다." + +#: ../src/users/user-settings.c:461 +msgid "_Replace With Old Files" +msgstr "예전 파일 바꾸기(_R)" + +#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 +#: ../src/users/user-settings.c:540 +msgid "_Cancel Change" +msgstr "바뀐 사항 취소(_C)" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:465 +msgid "_Use New Files" +msgstr "새 파일 사용(_U)" + +#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +msgid "Make user the _owner of the new home directory" +msgstr "사용자가 새 홈 디렉터리 소유(_O)" + +#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +msgid "_Delete old home directory" +msgstr "예전 홈 디렉터리 삭제(_D)" + +#: ../src/users/user-settings.c:493 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" +"%s의 홈 디렉터리가 %s 디렉터리로 설정되었지만 이 디렉터리가 이미 있습니다. 이 디렉터리의 파일을 사용하시겠습니까? 아니면 디렉터리 내용을 모두 지우고 빈 홈 디렉터리를 사용하시겠습니까?\n" +"\n" +"잘 모르겠으면 파일을 유지하고, 필요하면 나중에 파일을 제거하십시오." + +#: ../src/users/user-settings.c:503 +msgid "_Delete Files" +msgstr "파일 삭제(_D)" + +#: ../src/users/user-settings.c:505 +msgid "_Use Existing Files" +msgstr "기존 파일 사용(_U)" + +#: ../src/users/user-settings.c:526 +msgid "Copy old home directory to new location?" +msgstr "예전 홈 디렉터리에서 새 위치로 복사하시겠습니까?" + +#: ../src/users/user-settings.c:528 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" +"%s의 홈 디렉터리가 %s 디렉터리로 설정되었지만 이 디렉터리가 없습니다. 예전 홈 이 디렉터리의 (%s) 내용을 복사하시겠습니까? 아니면 빈 홈 디렉터리를 사용하시겠습니까?\n" +"\n" +"새 위치로 파일을 복사하겠다고 선택하시면, 예전 디렉터리는 삭제해도 안전합니다." + +#: ../src/users/user-settings.c:539 +msgid "_Use Empty Directory" +msgstr "빈 디렉터리 사용(_U)" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:542 +msgid "Co_py Old Files" +msgstr "예전 파일 복사(_P)" -#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:604 msgid "ID for the root user should not be modified" msgstr "루트(root) 사용자의 ID는 수정할 수 없습니다" #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:608 #, c-format msgid "User ID %d is already used by user %s" msgstr "사용자 ID %d번은 이미 %s 사용자가 사용하고 있습니다" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:610 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "%s 사용자에 다른 ID 번호를 사용하십시오." -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:628 msgid "Incomplete path in shell" msgstr "완전하지 않은 셸 경로" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:629 msgid "" "Please enter full path for shell\n" -"i.e.: /bin/bash." +"i.e.: /bin/bash." msgstr "" "셸의 전체경로를 넣으십시오\n" -"예: /bin/bash." +"i.e.: /bin/bash." -#: ../src/users/user-settings.c:534 +#: ../src/users/user-settings.c:663 msgid "Can't revoke administration rights" msgstr "관리 권한을 무효화할 수 없습니다" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:666 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." -msgstr "%s 사용자는 이 컴퓨터의 유일한 관리자입니다. 이 계정의 관리 권한을 무효화하면 시스템을 관리할 방법이 없어집니다." +msgstr "" +"%s 사용자는 이 컴퓨터의 유일한 관리자입니다. 이 계정의 관리 권한을 무효화하" +"면 시스템을 관리할 방법이 없어집니다." -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:683 msgid "You are about to revoke your own administration rights" msgstr "자기 자신의 관리자 권한을 무효화하려고 합니다" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:686 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." -msgstr "%s 사용자는 이제 관리 작업을 수행할 수 없게 됩니다. 이 계정은 자기 스스로 관리 권한을 획득할 수 없습니다." +msgstr "" +"%s 사용자는 이제 관리 작업을 수행할 수 없게 됩니다. 이 계정은 자기 스스로 관" +"리 권한을 획득할 수 없습니다." -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:691 msgid "Give up administration rights" msgstr "관리자 권한 포기" -#: ../src/users/users-tool.c:284 +#: ../src/users/user-settings.c:1469 +msgid "Applying changes to user settings..." +msgstr "바뀐 사항을 사용자 설정에 적용하는 중입니다..." + +#: ../src/users/users-tool.c:288 msgid "Users Settings" msgstr "사용자 설정" diff -Nru gnome-system-tools-2.32.0/po/lv.po gnome-system-tools-3.0.0/po/lv.po --- gnome-system-tools-2.32.0/po/lv.po 2010-06-27 10:49:31.000000000 +0000 +++ gnome-system-tools-3.0.0/po/lv.po 2011-04-02 13:14:29.000000000 +0000 @@ -6,199 +6,195 @@ # Peteris Krisjanis , 2002. # Raivis Dejus , 2006, 2007, 2009. # Rūdolfs Mazurs , 2010. +# Rūdofls Mazurs , 2011. msgid "" msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=gnome-system-tools&component=general\n" -"POT-Creation-Date: 2010-04-05 16:32+0000\n" -"PO-Revision-Date: 2010-06-13 22:22+0300\n" -"Last-Translator: Rūdolfs Mazurs \n" -"Language-Team: Latviešu \n" +"POT-Creation-Date: 2011-03-10 17:19+0000\n" +"PO-Revision-Date: 2011-03-31 21:42+0300\n" +"Last-Translator: Rūdofls Mazurs \n" +"Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: ../gnome-system-tools.schemas.in.h:1 -#| msgid "Whether the users-admin tool should show all users and groups or not" -msgid "Whether the users-admin tool should show system users in the users list" -msgstr "Vai user-admin rīkam būtu jārāda sistēmas lietotāji lietotāju sarakstā" - -#: ../gnome-system-tools.schemas.in.h:2 -#| msgid "Whether the users-admin tool should show all users and groups or not" -msgid "" -"Whether the users-admin tool should show the root user in the users list" -msgstr "Vai user-admin rīkam būtu jārāda root lietotājs lietotāju sarakstā" - -#: ../interfaces/network.ui.h:1 -msgid "Account data" -msgstr "Konta dati" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "Piekļuves punkta nosaukums:" #: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "Savienojuma iestatījumi" +#| msgid "Account data" +msgid "Account data" +msgstr "Konta dati" #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "DNS serveri" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "Saimnieka iestatījumi" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "Interneta pakalpojumu sniedzēja dati" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "Modema iestatījumi" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "Meklēt domēnos" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "Bezvadu tīkla iestatījumi" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "Piekļuves punkta nosaukums:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "Aliasi:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "Kon_figurācija:" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +#| msgid "Connection Settings" +msgid "Connection Settings" +msgstr "Savienojuma iestatījumi" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "Savienojuma tips:" -#: ../interfaces/network.ui.h:13 +#: ../interfaces/network.ui.h:7 msgid "Connections" msgstr "Savienojumi" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNS" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +#| msgid "DNS Servers" +msgid "DNS Servers" +msgstr "DNS serveri" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "D_omēna vārds:" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "Dzēst pašreizējo vietu" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "Aktivizēt klejoša_nu" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "Aktivizēt šo savie_nojumu" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "Ethernet saskarne:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:32 +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "Vispārīgi" -#: ../interfaces/network.ui.h:21 -#| msgid "WEP key (hexadecimal)" +#: ../interfaces/network.ui.h:16 msgid "Hexadecimal" msgstr "Heksadecimāla" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "Resursdatora aliasu iestatījumi" -#: ../interfaces/network.ui.h:23 +#: ../interfaces/network.ui.h:18 +#| msgid "Host Settings" +msgid "Host Settings" +msgstr "Tīkla datora iestatījumi" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" -msgstr "Serveri" +msgstr "Tīkla datori" -#: ../interfaces/network.ui.h:24 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "IP adreses:" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "Interfeisa parametri" -#: ../interfaces/network.ui.h:26 +#: ../interfaces/network.ui.h:22 +#| msgid "Internet service provider data" +msgid "Internet service provider data" +msgstr "Interneta pakalpojumu sniedzēja dati" + +#: ../interfaces/network.ui.h:23 msgid "Location:" msgstr "Vieta:" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:24 msgid "Loud" msgstr "Skaļi" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:25 msgid "Low" msgstr "Klusi" -#: ../interfaces/network.ui.h:29 +#: ../interfaces/network.ui.h:26 msgid "Medium" msgstr "Vidēji" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "Modems" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:28 +#| msgid "Modem Settings" +msgid "Modem Settings" +msgstr "Modema iestatījumi" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "Tīkla _parole:" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "Tīkla nosaukums (_ESSID):" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:31 msgid "Off" msgstr "Izslēgts" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "Opcijas" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "P_arole" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "Paroles _tips:" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:35 msgid "Plain (ASCII)" msgstr "Vienkāršs (ASCII)" -#: ../interfaces/network.ui.h:38 -#| msgid "Aliases" +#: ../interfaces/network.ui.h:36 msgid "Pulses" msgstr "Pulsi" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" msgstr "Saglabāt pašreizējo tīkla konfigurāciju kā konkrētu vietu" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:38 +#| msgid "Search Domains" +msgid "Search Domains" +msgstr "Meklēšanas domēni" + +#: ../interfaces/network.ui.h:39 msgid "Tones" msgstr "Skaņas signāli" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "Izmantot Interneta pakalpojumu sniedzēja domēnu vārdu serverus" +#: ../interfaces/network.ui.h:41 +#| msgid "Wireless Settings" +msgid "Wireless Settings" +msgstr "Bezvadu tīkla iestatījumi" + #: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "_Automātiski noteikt" @@ -251,7 +247,7 @@ msgid "_Subnet mask:" msgstr "Apakštīkla ma_ska:" -#: ../interfaces/network.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Lietotājvārds:" @@ -269,100 +265,104 @@ msgstr "Izvēlieties servisus, kurus vēlaties aktivizēt:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "Atļautie serveri" +msgid "Add allowed hosts" +msgstr "Pievienot atļautos serverus" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "Serveru iestatījumi" +#| msgid "Allowed hosts:" +msgid "Allowed Hosts" +msgstr "Atļautie tīkla datori" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "Koplietošanas rekvizīti" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "Koplietošanas mape" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "Windows koplietošana" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"Ievadiet lietotāja paroli:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "Pievienot atļautos serverus" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "Atļautie serveri:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "Komentārs:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "_Domēns / darba grupa:" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "Ievadiet lietotāja paroli" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +#| msgid "Enter password for user" +msgid "Enter password for user:" +msgstr "Ievadiet lietotāja paroli:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "Vispārīgie iestatījumi" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "Servera nosaukums:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +#| msgid "Hosts Settings" +msgid "Hosts Settings" +msgstr "Tīkla datoru iestatījumi" + +#: ../interfaces/shares.ui.h:12 msgid "Name:" msgstr "Nosaukums:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "Tīkla maska:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "Tīkls:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "Tikai lasāms" -#: ../interfaces/shares.ui.h:19 -#| msgid "Start" +#: ../interfaces/shares.ui.h:16 msgid "Share" msgstr "Koplietot" -#: ../interfaces/shares.ui.h:20 +#: ../interfaces/shares.ui.h:17 +#| msgid "Share Properties" +msgid "Share Properties" +msgstr "Koplietošanas īpašības" + +#: ../interfaces/shares.ui.h:18 msgid "Share through:" msgstr "Koplietot izmantojot:" -#: ../interfaces/shares.ui.h:21 ../src/shares/shares.desktop.in.in.h:2 +#: ../interfaces/shares.ui.h:19 +#| msgid "Shared Folders" +msgid "Shared Folder" +msgstr "Koplietošanas mape" + +#: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "Koplietošanas mapes" -#: ../interfaces/shares.ui.h:22 +#: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" msgstr "Šis dators ir _WINS serveris" -#: ../interfaces/shares.ui.h:23 +#: ../interfaces/shares.ui.h:22 msgid "Users" msgstr "Lietotāji" -#: ../interfaces/shares.ui.h:24 +#: ../interfaces/shares.ui.h:23 msgid "WINS _server:" msgstr "WINS _serveris:" +#: ../interfaces/shares.ui.h:24 +#| msgid "Windows sharing" +msgid "Windows sharing" +msgstr "Windows koplietošana" + #: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "_Ceļš:" @@ -372,29 +372,31 @@ msgstr "_Tikai lasāms" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "Izvēle" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "Laiks josla" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "Pievienot NTP serveri" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "NTP serveris" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "Izvē_lieties serverus" -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +#| msgid "Save location" +msgid "Selection" +msgstr "Izvēle" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "Sinhronizēt tagad" +#: ../interfaces/time.ui.h:6 +#| msgid "Time zone" +msgid "Time Zone" +msgstr "Laika josla" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "Laika serveri" @@ -428,135 +430,112 @@ msgstr "_Laiks:" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "Paplašinātie iestatījumi" +#| msgid "" +#| "A user with this name already exists. Please choose a different short " +#| "name for the new user." +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "" +"Lietotājs ar šādu vārdu jau ir. Lūdzu, izvēlieties citu vārdu jaunajam " +"lietotājam." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "Automātisks UID/GID" +msgid "Account _type:" +msgstr "Konta _tips:" #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "Vispārīgi iestatījumi" +msgid "Advanced" +msgstr "Paplašināti" #: ../interfaces/users.ui.h:4 -msgid "Group Members" -msgstr "Grupas dalībnieki" +#| msgid "_Advanced Settings" +msgid "Advanced Settings" +msgstr "Paplašinātie iestatījumi" #: ../interfaces/users.ui.h:5 -msgid "Optional Settings" -msgstr "Papildus iestatījumi" +msgid "Assign a random password by default" +msgstr "Piešķirt nejaušu paroli pēc noklusējuma" #: ../interfaces/users.ui.h:6 -msgid "Password Settings" -msgstr "Paroles iestatījumi" +msgid "Automatic UID/GID" +msgstr "Automātisks UID/GID" #: ../interfaces/users.ui.h:7 -msgid "Profile Settings" -msgstr "Profila iestatījumi" +#| msgid "Users Settings" +msgid "Basic Settings" +msgstr "Pamat iestatījumi" #: ../interfaces/users.ui.h:8 -msgid "System Defaults" -msgstr "Sistēmas noklusējumi" - -#: ../interfaces/users.ui.h:9 -msgid "" -"A user with this name already exists. Please choose a different short name " -"for the new user." -msgstr "" -"Lietotājs ar šādu vārdu jau ir. Lūdzu, izvēlieties citu īso vārdu jaunajam " -"lietotājam." - -#: ../interfaces/users.ui.h:10 -#| msgid "Account" -msgid "Account _type:" -msgstr "Konta _tips:" - -#: ../interfaces/users.ui.h:11 -msgid "Advanced" -msgstr "Paplašināti" - -#: ../interfaces/users.ui.h:12 -msgid "Assign a random password by default" -msgstr "Piešķirt nejaušu paroli pēc noklusējuma" - -#: ../interfaces/users.ui.h:13 -#| msgid "Advanced settings:" msgid "Change Advanced User Settings" msgstr "Mainīt paplašinātos lietotāja iestatījumus" -#: ../interfaces/users.ui.h:14 -#| msgid "New user account" +#: ../interfaces/users.ui.h:9 msgid "Change User Account Type" msgstr "Mainīt lietotāja konta tipu" -#: ../interfaces/users.ui.h:15 -msgid "Change User Name and Login" +#: ../interfaces/users.ui.h:10 +#| msgid "Change User Name and Login" +msgid "Change User Name" msgstr "Mainīt lietotāja vārdu" -#: ../interfaces/users.ui.h:16 -#| msgid "Enter Password" +#: ../interfaces/users.ui.h:11 msgid "Change User Password" msgstr "Mainīt lietotāja paroli" -#: ../interfaces/users.ui.h:17 -#| msgid "Advanced settings:" +#: ../interfaces/users.ui.h:12 msgid "Changing advanced settings for:" msgstr "Maina paplašinātos iestatījumus lietotājam:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:13 msgid "Changing user account type for:" msgstr "Maina lietotāja konta tipu:" -#: ../interfaces/users.ui.h:19 -#| msgid "Change _Host name" +#: ../interfaces/users.ui.h:14 msgid "Changing user name for:" msgstr "Maina lietotāja vārdu:" -#: ../interfaces/users.ui.h:20 -#| msgid "Enter password for user" +#: ../interfaces/users.ui.h:15 msgid "Changing user password for:" msgstr "Maina lietotāja paroli:" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "_Apstiprinājums:" -#: ../interfaces/users.ui.h:22 -#| msgid "Con_firmation:" +#: ../interfaces/users.ui.h:17 msgid "Contact Information" msgstr "Kontaktinformācija" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:18 msgid "Create New User" msgstr "Izveidot jaunu lietotāju" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:19 msgid "Create a new user" msgstr "Izveidot jaunu lietotāju" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" msgstr "Dienas starp brīdinājumu un paroles iztecēšanu:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" msgstr "Noklusētā _grupa:" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" msgstr "Noklu_sētā čaula:" -#: ../interfaces/users.ui.h:28 -#| msgid "New user account" +#: ../interfaces/users.ui.h:23 msgid "Disable _account" msgstr "_Deaktivizēt kontu" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:24 msgid "Don't ask for password on _login" msgstr "Piesakoties neprasīt paro_li" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:25 msgid "" "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " @@ -566,81 +545,102 @@ "cilvēkiem, kuriem ir fiziska pieeja jūsu datoram, bet būs jāpacieš nedaudz " "zemāka veiktspēja." -#: ../interfaces/users.ui.h:31 -#| msgid "Name:" +#: ../interfaces/users.ui.h:26 msgid "Full _Name:" msgstr "Pilns _vārds:" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "Ģene_rēt nejaušu paroli" -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:29 +#| msgid "Group name" +msgid "Group Members" +msgstr "Grupas dalībnieki" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" msgstr "Grupas _ID:" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "Grupas _nosaukums:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "Grupas īpašības" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "Uz sistēmas pieejamās grupas:" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Grupas iestatījumi" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Ma_ksimālais dienu skaits, cik parole var tikt lietota:" -#: ../interfaces/users.ui.h:39 -#| msgid "Maximum UID:" +#: ../interfaces/users.ui.h:36 msgid "Maximum GID:" msgstr "Maksimālais GID:" -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "Maksimālais UID:" -#: ../interfaces/users.ui.h:41 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" msgstr "Mi_nimālais dienu skaits starp paroļu maiņām:" -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "Minimālais GID:" -#: ../interfaces/users.ui.h:43 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "Minimālais UID:" -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Minimums atļauto dienu skaits starp paroļu maiņām:" -#: ../interfaces/users.ui.h:45 -#| msgid "Network _password:" +#: ../interfaces/users.ui.h:42 msgid "New _password:" msgstr "Jaunā _parole:" -#: ../interfaces/users.ui.h:46 +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Dienu skaits, cik parole var tikt lietota:" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "Biroja _vieta:" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:45 +#| msgid "Network Settings" +msgid "Optional Settings" +msgstr "Papildu iestatījumi" + +#: ../interfaces/users.ui.h:46 +#| msgid "Network Settings" +msgid "Password Settings" +msgstr "Paroles iestatījumi" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Parole iestatīta: " -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Privilēģijas" +#: ../interfaces/users.ui.h:49 +#| msgid "Services Settings" +msgid "Profile Settings" +msgstr "Profila iestatījumi" + #: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "Profila _nosaukums:" @@ -649,59 +649,62 @@ msgid "Set password b_y hand" msgstr "Iestatīt paroli ar _roku" -#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! -#: ../interfaces/users.ui.h:53 -msgid "" -"Short name must consist of:\n" -" ➣ lower case letters from the English alphabet\n" -" ➣ digits\n" -" ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"Īsajam vārdam vajadzētu saturēt:\n" -" ➣ mazos burtus no angļu alfabēta\n" -" ➣ ciparus\n" -" ➣ jebkuru no rakstzīmēm \".\", \"-\", \"_\"" - -#: ../interfaces/users.ui.h:57 -msgid "Short name must start with a letter!" -msgstr "Īsajam vārdam jāsākas ar burtu!" +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "Sistēmas noklusējumi" -#: ../interfaces/users.ui.h:58 -#| msgid "This action is allowed" +#: ../interfaces/users.ui.h:53 msgid "This account is disabled." msgstr "Konts ir deaktivizēts." -#: ../interfaces/users.ui.h:59 +#: ../interfaces/users.ui.h:54 msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." msgstr "" "Šis konts izmanto īpašus iestatījumus, kuri ir noteikti pašrocīgi. " -"Izmantojiet " -"paplašināto iestatījumu dialogu, lai tos pielāgotu." +"Izmantojiet paplašināto iestatījumu dialogu, lai tos pielāgotu." -#: ../interfaces/users.ui.h:60 +#: ../interfaces/users.ui.h:55 msgid "User ID:" msgstr "Lietotāja ID:" -#: ../interfaces/users.ui.h:61 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Lietotāja privilēģijas" -#: ../interfaces/users.ui.h:62 +#: ../interfaces/users.ui.h:57 msgid "User profiles" msgstr "Lietotāju profili" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +#| msgid "" +#| "Short name must consist of:\n" +#| " ➣ lower case letters from the English alphabet\n" +#| " ➣ digits\n" +#| " ➣ any of the characters \".\", \"-\" and \"_\"" +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"Lietotājvārdam vajadzētu saturēt:\n" +" ➣ mazos burtus no angļu alfabēta\n" +" ➣ ciparus\n" +" ➣ jebkuru no rakstzīmēm \".\", \"-\", \"_\"" + #: ../interfaces/users.ui.h:63 -msgid "You can't change user ID while the user is logged in." -msgstr "Jūs nevarat mainīt lietotāja ID, kamēr lietotājs ir pieteicies." +#| msgid "Short name must start with a letter!" +msgid "Username must start with a letter!" +msgstr "Lietotājvārdam jāsākas ar burtu!" #: ../interfaces/users.ui.h:64 msgid "_Add Profile" msgstr "_Pievienot profilu" #: ../interfaces/users.ui.h:65 -#| msgid "Advanced settings:" msgid "_Advanced Settings" msgstr "P_aplašinātie iestatījumi" @@ -714,7 +717,6 @@ msgstr "_Komentāri" #: ../interfaces/users.ui.h:68 -#| msgid "Network _password:" msgid "_Current password:" msgstr "_Pašreizējā parole:" @@ -727,7 +729,6 @@ msgstr "_Dienas starp brīdinājumu un paroles iztecēšanu:" #: ../interfaces/users.ui.h:71 -#| msgid "Account" msgid "_Enable Account" msgstr "_Aktivizēt kontu" @@ -756,7 +757,6 @@ msgstr "_Pārvaldīt grupas" #: ../interfaces/users.ui.h:78 -#| msgid "Name:" msgid "_Name:" msgstr "_Vārds:" @@ -768,15 +768,38 @@ msgid "_Shell:" msgstr "Č_aula:" -#: ../interfaces/users.ui.h:81 -#| msgid "_Host name:" -msgid "_Short Name:" -msgstr "Ī_sais vārds:" - #: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "_Darba tālrunis:" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "Rādīt root lietotāju" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "Rādīt sistēmas lietotājus" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +#| msgid "" +#| "Whether the users-admin tool should show system users in the users list" +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "" +"Vai user-admin rīkam būtu jārāda sistēmas lietotāji lietotāju sarakstā." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +#| msgid "" +#| "Whether the users-admin tool should show the root user in the users list" +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "Vai user-admin rīkam būtu jārāda root lietotājs lietotāju sarakstā." + +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Kļūda, piekļūstot sistēmas tiesībām: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Jūs šobrīd darbojaties ar platformu, kuru šis rīks neatbalsta" @@ -796,48 +819,51 @@ msgid "Unsupported platform" msgstr "Neatbalstīta platforma" -#: ../src/common/gst-tool.c:190 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "Nevarēja ielādēt konfigurāciju" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:192 +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "Nevar saglabāt konfigurāciju" -#: ../src/common/gst-tool.c:196 +#: ../src/common/gst-tool.c:194 msgid "You are not allowed to access the system configuration." msgstr "Jums nav tiesību piekļūt šai sistēmas konfigurācijas daļai." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:198 ../src/common/gst-tool.c:690 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Jums nav tiesību veikt sistēmas konfigurācijas izmaiņas." -#: ../src/common/gst-tool.c:201 +#: ../src/common/gst-tool.c:199 msgid "Invalid data was found." msgstr "Tika atrasti nederīgi dati." #. OOBS_RESULT_ERROR -#: ../src/common/gst-tool.c:203 -#| msgid "An unexpected error has occurred." +#: ../src/common/gst-tool.c:201 msgid "An unknown error occurred." msgstr "Notika nezināma kļūda." -#: ../src/common/gst-tool.c:427 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Palīdzība" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Nevarēja parādīt palīdzību" -#: ../src/common/gst-tool.c:621 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "Iespējams, ka sistēmas konfigurācija ir mainījusies." -#: ../src/common/gst-tool.c:623 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "" "Atjaunot saturu? Šīs darbības rezultātā visas veiktās izmaiņas tiks zaudētas." -#: ../src/common/gst-tool.c:692 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -846,6 +872,44 @@ "Gadījās kļūda, pārbaudot autorizācijas: %s\n" "Jūs varētu vēlēties to ziņot kā kļūdu." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Aizslēgt" + +#: ../src/common/um-lockbutton.c:365 +#| msgid "_Unlock" +msgid "Unlock" +msgstr "Atslēgt" + +#: ../src/common/um-lockbutton.c:374 +#| msgid "Loud" +msgid "Locked" +msgstr "Aizslēgts" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Dialogs ir atslēgts.\n" +"Klikšķiniet, lai novērstu turpmākas izmaiņas" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Dialogs ir aizslēgts.\n" +"Klikšķiniet, lai veiktu izmaiņas" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Sistēmas politika neļauj veikt izmaiņas.\n" +"Sazinieties ar sistēmas administratoru" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -856,7 +920,7 @@ msgid "_Delete" msgstr "_Dzēst" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "Ievadiet adresi" @@ -891,51 +955,51 @@ msgid "Change _Host name" msgstr "Mainīt _saimniekdatora vārdu" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Automātiskā konfigurācija (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Lokālais Zeroconf tīkls (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statiskā IP adrese" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP atslēga (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP atslēga (heksadecimāla)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA personālā" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 personālā" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN modems" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Seriālais modems" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "%s īpašības" @@ -966,58 +1030,49 @@ msgid "Essid: %s " msgstr "Essid: %s " -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "Adrese: %s Apakštīkla maska: %s" - -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "Adrese: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "Adrese: %s Attālinātā adrese: %s" - -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "Tips: %s Telefona numurs: %s" - -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "Tips: %s Piekļuves punkta nosaukums: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +#| msgid "IP Address" +msgid "Address:" +msgstr "Adrese:" + +#: ../src/network/ifaces-list.c:298 +#| msgid "_Subnet mask:" +msgid "Subnet mask:" +msgstr "Apakštīkla maska:" + +#: ../src/network/ifaces-list.c:308 +#| msgid "IP address:" +msgid "Remote address:" +msgstr "Attālinātā adrese:" + +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "Tips:" + +#: ../src/network/ifaces-list.c:321 +#| msgid "_Phone number:" +msgid "Phone number:" +msgstr "Tālruņa numurs:" -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "Tips: %s Ethernet saskarne: %s" - -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "Tips: %s" - -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "Bezvadu savienojums" -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "Infrasarkanais savienojums" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" msgstr "Vadu savienojums" -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" msgstr "Paralēlā porta savienojums" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" msgstr "Punkts uz punktu savienojums" @@ -1055,8 +1110,8 @@ "Check that it is correctly typed and that it is correctly supported by your " "system." msgstr "" -"Pārbaudiet, vai esat pareizi ierakstījuši un vai tas ir korekti " -"atbalstīts šajā sistēmā." +"Pārbaudiet, vai esat pareizi ierakstījuši un vai tas ir korekti atbalstīts " +"šajā sistēmā." #: ../src/network/main.c:183 msgid "Configure a network interface" @@ -1091,12 +1146,12 @@ msgid "Settings for service \"%s\"" msgstr "\"%s\" servisa iestatījumi" -#: ../src/services/callbacks.c:125 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "Vai tiešām vēlaties deaktivizēt %s?" -#: ../src/services/callbacks.c:129 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1508,7 +1563,6 @@ #. GST_ROLE_SYSTEM_MONITORING #: ../src/services/service.c:104 -#| msgid "Logical volume management" msgid "Virtual Machine management" msgstr "Virtuālo mašīnu pārvaldība" @@ -1569,11 +1623,11 @@ msgid "PATH" msgstr "CEĻŠ" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "_Koplietot mapi..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "Koplietot šo mapi ar citiem datoriem" @@ -1615,12 +1669,10 @@ #: ../src/shares/share-settings.c:462 #, c-format -#| msgid "Settings for service \"%s\"" msgid "Settings for folder '%s'" msgstr "\"%s\" mapes iestatījumi" #: ../src/shares/share-settings.c:469 -#| msgid "Shared Folders" msgid "Share Folder" msgstr "Koplietot mapi" @@ -1635,6 +1687,19 @@ msgstr "" "Jums ir jāuzinstalē Samba vai NFS pakotnes, lai varētu koplietot mapes." +#: ../src/time/e-map/e-map.c:775 +msgid "World Map" +msgstr "Pasaules karte" + +#: ../src/time/e-map/e-map.c:777 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" +"Bāzēts uz peles interaktīvais kartes logrīks laika josla izvēlei. Tastatūras " +"lietotājiem ir jāizvēlas laika joslu no zemāk redzamā kombinētā lodziņa " +"lauka." + #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" msgstr "Maina sistēmas laiku, datumu un laika zonu" @@ -1643,40 +1708,39 @@ msgid "Time and Date" msgstr "Laiks un datums" -#: ../src/time/time-tool.c:402 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP atbalsts nav uzinstalēts" -#: ../src/time/time-tool.c:404 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." msgstr "" "Lūdzu, aktivizējiet NTP atbalstu sistēmā, lai aktivizētu sinhronizāciju " -"starp " -"jūsu lokālo laika serveri un serveriem internetā." +"starp jūsu lokālo laika serveri un serveriem internetā." -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Aktivizē NTP" -#: ../src/time/time-tool.c:433 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Deaktivizē NTP" -#: ../src/time/time-tool.c:445 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Sinhronizē sistēmas pulksteni" -#: ../src/time/time-tool.c:525 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Sinhronizē pulksteni ar Interneta serveriem" -#: ../src/time/time-tool.c:526 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Pašrocīgi" -#: ../src/time/time-tool.c:672 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Laika un datuma iestatījumi" @@ -1686,7 +1750,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:476 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Šis varētu padarīt sistēmu nelietojamu." @@ -1738,7 +1802,6 @@ msgstr "Grupa \"%s\" jau eksistē" #: ../src/users/group-settings.c:230 -#| msgid "Please select a different user name." msgid "Please choose a different group name." msgstr "Lūdzu, izvēlieties citu grupas nosaukumu." @@ -1753,104 +1816,108 @@ msgstr "Grupas ID %d jau izmanto grupa \"%s\"" #: ../src/users/group-settings.c:264 -#| msgid "Please enter a different home directory path." msgid "Please choose a different numeric identifier for the new group." msgstr "Lūdzu, izvēlieties citu skaitlisku identifikatoru grupai." #: ../src/users/group-settings.c:266 #, c-format -#| msgid "Please enter a different home directory path." msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Lūdzu, izvēlieties citu skaitlisku identifikatoru grupai \"%s\"." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Grupas nosaukums" -#: ../src/users/privileges-table.c:53 +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 +msgid "Not asked on login" +msgstr "Neprasīt piesakoties" + +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 +msgid "Asked on login" +msgstr "Prasīt piesakoties" + +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Pārraudzīt sistēmas žurnālus" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Pārvaldīt sistēmu" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Izmantot audio ierīces" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Izmantot CD-ROM ierīces" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Ierakstīt CD /DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Izmantot modemus" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Pieslēgties Internetam, izmantojot modemu" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Sūtīt un saņemt faksus" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Izmantot diskešu iekārtas" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Montēt lietotāja-telpas failu sistēmas (FUSE)" -#: ../src/users/privileges-table.c:63 -#| msgid "Configure a network interface" +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Konfigurēt printerus" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Savienoties ar bezvadu un ethernet tīkliem" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Automātiski piekļūt ārējiem datu nesējiem" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Iesnaudināt un sastindzināt datoru" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Piekļūt /proc failu sistēmai" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Izmantot skanerus" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Izmantot lenšu dziņus" -#: ../src/users/privileges-table.c:70 -#| msgid "Use audio devices" +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Izmantot USB ierīces" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Izmantot VirtualBox virtualizācijas risinājumu" -#: ../src/users/privileges-table.c:72 -#| msgid "Use audio devices" +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Izmantot video ierīces" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Varēt iegūt administratora privilēģijas" @@ -1874,48 +1941,50 @@ "iestatījumus, kas ietekmē visus lietotājus." #: ../src/users/user-profiles.conf.in.h:4 -#| msgid "Disk server" msgid "Desktop user" msgstr "Darbvirsmas lietotājs" #: ../src/users/run-passwd.c:421 -#| msgid "MTA authentication service" msgid "Authentication failed" msgstr "Autentifikācija neizdevās" -#: ../src/users/run-passwd.c:495 +#: ../src/users/run-passwd.c:498 #, c-format -#| msgid "Password is too short" msgid "The new password is too short" msgstr "Jaunā parole ir par īsu" -#: ../src/users/run-passwd.c:500 +#: ../src/users/run-passwd.c:504 #, c-format -#| msgid "Password is too short" msgid "The new password is too simple" msgstr "Jaunā parole ir pārāk vienkārša" -#: ../src/users/run-passwd.c:505 +#: ../src/users/run-passwd.c:510 #, c-format msgid "The old and new passwords are too similar" msgstr "Jaunā un vecā parole ir pārāk līdzīgas" -#: ../src/users/run-passwd.c:508 +#: ../src/users/run-passwd.c:513 #, c-format msgid "The new password must contain numeric or special characters" msgstr "Jaunajai parolei jāsatur arī cipari vai īpašās rakstzīmes" -#: ../src/users/run-passwd.c:512 +#: ../src/users/run-passwd.c:517 #, c-format msgid "The old and new passwords are the same" msgstr "Jaunā un vecā parole ir vienādas" -#: ../src/users/run-passwd.c:516 +#: ../src/users/run-passwd.c:520 +#, c-format +#| msgid "The old and new passwords are the same" +msgid "The new password has already been used recently." +msgstr "Jaunā parole jau nesen tika izmantota." + +#: ../src/users/run-passwd.c:524 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "Jūsu parole ir mainīta kopš jūsu sākotnējās autorizācijas!" -#: ../src/users/run-passwd.c:520 +#: ../src/users/run-passwd.c:528 #, c-format msgid "Unknown error" msgstr "Nezināma kļūda" @@ -1933,11 +2002,14 @@ msgstr "Parole ir pārāk īsa" #: ../src/users/user-password.c:98 +#| msgid "" +#| "User passwords must be longer than 6 characters and preferably formed by " +#| "numbers, letters and special characters." msgid "" -"User passwords must be longer than 6 characters and preferably formed by " +"User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." msgstr "" -"Lietotāja parolei ir jābūt vismaz 6 simbolus garai, tai būtu jāsastāv no " +"Lietotāja parolei ir jābūt vismaz 5 simbolus garai, tai būtu jāsastāv no " "burtiem, cipariem un speciālajām rakstu zīmēm." #: ../src/users/user-password.c:101 @@ -1950,15 +2022,15 @@ "Pārbaudiet, vai jūs esat ievadījis vienu un to pašu paroli abos teksta " "laukos." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Lūdzu, izvēlieties citu paroli." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Lūdzu, atkal ievadiet savu pašreizējo paroli." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Neizdevās nomainīt paroli" @@ -1968,7 +2040,6 @@ #: ../src/users/user-settings.c:96 #, c-format -#| msgid "This user is currently using this computer" msgid "%s is currently using this computer" msgstr "%s pašlaik lieto šo datoru" @@ -2002,10 +2073,8 @@ "or keep them so that an administrator can save them later." msgstr "" "Failus, kuri pieder lietotājam %s mapē %s var pilnībā izmest, ja " -"jums " -"tos vairs nevajag. Jūs varat izveidot to rezerves kopiju, pirms dzēšat " -"kontu, " -"vai arī paturēt tos, lai administrators var tos saglabāt vēlāk." +"jums tos vairs nevajag. Jūs varat izveidot to rezerves kopiju, pirms dzēšat " +"kontu, vai arī paturēt tos, lai administrators var tos saglabāt vēlāk." #: ../src/users/user-settings.c:132 msgid "Keep Files" @@ -2016,46 +2085,36 @@ msgstr "Nedzēst kontu" #: ../src/users/user-settings.c:134 -#| msgid "_Delete" msgid "Delete Files" msgstr "Dzēst failus" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Administrators" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Pielāgots" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Nav" -#. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/user-settings.c:347 -msgid "Not asked on login" -msgstr "Neprasīt piesakoties" - -#: ../src/users/user-settings.c:349 -msgid "Asked on login" -msgstr "Prasīt piesakoties" - -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Nederīga rakstzīme \"%c\" komentārā" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Pārbaudiet, vai šī rakstzīme netiek lietota." -#: ../src/users/user-settings.c:417 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Nepilnīgs ceļš uz mājas mapi" -#: ../src/users/user-settings.c:418 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2063,47 +2122,128 @@ "Lūdzu, ievadiet pilnu ceļu uz mājas mapi\n" "piem.: /home/janis." -#: ../src/users/user-settings.c:433 -msgid "Home directory already exists" -msgstr "Mājas mape jau eksistē" +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 +#| msgid "Home directory already exists" +msgid "New home directory already exists, use it?" +msgstr "Jauna mājas mape jau eksistē, izmantot to?" + +#: ../src/users/user-settings.c:454 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of %" +"s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" +"%s mājas mape ir iestatīta uz%s, kas jau eksistē. " +"Vai vēlaties izmantot šo mapi, kopēt %s saturu uz jauno mājas mapi, " +"vai pilnīgi to pārrakstīt?\n" +"\n" +"Ja šaubāties, izmantojiet jauno mapi, lai izvairītos no datu zuduma, un " +"vēlāk " +"nokopējiet failus no vecās mapes." + +#: ../src/users/user-settings.c:466 +msgid "_Replace With Old Files" +msgstr "Ai_zvietot ar vecajiem failiem" + +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 +msgid "_Cancel Change" +msgstr "At_celt izmaiņas" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:470 +#| msgid "Keep Files" +msgid "_Use New Files" +msgstr "Izmantot ja_unos failus" + +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 +msgid "Make user the _owner of the new home directory" +msgstr "Padarīt liet_otāju par jaunās mājas mapes īpašnieku" + +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 +#| msgid "Incomplete path in home directory" +msgid "_Delete old home directory" +msgstr "_Dzēst veco mājas mapi" + +#: ../src/users/user-settings.c:498 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" +"%s mājas mape ir iestatīta uz%s, kas jau eksistē. " +"Vai vēlaties izmantot šo mapi, vai dzēst tā saturu un izmantot pilnīgi " +"tukšu mājas mapi?\n" +"\n" +"Ja šaubāties, paturiet failus, un vēlāk varēsiet tos izdzēst." + +#: ../src/users/user-settings.c:508 +#| msgid "Delete Files" +msgid "_Delete Files" +msgstr "_Dzēst failus" + +#: ../src/users/user-settings.c:510 +msgid "_Use Existing Files" +msgstr "Lietot ja_u esošos failus" + +#: ../src/users/user-settings.c:531 +msgid "Copy old home directory to new location?" +msgstr "Kopēt veco mājas mapi uz jauno vietu?" + +#: ../src/users/user-settings.c:533 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" +"%s mājas mape ir iestatīta uz%s, kas neeksistē. " +"Vai vēlaties kopēt saturu no iepriekšējās mājas mapes (%s), vai " +"izmantot pilnīgi tukšu mājas mapi?\n" +"\n" +"Ja izvēlēsities kopēt failus uz jauno vietu, varat droši izdzēst veco mapi." + +#: ../src/users/user-settings.c:544 +#| msgid "Use this directory" +msgid "_Use Empty Directory" +msgstr "Lietot t_ukšu mapi" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:547 +msgid "Co_py Old Files" +msgstr "K_opēt vecos failus" -#: ../src/users/user-settings.c:434 -#, c-format -msgid "" -"The directory %s already exists. User may not have the permissions " -"required to read or write in that directory. Do you want to use it anyway?" -msgstr "" -"Mape %s jau eksistē. Lietotājam varētu nebūt tiesību lasīt vai " -"rakstīt šajā mapē. Vai tomēr vēlaties turpināt?" - -#: ../src/users/user-settings.c:440 -#| msgid "Home directory" -msgid "Use this directory" -msgstr "Izmantot šo mapi" - -#: ../src/users/user-settings.c:475 -#| msgid "Group name of the administrator group user should not be modified" +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "root lietotāja ID nevajadzētu mainīt" #. check that UID is free -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:613 #, c-format -#| msgid "User name \"%s\" already exists" msgid "User ID %d is already used by user %s" msgstr "Lietotāja ID %d jau izmanto lietotājs %s" -#: ../src/users/user-settings.c:481 +#: ../src/users/user-settings.c:615 #, c-format -#| msgid "Please select a different user name." msgid "Please choose a different numeric identifier for %s." msgstr "Lūdzu, izvēlieties citu skaitlisku identifikatoru lietotājam %s." -#: ../src/users/user-settings.c:499 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Nepilnīgs ceļš čaulā" -#: ../src/users/user-settings.c:500 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2111,26 +2251,24 @@ "Lūdzu, ievadiet pilnu čaulas ceļu\n" "piem.: /bin/bash." -#: ../src/users/user-settings.c:534 -#| msgid "Be able to get administrator privileges" +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Atņemt administrēšanas tiesības" -#: ../src/users/user-settings.c:537 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." msgstr "" "%s ir vienīgais administrators uz šī datora. Administratora tiesību " -"atņemšana " -"šim lietotājam izslēgtu jūs no šīs sistēmas administrēšanas." +"atņemšana šim lietotājam izslēgtu jūs no šīs sistēmas administrēšanas." -#: ../src/users/user-settings.c:554 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Jūs grasāties pats sev atņemt administrēšanas tiesības" -#: ../src/users/user-settings.c:557 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2139,14 +2277,116 @@ "%s vairs nevarēs veikt administratīvos uzdevumus. Šis konts nevarēs pats sev " "piešķirt administratīvās tiesības atpakaļ." -#: ../src/users/user-settings.c:562 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Atteikties no administratīvajām tiesībām" -#: ../src/users/users-tool.c:284 +#: ../src/users/user-settings.c:1416 +#| msgid "You can't change user ID while the user is logged in." +msgid "You cannot change the user ID for the superuser account." +msgstr "Jūs nevarat mainīt lietotāja ID superlietotāja kontam." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Jūs nevarat deaktivēt pats savu kontu, nedz mainīt mājas mapes vai lietotāja " +"ID. " +"Izpildiet šo programmu no cita lietotāja sesijas, lai mainītu šos " +"iestatījumus." + +#: ../src/users/user-settings.c:1434 +#| msgid "You can't change user ID while the user is logged in." +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Jūs nevarat mainīt konta mājas mapi vai lietotāja ID, kamēr lietotājs ir " +"ierakstījies." + +#: ../src/users/user-settings.c:1512 +msgid "Applying changes to user settings..." +msgstr "Pielieto izmaiņas lietotāja iestatījumiem..." + +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Lietotāju iestatījumi" +#~ msgid "Allowed Hosts" +#~ msgstr "Atļautie serveri" + +#~ msgid "Shared Folder" +#~ msgstr "Koplietošanas mape" + +#~ msgid "" +#~ "Enter password for user:" +#~ msgstr "" +#~ "Ievadiet lietotāja paroli:" + +#~ msgid "Selection" +#~ msgstr "Izvēle" + +#~ msgid "Time Zone" +#~ msgstr "Laiks josla" + +#~ msgid "Advanced Settings" +#~ msgstr "Paplašinātie iestatījumi" + +#~ msgid "Automatic UID/GID" +#~ msgstr "Automātisks UID/GID" + +#~ msgid "Basic Settings" +#~ msgstr "Vispārīgi iestatījumi" + +#~ msgid "Group Members" +#~ msgstr "Grupas dalībnieki" + +#~ msgid "Optional Settings" +#~ msgstr "Papildus iestatījumi" + +#~ msgid "Password Settings" +#~ msgstr "Paroles iestatījumi" + +#~ msgid "Profile Settings" +#~ msgstr "Profila iestatījumi" + +#~ msgid "System Defaults" +#~ msgstr "Sistēmas noklusējumi" + +#~| msgid "_Host name:" +#~ msgid "_Short Name:" +#~ msgstr "Ī_sais vārds:" + +#~ msgid "Address: %s Subnet mask: %s" +#~ msgstr "Adrese: %s Apakštīkla maska: %s" + +#~ msgid "Address: %s" +#~ msgstr "Adrese: %s" + +#~ msgid "Address: %s Remote address: %s" +#~ msgstr "Adrese: %s Attālinātā adrese: %s" + +#~ msgid "Type: %s Phone number: %s" +#~ msgstr "Tips: %s Telefona numurs: %s" + +#~ msgid "Type: %s Access point name: %s" +#~ msgstr "Tips: %s Piekļuves punkta nosaukums: %s" + +#~ msgid "Type: %s Ethernet interface: %s" +#~ msgstr "Tips: %s Ethernet saskarne: %s" + +#~ msgid "Type: %s" +#~ msgstr "Tips: %s" + +#~ msgid "" +#~ "The directory %s already exists. User may not have the " +#~ "permissions required to read or write in that directory. Do you want to " +#~ "use it anyway?" +#~ msgstr "" +#~ "Mape %s jau eksistē. Lietotājam varētu nebūt tiesību lasīt vai " +#~ "rakstīt šajā mapē. Vai tomēr vēlaties turpināt?" + #~ msgid "" #~ "Please enter your root password" @@ -2187,9 +2427,6 @@ #~ msgid "_Real name:" #~ msgstr "Īstais vā_rds:" -#~ msgid "_Unlock" -#~ msgstr "_Atslēgt" - #~ msgid "This action is not allowed" #~ msgstr "Šī darbība nav atļauta" diff -Nru gnome-system-tools-2.32.0/po/nb.po gnome-system-tools-3.0.0/po/nb.po --- gnome-system-tools-2.32.0/po/nb.po 2010-09-13 09:28:10.000000000 +0000 +++ gnome-system-tools-3.0.0/po/nb.po 2011-02-12 16:38:38.000000000 +0000 @@ -1,21 +1,23 @@ # Norwegian (bokmål) translation of gnome-system-tools. # Copyright (C) 2001-2004, 2005 Free Software Foundation, Inc. +# # Kjartan Maraas , 2001-2010. # Terance Edward Sola , 2005. -# +# Torstein Adolf Winterseth , 2010. msgid "" msgstr "" "Project-Id-Version: gnome-system-tools 2.31.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-11 11:43+0200\n" -"PO-Revision-Date: 2010-09-11 11:52+0200\n" -"Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian Bokmal \n" +"POT-Creation-Date: 2011-01-15 13:47+0100\n" +"PO-Revision-Date: 2011-01-15 13:49+0100\n" +"Last-Translator: Torstein Adolf Winterseth \n" +"Language-Team: Norwegian Bokmål \n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.1\n" #: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 msgid "Access point name:" @@ -59,7 +61,7 @@ #: ../interfaces/network.ui.h:11 msgid "Delete current location" -msgstr "Slett aktiv lokasjon" +msgstr "Slett aktiv adresse" #: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" @@ -107,7 +109,7 @@ #: ../interfaces/network.ui.h:23 msgid "Location:" -msgstr "Lokasjon:" +msgstr "Adresse:" #: ../interfaces/network.ui.h:24 msgid "Loud" @@ -163,7 +165,7 @@ #: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" -msgstr "Lagre aktiv nettverkskonfigurasjon som en lokasjon" +msgstr "Lagre aktiv nettverkskonfigurasjon som en adresse" #: ../interfaces/network.ui.h:38 msgid "Search Domains" @@ -233,7 +235,7 @@ msgid "_Subnet mask:" msgstr "_Subnettmaske:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "Br_ukernavn:" @@ -512,7 +514,9 @@ "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " "slightly reduced performance." -msgstr "Krypter alle dine filer med påloggingspassordet for å beskytte dem fra andre som har fysisk tilgang til din datamaskin. Påvirker ytelsen noe." +msgstr "" +"Krypter alle dine filer med påloggingspassordet for å beskytte dem fra andre " +"som har fysisk tilgang til din datamaskin. Påvirker ytelsen noe." #: ../interfaces/users.ui.h:26 msgid "Full _Name:" @@ -584,7 +588,7 @@ #: ../interfaces/users.ui.h:44 msgid "O_ffice location:" -msgstr "Kon_torlokasjon<:" +msgstr "Kon_torplassering:<" #: ../interfaces/users.ui.h:45 msgid "Optional Settings" @@ -626,7 +630,9 @@ msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." -msgstr "Denne kontoen bruker spesielle innstillinger som er definert manuelt. Bruk Avanserte innstillinger for å endre dem." +msgstr "" +"Denne kontoen bruker spesielle innstillinger som er definert manuelt. Bruk " +"Avanserte innstillinger for å endre dem." #: ../interfaces/users.ui.h:55 msgid "User ID:" @@ -658,78 +664,74 @@ msgstr "Brukernavn må starte med en bokstav!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "Du kan ikke endre bruker-ID mens brukeren er logget inn." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Legg til profil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "_Avanserte instillinger" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." -msgstr "_Endre..." +msgstr "_Endre …" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Kommentarer" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Aktivt passord:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Egendefinert" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Dager mellom advarsel og utløp av passord:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Aktiver konto" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "Krypt_er hjemmemappen for å beskytte sensitive data" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Generer" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "_Hjemmemappe:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "_Hjemmetelefon:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "_Hovedgruppe:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Håndter grupper" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Navn:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Passord:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Skall:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "_Telefon arbeid:" @@ -744,13 +746,19 @@ #: ../org.gnome.system-tools.gschema.xml.in.h:3 msgid "" "Whether the users-admin tool should show system users in the users list." -msgstr "Hvorvidt verktøyet users-admin skal vises systembrukere i brukerlisten." +msgstr "" +"Hvorvidt verktøyet users-admin skal vises systembrukere i brukerlisten." #: ../org.gnome.system-tools.gschema.xml.in.h:4 msgid "" "Whether the users-admin tool should show the root user in the users list." msgstr "Hvorvidt verktøyet users-admin skal vise root-brukeren i brukerlisten." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Feil under tilgang til systemrettigheter: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Plattformen du kjører er ikke støttet av dette verktøyet" @@ -814,6 +822,44 @@ "An error occurred while checking for authorizations: %s\n" "You may report this as a bug." msgstr "" +"En feil oppsto under sjekk for autorisasjon: %s\n" +"Du kan rapportere dette som en feil." + +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Lås" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Lås opp" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Låst" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Dialogen er låst opp.\n" +"Klikk for å forhindre videre endringer" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Dialogen er låst.\n" +"Klikk for å gjøre endringer" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Regelsett for systemet forhindrer endringer.\n" +"Kontakt din systemadministrator" #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 @@ -860,51 +906,51 @@ msgid "Change _Host name" msgstr "Endre _vertsnavn" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Automatisk konfigurasjon (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Lokalt Zeroconf-nettverk (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statisk IP-adresse" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP-nøkkel (ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP-nøkkel (heksadesimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA personlig" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 personlig" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN-modem" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Seriell-modem" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Egenskaper for %s" @@ -979,11 +1025,11 @@ #: ../src/network/locations-combo.c:221 msgid "Changing network location" -msgstr "Bytter nettverkslokasjon" +msgstr "Bytter nettverksadresse" #: ../src/network/locations-combo.c:265 msgid "There is already a location with the same name" -msgstr "Det finnes allerede en lokasjon med samme navn" +msgstr "Det finnes allerede en adresse med samme navn" #: ../src/network/locations-combo.c:267 msgid "Overwrite it?" @@ -991,16 +1037,16 @@ #: ../src/network/locations-combo.c:355 msgid "Save location" -msgstr "Lagre lokasjon" +msgstr "Lagre adresse" #: ../src/network/locations-combo.c:370 msgid "_Location name:" -msgstr "Navn på _lokasjon:" +msgstr "Navn på _adresse:" #: ../src/network/locations-combo.c:422 #, c-format msgid "Do you want to delete location \"%s\"?" -msgstr "Vil du slette lokasjon «%s»?" +msgstr "Vil du slette adresse «%s»?" #: ../src/network/main.c:135 msgid "The interface does not exist" @@ -1523,7 +1569,7 @@ #: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." -msgstr "_Del mappe..." +msgstr "_Del mappe …" #: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" @@ -1584,11 +1630,11 @@ "folders." msgstr "Du må installere enten Samba eller NFS for å kunne dele dine mapper." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Verdenskart" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1602,11 +1648,11 @@ msgid "Time and Date" msgstr "Tid og dato" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP-støtte er ikke installert" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1614,27 +1660,27 @@ "Installer og aktiver NTP-støtte i systemet for å synkronisere din lokale " "tidtjener med en tidtjener på internett." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Aktiverer NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Deaktiverer NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Synkroniserer systemklokken" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Synkroniser klokken med tjenere på internett" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Manuell" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Innstillinger for tid og dato" @@ -1644,7 +1690,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Dette kan gjøre systemet ubrukelig." @@ -1718,100 +1764,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Vennligst velg en annen numerisk identifikator for gruppen «%s»." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Gruppenavn" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Ikke spør ved pålogging" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Spør ved innlogging" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Overvåk systemlogger" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administrer systemet" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Bruk lydenheter" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Bruk CD-ROM enheter" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Skriv CDer / DVDer" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Bruk modem" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Koble til internett med et modem" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Send og motta faks" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Bruk diskettstasjoner" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Monter brukerstyrte filsystemer (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Konfigurer skrivere." -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Koble til trådløse og faste nettverk" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Aksesser eksterne lagringsenheter automatisk" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Sett datamaskinen i hvilemodus og dvalemodus" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Aksesser /proc-filsystemet" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Bruk skannere" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Bruk båndstasjoner" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Bruk USB-enheter" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Bruk VirtualBox virtualiseringsløsning" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Bruk videoenheter" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Få administratorrettigheter" @@ -1823,13 +1869,17 @@ msgid "" "Can change anything on the system, including installing and upgrading " "software." -msgstr "Kan endre alt på systemet inkludert installering og oppgradering av programvare." +msgstr "" +"Kan endre alt på systemet inkludert installering og oppgradering av " +"programvare." #: ../src/users/user-profiles.conf.in.h:3 msgid "" "Can perform common tasks. Can't install software or change settings " "affecting all users." -msgstr "Kan utføre vanlige oppgaver. Kan ikke installere programvare eller endre innstillinger som påvirker alle brukere." +msgstr "" +"Kan utføre vanlige oppgaver. Kan ikke installere programvare eller endre " +"innstillinger som påvirker alle brukere." #: ../src/users/user-profiles.conf.in.h:4 msgid "Desktop user" @@ -1907,15 +1957,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Sjekk at du har oppgitt samme passord i begge tekstfeltene." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Vennligst velg et annet passord." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Vennligst skriv inn passordet på nytt." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Passordet kunne ikke byttes" @@ -1970,33 +2020,33 @@ msgid "Delete Files" msgstr "Slett filer" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Superbruker" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Egendefinert" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Ingen" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Ugyldig tegn «%c» i kommentar" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Sjekk at dette tegnet ikke brukes." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Ugyldig sti i hjemmemappen" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2004,11 +2054,11 @@ "Vennligst oppgi full sti til hjemmemappen\n" "f.eks: /home/john." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Ny hjemmekatalog eksisterer allerede, bruk den?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2019,30 +2069,30 @@ "the old directory later." msgstr "" -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "E_rstatt med gamle filer" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Avbryt endring" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "Br_uk nye filer" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" -msgstr "" +msgstr "Gjør bruker til _eier av den nye hjemmekatalogen" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Slett gammel hjemmemappe" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2052,19 +2102,19 @@ "In doubt, keep the files, and remove them later if needed." msgstr "" -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Slett filer" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "Br_uk eksisterende filer" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" -msgstr "Kopier gammel hjemmekatalog til ny lokasjon?" +msgstr "Kopier gammel hjemmekatalog til ny adresse?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2075,35 +2125,35 @@ "old directory." msgstr "" -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "Br_uk tom katalog" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "Ko_pier gamle filer" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "ID for administrator-brukeren bør ikke endres" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Bruker-ID %d er allerede i bruk av bruker %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Vennligst velg en annen numerisk identifikator for %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Ufullferdig sti i skallet" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2111,36 +2161,52 @@ "Vennligst oppgi full sti for skallet\n" "f.eks: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Kan ikke trekke tilbake administratorrettigheter" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." msgstr "" -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Du er i ferd med å trekke tilbake dine egne administrative rettigheter" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." msgstr "" -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Gi opp administrasjonsrettigheter" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Du kan ikke endre bruker-ID for superbrukerkontoen." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "Du kan ikke endre hjemmekatalog eller bruker-ID for en konto mens brukeren er logget inn." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." -msgstr "Aktiverer endringer i innstillinger for bruker..." +msgstr "Aktiverer endringer i innstillinger for bruker …" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Instillinger for bruker" diff -Nru gnome-system-tools-2.32.0/po/pl.po gnome-system-tools-3.0.0/po/pl.po --- gnome-system-tools-2.32.0/po/pl.po 2010-09-13 09:28:10.000000000 +0000 +++ gnome-system-tools-3.0.0/po/pl.po 2011-04-02 12:55:08.000000000 +0000 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-08 10:26+0200\n" -"PO-Revision-Date: 2010-09-07 14:07+0200\n" +"POT-Creation-Date: 2011-03-13 16:51+0100\n" +"PO-Revision-Date: 2011-03-13 16:52+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" @@ -240,7 +240,7 @@ msgid "_Subnet mask:" msgstr "_Maska podsieci:" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "_Nazwa użytkownika:" @@ -670,78 +670,74 @@ msgstr "Nazwa użytkownika musi zaczynać się od litery." #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "Nie można zmienić identyfikatora zalogowanego użytkownika." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Dodaj profil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "Z_aawansowane ustawienia" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Zmień..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "K_omentarze" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Bieżące hasło:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Własne" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "_Liczba dni pomiędzy ostrzeżeniem a unieważnieniem hasła:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "Włącz_enie konta" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Zaszyfrowanie katalogu domowego, aby chronić prywatne dane" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Utworzenie" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "Katalog do_mowy:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "Telefon _domowy:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "G_rupa główna:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Zarządzaj grupami" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Nazwa:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Hasło:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "Po_włoka:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "Telefon _służbowy:" @@ -767,6 +763,11 @@ "Określa, czy narzędzie users-admin powinno wyświetlać użytkownika root na " "liście użytkowników." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Błąd podczas uzyskiwania uprawnień systemowych: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "Obecnie używana platforma nie jest obsługiwana przez te narzędzie" @@ -800,7 +801,7 @@ msgstr "Brak uprawnień do dostępu do konfiguracji systemu." #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Brak uprawnień do modyfikacji konfiguracji systemu." @@ -813,19 +814,23 @@ msgid "An unknown error occurred." msgstr "Wystąpił nieznany błąd." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Pomoc" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Nie można wyświetlić pomocy" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "Konfiguracja systemu mogła zostać zmieniona." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "Zaktualizować zawartość? Wszystkie zmiany zostaną utracone." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -834,6 +839,42 @@ "Wystąpił błąd podczas sprawdzania upoważnień: %s\n" "Można to zgłosić jako błąd." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Zablokuj" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Odblokuj" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Zablokowane" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Okno nie jest zablokowane.\n" +"Naciśnięcie uniemożliwi dalsze zmiany" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Okno jest zablokowane.\n" +"Naciśnięcie umożliwi wprowadzanie zmian" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Polityka systemu uniemożliwia zmiany.\n" +"Proszę skontaktować się z administratorem systemu" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -880,51 +921,51 @@ msgid "Change _Host name" msgstr "Zmień nazwę _komputera" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Konfiguracja automatyczna (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Lokalna sieć Zeroconf (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statyczny adres IP" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "Klucz WEP (znaki ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "Klucz WEP (szesnastkowo)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA Personal" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 Personal" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "Modem ISDN" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Modem szeregowy" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Właściwości %s" @@ -1609,11 +1650,11 @@ "Aby mieć możliwość udostępniania katalogów, należy zainstalować usługę Samba " "lub NFS." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Mapa świata" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1630,11 +1671,11 @@ msgid "Time and Date" msgstr "Czas i data" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "Obsługa NTP nie jest zainstalowana" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1642,27 +1683,27 @@ "Aby włączyć synchronizację lokalnego serwera czasu z internetowymi serwerami " "czasu, należy zainstalować i włączyć usługę NTP." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Włączanie NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Wyłączanie NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Synchronizowanie zegara systemowego" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Synchronizowanie zegara z serwerami w Internecie" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Ręcznie" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Ustawienia czasu i daty" @@ -1672,7 +1713,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "Spowoduje to, że system stanie się bezużyteczny." @@ -1748,100 +1789,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Proszę wybrać inny identyfikator numeryczny dla grupy \"%s\"." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Nazwa grupy" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Bez pytania podczas logowania" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Pytanie podczas logowania" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Monitorowanie dzienników systemowych" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Administruje systemem" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Użycie urządzeń dźwiękowych" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Użycie napędów CD-ROM" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Nagrywanie płyt CD/DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Użycie modemów" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Połączenie z Internetem za pomocą modemu" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Wysyłanie i odbiór faksów" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Użycie napędów dyskietek" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Montowanie systemów plików w przestrzeni użytkownika (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Konfiguracja drukarek" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "Łączenie z sieciami bezprzewodowymi i sieciami Ethernet" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Automatyczny dostęp do zewnętrznych urządzeń pamięci masowej" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "Usypianie i hibernowanie komputera" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Dostęp do systemu plików /proc" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Użycie skanerów" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Użycie napędów taśmowych" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Użycie urządzeń USB" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Użycie wirtualizacji VirtualBox" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Użycie urządzeń wideo" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Możliwość otrzymania uprawnień administratora" @@ -1942,15 +1983,15 @@ msgstr "" "Proszę się upewnić, że podano takie samo hasło w obu polach tekstowych." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Proszę wybrać inne hasło." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Proszę ponownie wprowadzić bieżące hasło." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Nie można zmienić hasła" @@ -2010,33 +2051,33 @@ msgid "Delete Files" msgstr "Usuń pliki" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Administrator" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Własne" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Brak" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Nieprawidłowy znak \"%c\" w komentarzu" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Proszę sprawdzić, czy ten znak nie został użyty." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Niepełna ścieżka do katalogu domowego" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2044,16 +2085,16 @@ "Proszę wprowadzić pełną ścieżkę do katalogu domowego,\n" "np.: /home/jan." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Nowy katalog domowy już istnieje, użyć go?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." @@ -2065,30 +2106,30 @@ "W razie wątpliwości należy użyć nowego katalogu, aby uniknąć utraty danych, " "i skopiować pliki z poprzedniego katalogu w późniejszym czasie." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Zastąp poprzednimi plikami" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Anuluj zmianę" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "_Użyj nowych plików" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Uczyń użytk_ownika właścicielem nowego katalogu domowego" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Usuń poprzedni katalog domowy" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2104,19 +2145,19 @@ "W razie wątpliwości należy zachować pliki i usunąć je w późniejszym czasie, " "jeśli nie będą potrzebne." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "U_suń pliki" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "_Użyj istniejących plików" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Skopiować poprzedni katalog domowy do nowego położenia?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2133,35 +2174,35 @@ "Jeśli zostanie wybrane skopiowanie plików do nowego położenia, to można " "będzie bezpiecznie usunąć poprzedni katalog." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Użyj pustego katalogu" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "_Skopiuj poprzednie pliki" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "Identyfikator użytkownika root nie powinien być modyfikowany" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Identyfikator użytkownika %d jest już używany przez użytkownika %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Proszę wybrać inny identyfikator numeryczny dla użytkownika %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Niepełna ścieżka do powłoki" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2169,11 +2210,11 @@ "Proszę wprowadzić pełną ścieżkę do powłoki,\n" "np: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Nie można unieważnić uprawnień administratora" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " @@ -2183,11 +2224,11 @@ "uprawnień administratora dla tego konta spowoduję utratę możliwości " "administrowania systemem." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Uprawnienia administratora zostaną zaraz unieważnione" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2196,14 +2237,35 @@ "Użytkownik %s nie może już wykonywać zadań administracyjnych. To konto nie " "będzie mogło samo uzyskać uprawnień administratora z powrotem." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Oddaj uprawnienia administratora" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Nie można zmienić identyfikatora superużytkownika." + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"Nie można wyłączyć własnego konta, ani zmienić katalogu domowego lub " +"identyfikatora użytkownika. Należy uruchomić ten program w sesji innego " +"użytkownika, aby zmienić te ustawienia." + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" +"Nie można zmienić katalogu domowego lub identyfikatora zalogowanego " +"użytkownika." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Zastosowywanie zmian w ustawieniach użytkownika..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Ustawienia użytkowników" diff -Nru gnome-system-tools-2.32.0/po/POTFILES.in gnome-system-tools-3.0.0/po/POTFILES.in --- gnome-system-tools-2.32.0/po/POTFILES.in 2010-07-29 09:44:28.000000000 +0000 +++ gnome-system-tools-3.0.0/po/POTFILES.in 2010-12-19 20:52:54.000000000 +0000 @@ -11,6 +11,7 @@ src/common/gst-dialog.c src/common/gst-platform-dialog.c src/common/gst-tool.c +src/common/um-lockbutton.c src/network/address-list.c src/network/callbacks.c src/network/connection.c diff -Nru gnome-system-tools-2.32.0/po/sk.po gnome-system-tools-3.0.0/po/sk.po --- gnome-system-tools-2.32.0/po/sk.po 2010-06-07 21:51:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/sk.po 2010-12-12 12:16:01.000000000 +0000 @@ -1,18 +1,18 @@ -# Slovak translation of gnome-system-tools. -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2009 Free Software Foundation, Inc. +# Slovak translation for gnome-system-tools. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the gnome-system-tools package. # Stanislav Višňovský , 2001, 2002, 2003. # Stanislav Višňovský , 2003. # Ivan Noris , 2005. -# Pavol Klačanský , 2008, 2009. +# Pavol Klačanský , 2008, 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "system-tools&component=general\n" -"POT-Creation-Date: 2009-05-21 12:38+0000\n" -"PO-Revision-Date: 2009-05-25 09:22+0200\n" +"POT-Creation-Date: 2010-10-13 10:07+0000\n" +"PO-Revision-Date: 2010-10-25 19:27+0200\n" "Last-Translator: Pavol Klačanský \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -20,225 +20,236 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: ../gnome-system-tools.schemas.in.h:1 -msgid "Whether the users-admin tool should show all users and groups or not" -msgstr "" -"Či nástroj na správu používateľov môže alebo nemôže zobraziť všetkých " -"používateľov a skupiny" - -#: ../interfaces/common.ui.h:1 -msgid "" -"Please enter your root password" -msgstr "" -"Zadajte heslo používateľa root" - -#: ../interfaces/common.ui.h:2 -msgid "Enter Password" -msgstr "Zadajte heslo" - -#: ../interfaces/common.ui.h:3 -msgid "" -"You need administrator privileges to use this tool. Enter a password to " -"modify\n" -"your system configuration." -msgstr "" -"Pre použitie tohto nástroja potrebujete administrátorské práva. Zadajte " -"heslo pre zmenu\n" -"konfigurácie vášho systému." - -#: ../interfaces/common.ui.h:5 -msgid "_Password:" -msgstr "_Heslo:" +#: ../interfaces/network.ui.h:1 ../src/network/ifaces-list.c:326 +msgid "Access point name:" +msgstr "Názov prístupového bodu:" -#: ../interfaces/network.ui.h:1 +#: ../interfaces/network.ui.h:2 msgid "Account data" msgstr "Údaje o účte" -#: ../interfaces/network.ui.h:2 -msgid "Connection Settings" -msgstr "Nastavenia pripojenia" - #: ../interfaces/network.ui.h:3 -msgid "DNS Servers" -msgstr "DNS servery" - -#: ../interfaces/network.ui.h:4 -msgid "Host Settings" -msgstr "Nastavenia hostiteľa" - -#: ../interfaces/network.ui.h:5 -msgid "Internet service provider data" -msgstr "Údaje o poskytovateľovi Internetu" - -#: ../interfaces/network.ui.h:6 -msgid "Modem Settings" -msgstr "Nastavenia modemu" - -#: ../interfaces/network.ui.h:7 -msgid "Search Domains" -msgstr "Prehľadávané domény" - -#: ../interfaces/network.ui.h:8 -msgid "Wireless Settings" -msgstr "Nastavenia bezdrôtovej siete" - -#: ../interfaces/network.ui.h:9 -msgid "Access point name:" -msgstr "Názov prístupového bodu:" - -#: ../interfaces/network.ui.h:10 msgid "Aliases:" msgstr "Aliasy:" -#: ../interfaces/network.ui.h:11 +#: ../interfaces/network.ui.h:4 msgid "Con_figuration:" msgstr "Kon_figurácia:" -#: ../interfaces/network.ui.h:12 +#: ../interfaces/network.ui.h:5 +msgid "Connection Settings" +msgstr "Nastavenia pripojenia" + +#: ../interfaces/network.ui.h:6 msgid "Connection type:" msgstr "Typ pripojenia:" -#: ../interfaces/network.ui.h:13 +# názov karty +#: ../interfaces/network.ui.h:7 msgid "Connections" -msgstr "Spojenia" +msgstr "Pripojenia" -#: ../interfaces/network.ui.h:14 +#: ../interfaces/network.ui.h:8 msgid "DNS" msgstr "DNS" -#: ../interfaces/network.ui.h:15 +#: ../interfaces/network.ui.h:9 +msgid "DNS Servers" +msgstr "DNS servery" + +#: ../interfaces/network.ui.h:10 msgid "D_omain name:" msgstr "Názov d_omény:" -#: ../interfaces/network.ui.h:16 +#: ../interfaces/network.ui.h:11 msgid "Delete current location" msgstr "Vymazať aktuálne umiestnenie" -#: ../interfaces/network.ui.h:17 +#: ../interfaces/network.ui.h:12 msgid "E_nable roaming mode" msgstr "P_ovoliť cestovný režim" -#: ../interfaces/network.ui.h:18 +#: ../interfaces/network.ui.h:13 msgid "E_nable this connection" msgstr "A_ktivovať toto pripojenie" -#: ../interfaces/network.ui.h:19 +#: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" msgstr "Ethernetové rozhranie:" -#: ../interfaces/network.ui.h:20 ../interfaces/users.ui.h:19 +# názov karty - túto poznamku navrhujem ponechať +#: ../interfaces/network.ui.h:15 ../interfaces/users.ui.h:27 msgid "General" msgstr "Všeobecné" -#: ../interfaces/network.ui.h:21 +#: ../interfaces/network.ui.h:16 +msgid "Hexadecimal" +msgstr "Hexadecimálny" + +#: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" msgstr "Predvoľby aliasov hostiteľa" -#: ../interfaces/network.ui.h:22 +#: ../interfaces/network.ui.h:18 +msgid "Host Settings" +msgstr "Nastavenia hostiteľa" + +#: ../interfaces/network.ui.h:19 msgid "Hosts" msgstr "Hostitelia" -#: ../interfaces/network.ui.h:23 ../interfaces/shares.ui.h:14 +#: ../interfaces/network.ui.h:20 ../interfaces/shares.ui.h:11 msgid "IP address:" msgstr "IP adresa:" -#: ../interfaces/network.ui.h:24 +#: ../interfaces/network.ui.h:21 msgid "Interface properties" msgstr "Vlastnosti rozhrania" -#: ../interfaces/network.ui.h:25 +#: ../interfaces/network.ui.h:22 +msgid "Internet service provider data" +msgstr "Údaje o poskytovateľovi internetu" + +#: ../interfaces/network.ui.h:23 msgid "Location:" -msgstr "Umiestnenie:" +msgstr "Miesto:" + +# toto je za Hlasitosť: +#: ../interfaces/network.ui.h:24 +msgid "Loud" +msgstr "Vysoká" +# toto je za Hlasitosť: +#: ../interfaces/network.ui.h:25 +msgid "Low" +msgstr "Nízka" + +# toto je za Hlasitosť: #: ../interfaces/network.ui.h:26 +msgid "Medium" +msgstr "Stredná" + +#: ../interfaces/network.ui.h:27 msgid "Modem" msgstr "Modem" -#: ../interfaces/network.ui.h:27 +#: ../interfaces/network.ui.h:28 +msgid "Modem Settings" +msgstr "Nastavenia modemu" + +#: ../interfaces/network.ui.h:29 msgid "Network _password:" msgstr "_Heslo siete:" -#: ../interfaces/network.ui.h:28 +#: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" msgstr "Názov siete (_ESSID):" -#: ../interfaces/network.ui.h:29 +# toto je za Hlasitosť: +#: ../interfaces/network.ui.h:31 +msgid "Off" +msgstr "Stlmená" + +#: ../interfaces/network.ui.h:32 msgid "Options" msgstr "Nastavenia" -#: ../interfaces/network.ui.h:30 +#: ../interfaces/network.ui.h:33 msgid "P_assword" msgstr "_Heslo" -#: ../interfaces/network.ui.h:31 +#: ../interfaces/network.ui.h:34 msgid "Password _type:" msgstr "_Typ hesla:" -#: ../interfaces/network.ui.h:32 +#: ../interfaces/network.ui.h:35 +msgid "Plain (ASCII)" +msgstr "Jednoduchý (ASCII)" + +# Toto je za Typ vytáčania +#: ../interfaces/network.ui.h:36 +msgid "Pulses" +msgstr "Pulzný" + +#: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" -msgstr "Uložiť sučasné nastavenie siete ako umiestnenie" +msgstr "Uložiť sučasné nastavenia siete ako miesto" -#: ../interfaces/network.ui.h:33 +#: ../interfaces/network.ui.h:38 +msgid "Search Domains" +msgstr "Prehľadávať domény" + +# Toto je za Typ vytáčania +#: ../interfaces/network.ui.h:39 +msgid "Tones" +msgstr "Tónový" + +#: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" msgstr "Použiť DNS servery poskytovateľa internetu" -#: ../interfaces/network.ui.h:34 +#: ../interfaces/network.ui.h:41 +msgid "Wireless Settings" +msgstr "Nastavenia bezdrôtovej siete" + +#: ../interfaces/network.ui.h:42 msgid "_Autodetect" msgstr "_Automaticky nájsť" -#: ../interfaces/network.ui.h:35 +#: ../interfaces/network.ui.h:43 msgid "_Dial prefix:" msgstr "Predvoľba _vytáčania:" -#: ../interfaces/network.ui.h:36 +#: ../interfaces/network.ui.h:44 msgid "_Dial type:" msgstr "Typ _vytáčania:" -#: ../interfaces/network.ui.h:37 +#: ../interfaces/network.ui.h:45 msgid "_Gateway address:" msgstr "Adresa _brány:" -#: ../interfaces/network.ui.h:38 +#: ../interfaces/network.ui.h:46 msgid "_Host name:" msgstr "Názov _hostiteľa:" -#: ../interfaces/network.ui.h:39 +#: ../interfaces/network.ui.h:47 msgid "_IP address:" msgstr "_IP adresa:" -#: ../interfaces/network.ui.h:40 +#: ../interfaces/network.ui.h:48 msgid "_Local IP:" -msgstr "_Lokálne IP:" +msgstr "_Lokálna IP:" -#: ../interfaces/network.ui.h:41 +#: ../interfaces/network.ui.h:49 msgid "_Modem port:" msgstr "_Port modemu:" -#: ../interfaces/network.ui.h:42 +#: ../interfaces/network.ui.h:50 msgid "_Phone number:" msgstr "_Telefónne číslo:" -#: ../interfaces/network.ui.h:43 +#: ../interfaces/network.ui.h:51 msgid "_Remote IP:" -msgstr "_Vzdialené IP:" +msgstr "_Vzdialená IP:" -#: ../interfaces/network.ui.h:44 +#: ../interfaces/network.ui.h:52 msgid "_Retry if the connection breaks or fails to start" -msgstr "_Skúsiť znovu, ak spojenie spadne alebo sa nespustí" +msgstr "_Skúsiť znovu, ak pripojenie spadne alebo sa nespustí" -#: ../interfaces/network.ui.h:45 +#: ../interfaces/network.ui.h:53 msgid "_Set modem as default route to internet" -msgstr "_Nastaviť modem ako štandardné smerovanie na internet" +msgstr "_Nastaviť modem ako predvolené smerovanie na internet" -#: ../interfaces/network.ui.h:46 +#: ../interfaces/network.ui.h:54 msgid "_Subnet mask:" msgstr "Sieťová _maska:" -#: ../interfaces/network.ui.h:47 ../interfaces/users.ui.h:55 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 msgid "_Username:" msgstr "Meno po_užívateľa:" -#: ../interfaces/network.ui.h:48 +#. TRANSLATORS: Volume as in loudness +#: ../interfaces/network.ui.h:57 msgid "_Volume:" msgstr "_Hlasitosť:" @@ -251,80 +262,82 @@ msgstr "Vyberte služby, ktoré chcete aktivovať:" #: ../interfaces/shares.ui.h:1 -msgid "Allowed Hosts" -msgstr "Povolení hostitelia" +msgid "Add allowed hosts" +msgstr "Pridať povolených hostiteľov" #: ../interfaces/shares.ui.h:2 -msgid "Hosts Settings" -msgstr "Nastavenia hostiteľa" +msgid "Allowed Hosts" +msgstr "Povolení hostitelia" #: ../interfaces/shares.ui.h:3 -msgid "Share Properties" -msgstr "Vlastnosti zdieľania" - -#: ../interfaces/shares.ui.h:4 -msgid "Shared Folder" -msgstr "Zdieľaný priečinok" - -#: ../interfaces/shares.ui.h:5 -msgid "Windows sharing" -msgstr "Zdieľanie Windows" - -#: ../interfaces/shares.ui.h:6 -msgid "Enter password for user:" -msgstr "" -"Zadajte heslo pre používateľa:" - -#: ../interfaces/shares.ui.h:7 -msgid "Add allowed hosts" -msgstr "Pridať povolených hostiteľov" - -#: ../interfaces/shares.ui.h:8 msgid "Allowed hosts:" msgstr "Povolení hostitelia:" -#: ../interfaces/shares.ui.h:9 +#: ../interfaces/shares.ui.h:4 msgid "Comment:" msgstr "Komentár:" -#: ../interfaces/shares.ui.h:10 +#: ../interfaces/shares.ui.h:5 msgid "Domain / _Workgroup:" msgstr "Doména / _pracovná skupina:" -#: ../interfaces/shares.ui.h:11 +#: ../interfaces/shares.ui.h:6 msgid "Enter password for user" msgstr "Zadajte heslo pre používateľa" -#: ../interfaces/shares.ui.h:12 +#: ../interfaces/shares.ui.h:7 +msgid "Enter password for user:" +msgstr "Zadajte heslo pre používateľa:" + +#: ../interfaces/shares.ui.h:8 msgid "General Properties" msgstr "Všeobecné vlastnosti" -#: ../interfaces/shares.ui.h:13 +#: ../interfaces/shares.ui.h:9 msgid "Host name:" msgstr "Názov hostiteľa:" -#: ../interfaces/shares.ui.h:15 +#: ../interfaces/shares.ui.h:10 +msgid "Hosts Settings" +msgstr "Nastavenia hostiteľov" + +# názov zdieľania +#: ../interfaces/shares.ui.h:12 msgid "Name:" -msgstr "Meno:" +msgstr "Názov:" -#: ../interfaces/shares.ui.h:16 +#: ../interfaces/shares.ui.h:13 msgid "Netmask:" msgstr "Sieťová maska:" -#: ../interfaces/shares.ui.h:17 +#: ../interfaces/shares.ui.h:14 msgid "Network:" msgstr "Sieť:" -#: ../interfaces/shares.ui.h:18 ../src/shares/nfs-acl-table.c:56 +#: ../interfaces/shares.ui.h:15 ../src/shares/nfs-acl-table.c:56 msgid "Read only" msgstr "Len na čítanie" -#: ../interfaces/shares.ui.h:19 +#: ../interfaces/shares.ui.h:16 +msgid "Share" +msgstr "Zdieľať" + +#: ../interfaces/shares.ui.h:17 +msgid "Share Properties" +msgstr "Vlastnosti zdieľania" + +#: ../interfaces/shares.ui.h:18 msgid "Share through:" -msgstr "Zdieľať cez:" +msgstr "Zdieľať pomocou:" + +#: ../interfaces/shares.ui.h:19 +#, fuzzy +#| msgid "Shared Folders" +msgid "Shared Folder" +msgstr "Zdieľané priečinky" #: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 -#: ../src/shares/shares-tool.c:239 +#: ../src/shares/shares-tool.c:237 msgid "Shared Folders" msgstr "Zdieľané priečinky" @@ -341,37 +354,43 @@ msgstr "WINS _server:" #: ../interfaces/shares.ui.h:24 +msgid "Windows sharing" +msgstr "Zdieľanie Windows" + +#: ../interfaces/shares.ui.h:25 msgid "_Path:" msgstr "_Cesta:" -#: ../interfaces/shares.ui.h:25 +#: ../interfaces/shares.ui.h:26 msgid "_Read only" msgstr "_Len na čítanie" #: ../interfaces/time.ui.h:1 -msgid "Selection" -msgstr "Výber" - -#: ../interfaces/time.ui.h:2 -msgid "Time Zone" -msgstr "Časová zóna" - -#: ../interfaces/time.ui.h:3 msgid "Add NTP Server" msgstr "Pridať NTP server" -#: ../interfaces/time.ui.h:4 +#: ../interfaces/time.ui.h:2 msgid "NTP server" msgstr "NTP server" -#: ../interfaces/time.ui.h:5 +#: ../interfaces/time.ui.h:3 msgid "Se_lect Servers" msgstr "Vybrať _servery" -#: ../interfaces/time.ui.h:6 +#: ../interfaces/time.ui.h:4 +#, fuzzy +#| msgid "Save location" +msgid "Selection" +msgstr "Uložiť miesto" + +#: ../interfaces/time.ui.h:5 msgid "Synchronize now" msgstr "Synchronizovať teraz" +#: ../interfaces/time.ui.h:6 +msgid "Time Zone" +msgstr "Časové pásmo" + #: ../interfaces/time.ui.h:7 msgid "Time servers" msgstr "Časové servery" @@ -382,15 +401,17 @@ #: ../interfaces/time.ui.h:9 msgid "Time zone" -msgstr "Časová zóna" +msgstr "Časové pásmo" #: ../interfaces/time.ui.h:10 msgid "Time zone:" -msgstr "Časová zóna:" +msgstr "Časové pásmo:" +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +# ide o časové pásmo #: ../interfaces/time.ui.h:11 msgid "Unconfigured" -msgstr "Nenastavený" +msgstr "Nenastavené" #: ../interfaces/time.ui.h:12 msgid "_Configuration:" @@ -405,216 +426,386 @@ msgstr "Ča_s:" #: ../interfaces/users.ui.h:1 -msgid "Advanced Settings" -msgstr "Pokročilé nastavenia" +#| msgid "" +#| "An user with such a name already exists. Please choose a different short " +#| "name for the new user." +msgid "" +"A user with this name already exists. Please choose a different name for the " +"new user." +msgstr "" +"Používateľ s takýmto menom už existuje. Zvoľte, prosím, iné meno pre tohto " +"nového používateľa." #: ../interfaces/users.ui.h:2 -msgid "Automatic UID/GID" -msgstr "Automatické UID/GID" +msgid "Account _type:" +msgstr "_Typ účtu:" +# názov karty #: ../interfaces/users.ui.h:3 -msgid "Basic Settings" -msgstr "Základné nastavenia" +msgid "Advanced" +msgstr "Pokročilé" +#: ../interfaces/users.ui.h:4 +#| msgid "_Advanced Settings" +msgid "Advanced Settings" +msgstr "Pokročilé nastavenia" #: ../interfaces/users.ui.h:5 -msgid "Group Members" -msgstr "Členovia skupiny" +msgid "Assign a random password by default" +msgstr "Predvolene priradiť náhodné heslo" #: ../interfaces/users.ui.h:6 -msgid "Optional Settings" -msgstr "Nepovinné nastavenia" +msgid "Automatic UID/GID" +msgstr "" #: ../interfaces/users.ui.h:7 -msgid "Password Settings" -msgstr "Nastavenia hesla" - +#, fuzzy +#| msgid "Users Settings" +msgid "Basic Settings" +msgstr "Nastavenia používateľov" +#: ../interfaces/users.ui.h:8 +msgid "Change Advanced User Settings" +msgstr "Zmeniť pokročilé nastavenia používateľa" + +#: ../interfaces/users.ui.h:9 +msgid "Change User Account Type" +msgstr "Zmeniť typ používateľského účtu" #: ../interfaces/users.ui.h:10 -msgid "System Defaults" -msgstr "Štandardné nastavenia systému" +#| msgid "Change User Name and Login" +msgid "Change User Name" +msgstr "Zmeniť používateľské meno" #: ../interfaces/users.ui.h:11 -msgid "Account" -msgstr "Účet" +msgid "Change User Password" +msgstr "Zmeniť používateľské heslo" #: ../interfaces/users.ui.h:12 -msgid "Advanced" -msgstr "Pokročilé" +msgid "Changing advanced settings for:" +msgstr "Menia sa pokročilé nastavenia pre:" #: ../interfaces/users.ui.h:13 -msgid "Assign a random password by default" -msgstr "Štandardne priradiť náhodné heslo" +msgid "Changing user account type for:" +msgstr "Mení sa typ používateľského účtu pre:" #: ../interfaces/users.ui.h:14 -msgid "Check password _quality" -msgstr "Skontrolovať k_valitu hesla" +msgid "Changing user name for:" +msgstr "Mení sa používateľské meno pre:" #: ../interfaces/users.ui.h:15 +msgid "Changing user password for:" +msgstr "Mení sa používateľské heslo pre:" + +#: ../interfaces/users.ui.h:16 msgid "Con_firmation:" msgstr "_Potvrdenie:" -#: ../interfaces/users.ui.h:16 +#: ../interfaces/users.ui.h:17 +msgid "Contact Information" +msgstr "Kontaktné informácie" + +#: ../interfaces/users.ui.h:18 +msgid "Create New User" +msgstr "Vytvoriť nového používateľa" + +#: ../interfaces/users.ui.h:19 +msgid "Create a new user" +msgstr "Vytvoriť nového používateľa" + +#: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" -msgstr "Dní medzi varovaním a vypršaním hesla: " +msgstr "Počet dní medzi varovaním a vypršaním hesla:" -#: ../interfaces/users.ui.h:17 +#: ../interfaces/users.ui.h:21 msgid "Default _group:" -msgstr "Štandardná _skupina:" +msgstr "Predvolená _skupina:" -#: ../interfaces/users.ui.h:18 +#: ../interfaces/users.ui.h:22 msgid "Default _shell:" -msgstr "Štandardný s_hell:" +msgstr "Predvolený s_hell:" -#: ../interfaces/users.ui.h:20 +#: ../interfaces/users.ui.h:23 +msgid "Disable _account" +msgstr "Zakázať úč_eť" + +#: ../interfaces/users.ui.h:24 +msgid "Don't ask for password on _login" +msgstr "Nepýtať si heslo pri prih_lásení" + +#: ../interfaces/users.ui.h:25 +msgid "" +"Encrypt all your files with your login password to strongly protect them " +"from people with physical access to your computer, at the expense of a " +"slightly reduced performance." +msgstr "" +"Šifrovať všetky vaše súbory pomocou vášho prihlasovacieho hesla za cenu " +"mierne nižšieho výkonu, aby boli dobre chránené pred ľudmi, ktorí majú " +"fyzický prístup k vášmu počítaču." + +#: ../interfaces/users.ui.h:26 +msgid "Full _Name:" +msgstr "Celé me_no:" + +#: ../interfaces/users.ui.h:28 msgid "Generate _random password" msgstr "Generovať _náhodné heslo" -#: ../interfaces/users.ui.h:21 +#: ../interfaces/users.ui.h:29 +#, fuzzy +#| msgid "Group name" +msgid "Group Members" +msgstr "Názov skupiny" + +#: ../interfaces/users.ui.h:30 msgid "Group _ID:" -msgstr "_ID skupiny:" +msgstr "_Identifikátor skupiny:" -#: ../interfaces/users.ui.h:22 +#: ../interfaces/users.ui.h:31 msgid "Group _name:" msgstr "_Názov skupiny:" -#: ../interfaces/users.ui.h:23 +#: ../interfaces/users.ui.h:32 msgid "Group properties" msgstr "Vlastnosti skupiny" -#: ../interfaces/users.ui.h:24 +#: ../interfaces/users.ui.h:33 +msgid "Groups available on the system:" +msgstr "" + +#: ../interfaces/users.ui.h:34 msgid "Groups settings" msgstr "Nastavenia skupín" -#: ../interfaces/users.ui.h:25 +#: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" msgstr "Heslo môže byť použité ma_x. dní:" -#: ../interfaces/users.ui.h:26 +#: ../interfaces/users.ui.h:36 +msgid "Maximum GID:" +msgstr "Maximálne GID:" + +#: ../interfaces/users.ui.h:37 msgid "Maximum UID:" msgstr "Maximálne UID:" -#: ../interfaces/users.ui.h:27 +#: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" -msgstr "Mini_málna doba medzi zmenami hesla:" +msgstr "Mini_málny počet dní medzi zmenami hesla:" -#: ../interfaces/users.ui.h:28 +#: ../interfaces/users.ui.h:39 msgid "Minimum GID:" msgstr "Minimálne GID:" -#: ../interfaces/users.ui.h:29 +#: ../interfaces/users.ui.h:40 msgid "Minimum UID:" msgstr "Minimálne UID:" -#: ../interfaces/users.ui.h:30 +#: ../interfaces/users.ui.h:41 msgid "Minimum days allowed between password changes:" msgstr "Minimálny počet dní medzi zmenami hesla:" -#: ../interfaces/users.ui.h:31 +#: ../interfaces/users.ui.h:42 +msgid "New _password:" +msgstr "Nové _heslo:" + +#: ../interfaces/users.ui.h:43 msgid "Number of days that a password may be used:" msgstr "Počet dní platnosti hesla:" -#: ../interfaces/users.ui.h:32 +#: ../interfaces/users.ui.h:44 msgid "O_ffice location:" msgstr "Adresa _kancelárie:" -#: ../interfaces/users.ui.h:33 +#: ../interfaces/users.ui.h:45 +#, fuzzy +#| msgid "Network Settings" +msgid "Optional Settings" +msgstr "Nastavenia siete" + +#: ../interfaces/users.ui.h:46 +#, fuzzy +#| msgid "Network Settings" +msgid "Password Settings" +msgstr "Nastavenia siete" + +#: ../interfaces/users.ui.h:47 msgid "Password set to: " msgstr "Heslo nastavené na: " -#: ../interfaces/users.ui.h:34 +#: ../interfaces/users.ui.h:48 msgid "Privileges" msgstr "Práva" -#: ../interfaces/users.ui.h:35 +#: ../interfaces/users.ui.h:49 +#, fuzzy +#| msgid "Services Settings" +msgid "Profile Settings" +msgstr "Nastavenia služieb" + +#: ../interfaces/users.ui.h:50 msgid "Profile _name:" msgstr "_Názov profilu:" -#: ../interfaces/users.ui.h:36 +#: ../interfaces/users.ui.h:51 msgid "Set password b_y hand" msgstr "Nastaviť heslo _ručne" -#: ../interfaces/users.ui.h:37 +#: ../interfaces/users.ui.h:52 +msgid "System Defaults" +msgstr "" + +#: ../interfaces/users.ui.h:53 +msgid "This account is disabled." +msgstr "Tento účet je zakázaný." + +#: ../interfaces/users.ui.h:54 +msgid "" +"This account is using special settings that have been defined manually. Use " +"the Advanced Settings dialog to tune them." +msgstr "" +"Tento účet používa špeciálne nastavenia, ktoré boli definované ručne. " +"Použite dialóg Pokročilé nastavenia na ich optimalizáciu." + +#: ../interfaces/users.ui.h:55 msgid "User ID:" -msgstr "ID používateľa:" +msgstr "Identifikátor používateľa:" -#: ../interfaces/users.ui.h:38 +#: ../interfaces/users.ui.h:56 msgid "User Privileges" msgstr "Používateľské práva" -#: ../interfaces/users.ui.h:39 -msgid "User _password:" -msgstr "_Heslo používateľa:" - -#: ../interfaces/users.ui.h:40 +#: ../interfaces/users.ui.h:57 msgid "User profiles" -msgstr "Profily používateľov" +msgstr "Používateľské profily" -#: ../interfaces/users.ui.h:41 -msgid "_Add Group" -msgstr "Prid_ať skupinu" +#. No item should exceed a length of 40 characters, to avoid wrapping on two lines. Better simplifying than making it hard to read! +#: ../interfaces/users.ui.h:59 +#, fuzzy +#| msgid "" +#| "Short name must consist of:\n" +#| " ➣ lower case letters from the English alphabet\n" +#| " ➣ digits\n" +#| " ➣ any of the characters \".\", \"-\" and \"_\"" +msgid "" +"Username must consist of:\n" +" ➣ lower case letters from the English alphabet\n" +" ➣ digits\n" +" ➣ any of the characters \".\", \"-\" and \"_\"" +msgstr "" +"Krátke meno sa musí skladať z:\n" +" ➣ malých písmen anglickej abecedy\n" +" ➣ číslic\n" +" ➣ žiadnych \".\", \"-\" a \"_\"" + +#: ../interfaces/users.ui.h:63 +#, fuzzy +#| msgid "Short name must start with a letter!" +msgid "Username must start with a letter!" +msgstr "Krátke meno musí začínať písmenom!" + +#: ../interfaces/users.ui.h:64 +msgid "You can't change user ID while the user is logged in." +msgstr "Nemôžete zmeniť identifikátor používateľa pokiaľ je prihlásený." -#: ../interfaces/users.ui.h:42 +#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "Prid_ať profil" -#: ../interfaces/users.ui.h:43 -msgid "_Add User" -msgstr "Prid_ať používateľa" +#: ../interfaces/users.ui.h:66 +msgid "_Advanced Settings" +msgstr "Pokročilé n_astavenia" + +#: ../interfaces/users.ui.h:67 +msgid "_Change..." +msgstr "_Zmeniť..." -#: ../interfaces/users.ui.h:44 +#: ../interfaces/users.ui.h:68 msgid "_Comments" msgstr "_Komentáre" -#: ../interfaces/users.ui.h:45 +#: ../interfaces/users.ui.h:69 +msgid "_Current password:" +msgstr "_Aktuálne heslo:" + +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../interfaces/users.ui.h:70 +msgid "_Custom" +msgstr "_Vlastné" + +#: ../interfaces/users.ui.h:71 msgid "_Days between warning and password expiration:" -msgstr "_Dní medzi varovaním a vypršaním hesla: " +msgstr "Počet _dní medzi varovaním a vypršaním hesla: " -#: ../interfaces/users.ui.h:46 ../src/network/address-list.c:77 -#: ../src/network/hosts.c:33 ../src/shares/table.c:40 ../src/users/table.c:40 -msgid "_Delete" -msgstr "_Odstrániť" +#: ../interfaces/users.ui.h:72 +msgid "_Enable Account" +msgstr "_Povoliť účet" -#: ../interfaces/users.ui.h:47 +#: ../interfaces/users.ui.h:73 +msgid "_Encrypt home folder to protect sensitive data" +msgstr "Š_ifrovať domovský priečinok kvôli ochrane citlivých údajov" + +#: ../interfaces/users.ui.h:74 msgid "_Generate" msgstr "Vy_generovať" -#: ../interfaces/users.ui.h:48 +#: ../interfaces/users.ui.h:75 msgid "_Home directory:" msgstr "_Domovský priečinok:" -#: ../interfaces/users.ui.h:49 +#: ../interfaces/users.ui.h:76 msgid "_Home phone:" msgstr "Telefón _domov:" -#: ../interfaces/users.ui.h:50 +#: ../interfaces/users.ui.h:77 msgid "_Main group:" msgstr "_Hlavná skupina:" -#: ../interfaces/users.ui.h:51 +#: ../interfaces/users.ui.h:78 msgid "_Manage Groups" msgstr "_Spravovať skupiny" -#: ../interfaces/users.ui.h:52 -msgid "_Profile:" -msgstr "_Profil:" +#: ../interfaces/users.ui.h:79 +msgid "_Name:" +msgstr "Me_no:" -#: ../interfaces/users.ui.h:53 -msgid "_Real name:" -msgstr "_Skutočné meno:" +#: ../interfaces/users.ui.h:80 +msgid "_Password:" +msgstr "_Heslo:" -#: ../interfaces/users.ui.h:54 +#: ../interfaces/users.ui.h:81 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:56 +#: ../interfaces/users.ui.h:83 msgid "_Work phone:" msgstr "Telefón do _zamestnania:" -#: ../src/common/gst-dialog.c:179 -msgid "_Unlock" -msgstr "_Odomknúť" +#: ../org.gnome.system-tools.gschema.xml.in.h:1 +msgid "Show root user" +msgstr "" + +#: ../org.gnome.system-tools.gschema.xml.in.h:2 +msgid "Show system users" +msgstr "" + +#: ../org.gnome.system-tools.gschema.xml.in.h:3 +#| msgid "" +#| "Whether the users-admin tool should show system users in the users list" +msgid "" +"Whether the users-admin tool should show system users in the users list." +msgstr "" +"Či nástroj na správu používateľov má zobraziť systémových používateľov v " +"zozname používateľov." + +#: ../org.gnome.system-tools.gschema.xml.in.h:4 +#| msgid "" +#| "Whether the users-admin tool should show the root user in the users list" +msgid "" +"Whether the users-admin tool should show the root user in the users list." +msgstr "" +"Či nástroj na správu používateľov má zobraziť používateľa root v zozname " +"používateľov." #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" @@ -635,56 +826,66 @@ msgid "Unsupported platform" msgstr "Nepodporovaná platforma" -#: ../src/common/gst-polkit-button.c:126 -msgid "This action is allowed" -msgstr "Táto akcia je povolená" - -#: ../src/common/gst-polkit-button.c:140 -msgid "This action is not allowed" -msgstr "Táto akcia nie je povolená" - -#: ../src/common/gst-polkit-button.c:247 -msgid "Could not authenticate" -msgstr "Nepodarilo sa overiť" - -#: ../src/common/gst-polkit-button.c:249 -msgid "An unexpected error has occurred." -msgstr "Vyskytla sa neočakávaná chyba." - -#: ../src/common/gst-tool.c:185 +#: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" msgstr "Konfiguráciu sa nepodarilo načítať" -#: ../src/common/gst-tool.c:186 -msgid "You are not allowed to access the system configuration." -msgstr "Nemáte povolený prístup ku konfigurácii systému." - -#: ../src/common/gst-tool.c:188 +#. OPERATION_COMMIT +#: ../src/common/gst-tool.c:190 msgid "The configuration could not be saved" msgstr "Konfigurácia nemohla byť uložená" -#: ../src/common/gst-tool.c:189 +#: ../src/common/gst-tool.c:194 +msgid "You are not allowed to access the system configuration." +msgstr "Nemáte povolený prístup ku konfigurácii systému." + +#. OPERATION_COMMIT +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 msgid "You are not allowed to modify the system configuration." msgstr "Nemáte povolené upraviť konfiguráciu systému." -#: ../src/common/gst-tool.c:418 +#: ../src/common/gst-tool.c:199 +msgid "Invalid data was found." +msgstr "Boli nájdené neplatné údaje." + +#. OOBS_RESULT_ERROR +#: ../src/common/gst-tool.c:201 +msgid "An unknown error occurred." +msgstr "Vyskytla sa neznáma chyba." + +#: ../src/common/gst-tool.c:422 msgid "Could not display help" msgstr "Nepodarilo sa zobraziť pomocníka" -#: ../src/common/gst-tool.c:596 +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/common/gst-tool.c:616 msgid "The system configuration has potentially changed." -msgstr "Nastavenia systému sa prípadne zmenili." +msgstr "Konfigurácia systému sa mohla zmeniť." -#: ../src/common/gst-tool.c:598 +#: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." msgstr "Aktualizovať obsah? Spôsobí to stratu neuložených zmien." +#: ../src/common/gst-tool.c:687 +#, c-format +msgid "" +"An error occurred while checking for authorizations: %s\n" +"You may report this as a bug." +msgstr "" +"Vyskytla sa chyba počas kontroly poverení: %s\n" +"Mali by ste to nahlásiť ako chybu." + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 -#: ../src/shares/table.c:38 ../src/users/table.c:38 +#: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" msgstr "_Pridať" -#: ../src/network/address-list.c:486 +#: ../src/network/address-list.c:77 ../src/network/hosts.c:33 +#: ../src/shares/table.c:40 ../src/users/table.c:42 +msgid "_Delete" +msgstr "_Odstrániť" + +#: ../src/network/address-list.c:485 msgid "Type address" msgstr "Zadajte adresu" @@ -769,7 +970,7 @@ msgstr "Vlastnosti %s" #: ../src/network/hosts.c:32 ../src/network/ifaces-list.c:33 -#: ../src/shares/table.c:39 ../src/users/table.c:39 +#: ../src/shares/table.c:39 ../src/users/table.c:41 msgid "_Properties" msgstr "_Vlastnosti" @@ -791,88 +992,82 @@ #: ../src/network/ifaces-list.c:289 #, c-format -msgid "Essid: %s " -msgstr "Essid: %s " +msgid "Essid: %s " +msgstr "Essid: %s " -#: ../src/network/ifaces-list.c:295 -#, c-format -msgid "Address: %s Subnet mask: %s" -msgstr "Adresa: %s Maska podsiete: %s" - -#: ../src/network/ifaces-list.c:299 -#, c-format -msgid "Address: %s" -msgstr "Adresa: %s" - -#: ../src/network/ifaces-list.c:303 -#, c-format -msgid "Address: %s Remote address: %s" -msgstr "Adresa: %s Vzdialená adresa: %s" +#: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 +#: ../src/network/ifaces-list.c:306 +#, fuzzy +#| msgid "IP Address" +msgid "Address:" +msgstr "IP adresa" -#: ../src/network/ifaces-list.c:315 -#, c-format -msgid "Type: %s Phone number: %s" -msgstr "Typ: %s Telefónne číslo: %s" +#: ../src/network/ifaces-list.c:298 +#, fuzzy +#| msgid "_Subnet mask:" +msgid "Subnet mask:" +msgstr "Sieťová _maska:" -#: ../src/network/ifaces-list.c:318 -#, c-format -msgid "Type: %s Access point name: %s" -msgstr "Typ: %s Názov prístupového bodu: %s" +#: ../src/network/ifaces-list.c:308 +#, fuzzy +#| msgid "IP address:" +msgid "Remote address:" +msgstr "IP adresa:" -#: ../src/network/ifaces-list.c:325 -#, c-format -msgid "Type: %s Ethernet interface: %s" -msgstr "Typ: %s Ethernetové rozhranie: %s" +#: ../src/network/ifaces-list.c:320 ../src/network/ifaces-list.c:325 +#: ../src/network/ifaces-list.c:334 ../src/network/ifaces-list.c:339 +msgid "Type:" +msgstr "" -#: ../src/network/ifaces-list.c:329 -#, c-format -msgid "Type: %s" -msgstr "Typ: %s" +#: ../src/network/ifaces-list.c:321 +#| msgid "_Phone number:" +msgid "Phone number:" +msgstr "Telefónne číslo:" -#: ../src/network/ifaces-list.c:346 +#: ../src/network/ifaces-list.c:356 msgid "Wireless connection" msgstr "Bezdrôtové pripojenie" -#: ../src/network/ifaces-list.c:348 +#: ../src/network/ifaces-list.c:358 msgid "Infrared connection" msgstr "Infračervené pripojenie" -#: ../src/network/ifaces-list.c:350 +#: ../src/network/ifaces-list.c:360 msgid "Wired connection" -msgstr "Pripojenie káblom" +msgstr "Drôtové pripojenie" -#: ../src/network/ifaces-list.c:352 +#: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" -msgstr "Pripojenie pomocou paralelného portu" +msgstr "Pripojenie cez paralelný port" -#: ../src/network/ifaces-list.c:354 +#: ../src/network/ifaces-list.c:364 msgid "Point to point connection" -msgstr "Point to point spojenie" +msgstr "Pripojenie typu Point to point" #: ../src/network/locations-combo.c:221 msgid "Changing network location" -msgstr "Mení sa sieťové umiestnenie" +msgstr "Mení sa miesto siete" #: ../src/network/locations-combo.c:265 msgid "There is already a location with the same name" -msgstr "Už tu je umiestnenie s rovnakým názvom" +msgstr "Už je tu miesto s rovnakým názvom" #: ../src/network/locations-combo.c:267 msgid "Overwrite it?" -msgstr "Prepísať to?" +msgstr "Prepísať ho?" #: ../src/network/locations-combo.c:355 msgid "Save location" -msgstr "Uložiť umiestnenie" +msgstr "Uložiť miesto" #: ../src/network/locations-combo.c:370 msgid "_Location name:" -msgstr "Názov _umiestnenia:" +msgstr "Názov _miesta:" #: ../src/network/locations-combo.c:422 #, c-format msgid "Do you want to delete location \"%s\"?" -msgstr "Naozaj chcete odstrániť umiestnenie \"%s\"?" +msgstr "Naozaj chcete odstrániť miesto \"%s\"?" #: ../src/network/main.c:135 msgid "The interface does not exist" @@ -912,17 +1107,17 @@ msgid "Network Settings" msgstr "Nastavenia siete" -#: ../src/services/callbacks.c:59 +#: ../src/services/callbacks.c:65 #, c-format msgid "Settings for service \"%s\"" msgstr "Nastavenia pre službu \"%s\"" -#: ../src/services/callbacks.c:119 +#: ../src/services/callbacks.c:122 #, c-format msgid "Are you sure you want to deactivate %s?" msgstr "Naozaj chcete deaktivovať %s?" -#: ../src/services/callbacks.c:123 +#: ../src/services/callbacks.c:126 msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." @@ -1007,7 +1202,7 @@ #: ../src/services/service.c:40 ../src/services/service.c:41 msgid "Shares folders over your network" -msgstr "Zdieľanie súborov cez sieť" +msgstr "Zdieľa súbory cez sieť" #. GST_ROLE_FILE_SERVER_NFS #: ../src/services/service.c:42 @@ -1016,7 +1211,7 @@ #: ../src/services/service.c:42 ../src/services/service.c:43 msgid "Shares folders over the Internet" -msgstr "Zdieľanie súborov cez internet" +msgstr "Zdieľa súbory cez internet" #. GST_ROLE_FILE_SERVER_TFTP #: ../src/services/service.c:44 @@ -1058,11 +1253,11 @@ #. GST_ROLE_SPEECH_SYNTHESIS #: ../src/services/service.c:51 msgid "Computer activity logger" -msgstr "Zaznamenávanie aktivity počítača" +msgstr "Zaznamenávač aktivity počítača" #: ../src/services/service.c:51 msgid "Keeps a log of your computer activity" -msgstr "Udržiava záznamy aktivity počítača" +msgstr "Udržiava záznamy o aktivite počítača" #. GST_ROLE_SYSTEM_LOGGER #: ../src/services/service.c:52 @@ -1072,12 +1267,12 @@ #. GST_ROLE_REMOTE_BACKUP #: ../src/services/service.c:53 msgid "Spam filter" -msgstr "Filter spamu" +msgstr "Filter nevyžiadanej pošty" #. GST_ROLE_SPAM_FILTER #: ../src/services/service.c:54 msgid "Remote shell server" -msgstr "Server remote shell" +msgstr "Server vzdialeného prístupu" #: ../src/services/service.c:54 msgid "Secure shell server" @@ -1091,7 +1286,7 @@ #. GST_ROLE_APPLICATION_SERVER #: ../src/services/service.c:56 msgid "Automated crash reports support" -msgstr "Podpora automatických záznamov o pádoch" +msgstr "Podpora automatických hlásení o pádoch" #. GST_ROLE_AUTOMATED_CRASH_REPORTS_MANAGEMENT #: ../src/services/service.c:57 @@ -1116,7 +1311,7 @@ #. GST_ROLE_SECURITY_AUDITING #: ../src/services/service.c:61 msgid "Web calendar server" -msgstr "Server webového kalendáru" +msgstr "Server webového kalendára" #. GST_ROLE_WEB_CALENDAR_SERVER #: ../src/services/service.c:62 @@ -1133,6 +1328,7 @@ msgid "Disk quota activation" msgstr "Aktivácia diskovej kvóty" +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 #. GST_ROLE_QUOTA_MANAGEMENT #: ../src/services/service.c:65 msgid "Package index monitor" @@ -1156,12 +1352,12 @@ #. GST_ROLE_DHCP_SERVER #: ../src/services/service.c:69 msgid "Domain name server" -msgstr "Domain name server" +msgstr "DNS server" #. GST_ROLE_DNS #: ../src/services/service.c:70 msgid "Proxy cache service" -msgstr "Služba proxy cache" +msgstr "Služba vyrovnávacej pamäte proxy" #. GST_ROLE_PROXY_CACHE #: ../src/services/service.c:71 @@ -1171,12 +1367,12 @@ #. GST_ROLE_LDAP_SERVER #: ../src/services/service.c:72 msgid "Mailing lists manager" -msgstr "Správca mailing listov" +msgstr "Správca mailových diskusií" #. GST_ROLE_MAILING_LISTS_MANAGER #: ../src/services/service.c:73 msgid "Multicast DNS service discovery" -msgstr "Služba objavenia Multicast DNS" +msgstr "Služba objavovania Multicast DNS" #. GST_ROLE_RENDEZVOUS #: ../src/services/service.c:74 @@ -1186,7 +1382,7 @@ #. GST_ROLE_NSS #: ../src/services/service.c:75 msgid "Virtual Private Network server" -msgstr "Virtuálny súkromný sieťový server" +msgstr "VPN server" #. GST_ROLE_VPN_SERVER #: ../src/services/service.c:76 @@ -1196,7 +1392,7 @@ #. GST_ROLE_ROUTER_ADVERTISEMENT_SERVER #: ../src/services/service.c:77 msgid "IPSec key exchange server" -msgstr "Výmený server IPSec kľúčov" +msgstr "Výmenný server IPSec kľúčov" #. GST_ROLE_IPSEC_KEY_EXCHANGE_SERVER #: ../src/services/service.c:78 @@ -1236,11 +1432,11 @@ #. GST_ROLE_AUDIO_MANAGEMENT #: ../src/services/service.c:85 msgid "Volumes mounter" -msgstr "Pripájanie diskov" +msgstr "Pripájač zväzkov" #: ../src/services/service.c:85 msgid "Mounts your volumes automatically" -msgstr "Automaticky pripája disky" +msgstr "Automaticky pripája vaše zväzky" #. GST_ROLE_AUTOMOUNTER #: ../src/services/service.c:86 @@ -1280,7 +1476,7 @@ #. GST_ROLE_LVM_MANAGEMENT #: ../src/services/service.c:93 msgid "Cluster management tool" -msgstr "Nástroj pre správu clusterov" +msgstr "Nástroj pre správu klasterov" #. GST_ROLE_CLUSTER_MANAGEMENT #: ../src/services/service.c:94 @@ -1332,9 +1528,14 @@ msgid "System monitor" msgstr "Monitor systému" +#. GST_ROLE_SYSTEM_MONITORING +#: ../src/services/service.c:104 +msgid "Virtual Machine management" +msgstr "Správa virtuálneho počítača" + #: ../src/services/services.desktop.in.in.h:1 msgid "Configure which services will be run when the system starts" -msgstr "Nastavenie služieb, ktoré sa budú pri štarte systému spúšťať" +msgstr "Nastavuje, ktoré služby sa budú pri štarte systému spúšťať" #: ../src/services/services.desktop.in.in.h:2 msgid "Services" @@ -1369,7 +1570,7 @@ msgid "Priority" msgstr "Priorita" -#: ../src/services/services-tool.c:99 +#: ../src/services/services-tool.c:106 msgid "Services Settings" msgstr "Nastavenia služieb" @@ -1389,11 +1590,11 @@ msgid "PATH" msgstr "CESTA" -#: ../src/shares/nautilus/nautilus-shares.c:152 +#: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." msgstr "_Zdieľať priečinok..." -#: ../src/shares/nautilus/nautilus-shares.c:153 +#: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" msgstr "Zdieľať tento priečinok s inými počítačmi" @@ -1415,7 +1616,7 @@ #: ../src/shares/shares.desktop.in.in.h:1 msgid "Configure which folders are available for your network neighborhood" -msgstr "Nastaviť, ktoré priečinky sú dostupné pre vaše okolité počítače" +msgstr "Nastavuje, ktoré priečinky sú dostupné pre vaše okolité počítače" #: ../src/shares/share-settings.c:61 msgid "File System" @@ -1433,29 +1634,50 @@ msgid "Unix networks (NFS)" msgstr "Siete Unix (NFS)" -#: ../src/shares/shares-tool.c:155 +#: ../src/shares/share-settings.c:462 +#, c-format +msgid "Settings for folder '%s'" +msgstr "Nastavenia pre priečinok '%s'" + +#: ../src/shares/share-settings.c:469 +msgid "Share Folder" +msgstr "Zdieľať priečinok" + +#: ../src/shares/shares-tool.c:152 msgid "Sharing services are not installed" msgstr "Služby zdieľania nie sú nainštalované" -#: ../src/shares/shares-tool.c:157 +#: ../src/shares/shares-tool.c:154 msgid "" "You need to install at least either Samba or NFS in order to share your " "folders." -msgstr "Na zdieľanie priečinkov potrebujete nainštalovať buď Samba alebo NFS." +msgstr "" +"Aby ste mohli zdieľať vaše priečinky, potrebujete nainštalovať buď Samba " +"alebo NFS." + +#: ../src/time/e-map/e-map.c:745 +msgid "World Map" +msgstr "" + +#: ../src/time/e-map/e-map.c:747 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" -msgstr "Zmena dátumu, času a časová zóna" +msgstr "Zmena dátumu, času a časového pásma" #: ../src/time/time.desktop.in.in.h:2 msgid "Time and Date" msgstr "Dátum a čas" -#: ../src/time/time-tool.c:390 +#: ../src/time/time-tool.c:398 msgid "NTP support is not installed" msgstr "Podpora NTP nie je nainštalovaná" -#: ../src/time/time-tool.c:392 +#: ../src/time/time-tool.c:400 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1463,149 +1685,282 @@ "Prosím, nainštalujte a aktivujte podporu NTP, aby ste mohli synchronizovať " "váš lokálny časový server s internetovými časovými servermi." -#: ../src/time/time-tool.c:422 +#: ../src/time/time-tool.c:429 msgid "Enabling NTP" msgstr "Povoľuje sa NTP" -#: ../src/time/time-tool.c:422 +#: ../src/time/time-tool.c:429 msgid "Disabling NTP" msgstr "Zakazuje sa NTP" -#: ../src/time/time-tool.c:434 +#: ../src/time/time-tool.c:441 msgid "Synchronizing system clock" msgstr "Prebieha synchronizácia systémových hodín" -#: ../src/time/time-tool.c:514 +#: ../src/time/time-tool.c:521 msgid "Keep synchronized with Internet servers" -msgstr "Udržiavať synchronizované s internetovými servermi:" +msgstr "Udržiavať synchronizované s internetovými servermi" -#: ../src/time/time-tool.c:515 +# toto je za Nastavenie: +#: ../src/time/time-tool.c:522 msgid "Manual" -msgstr "Ručne" +msgstr "Ručné" -#: ../src/time/time-tool.c:661 +#: ../src/time/time-tool.c:665 msgid "Time and Date Settings" -msgstr "Nastavenie času a dátumu" +msgstr "Nastavenie dátumu a času" -#: ../src/users/group-settings.c:52 +#: ../src/users/group-settings.c:55 msgid "Administrator group can not be deleted" msgstr "Administrátorská skupina nemôže byť odstránená" -#: ../src/users/group-settings.c:55 ../src/users/group-settings.c:279 -#: ../src/users/group-settings.c:303 ../src/users/user-settings.c:60 -#: ../src/users/user-settings.c:550 +#: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 +#: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 +#: ../src/users/user-settings.c:606 msgid "This would leave the system unusable." msgstr "Toto môže spôsobiť, že sa systém stane nepoužiteľným." -#: ../src/users/group-settings.c:68 +#: ../src/users/group-settings.c:71 #, c-format msgid "Are you sure you want to delete group \"%s\"?" msgstr "Naozaj chcete odstrániť skupinu \"%s\"?" -#: ../src/users/group-settings.c:71 +#: ../src/users/group-settings.c:74 msgid "This may leave files with invalid group ID in the filesystem." msgstr "" "Toto môže spôsobiť, že na vašich súborových systémoch zostanú súbory s " -"neplatným ID skupiny." +"neplatným identifikátorom skupiny." -#: ../src/users/group-settings.c:167 +#: ../src/users/group-settings.c:144 msgid "New group" msgstr "Nová skupina" -#: ../src/users/group-settings.c:175 +#: ../src/users/group-settings.c:151 #, c-format msgid "Group '%s' Properties" msgstr "Vlastnosti skupiny '%s'" -#: ../src/users/group-settings.c:275 +#: ../src/users/group-settings.c:217 msgid "Group name is empty" msgstr "Názov skupiny je prázdny" -#: ../src/users/group-settings.c:276 +#: ../src/users/group-settings.c:218 msgid "A group name must be specified." -msgstr "Názov skupiny musí byť určený." +msgstr "Názov skupiny musí byť zadaný." -#: ../src/users/group-settings.c:278 +#: ../src/users/group-settings.c:220 msgid "Group name of the administrator group user should not be modified" -msgstr "Názov skupiny správcovskej skupiny by nemal byť modifikovaný" +msgstr "Názov skupiny správcovskej skupiny by sa nemal meniť" -#: ../src/users/group-settings.c:281 +#: ../src/users/group-settings.c:223 msgid "Group name has invalid characters" msgstr "Názov skupiny obsahuje neplatné znaky" -#: ../src/users/group-settings.c:282 +#: ../src/users/group-settings.c:224 msgid "" "Please set a valid group name consisting of a lower case letter followed by " "lower case letters and numbers." msgstr "" -"Prosím, zadajte platný názov skupiny zloženého s malého písmena " -"nasledovaného malými písmenami a číslami." +"Prosím, zadajte platný názov skupiny zložený z malých písmen (musí ním " +"začínať) a číslic." -#: ../src/users/group-settings.c:286 +#: ../src/users/group-settings.c:229 #, c-format msgid "Group \"%s\" already exists" msgstr "Skupina \"%s\" už existuje" -#: ../src/users/group-settings.c:287 ../src/users/user-settings.c:484 -msgid "Please select a different user name." -msgstr "Prosím, vyberte iné meno používateľa." +#: ../src/users/group-settings.c:230 +msgid "Please choose a different group name." +msgstr "Prosím, vyberte iný názov skupiny." -#: ../src/users/group-settings.c:302 +#: ../src/users/group-settings.c:257 msgid "Group ID of the Administrator account should not be modified" -msgstr "ID skupiny správcovského účtu by nemalo byť modifikované" +msgstr "Identifikátor skupiny správcovského účtu by sa nemal meniť" + +#. check that GID is free +#: ../src/users/group-settings.c:261 +#, c-format +msgid "Group ID %d is already used by group \"%s\"" +msgstr "Identifikátor skupiny %d je už použitý skupinou \"%s\"" + +#: ../src/users/group-settings.c:264 +msgid "Please choose a different numeric identifier for the new group." +msgstr "Prosím, vyberte iný číselný identifikátor pre novú skupinu." + +#: ../src/users/group-settings.c:266 +#, c-format +msgid "Please choose a different numeric identifier for group \"%s\"." +msgstr "Prosím, vyberte iný číselný identifikátor pre skupinu \"%s\"." -#: ../src/users/groups-table.c:45 +#: ../src/users/groups-table.c:44 msgid "Group name" msgstr "Názov skupiny" -#: ../src/users/privileges-table.c:49 +#. TRANSLATORS: This applies to a password. Keep the string short. +#: ../src/users/main.c:74 ../src/users/user-settings.c:348 +msgid "Not asked on login" +msgstr "Nepýtať sa pri prihlásení" + +# asked je minulý čas - neviem ako to správne preložiť - skús sa opýtať v ML, potom oprav všetky výskyty +# PK: podla mna je to spravne, lebo tu je doslovny preklad blby +#: ../src/users/main.c:74 ../src/users/user-settings.c:350 +msgid "Asked on login" +msgstr "Pýtať sa pri prihlásaní" + +#: ../src/users/privileges-table.c:53 msgid "Monitor system logs" msgstr "Monitorovať systémové záznamy" -#: ../src/users/privileges-table.c:50 +#: ../src/users/privileges-table.c:54 msgid "Administer the system" msgstr "Spravovať systém" -#: ../src/users/privileges-table.c:51 +#: ../src/users/privileges-table.c:55 msgid "Use audio devices" msgstr "Používať zvukové zariadenia" -#: ../src/users/privileges-table.c:52 +#: ../src/users/privileges-table.c:56 msgid "Use CD-ROM drives" msgstr "Používať mechaniky CD-ROM" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:57 +msgid "Burn CDs / DVDs" +msgstr "Napaľovať CD / DVD" + +#: ../src/users/privileges-table.c:58 msgid "Use modems" msgstr "Používať modemy" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:59 msgid "Connect to Internet using a modem" -msgstr "Pripájať k internetu pomocou modemu" +msgstr "Pripájať sa k internetu pomocou modemu" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:60 msgid "Send and receive faxes" msgstr "Posielať a prijímať faxy" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:61 msgid "Use floppy drives" msgstr "Používať disketové mechaniky" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:62 +msgid "Mount user-space filesystems (FUSE)" +msgstr "Pripájať súborové systémy v používateľskom prostredí (FUSE)" + +#: ../src/users/privileges-table.c:63 +msgid "Configure printers" +msgstr "Nastavovať tlačiarne" + +#: ../src/users/privileges-table.c:64 +msgid "Connect to wireless and ethernet networks" +msgstr "Pripájať sa do bezdrôtových a drôtových sietí" + +#: ../src/users/privileges-table.c:65 msgid "Access external storage devices automatically" -msgstr "Automatický prístup k vonkajším úložným zariadeniam" +msgstr "Automaticky pristupovať k vonkajším úložným zariadeniam" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:66 +msgid "Suspend and hibernate the computer" +msgstr "Uspávať a hibernovať počítač" + +#: ../src/users/privileges-table.c:67 +msgid "Access /proc filesystem" +msgstr "Pristupovať k súborovému systému /proc" + +#: ../src/users/privileges-table.c:68 msgid "Use scanners" msgstr "Používať skenery" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:69 msgid "Use tape drives" msgstr "Používať páskové mechaniky" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:70 +msgid "Use USB devices" +msgstr "Používať USB zariadenia" + +#: ../src/users/privileges-table.c:71 +msgid "Use VirtualBox virtualization solution" +msgstr "Používať virtualizačné riešenie VirtualBox" + +#: ../src/users/privileges-table.c:72 +msgid "Use video devices" +msgstr "Používať video zariadenia" + +#: ../src/users/privileges-table.c:73 msgid "Be able to get administrator privileges" msgstr "Môcť získať práva správcu" +#: ../src/users/user-profiles.conf.in.h:1 +msgid "Administrator" +msgstr "Správca" + +#: ../src/users/user-profiles.conf.in.h:2 +msgid "" +"Can change anything on the system, including installing and upgrading " +"software." +msgstr "" +"Môže zmeniť hocičo v systéme, vrátane inštalovania a aktualizovania softvéru." + +#: ../src/users/user-profiles.conf.in.h:3 +msgid "" +"Can perform common tasks. Can't install software or change settings " +"affecting all users." +msgstr "" +"Môže vykonávať bežné úlohy. Nemôže inštalovať softvér ani meniť nastavenia, " +"ktoré ovplyvňujú všetkých používateľov." + +# podľa mňa ide o bežného používateľa (v kontraste k správcovi) +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/users/user-profiles.conf.in.h:4 +msgid "Desktop user" +msgstr "Používateľ pracovného prostredia" + +#: ../src/users/run-passwd.c:421 +msgid "Authentication failed" +msgstr "Overenie totožnosti zlyhalo" + +#: ../src/users/run-passwd.c:498 +#, c-format +msgid "The new password is too short" +msgstr "Nové heslo je príliš krátke" + +#: ../src/users/run-passwd.c:504 +#, c-format +msgid "The new password is too simple" +msgstr "Nové heslo je príliš jednoduché" + +#: ../src/users/run-passwd.c:510 +#, c-format +msgid "The old and new passwords are too similar" +msgstr "Staré a nové heslá sú príliš podobné" + +#: ../src/users/run-passwd.c:513 +#, c-format +msgid "The new password must contain numeric or special characters" +msgstr "Nové heslo musí obsahovať číslice alebo špeciálne znaky" + +#: ../src/users/run-passwd.c:517 +#, c-format +msgid "The old and new passwords are the same" +msgstr "Staré a nové heslá sú zhodné" + +#: ../src/users/run-passwd.c:520 +#, fuzzy, c-format +#| msgid "The old and new passwords are the same" +msgid "The new password has already been used recently." +msgstr "Staré a nové heslo sú zhodné" + +#: ../src/users/run-passwd.c:524 +#, c-format +msgid "Your password has been changed since you initially authenticated!" +msgstr "Od prvotného overenia vašej totožnosti bolo vaše heslo zmenené!" + +#: ../src/users/run-passwd.c:528 +#, c-format +msgid "Unknown error" +msgstr "Neznáma chyba" + #: ../src/users/users.desktop.in.in.h:1 msgid "Add or remove users and groups" msgstr "Pridanie alebo odstránenie používateľov a skupín" @@ -1614,138 +1969,368 @@ msgid "Users and Groups" msgstr "Používatelia a skupiny" -#: ../src/users/user-settings.c:57 -msgid "Administrator account cannot be deleted" -msgstr "Účet správcu nemôže byť odstránený" - -#: ../src/users/user-settings.c:71 -#, c-format -msgid "Are you sure you want to delete account \"%s\"?" -msgstr "Naozaj chcete odstrániť účet \"%s\"?" +#: ../src/users/user-password.c:97 +msgid "Password is too short" +msgstr "Heslo je príliš krátke" -#: ../src/users/user-settings.c:74 +#: ../src/users/user-password.c:98 +#, fuzzy +#| msgid "" +#| "User passwords must be longer than 6 characters and preferably formed by " +#| "numbers, letters and special characters." msgid "" -"This will disable this user's access to the system without deleting the " -"user's home directory." +"User passwords must be longer than 5 characters and preferably formed by " +"numbers, letters and special characters." msgstr "" -"Týmto zakážete tomuto používateľovi prístup do systému bez odstránenia jeho " -"domovského priečinka." +"Používateľské heslo musí byť dlhšie ako 6 znakov a vhodné vytvorené z " +"číslic, písmen a špeciálnych znakov." + +#: ../src/users/user-password.c:101 +msgid "Password confirmation is not correct" +msgstr "Potvrdenie hesla nie je správne" + +#: ../src/users/user-password.c:102 +msgid "Check that you have provided the same password in both text fields." +msgstr "Skontrolujte, či ste zadali rovnaké heslo v oboch poliach." -#: ../src/users/user-settings.c:84 -msgid "This user is currently using this computer" -msgstr "Tento používateľ práve používa počítač" +#: ../src/users/user-password.c:445 +msgid "Please choose another password." +msgstr "Prosím, vyberte iné heslo." + +#: ../src/users/user-password.c:456 +msgid "Please type again your current password." +msgstr "Prosím, zadajte znovu vaše aktuálne heslo." + +#: ../src/users/user-password.c:463 +msgid "Password could not be changed" +msgstr "Heslo nemohlo byť zmenené" -#: ../src/users/user-settings.c:324 -msgid "New user account" -msgstr "Nový používateľský účet" +#: ../src/users/user-settings.c:85 +msgid "Administrator account cannot be deleted" +msgstr "Účet správcu nemôže byť odstránený" -#: ../src/users/user-settings.c:342 +#: ../src/users/user-settings.c:96 #, c-format -msgid "Account '%s' Properties" -msgstr "Vlastnosti účtu '%s'" +msgid "%s is currently using this computer" +msgstr "%s práve používa tento počítač" -#: ../src/users/user-settings.c:475 -msgid "User name is empty" -msgstr "Používateľské meno je prázdne" - -#: ../src/users/user-settings.c:476 -msgid "A user name must be specified." -msgstr "Musí byť špecifikované používateľské meno." +#: ../src/users/user-settings.c:99 +msgid "Please ensure the user has logged out before deleting this account." +msgstr "" +"Uistite sa, prosím, že bol pred odstraňovaním tohto účtu používateľ " +"odhlásený." -#: ../src/users/user-settings.c:478 -msgid "User name has invalid characters" -msgstr "Meno používateľa obsahuje neplatné znaky" +#: ../src/users/user-settings.c:109 +msgid "Can't delete the only administrator account" +msgstr "Nemožno odstrániť jediný účet správcu" -#: ../src/users/user-settings.c:479 +#: ../src/users/user-settings.c:111 +#, c-format msgid "" -"Please set a valid user name consisting of a lower case letter followed by " -"lower case letters and numbers." +"%s is the only administrator on this computer. Deleting this account would " +"lock you out of administrating the system." msgstr "" -"Prosím, zadajte platné používateľské meno, použite iba malé písmená a " -"číslice. Meno musí začínať písmenom." +"%s je jediný správca na tomto počítači. Odstránenie tohto účtu by mohlo " +"zablokovať spravovanie systému." -#: ../src/users/user-settings.c:483 +#: ../src/users/user-settings.c:121 #, c-format -msgid "User name \"%s\" already exists" -msgstr "Používateľ \"%s\" už existuje" +msgid "Remove home folder for %s?" +msgstr "Odstrániť domovský priečinok pre %s?" -#: ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:124 +#, c-format +msgid "" +"Files owned by user %s in %s can be completely removed if you don't " +"need them anymore. You may want to back them up before deleting the account, " +"or keep them so that an administrator can save them later." +msgstr "" +"Súbory vlastnené používateľom %s v %s môžu byť kompletne zmazané, " +"ak ich už viac nepotrebujete. Možno ich budete chcieť pred odstránením účtu " +"zálohovať, alebo ich zachovať tak, aby ich mohol správca neskôr zachrániť." + +#: ../src/users/user-settings.c:132 +msgid "Keep Files" +msgstr "Zachovať súbory" + +#: ../src/users/user-settings.c:133 +msgid "Don't Remove Account" +msgstr "Neodstrániť účet" + +#: ../src/users/user-settings.c:134 +msgid "Delete Files" +msgstr "Odstrániť súbory" + +#: ../src/users/user-settings.c:331 +msgid "Superuser" +msgstr "Superpoužívateľ" + +# ide o typ používateľa +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/users/user-settings.c:336 +msgid "Custom" +msgstr "Vlastný" + +#. TRANSLATORS: This applies to a password. +#: ../src/users/user-settings.c:345 +msgid "None" +msgstr "Žiadne" + +#: ../src/users/user-settings.c:394 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Neplatný znak \"%c\" v komentári" -#: ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:395 msgid "Check that this character is not used." msgstr "Skontrolujte, či sa tento znak nepoužíva." -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:427 msgid "Incomplete path in home directory" -msgstr "Neúplná cesta k domovskom priečinku" +msgstr "Neúplná cesta k domovskému priečinku" -#: ../src/users/user-settings.c:529 +# 2. správne má byť folder, nahlás bug +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/users/user-settings.c:428 msgid "" "Please enter full path for home directory\n" -"i.e.: /home/john." +"i.e.: /home/john." msgstr "" -"Zadajte plnú cestu k domovskému priečinku\n" -"napr. /home/john." +"Zadajte, prosím, celú cestu k domovskému priečinku\n" +"napr. /home/john." -#: ../src/users/user-settings.c:532 -msgid "Home directory already exists" +# správne má byť folder, nahlás bug +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/users/user-settings.c:448 ../src/users/user-settings.c:492 +#, fuzzy +#| msgid "Home directory already exists" +msgid "New home directory already exists, use it?" msgstr "Domovský priečinok už existuje" -#: ../src/users/user-settings.c:533 -msgid "Please enter a different home directory path." -msgstr "Prosím, zadajte iné umiestnenie domovského priečinku." - -#: ../src/users/user-settings.c:549 -msgid "Administrator account's user ID should not be modified" -msgstr "Používateľské ID správcovského účtu by nemalo byť menené" +#: ../src/users/user-settings.c:450 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or copy the contents of %" +"s to the new home, overwriting it?\n" +"\n" +"In doubt, use the new directory to avoid losing data, and copy files from " +"the old directory later." +msgstr "" + +#: ../src/users/user-settings.c:462 +msgid "_Replace With Old Files" +msgstr "" + +#: ../src/users/user-settings.c:463 ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:541 +msgid "_Cancel Change" +msgstr "" + +#. TRANSLATORS: This means "use the files from the new location", +#. * as opposed to those from the old location. +#: ../src/users/user-settings.c:466 +#, fuzzy +#| msgid "Keep Files" +msgid "_Use New Files" +msgstr "Zachovať súbory" + +#: ../src/users/user-settings.c:471 ../src/users/user-settings.c:511 +msgid "Make user the _owner of the new home directory" +msgstr "" + +#: ../src/users/user-settings.c:474 ../src/users/user-settings.c:548 +#, fuzzy +#| msgid "Incomplete path in home directory" +msgid "_Delete old home directory" +msgstr "Neúplná cesta k domovskému priečinku" + +#: ../src/users/user-settings.c:494 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which already exists. " +"Do you want to use files from this directory, or delete all its contents and " +"use a completely empty home directory?\n" +"\n" +"In doubt, keep the files, and remove them later if needed." +msgstr "" + +#: ../src/users/user-settings.c:504 +#, fuzzy +#| msgid "Delete Files" +msgid "_Delete Files" +msgstr "Odstrániť súbory" + +#: ../src/users/user-settings.c:506 +msgid "_Use Existing Files" +msgstr "" + +#: ../src/users/user-settings.c:527 +msgid "Copy old home directory to new location?" +msgstr "" + +#: ../src/users/user-settings.c:529 +#, c-format +msgid "" +"The home directory for %s has been set to %s, which doesn't exist. " +"Do you want to copy the contents of the old home directory (%s), or " +"use a completely empty home directory?\n" +"\n" +"If you choose to copy the files to the new location, it's safe to delete the " +"old directory." +msgstr "" + +# správne má byť folder, nahlás bug +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#: ../src/users/user-settings.c:540 +#, fuzzy +#| msgid "Use this directory" +msgid "_Use Empty Directory" +msgstr "Použiť tento adresár" + +#. TRANSLATORS: This means "copy files from the old home directory". +#: ../src/users/user-settings.c:543 +msgid "Co_py Old Files" +msgstr "" -#: ../src/users/user-settings.c:564 +#: ../src/users/user-settings.c:605 +msgid "ID for the root user should not be modified" +msgstr "Identifikátor používateľa root by sa nemal meniť" + +#. check that UID is free +#: ../src/users/user-settings.c:609 +#, c-format +msgid "User ID %d is already used by user %s" +msgstr "Používateľský indentifikátor %d je už použitý používateľom %s" + +#: ../src/users/user-settings.c:611 +#, c-format +msgid "Please choose a different numeric identifier for %s." +msgstr "Prosím, vyberte iný číselný identifikátor pre %s." + +#: ../src/users/user-settings.c:629 msgid "Incomplete path in shell" msgstr "Neúplná cesta v shelli" -#: ../src/users/user-settings.c:565 +#: ../src/users/user-settings.c:630 msgid "" "Please enter full path for shell\n" -"i.e.: /bin/bash." +"i.e.: /bin/bash." msgstr "" -"Prosím zadajte celú cestu k shellu\n" -"napr.: /bin/sh." +"Prosím, zadajte celú cestu k shellu\n" +"napr.: /bin/bash." -#: ../src/users/user-settings.c:598 -msgid "Password is too short" -msgstr "Heslo je príliš krátke" +#: ../src/users/user-settings.c:664 +msgid "Can't revoke administration rights" +msgstr "Nemožno zrušiť práva správcu" -#: ../src/users/user-settings.c:599 +#: ../src/users/user-settings.c:667 +#, c-format msgid "" -"User passwords must be longer than 6 characters and preferably formed by " -"numbers, letters and special characters." +"%s is the only administrator on this computer. Revoking administration " +"rights for this account would lock you out of administrating the system." msgstr "" -"Používateľské meno musí byť dlhšie ako 6 znakov a pokiaľ možno tvorené " -"číslicami, písmenami a špeciálnymi znakmi." +"%s je jediný správca na tomto počítači. Zrušenie správcovských práv pre " +"tento účet by mohlo zablokovať spravovanie systému." -#: ../src/users/user-settings.c:602 -msgid "Password confirmation is not correct" -msgstr "Potvrdenie hesla nie je správne" +#: ../src/users/user-settings.c:684 +msgid "You are about to revoke your own administration rights" +msgstr "Chystáte sa zrušiť vaše vlastné správcovské práva" -#: ../src/users/user-settings.c:603 -msgid "Check that you have provided the same password in both text fields." -msgstr "Skontrolujte, či ste zadali rovnaké heslo v oboch poliach." +#: ../src/users/user-settings.c:687 +#, c-format +msgid "" +"%s will no longer be able to perform administrative tasks. This account " +"won't be allowed to get administration rights back on its own." +msgstr "" +"%s nebude viac schopný vykonávať správcovské úlohy. Tento účet nebude " +"schopný získať späť správcovské práva." -#: ../src/users/users-table.c:44 -msgid "Name" -msgstr "Meno" - -#: ../src/users/users-table.c:67 -msgid "Login name" -msgstr "Prihlasovacie meno" - -#: ../src/users/users-table.c:76 -msgid "Home directory" -msgstr "Domovský priečinok" +#: ../src/users/user-settings.c:692 +msgid "Give up administration rights" +msgstr "Vzdať sa práv správcu" -#: ../src/users/users-tool.c:216 +#: ../src/users/user-settings.c:1470 +msgid "Applying changes to user settings..." +msgstr "" + +#: ../src/users/users-tool.c:288 msgid "Users Settings" msgstr "Nastavenia používateľov" + +#~ msgid "Allowed Hosts" +#~ msgstr "Povolení hostitelia" + +#~ msgid "Shared Folder" +#~ msgstr "Zdieľaný priečinok" + +#~ msgid "" +#~ "Enter password for user:" +#~ msgstr "" +#~ "Zadajte heslo pre používateľa:" + +#~ msgid "Selection" +#~ msgstr "Výber" + +#~ msgid "Time Zone" +#~ msgstr "Časová zóna" + +#~ msgid "Advanced Settings" +#~ msgstr "Pokročilé nastavenia" + +#~ msgid "Automatic UID/GID" +#~ msgstr "Automatické UID/GID" + +#~ msgid "Basic Settings" +#~ msgstr "Základné nastavenia" + +#~ msgid "Group Members" +#~ msgstr "Členovia skupiny" + +#~ msgid "Optional Settings" +#~ msgstr "Nepovinné nastavenia" + +#~ msgid "Password Settings" +#~ msgstr "Nastavenia hesla" + +#~ msgid "Profile Settings" +#~ msgstr "Nastavenie profilu" + +#~ msgid "System Defaults" +#~ msgstr "Štandardné nastavenia systému" + +#~ msgid "_Short Name:" +#~ msgstr "_Krátke meno:" + +#~ msgid "Address: %s Subnet mask: %s" +#~ msgstr "Adresa: %s Maska podsiete: %s" + +#~ msgid "Address: %s" +#~ msgstr "Adresa: %s" + +#~ msgid "Address: %s Remote address: %s" +#~ msgstr "Adresa: %s Vzdialená adresa: %s" + +#~ msgid "Type: %s Phone number: %s" +#~ msgstr "Typ: %s Telefónne číslo: %s" + +#~ msgid "Type: %s Access point name: %s" +#~ msgstr "Typ: %s Názov prístupového bodu: %s" + +#~ msgid "Type: %s Ethernet interface: %s" +#~ msgstr "Typ: %s Ethernetové rozhranie: %s" + +#~ msgid "Type: %s" +#~ msgstr "Typ: %s" + +# správne má byť folder, nahlás bug +# * https://bugzilla.gnome.org/show_bug.cgi?id=626523 +#~ msgid "" +#~ "The directory %s already exists. User may not have the " +#~ "permissions required to read or write in that directory. Do you want to " +#~ "use it anyway?" +#~ msgstr "" +#~ "Adresár %s už existuje. Používateľ by nemal mať požadované " +#~ "oprávnenia na čítanie alebo zápis v tomto adresári. Chcete ho napriek " +#~ "tomu použiť?" diff -Nru gnome-system-tools-2.32.0/po/sl.po gnome-system-tools-3.0.0/po/sl.po --- gnome-system-tools-2.32.0/po/sl.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/sl.po 2011-04-02 12:55:08.000000000 +0000 @@ -3,19 +3,20 @@ # This file is distributed under the same license as the gnome-system-tools package. # # Matic Žgur , 2006. -# Matej Urbančič , 2007 - 2010. +# Matej Urbančič , 2007 - 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools&component=general\n" -"POT-Creation-Date: 2010-08-24 02:35+0000\n" -"PO-Revision-Date: 2010-08-25 08:43+0100\n" -"Last-Translator: Matej Urbančič \n" +"POT-Creation-Date: 2011-02-28 17:26+0000\n" +"PO-Revision-Date: 2011-03-15 19:16+0100\n" +"Last-Translator: Andrej Žnidaršič \n" "Language-Team: Slovenian GNOME Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \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-Country: SLOVENIA\n" "X-Poedit-Language: Slovenian\n" @@ -242,9 +243,9 @@ msgstr "_Maska Podomrežja:" #: ../interfaces/network.ui.h:55 -#: ../interfaces/users.ui.h:82 +#: ../interfaces/users.ui.h:81 msgid "_Username:" -msgstr "__Uporabniško ime:" +msgstr "_Uporabniško ime:" #. TRANSLATORS: Volume as in loudness #: ../interfaces/network.ui.h:57 @@ -660,78 +661,74 @@ msgstr "Uporabniško ime se mora začeti s črko!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "Ni mogoče spremeniti uporabniškega ID, dokler je uporabnik prijavljen." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "_Dodaj profil" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "_Napredne nastavitve" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "_Spremeni ..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "_Opombe" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "_Trenutno geslo:" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "_Po meri" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "Število _dni med opozorilom in dokončnim pretekom gesla:" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "_Omogoči račun" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "_Šifriraj domačo mapo za zaščito občutljivih podatkov" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "_Ustvari" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "_Domači imenik:" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "_Domači telefon:" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "_Glavna skupina:" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "_Upravljanje skupin" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "_Ime:" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "_Geslo:" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Lupina:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "_Službeni telefon" @@ -751,18 +748,23 @@ msgid "Whether the users-admin tool should show the root user in the users list." msgstr "Ali naj orodje user-admin pokaže skrbniški račun na seznamu uporabnikov." +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "Prišlo je do napake dostopa do sistemskih dovoljenj: %s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" -msgstr "Orodje ne podpira sistema, ki ga uporabljate" +msgstr "Orodje ne podpira okolja, ki je v uporabi" #. label #: ../src/common/gst-platform-dialog.c:185 msgid "If you know for sure that it works like one of the platforms listed below, you can select that and continue. Note, however, that this might damage the system configuration or downright cripple your computer." -msgstr "Če ste prepričani, da deluje kot kakšna izmed spodaj naštetih platform, lahko le-to izberete in nadaljujete. Lahko pa to poškoduje nastavitev sistema ali ohromi računalnik" +msgstr "Če ste prepričani, da deluje kot kakšno izmed spodaj naštetih okolij, lahko le-to izberete in nadaljujete. Lahko pa to poškoduje nastavitev sistema ali ohromi računalnik" #: ../src/common/gst-platform-dialog.c:212 msgid "Unsupported platform" -msgstr "Nepodprt sistem" +msgstr "Nepodprto okolje" #: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" @@ -779,7 +781,7 @@ #. OPERATION_COMMIT #: ../src/common/gst-tool.c:196 -#: ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "Ni ustreznega dovoljenja za spreminjanje sistemskih nastavitev." @@ -792,19 +794,23 @@ msgid "An unknown error occurred." msgstr "Prišlo je do neznane napake." -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "Pomoč" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "Ni mogoče prikazati pomoči" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "Sistemske nastavitve so spremenjene." -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "Ali naj se posodobi vsebina? Med posodobitvijo bodo izgubljene vse naknadne spremembe." -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -813,6 +819,42 @@ "Prišlo je od napake med preverjanjem overitve: %s\n" "Napako je mogoče prijaviti kot hrošč." +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "Zakleni" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "Odkleni" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "Zaklenjeno" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"Pogovorno okno je odklenjeno.\n" +"Kliknite za preprečitev nadaljnjih sprememb." + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"Pogovorno okno je zaklenjeno.\n" +"Kliknite za spreminjanje zaklepa." + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"Sistemska pravila preprečujejo spremembe.\n" +"Stopite v stik s sistemskim skrbnikom." + #: ../src/network/address-list.c:76 #: ../src/network/hosts.c:31 #: ../src/shares/table.c:38 @@ -856,51 +898,51 @@ msgid "Change _Host name" msgstr "Spremeni ime _gostitelja" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "Samodejne nastavitve (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "Krajevno Zeroconf omrežje (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "Statični naslov IP" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP ključ (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP ključ (hex)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA Osebni" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 Osebni" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN modem" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "Serijski modem" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "Lastnosti %s" @@ -1232,7 +1274,7 @@ #. GST_ROLE_SYSTEM_CONFIGURATION_MANAGEMENT #: ../src/services/service.c:59 msgid "School management platform" -msgstr "Sistem šolskega upravljanja" +msgstr "Okolje šolskega upravljanja" #. GST_ROLE_SCHOOL_MANAGEMENT_PLATFORM #: ../src/services/service.c:60 @@ -1581,11 +1623,11 @@ msgid "You need to install at least either Samba or NFS in order to share your folders." msgstr "Namestiti morate vsaj Sambo ali NFS za souporabo mape." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "Zemljevid sveta" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below." msgstr "Gradnik za izbor časovnega pasu z miško na zemljevidu. Uporabniki tipkovnice lahko časovni pas izberejo iz spodnjega spustnega polja." @@ -1597,35 +1639,35 @@ msgid "Time and Date" msgstr "Čas in datum" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "Podpora za NTP ni nameščena" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "Please install and activate NTP support in the system to enable synchronization of your local time server with internet time servers." msgstr "Namestite in vključite podporo za NTP da bi vključili usklajevanje vašega krajevnega časovnega strežnika s spletnimi časovnimi strežniki." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "Omogočanje NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "Onemogočanje NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "Usklajevanje sistemske ure" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "Ohrani usklajeno s spletnimi strežniki" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "Ročno" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "Nastavitve časa in datuma" @@ -1637,7 +1679,7 @@ #: ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 #: ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "To bi naredilo sistem neuporaben." @@ -1707,102 +1749,102 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "Izberite drugo številčno določilo skupine \"%s\"." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "Ime skupine" #. TRANSLATORS: This applies to a password. Keep the string short. #: ../src/users/main.c:74 -#: ../src/users/user-settings.c:347 +#: ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "Ne vprašaj ob prijavi" #: ../src/users/main.c:74 -#: ../src/users/user-settings.c:349 +#: ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "Vprašanje ob prijavi" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "Nadzor sistema beleženja" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "Oskrbovanje sistema" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "Uporabi zvočne naprave" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "Uporabi CD naprave" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "Zapisovanje CD-jev in DVD-jev" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "Uporabi modem" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "Povezava s strežnikom preko modema" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "Pošiljanje in prejemanje faksov" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "Uporabi disketni pogon" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "Priklopi uporabniški datotečni sistem (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "Nastavitev tiskalnikov" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" -msgstr "Povazava v brežžična ali žična omrežja" +msgstr "Povezava v brežžična ali žična omrežja" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "Samodejni dostop do zunanjih diskovnih naprav" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" -msgstr "Hiberniranje in mirovanje računalnika" +msgstr "Pripravljenost ali mirovanje računalnika" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "Dostop do /proc datotečnega sistema" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "Uporabi preiskovalnike" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "Uporabi tračni pogon" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "Uporabi USB naprave" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "Uporabi VirtualBox sistem" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "Uporabi video naprave" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "Dostop do skrbniških dovoljenj" @@ -1890,15 +1932,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "Preverite, ali ste vpisali isto geslo v obe polji." -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "Izberite drugačno ime." -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "Znova vnesite trenutno geslo." -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "Gesla ni mogoče spremeniti." @@ -1946,33 +1988,33 @@ msgid "Delete Files" msgstr "Izbriši datoteke" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "Izkušeni uporabnik" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "Po meri" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "Brez" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "Neveljavni znak \"%c\" v opombi" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "Preverite, ali ta znak že ni uporabljen." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "Nepopolna pot v domači imenik" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -1980,12 +2022,12 @@ "Vnesite celo pot za domačo mapo\n" "npr.: /home/janez." -#: ../src/users/user-settings.c:447 -#: ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 +#: ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "Nova domača mapa že obstaja. Ali jo želite uporabiti?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. Do you want to use files from this directory, or copy the contents of %s to the new home, overwriting it?\n" @@ -1996,33 +2038,33 @@ "\n" "V kolikor ste v dvomih, uporabite novo mapo in se izognite izgubi podatkov. Datoteke je mogoče kopirati tudi kasneje." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "_Zamenjaj s starimi datotekami" -#: ../src/users/user-settings.c:462 -#: ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 +#: ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "_Prekliči spremembo" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "_Uporabi nove datoteke" -#: ../src/users/user-settings.c:470 -#: ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 +#: ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "Določi uporabnika kot _lastnika domače mape" -#: ../src/users/user-settings.c:473 -#: ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 +#: ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "_Izbriši staro domačo mapo" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. Do you want to use files from this directory, or delete all its contents and use a completely empty home directory?\n" @@ -2033,19 +2075,19 @@ "\n" "V kolikor ste v dvomih, ohranite datoteke in jih izbrišite kasneje." -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "_Izbriši datoteke" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "_Uporabi obstoječe datoteke" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "Ali naj se kopira stara domača mapa na novo mesto?" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. Do you want to copy the contents of the old home directory (%s), or use a completely empty home directory?\n" @@ -2056,35 +2098,35 @@ "\n" "V kolikor želite kopirati vsebino, lahko staro mapo varno izbrišete." -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "_Uporabi prazno mapo" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "_Kopiraj stare datoteke" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "ID skrbnika ni dovoljeno spreminjati" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "Uporabniški ID %d je že uporabljen pri uporabniku %s" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "Izberite drugo številčno določilo za %s." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "Nepopolna pot v ukazni lupini" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2092,33 +2134,45 @@ "Vpišite polno pot za ukazno lupino\n" "npr.: /bin/sh." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "Ni mogoče povrniti skrbniških dovoljenj" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "%s is the only administrator on this computer. Revoking administration rights for this account would lock you out of administrating the system." msgstr "%s je edini skrbnik tega sistema. S preklicom skrbniških dovoljenj za ta račun, onemogočite nadaljnje izvajanje skrbniških opravil celotnega sistema." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "Preklicali boste lastne skrbniške pravice." -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "%s will no longer be able to perform administrative tasks. This account won't be allowed to get administration rights back on its own." msgstr "%s nima več dovoljenja za izvajanje skrbniških nalog. S tem računom ni več mogoče lastnoročno pridobiti skrbniških pravic." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "Prepusti skrbniška dovoljenja" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "Ni mogoče spremeniti uporabniškega ID skrbnika." + +#: ../src/users/user-settings.c:1424 +msgid "You cannot disable your own account, nor change your own home directory or user ID. Run this program from another user's session to edit these settings." +msgstr "Ni mogoče onemogočiti lastnega računa, niti ni mogoče spremeniti lastne domače mape ali pa uporabniškega ID. Za spreminjanje teh nastavitev je treba biti prijavljen z drugim računom." + +#: ../src/users/user-settings.c:1434 +msgid "You cannot change an account's home directory or user ID while the user is logged in." +msgstr "Ni mogoče spremeniti domače mape računa ali pa ID uporabnika, dokler je uporabnik prijavljen." + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "Uveljavljanje sprememb nastavitev uporabnika ..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "Nastavitev uporabnika" @@ -2129,153 +2183,109 @@ #~ msgstr "" #~ "Mapa %s že obstaja. Uporabnik morda nima dovoljenj za branje in " #~ "pisanje v to mapo. Ali jo vseeno želite uporabiti?" - #~ msgid "Allowed Hosts" #~ msgstr "Dovoljeni gostitelji" - #~ msgid "Shared Folder" #~ msgstr "Mape v souporabi" - #~ msgid "" #~ "Enter password for user:" #~ msgstr "" #~ "Vnesite geslo uporabnika:" - #~ msgid "Selection" #~ msgstr "Izbor" - #~ msgid "Time Zone" #~ msgstr "Časovni pas" - #~ msgid "Advanced Settings" #~ msgstr "Napredne nastavitve" - #~ msgid "Automatic UID/GID" #~ msgstr "Samodejni UID/GID" - #~ msgid "Basic Settings" #~ msgstr "Osnovne nastavitve" - #~ msgid "Group Members" #~ msgstr "Člani skupine" - #~ msgid "Optional Settings" #~ msgstr "Izbirne nastavitve" - #~ msgid "Password Settings" #~ msgstr "Nastavitve gesla" - #~ msgid "Profile Settings" #~ msgstr "Nastavitve profila" - #~ msgid "System Defaults" #~ msgstr "Privzete sistemske nastavitve" - #~ msgid "_Short Name:" #~ msgstr "_Kratko ime:" - #~ msgid "Address: %s Subnet mask: %s" #~ msgstr "Naslov: %s Podomrežna maska: %s" - #~ msgid "Address: %s" #~ msgstr "Naslov: %s" - #~ msgid "Address: %s Remote address: %s" #~ msgstr "Naslov: %s Oddaljeni naslov: %s" - #~ msgid "Type: %s Phone number: %s" #~ msgstr "Vrsta: %s Telefonska številka: %s" - #~ msgid "Type: %s Access point name: %s" #~ msgstr "Vrsta: %s Ime odstopne točke: %s" - #~ msgid "Type: %s Ethernet interface: %s" #~ msgstr "Vrsta: %s Vmesnik eterneta: %s" - #~ msgid "Type: %s" #~ msgstr "Vrstas: %s" - #~ msgid "Check password _quality" #~ msgstr "Preveri _kakovost gesla" - #~ msgid "User _password:" #~ msgstr "Uporabnikovo _geslo:" - #~ msgid "User must log out before you can change his ID." #~ msgstr "Uporabnik se mora odjaviti, preden je mogoče spremeniti njegov ID." - #~ msgid "Are you sure you want to delete account \"%s\"?" #~ msgstr "Ali ste prepričani, da želite izbrisati račun \"%s\"?" - #~ msgid "" #~ "This will disable this user's access to the system without deleting the " #~ "user's home directory." #~ msgstr "" #~ "To bo onemogočilo dostop uporabnika do sistema, brez da bi izbrisali " #~ "uporabnikov domači imenik." - #~ msgid "Administrator account's user ID should not be modified" #~ msgstr "Skrbniški ID ne sme biti spremenjen" - #~ msgid "Please enter a different home directory path." #~ msgstr "Izberite drugo pot domače mape." - #~ msgid "Password" #~ msgstr "Geslo" - #~ msgid "" #~ "Allow this user to open a local session without entering his password. " #~ "The password will still be required to perform administrative tasks." #~ msgstr "" #~ "Dovoli uporabniku odpiranje krajevne seje brez vnosa gesla. Geslo bo še " #~ "vedno zahtevano za izvajanje skrbniških nalog." - #~ msgid "_Add Group" #~ msgstr "_Dodaj skupino" - #~ msgid "_Add User" #~ msgstr "_Dodaj uporabnika" - #~ msgid "_Profile:" #~ msgstr "_Profil:" - #~ msgid "_Real name:" #~ msgstr "_Pravo ime:" - #~ msgid "Account '%s' Properties" #~ msgstr "Lastnosti računa '%s'" - #~ msgid "User name is empty" #~ msgstr "Uporabniško ime je prazno" - #~ msgid "A user name must be specified." #~ msgstr "Podano mora biti uporabniško ime." - #~ msgid "User name has invalid characters" #~ msgstr "Uporabniško ime vsebuje neveljavne znake" - #~ msgid "" #~ "Please set a valid user name consisting of a lower case letter followed " #~ "by lower case letters and numbers." #~ msgstr "" #~ "Nastavite veljavno uporabniško ime, ki vsebuje malo črko, ki ji sledijo " #~ "male črke in številke." - #~ msgid "User name \"%s\" already exists" #~ msgstr "Uporabniško ime \"%s\" že obstaja" - #~ msgid "Name" #~ msgstr "Ime" - #~ msgid "Login name" #~ msgstr "Uporabniško ime" - #~ msgid "" #~ "Please enter your root password" #~ msgstr "" #~ "Vnesite skrbniško geslo" - #~ msgid "" #~ "You need administrator privileges to use this tool. Enter a password to " #~ "modify\n" @@ -2284,15 +2294,10 @@ #~ "Za uporabo tega orodja morate imeti skrbniško dovoljenje. Vnesite geslo " #~ "za\n" #~ "spreminjanje nastavitev sistema." - #~ msgid "Contact Information" #~ msgstr "Podrobnosti stika" - -#~ msgid "_Unlock" -#~ msgstr "_Odkleni" - #~ msgid "This action is not allowed" #~ msgstr "Dejanje ni dovoljeno" - #~ msgid "Could not authenticate" #~ msgstr "Ni mogoče overiti" + diff -Nru gnome-system-tools-2.32.0/po/ug.po gnome-system-tools-3.0.0/po/ug.po --- gnome-system-tools-2.32.0/po/ug.po 2010-09-27 16:04:07.000000000 +0000 +++ gnome-system-tools-3.0.0/po/ug.po 2011-01-06 11:17:34.000000000 +0000 @@ -1,14 +1,13 @@ -# Uyghur translation for gnome-system-tools -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Sahran , 2010-09-22. -# +# Uyghur translation for gnome-system-tools +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Sahran , 2010. +# msgid "" msgstr "" "Project-Id-Version: gnome-system-tools\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"system-tools&component=general\n" -"POT-Creation-Date: 2010-09-25 12:50+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools&component=general\n" +"POT-Creation-Date: 2010-12-19 21:45+0000\n" "PO-Revision-Date: 2010-09-22 14:22+0600\n" "Last-Translator: Sahran \n" "Language-Team: Uyghur Computer Science Association \n" @@ -23,11 +22,11 @@ #: ../interfaces/network.ui.h:2 msgid "Account data" -msgstr "ھېساب سانلىق مەلۇماتى" +msgstr "ھېساب سانلىق-مەلۇماتى" #: ../interfaces/network.ui.h:3 msgid "Aliases:" -msgstr "باشقا ئاتى:" +msgstr "تەخەللۇسلار:" #: ../interfaces/network.ui.h:4 msgid "Con_figuration:" @@ -35,15 +34,15 @@ #: ../interfaces/network.ui.h:5 msgid "Connection Settings" -msgstr "ئۇلاش تەڭشىكى" +msgstr "باغلىنىش تەڭشىكى" #: ../interfaces/network.ui.h:6 msgid "Connection type:" -msgstr "ئۇلىنىش تىپى:" +msgstr "باغلىنىش تىپى:" #: ../interfaces/network.ui.h:7 msgid "Connections" -msgstr "ئۇلانمىلار" +msgstr "باغلىنىشلار" #: ../interfaces/network.ui.h:8 msgid "DNS" @@ -67,7 +66,7 @@ #: ../interfaces/network.ui.h:13 msgid "E_nable this connection" -msgstr "بۇ ئۇلىنىشنى قوزغات(_N)" +msgstr "بۇ باغلىنىشنى قوزغات(_N)" #: ../interfaces/network.ui.h:14 ../src/network/ifaces-list.c:335 msgid "Ethernet interface:" @@ -79,7 +78,7 @@ #: ../interfaces/network.ui.h:16 msgid "Hexadecimal" -msgstr "16لىك سىستېما" +msgstr "16 لىك سىستېما" #: ../interfaces/network.ui.h:17 msgid "Host Alias Properties" @@ -103,7 +102,7 @@ #: ../interfaces/network.ui.h:22 msgid "Internet service provider data" -msgstr "تۇتاش تور مۇلازىمىتى تەمىنلەش سودىگىرى سانلىق مەلۇماتى" +msgstr "ئىنتېرنېت مۇلازىمىتى تەمىنلەش سودىگىرى سانلىق-مەلۇماتى" #: ../interfaces/network.ui.h:23 msgid "Location:" @@ -111,7 +110,7 @@ #: ../interfaces/network.ui.h:24 msgid "Loud" -msgstr "يۇقىرى" +msgstr "ئۈنلۈك" #: ../interfaces/network.ui.h:25 msgid "Low" @@ -127,7 +126,7 @@ #: ../interfaces/network.ui.h:28 msgid "Modem Settings" -msgstr "مودېم تەڭشەك" +msgstr "مودېم تەڭشەكلىرى" #: ../interfaces/network.ui.h:29 msgid "Network _password:" @@ -135,7 +134,7 @@ #: ../interfaces/network.ui.h:30 msgid "Network name (_ESSID):" -msgstr "تور ئاتى (_ESSID):" +msgstr "تور ئاتى (ESSID)(_E):" #: ../interfaces/network.ui.h:31 msgid "Off" @@ -147,7 +146,7 @@ #: ../interfaces/network.ui.h:33 msgid "P_assword" -msgstr "ئىم(_P)" +msgstr "ئىم(_A)" #: ../interfaces/network.ui.h:34 msgid "Password _type:" @@ -159,7 +158,7 @@ #: ../interfaces/network.ui.h:36 msgid "Pulses" -msgstr "دولقۇن" +msgstr "سوقما دولقۇن" #: ../interfaces/network.ui.h:37 msgid "Save current network configuration as a location" @@ -175,12 +174,11 @@ #: ../interfaces/network.ui.h:40 msgid "Use the Internet service provider nameservers" -msgstr "" -"تۇتاش تور مۇلازىمىتى تەمىنلەش سودىگىرىنىڭ دائىرە نامى مۇلازىمېتىرىنى ئىشلەت" +msgstr "ئىنتېرنېت مۇلازىمىتى تەمىنلەش سودىگىرىنىڭ دائىرە نامى مۇلازىمېتىرىنى ئىشلەت" #: ../interfaces/network.ui.h:41 msgid "Wireless Settings" -msgstr "سىمسىز تور تەڭشەك" +msgstr "سىمسىز تور تەڭشەكلىرى" #: ../interfaces/network.ui.h:42 msgid "_Autodetect" @@ -224,7 +222,7 @@ #: ../interfaces/network.ui.h:52 msgid "_Retry if the connection breaks or fails to start" -msgstr "ئۇلىنىش ئۈزۈلگەندە ياكى مەغلۇپ بولغاندا قايتا سىنا(_R)" +msgstr "باغلىنىش ئۈزۈلگەندە ياكى مەغلۇپ بولغاندا قايتا سىنا(_R)" #: ../interfaces/network.ui.h:53 msgid "_Set modem as default route to internet" @@ -234,7 +232,7 @@ msgid "_Subnet mask:" msgstr "تارماق تور نىقابلاش كودى(_S):" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "ئىشلەتكۈچى ئاتى(_U):" @@ -245,7 +243,7 @@ #: ../interfaces/services.ui.h:1 msgid "Advanced settings:" -msgstr "ئالىي تەڭشەك:" +msgstr "ئالىي تەڭشەكلەر:" #: ../interfaces/services.ui.h:2 msgid "Select the services that you wish to activate:" @@ -253,15 +251,15 @@ #: ../interfaces/shares.ui.h:1 msgid "Add allowed hosts" -msgstr "يول قويىدىغان ئاساسىي ئاپپارات قوش" +msgstr "يول قويىدىغان ئاساسىي ئاپپاراتلارنى قوش" #: ../interfaces/shares.ui.h:2 msgid "Allowed Hosts" -msgstr "يول قويىدىغان ئاساسىي ئاپپارات:" +msgstr "يول قويىدىغان ئاساسىي ئاپپاراتلار:" #: ../interfaces/shares.ui.h:3 msgid "Allowed hosts:" -msgstr "يول قويىدىغان ئاساسىي ئاپپارات:" +msgstr "يول قويىدىغان ئاساسىي ئاپپاراتلار:" #: ../interfaces/shares.ui.h:4 msgid "Comment:" @@ -273,15 +271,15 @@ #: ../interfaces/shares.ui.h:6 msgid "Enter password for user" -msgstr "ئىشلەتكۈچى ئىم كىرگۈزۈڭ" +msgstr "ئىشلەتكۈچىنىڭ ئىمىنى كىرگۈزۈڭ" #: ../interfaces/shares.ui.h:7 msgid "Enter password for user:" -msgstr "ئىشلەتكۈچى ئىم كىرگۈزۈڭ:" +msgstr "ئىشلەتكۈچىنىڭ ئىمىنى كىرگۈزۈڭ:" #: ../interfaces/shares.ui.h:8 msgid "General Properties" -msgstr "ئادەتتىكى خاسلىق" +msgstr "ئادەتتىكى خاسلىقلار" #: ../interfaces/shares.ui.h:9 msgid "Host name:" @@ -289,7 +287,7 @@ #: ../interfaces/shares.ui.h:10 msgid "Hosts Settings" -msgstr "ئاساسىي ئاپپارات تەڭشەك" +msgstr "ئاساسىي ئاپپارات تەڭشەكلىرى" #: ../interfaces/shares.ui.h:12 msgid "Name:" @@ -313,7 +311,7 @@ #: ../interfaces/shares.ui.h:17 msgid "Share Properties" -msgstr "ھەمبەھىر خاسلىقى" +msgstr "ھەمبەھىر خاسلىقلىرى" #: ../interfaces/shares.ui.h:18 msgid "Share through:" @@ -321,16 +319,16 @@ #: ../interfaces/shares.ui.h:19 msgid "Shared Folder" -msgstr "ھەمبەھىر قىسقۇچ" +msgstr "ھەمبەھىرلەنگەن قىسقۇچ" #: ../interfaces/shares.ui.h:20 ../src/shares/shares.desktop.in.in.h:2 #: ../src/shares/shares-tool.c:237 msgid "Shared Folders" -msgstr "ھەمبەھىر قىسقۇچلار" +msgstr "ھەمبەھىرلەنگەن قىسقۇچلار" #: ../interfaces/shares.ui.h:21 msgid "This computer is a _WINS server" -msgstr "بۇ كومپيۇتېر _WINS مۇلازىمېتىر" +msgstr "بۇ كومپيۇتېر WINS مۇلازىمېتىرىدۇر(_W)" #: ../interfaces/shares.ui.h:22 msgid "Users" @@ -338,7 +336,7 @@ #: ../interfaces/shares.ui.h:23 msgid "WINS _server:" -msgstr "WIN_S مۇلازىمېتىر:" +msgstr "WIN مۇلازىمېتىر(_S):" #: ../interfaces/shares.ui.h:24 msgid "Windows sharing" @@ -346,7 +344,7 @@ #: ../interfaces/shares.ui.h:25 msgid "_Path:" -msgstr "يول:" +msgstr "يول(_P):" #: ../interfaces/shares.ui.h:26 msgid "_Read only" @@ -366,7 +364,7 @@ #: ../interfaces/time.ui.h:4 msgid "Selection" -msgstr "تاللا" +msgstr "تاللانما" #: ../interfaces/time.ui.h:5 msgid "Synchronize now" @@ -378,11 +376,11 @@ #: ../interfaces/time.ui.h:7 msgid "Time servers" -msgstr "ۋاقىت مۇلازىمېتىرى" +msgstr "ۋاقىت مۇلازىمېتىرلىرى" #: ../interfaces/time.ui.h:8 msgid "Time servers:" -msgstr "ۋاقىت مۇلازىمېتىرى:" +msgstr "ۋاقىت مۇلازىمېتىرلىرى:" #: ../interfaces/time.ui.h:9 msgid "Time zone" @@ -412,8 +410,7 @@ msgid "" "A user with this name already exists. Please choose a different name for the " "new user." -msgstr "" -"بۇ ئاتنى ئىشلەتكەن ئىشلەتكۈچى مەۋجۇت. يېڭى ئىشلەتكۈچىگە باشقا ئات تاللاڭ." +msgstr "بۇ ئاتنى ئىشلەتكەن ئىشلەتكۈچى مەۋجۇت. يېڭى ئىشلەتكۈچىگە باشقا ئات تاللاڭ." #: ../interfaces/users.ui.h:2 msgid "Account _type:" @@ -437,7 +434,7 @@ #: ../interfaces/users.ui.h:7 msgid "Basic Settings" -msgstr "ئاساسىي تەڭشەك" +msgstr "ئاساسىي تەڭشەكلەر" #: ../interfaces/users.ui.h:8 msgid "Change Advanced User Settings" @@ -481,7 +478,7 @@ #: ../interfaces/users.ui.h:18 msgid "Create New User" -msgstr "يېڭى ئەزا قوش" +msgstr "يېڭى ئەزا قوشۇش" #: ../interfaces/users.ui.h:19 msgid "Create a new user" @@ -489,9 +486,7 @@ #: ../interfaces/users.ui.h:20 msgid "Days between warning and password expiration:" -msgstr "" -"ئىمنىڭ ۋاقتى ئۆتىدىغان ۋاقىت بىلەن راستىنىلا ۋاقتى ئۆتكەن ۋاقىت " -"ئوتتۇرىسىدىكى كۈننى ئاگاھلاندۇر:" +msgstr "ئىمنىڭ ۋاقتى ئۆتىدىغان ۋاقىت بىلەن راستىنىلا ۋاقتى ئۆتكەن ۋاقىت ئوتتۇرىسىدىكى كۈننى ئاگاھلاندۇر:" #: ../interfaces/users.ui.h:21 msgid "Default _group:" @@ -514,10 +509,7 @@ "Encrypt all your files with your login password to strongly protect them " "from people with physical access to your computer, at the expense of a " "slightly reduced performance." -msgstr "" -"Encrypt all your files with your login password to strongly protect them " -"from people with physical access to your computer, at the expense of a " -"slightly reduced performance." +msgstr "ھەممە ھۆججىتىڭىزنى كىرىش ئىمى بىلەن شىفىرلاپ، كومپيۇتېرىڭىزنى ئىشلىتەلەيدىغان كىشىلەردىن مەخپىي تۇتۇڭ. بۇنداقتا كومپيۇتېرنىڭ سۈرئىتى ئازراق ئاستىلايدۇ" #: ../interfaces/users.ui.h:26 msgid "Full _Name:" @@ -545,11 +537,11 @@ #: ../interfaces/users.ui.h:33 msgid "Groups available on the system:" -msgstr "" +msgstr "سىستېمىدا بار گۇرۇپپىلار:" #: ../interfaces/users.ui.h:34 msgid "Groups settings" -msgstr "گۇرۇپپا تەڭشەك" +msgstr "گۇرۇپپا تەڭشەكلىرى" #: ../interfaces/users.ui.h:35 msgid "Ma_ximum days a password may be used:" @@ -561,7 +553,7 @@ #: ../interfaces/users.ui.h:37 msgid "Maximum UID:" -msgstr "ئەڭ چوڭUID:" +msgstr "ئەڭ چوڭ UID:" #: ../interfaces/users.ui.h:38 msgid "Mi_nimum days between password changes:" @@ -593,23 +585,23 @@ #: ../interfaces/users.ui.h:45 msgid "Optional Settings" -msgstr "تاللاشچان تەڭشەك" +msgstr "تاللاشچان تەڭشەكلەر" #: ../interfaces/users.ui.h:46 msgid "Password Settings" -msgstr "ئىم تەڭشەك" +msgstr "ئىم تەڭشەكلىرى" #: ../interfaces/users.ui.h:47 msgid "Password set to: " -msgstr "ئىم تەڭشەك: " +msgstr "بېكىتىدىغان ئىم: " #: ../interfaces/users.ui.h:48 msgid "Privileges" -msgstr "ھوقۇق" +msgstr "ھوقۇقلار" #: ../interfaces/users.ui.h:49 msgid "Profile Settings" -msgstr "سەپلىمە ھۆججەت تەڭشىكى" +msgstr "سەپلىمە ھۆججەت تەڭشەكلىرى" #: ../interfaces/users.ui.h:50 msgid "Profile _name:" @@ -621,7 +613,7 @@ #: ../interfaces/users.ui.h:52 msgid "System Defaults" -msgstr "سىستېما كۆڭۈلدىكى" +msgstr "سىستېمىنىڭ كۆڭۈلدىكىلىرى" #: ../interfaces/users.ui.h:53 msgid "This account is disabled." @@ -631,9 +623,7 @@ msgid "" "This account is using special settings that have been defined manually. Use " "the Advanced Settings dialog to tune them." -msgstr "" -"بۇ ھېسابات قولدا بەلگىلەنگەن تەڭشەكنى تەڭشەشكە ئىشلىتىلىدۇ. ئالىي تەڭشەك سۆزلەشكۈ ئىشلىتىپ تەڭشىلىدۇ." +msgstr "بۇ ھېسابات قولدا بەلگىلەنگەن تەڭشەكنى تەڭشەشكە ئىشلىتىلىدۇ. ئالىي تەڭشەك سۆزلەشكۈ ئىشلىتىپ تەڭشىلىدۇ." #: ../interfaces/users.ui.h:55 msgid "User ID:" @@ -641,7 +631,7 @@ #: ../interfaces/users.ui.h:56 msgid "User Privileges" -msgstr "ئىشلەتكۈچى ھوقۇقى" +msgstr "ئىشلەتكۈچى ھوقۇقلىرى" #: ../interfaces/users.ui.h:57 msgid "User profiles" @@ -654,8 +644,7 @@ " ➣ lower case letters from the English alphabet\n" " ➣ digits\n" " ➣ any of the characters \".\", \"-\" and \"_\"" -msgstr "" -"ئىشلەتكۈچى ئاتىنىڭ تەركىبىدە بولىدىغىنى:\n" +msgstr "ئىشلەتكۈچى ئاتىنىڭ تەركىبىدە بولىدىغىنى:\n" " ➣ ئىنگلىزچە ئېلىپبەدىكى كىچىك يېزىلىشتىكى ھەرپلەر\n" " ➣ رەقەملەر\n" " ➣ \"-\" خالىغان ھەرپ \".\"، \"_\" ۋە" @@ -665,82 +654,74 @@ msgstr "ئىشلەتكۈچى ئاتى ھەرپتىن باشلىنىشى لازىم!" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "" -"ئىشلەتكۈچى تىزىمغا كىرگەندىن كېيىن ئۇنىڭ ئىشلەتكۈچى كىملىكىنى " -"ئۆزگەرتەلمەيسىز." - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" -msgstr "سەپلىمە ھۆججەت قوش(_L)" +msgstr "سەپلىمە ھۆججەت قوش(_A)" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" -msgstr "ئالىي تەڭشەك(_A)" +msgstr "ئالىي تەڭشەكler(_A)" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "ئۆزگەرت(_C)…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "ئىزاھات(_C)" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "ھازىرقى ئىم(_C):" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "ئىختىيارى(_C)" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" -msgstr "" -"ئىمنىڭ ۋاقتى ئۆتىدىغان ۋاقىت بىلەن راستىنىلا ۋاقتى ئۆتكەن ۋاقىت " -"ئوتتۇرىسىدىكى كۈننى ئاگاھلاندۇر(_D):" +msgstr "ئىمنىڭ ۋاقتى ئۆتىدىغان ۋاقىت بىلەن راستىنىلا ۋاقتى ئۆتكەن ۋاقىت ئوتتۇرىسىدىكى كۈننى ئاگاھلاندۇر(_D):" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "ھېسابات قوزغات(_E)" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" -msgstr "غول مۇندەرىجىنى شىفىرلاپ سەزگۈر سانلىق مەلۇماتلار قوغدا(_E)" +msgstr "غول مۇندەرىجىنى شىفىرلاپ سەزگۈر سانلىق-مەلۇماتلار قوغدا(_E)" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "قۇر(_G)" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "ماكان مۇندەرىجە(_H):" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "ئۆي تېلېفونى(_H):" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "ئاساسىي گۇرۇپپا(_M):" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "گۇرۇپپا باشقۇر(_M)" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "ئاتى(_N):" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "ئىم(_P):" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" -msgstr "_Shell:" +msgstr "Shell(_S):" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "خىزمەت تېلېفونى(_W):" @@ -755,16 +736,17 @@ #: ../org.gnome.system-tools.gschema.xml.in.h:3 msgid "" "Whether the users-admin tool should show system users in the users list." -msgstr "" -"ئىشلەتكۈچى باشقۇرۇش قورالى ئىشلەتكۈچى تىزىملىكىدە سىستېما ئىشلەتكۈچىسىنى " -"كۆرسىتەمدۇ يوق" +msgstr "ئىشلەتكۈچى باشقۇرۇش قورالى ئىشلەتكۈچى تىزىملىكىدە سىستېما ئىشلەتكۈچىسىنى كۆرسىتەمدۇ يوق" #: ../org.gnome.system-tools.gschema.xml.in.h:4 msgid "" "Whether the users-admin tool should show the root user in the users list." +msgstr "ئىشلەتكۈچى باشقۇرۇش قورالى ئىشلەتكۈچى تىزىملىكىدە باشقۇرغۇچى (root) ئىشلەتكۈچىسىنى كۆرسىتەمدۇ يوق" + +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" msgstr "" -"ئىشلەتكۈچى باشقۇرۇش قورالى ئىشلەتكۈچى تىزىملىكىدە باشقۇرغۇچى (root) " -"ئىشلەتكۈچىسىنى كۆرسىتەمدۇ يوق" #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" @@ -776,10 +758,7 @@ "If you know for sure that it works like one of the platforms listed below, " "you can select that and continue. Note, however, that this might damage the " "system configuration or downright cripple your computer." -msgstr "" -"ئەگەر سىستېمىڭىزنىڭ تۆۋەندىكى سۇپا بىلەن ئوخشاشلىقىنى جەزملىسىڭىز، تاللاپ " -"داۋاملاشتۇرۇڭ. دىققەت، بۇنداق بولغاندا سىستېما سەپلىمىسى ياكى كومپيۇتېرغا " -"خەۋپ يەتكۈزۈشى مۇمكىن." +msgstr "ئەگەر سىستېمىڭىزنىڭ تۆۋەندىكى سۇپا بىلەن ئوخشاشلىقىنى جەزملىسىڭىز، تاللاپ داۋاملاشتۇرۇڭ. دىققەت، بۇنداق بولغاندا سىستېما سەپلىمىسى ياكى كومپيۇتېرغا خەۋپ يەتكۈزۈشى مۇمكىن." #: ../src/common/gst-platform-dialog.c:212 msgid "Unsupported platform" @@ -805,7 +784,7 @@ #: ../src/common/gst-tool.c:199 msgid "Invalid data was found." -msgstr "ئىناۋەتسىز سانلىق مەلۇمات بايقالدى" +msgstr "ئىناۋەتسىز سانلىق-مەلۇمات بايقالدى" #. OOBS_RESULT_ERROR #: ../src/common/gst-tool.c:201 @@ -822,18 +801,48 @@ #: ../src/common/gst-tool.c:618 msgid "Update content? This will lose any modification in course." -msgstr "" -"مەزمۇننى يېڭىلىسۇنمۇ؟ بۇنداق بولغاندا ھەر قانداق ئۆزگەرتىش جەريانى يوقاپ " -"كېتىشى مۇمكىن." +msgstr "مەزمۇننى يېڭىلىسۇنمۇ؟ بۇنداق بولغاندا ھەر قانداق ئۆزگەرتىش جەريانى يوقاپ كېتىشى مۇمكىن." #: ../src/common/gst-tool.c:687 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" "You may report this as a bug." +msgstr "ھوقۇق دەلىللىگەندە خاتالىق كۆرۈلدى: %s\n" +"بۇنى كەمتۈك سۈپىتىدە مەلۇم قىلسىڭىز بولىدۇ." + +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "قۇلۇپلا" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "قۇلۇپ ئاچ" + +#: ../src/common/um-lockbutton.c:374 +#| msgid "Loud" +msgid "Locked" +msgstr "قۇلۇپلانغان" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "سۆزلەشكۈ قۇلۇپسىزلاندى.\n" +"ئەمدى ئۆزگەرتمەسلىك ئۈچۈن چېكىڭ" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "سۆزلەشكۈ قۇلۇپلانغان.\n" +"ئۆزگەرتىش ئۈچۈن چېكىڭ" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" msgstr "" -"ھوقۇق دەلىللىگەندە خاتالىق كۆرۈلدى: %s\n" -"بۇ كەمتۈكنى مەلۇم قىلالايسىز." #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 @@ -851,18 +860,17 @@ #: ../src/network/callbacks.c:237 ../src/network/callbacks.c:487 msgid "Changing interface configuration" -msgstr "ئارا يۈز سەپلىمىسىنى ئۆزگەرت" +msgstr "ئارايۈز سەپلىمىسىنى ئۆزگەرت" #: ../src/network/callbacks.c:299 msgid "Could not autodetect modem device" -msgstr "مودېم ئۈسكۈنىسىنى ئۆزلۈكىدىن بايقىيالمىدى" +msgstr "مودېمنى ئۆزلۈكىدىن بايقىيالمىدى" #: ../src/network/callbacks.c:302 msgid "" "Check that the device is not busy and that is correctly attached to the " "computer." -msgstr "" -"ئۈسكۈنىنىڭ ئالدىراش ئەمەسلىكى ۋە كومپيۇتېرغا توغرا چېتىلغانلىقىنى جەزملەڭ." +msgstr "ئۈسكۈنىنىڭ ئالدىراش ئەمەسلىكى ۋە كومپيۇتېرغا توغرا چېتىلغانلىقىنى جەزملەڭ." #: ../src/network/callbacks.c:523 msgid "The host name has changed" @@ -872,59 +880,57 @@ msgid "" "This will prevent you from launching new applications, and so you will have " "to log in again. Continue anyway?" -msgstr "" -" بۇنداق بولغاندا يېڭى قوللىنىشچان پروگرامما قوزغىتىشنى چەكلەيدۇ، شۇڭلاشقا " -"چوقۇم قايتا تىزىمغا كىرىڭ. داۋاملاشتۇرۇۋېرەمسىز؟" +msgstr "بۇنداق بولغاندا يېڭى پروگرامما قوزغىتىشنى چەكلىنىدۇ، شۇڭلاشقا چوقۇم قايتا تىزىمغا كىرىڭ. داۋاملاشتۇرۇۋېرەمسىز؟" #: ../src/network/callbacks.c:532 msgid "Change _Host name" msgstr "ئاساسىي ئاپپارات ئاتىنى ئۆزگەرت(_H)" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "ئۆزلۈكىدىن سەپلەش (DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "يەرلىك Zeroconf تورى (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "مۇقىم IP ئادرېس" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP شىفىرلىق ئاچقۇچ (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP شىفىرلىق ئاچقۇچ (hexadecimal)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "شەخسىي WPA" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "شەخسىي WPA2" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN مودېم" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "ئارقىمۇ-ئارقا مودېم" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "%s خاسلىقى" @@ -940,7 +946,7 @@ #: ../src/network/hosts.c:97 msgid "Aliases" -msgstr "باشقا ئاتى:" +msgstr "تەخەللۇسلار:" #: ../src/network/ifaces-list.c:280 msgid "This network interface is not configured" @@ -958,7 +964,7 @@ #: ../src/network/ifaces-list.c:296 ../src/network/ifaces-list.c:301 #: ../src/network/ifaces-list.c:306 msgid "Address:" -msgstr "مەنزىل:" +msgstr "ئادرېس:" #: ../src/network/ifaces-list.c:298 msgid "Subnet mask:" @@ -979,23 +985,23 @@ #: ../src/network/ifaces-list.c:356 msgid "Wireless connection" -msgstr "سىمسىز تور ئۇلىنىشى" +msgstr "سىمسىز تور باغلىنىشى" #: ../src/network/ifaces-list.c:358 msgid "Infrared connection" -msgstr "ئىنفرا قىزىل نۇر ئۇلىنىشى" +msgstr "ئىنفرا قىزىل نۇر باغلىنىشى" #: ../src/network/ifaces-list.c:360 msgid "Wired connection" -msgstr "سىملىق ئۇلىنىش" +msgstr "سىملىق باغلىنىش" #: ../src/network/ifaces-list.c:362 msgid "Parallel port connection" -msgstr "پاراللېل ئېغىز ئۇلىنىشى" +msgstr "پاراللېل ئېغىز باغلىنىشى" #: ../src/network/ifaces-list.c:364 msgid "Point to point connection" -msgstr "نۇقتىدىن نۇقتىغا ئۇلىنىشى" +msgstr "نۇقتىدىن نۇقتىغا باغلىنىش" #: ../src/network/locations-combo.c:221 msgid "Changing network location" @@ -1024,14 +1030,13 @@ #: ../src/network/main.c:135 msgid "The interface does not exist" -msgstr "ئېغىز مەۋجۇت ئەمەس" +msgstr "تور كارتىسى مەۋجۇت ئەمەس" #: ../src/network/main.c:137 msgid "" "Check that it is correctly typed and that it is correctly supported by your " "system." -msgstr "" -"كىرگۈزگەننىڭ توغرا ئىكەنلىكىنى ھەمدە سىستېمىنىڭ قوللايدىغانلىقىنى جەزملەڭ." +msgstr "كىرگۈزگەننىڭ توغرا ئىكەنلىكىنى ھەمدە سىستېمىنىڭ قوللايدىغانلىقىنى جەزملەڭ." #: ../src/network/main.c:183 msgid "Configure a network interface" @@ -1039,7 +1044,7 @@ #: ../src/network/main.c:183 msgid "INTERFACE" -msgstr "ئارا يۈز" +msgstr "INTERFACE" #: ../src/network/main.c:184 msgid "Configure the first network interface with a specific type" @@ -1051,7 +1056,7 @@ #: ../src/network/network.desktop.in.in.h:1 msgid "Configure network devices and connections" -msgstr "تور ئۈسكۈنىسى ۋە ئۇلىنىشىنى سەپلەش" +msgstr "تور ئۈسكۈنىسى ۋە باغلىنىشىنى سەپلەش" #: ../src/network/network.desktop.in.in.h:2 msgid "Network" @@ -1059,12 +1064,12 @@ #: ../src/network/network-tool.c:280 msgid "Network Settings" -msgstr "تور تەڭشىكى" +msgstr "تور تەڭشەكلىرى" #: ../src/services/callbacks.c:65 #, c-format msgid "Settings for service \"%s\"" -msgstr "\"%s\" مۇلازىمەت تەڭشىكى" +msgstr "مۇلازىمەت \"%s\" نىڭ تەڭشەكلىرى" #: ../src/services/callbacks.c:122 #, c-format @@ -1075,17 +1080,15 @@ msgid "" "This may affect your system behavior in several ways, possibly leading to " "data loss." -msgstr "" -"ئوخشىمىغان ئۇسۇلدا سىستېمىڭىزنىڭ ھەرىكىتىگە تەسىر كۆرسىتىشى مۇمكىن، سانلىق " -"مەلۇمات يوقاپ كېتىشىنى كەلتۈرۈپ چىقىرىشى مۇمكىن." +msgstr "ئوخشىمىغان ئۇسۇلدا سىستېمىڭىزنىڭ ھەرىكىتىگە تەسىر كۆرسىتىشى مۇمكىن، سانلىق-مەلۇمات يوقاپ كېتىشىنى كەلتۈرۈپ چىقىرىشى مۇمكىن." #: ../src/services/service.c:32 msgid "Web server" -msgstr "تور مۇلازىمىتى" +msgstr "تور مۇلازىمېتىرى" #: ../src/services/service.c:32 msgid "Shares your web pages over the Internet" -msgstr "ئىنتېرنېتتا تور بېتىڭىزنى ھەمبەھىر قىلىڭ" +msgstr "ئىنتېرنېتتا تور بېتىڭىزنى ھەمبەھىر قىلىدۇ" #. GST_ROLE_WEB_SERVER #: ../src/services/service.c:33 @@ -1103,7 +1106,7 @@ #: ../src/services/service.c:34 msgid "Allows applications to use printers" -msgstr "قوللىنىشچان پروگرامما پرىنتېر ئىشلىتىشكە يول قوي" +msgstr "پروگراممىنىڭ پرىنتېر ئىشلىتىشىگە يول قوي" #. GST_ROLE_PRINTER_SERVICE #: ../src/services/service.c:35 @@ -1131,11 +1134,11 @@ #. GST_ROLE_MAIL_FETCHER #: ../src/services/service.c:38 msgid "Graphical login manager" -msgstr "گرافىكىلىق تىزىمغا كىرىشنى باشقۇرۇش" +msgstr "كۆزنەكلىك تىزىمغا كىرىش باشقۇرغۇسى" #: ../src/services/service.c:38 msgid "Allows users to login graphically" -msgstr "ئىشلەتكۈچى كۆزنەك ھالىتىدە تىزىمغا كىرىشكە يول قوي" +msgstr "ئىشلەتكۈچىنىڭ كۆزنەكلىك تىزىمغا كىرىشىگە يول قوي" #. GST_ROLE_DISPLAY_MANAGER #: ../src/services/service.c:39 @@ -1144,7 +1147,7 @@ #: ../src/services/service.c:39 msgid "Data storage system" -msgstr "سانلىق مەلۇمات ساقلاش سىستېمىسى" +msgstr "سانلىق-مەلۇمات ساقلاش سىستېمىسى" #. GST_ROLE_DATABASE_SERVER #. GST_ROLE_FILE_SERVER_SMB @@ -1156,7 +1159,7 @@ #: ../src/services/service.c:40 ../src/services/service.c:41 msgid "Shares folders over your network" -msgstr "تورىڭىزدا مۇندەرىجە ھەمبەھىرلەش" +msgstr "تورىڭىزدا مۇندەرىجە ھەمبەھىرلەيدۇ" #. GST_ROLE_FILE_SERVER_NFS #: ../src/services/service.c:42 @@ -1165,7 +1168,7 @@ #: ../src/services/service.c:42 ../src/services/service.c:43 msgid "Shares folders over the Internet" -msgstr "ئىنتېرنېتتا مۇندەرىجە ھەمبەھىرلەش" +msgstr "ئىنتېرنېتتا مۇندەرىجە ھەمبەھىرلەيدۇ" #. GST_ROLE_FILE_SERVER_TFTP #: ../src/services/service.c:44 @@ -1174,9 +1177,7 @@ #: ../src/services/service.c:44 msgid "Synchronizes your computer clock with Internet time servers" -msgstr "" -"كومپيۇتېرىڭىزنىڭ سائىتى بىلەن ئىنتېرنېتتىكى ۋاقىت مۇلازىمېتىرىنى " -"قەدەمداشلايدۇ" +msgstr "كومپيۇتېرىڭىزنىڭ سائىتى بىلەن ئىنتېرنېتتىكى ۋاقىت مۇلازىمېتىرىنى قەدەمداشلايدۇ" #. GST_ROLE_NTP_SERVER #: ../src/services/service.c:46 @@ -1209,11 +1210,11 @@ #. GST_ROLE_SPEECH_SYNTHESIS #: ../src/services/service.c:51 msgid "Computer activity logger" -msgstr "كومپيۇتېر ھەرىكەت كۈندىلىك خاتىرىسى" +msgstr "كومپيۇتېر ھەرىكىتىنى كۈندىلىك خاتىرىلىگۈچ" #: ../src/services/service.c:51 msgid "Keeps a log of your computer activity" -msgstr "كومپيۇتېر ھەرىكەت كۈندىلىك خاتىرىسىنى ساقلاپ قالىدۇ" +msgstr "كومپيۇتېردىكى ھەرىكەتلەرنىڭ خاتىرىسىنى ساقلاپ قالىدۇ" #. GST_ROLE_SYSTEM_LOGGER #: ../src/services/service.c:52 @@ -1237,7 +1238,7 @@ #. GST_ROLE_SECURE_SHELL_SERVER #: ../src/services/service.c:55 msgid "Application server" -msgstr "قوللىنىشچان پروگرامما مۇلازىمېتىرى" +msgstr "پروگرامما مۇلازىمېتىرى" #. GST_ROLE_APPLICATION_SERVER #: ../src/services/service.c:56 @@ -1262,7 +1263,7 @@ #. GST_ROLE_SCHOOL_MANAGEMENT_PLATFORM #: ../src/services/service.c:60 msgid "Network security auditor" -msgstr "تور بىخەتەرلىك تەكشۈرگۈچى" +msgstr "تور بىخەتەرلىك تەكشۈرگۈچ" #. GST_ROLE_SECURITY_AUDITING #: ../src/services/service.c:61 @@ -1337,7 +1338,7 @@ #. GST_ROLE_NSS #: ../src/services/service.c:75 msgid "Virtual Private Network server" -msgstr "تەقلىدىي مەخسۇس تور مۇلازىمېتىرى" +msgstr "مەۋھۇم خۇسۇسىي تور مۇلازىمېتىرى" #. GST_ROLE_VPN_SERVER #: ../src/services/service.c:76 @@ -1382,66 +1383,66 @@ #. GST_ROLE_LTSP_CLIENT #: ../src/services/service.c:84 msgid "Audio settings management" -msgstr "ئاۋاز تەڭشىكى باشقۇرۇش" +msgstr "ئاۋاز تەڭشەكلىرىنى باشقۇرۇش" #. GST_ROLE_AUDIO_MANAGEMENT #: ../src/services/service.c:85 msgid "Volumes mounter" -msgstr "ئەن يۈكلىگۈچ" +msgstr "دىسكا ئېگەرلىگۈچ" #: ../src/services/service.c:85 msgid "Mounts your volumes automatically" -msgstr "دىسكا ئېنىڭىزنى ئۆزلۈكىدىن يۈكلەيدۇ" +msgstr "دىسكىڭىزنى ئۆزلۈكىدىن ئېگەرلەيدۇ" #. GST_ROLE_AUTOMOUNTER #: ../src/services/service.c:86 msgid "Infrared port management" -msgstr "ئىنفرا قىزىل نۇر ئېغىز باشقۇرۇش" +msgstr "ئىنفرا قىزىل نۇر ئېغىزىنى باشقۇرۇش" #. GST_ROLE_INFRARED_MANAGEMENT #: ../src/services/service.c:87 msgid "Braille display management" -msgstr "Braille كۆرسىتىش باشقۇرۇش" +msgstr "Braille كۆرسىتىشنى باشقۇرۇش" #. GST_ROLE_BRAILLE_DISPLAY_MANAGEMENT #: ../src/services/service.c:88 msgid "Bluetooth device management" -msgstr "كۆك چىش ئۈسكۈنىسى باشقۇرۇش" +msgstr "كۆكچىش ئۈسكۈنىسىنى باشقۇرۇش" #. GST_ROLE_BLUETOOTH_MANAGEMENT #: ../src/services/service.c:89 msgid "Hard disk tuning" -msgstr "قاتتىق دىسكا تەڭشەش" +msgstr "قاتتىق دىسكىنى تەڭشەش" #. GST_ROLE_HDD_MANAGEMENT #: ../src/services/service.c:90 msgid "Hotkeys management" -msgstr "تېز كۇنۇپكا باشقۇرۇش" +msgstr "تېزلەتمە باشقۇرۇش" #. GST_ROLE_HOTKEYS_MANAGEMENT #: ../src/services/service.c:91 msgid "Power management" -msgstr "توك مەنبە باشقۇرۇش" +msgstr "توك مەنبەسىنى باشقۇرۇش" #. GST_ROLE_POWER_MANAGEMENT #: ../src/services/service.c:92 msgid "Logical volume management" -msgstr "لوگىكىلىق ئەن باشقۇرۇش" +msgstr "لوگىكىلىق دىسكىنى باشقۇرۇش" #. GST_ROLE_LVM_MANAGEMENT #: ../src/services/service.c:93 msgid "Cluster management tool" -msgstr "دىسكا پارچىسى باشقۇرۇش قورالى" +msgstr "دىسكا پارچىسىنى باشقۇرۇش قورالى" #. GST_ROLE_CLUSTER_MANAGEMENT #: ../src/services/service.c:94 msgid "Fax settings management" -msgstr "فاكىس تەڭشەك باشقۇرۇش" +msgstr "فاكىس تەڭشىكىنى باشقۇرۇش" #. GST_ROLE_FAX_MANAGEMENT #: ../src/services/service.c:95 msgid "RAID disks management" -msgstr "RAID دىسكا باشقۇرۇش" +msgstr "RAID دىسكىلىرىنى باشقۇرۇش" #. GST_ROLE_RAID_MANAGEMENT #: ../src/services/service.c:96 @@ -1451,22 +1452,22 @@ #. GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT #: ../src/services/service.c:97 msgid "CPU Frequency manager" -msgstr "CPU چاستوتا باشقۇرۇش" +msgstr "CPU چاستوتىسىنى باشقۇرۇش" #. GST_ROLE_CPUFREQ_MANAGEMENT #: ../src/services/service.c:98 msgid "Eagle USB ADSL modems manager" -msgstr "Eagle USB ADSL مودېم باشقۇرۇش" +msgstr "Eagle USB ADSL مودېملىرىنى باشقۇرۇش" #. GST_ROLE_EAGLE_USB_MODEMS_MANAGEMENT #: ../src/services/service.c:99 msgid "Serial port settings management" -msgstr "ئارقىمۇ-ئارقا ئېغىز تەڭشەشنى باشقۇرۇش" +msgstr "ئارقىمۇ-ئارقا ئېغىز تەڭشەشلىرىنى باشقۇرۇش" #. GST_ROLE_SERIAL_PORTS_MANAGEMENT #: ../src/services/service.c:100 msgid "ISDN modems manager" -msgstr "ISDN مودېم باشقۇرۇش" +msgstr "ISDN مودېملىرىنى باشقۇرۇش" #. GST_ROLE_ISDN_MANAGEMENT #: ../src/services/service.c:101 @@ -1519,7 +1520,7 @@ #: ../src/services/service-settings-table.c:192 msgid "Status" -msgstr "ھالەت" +msgstr "ھالىتى" #: ../src/services/service-settings-table.c:211 msgid "Priority" @@ -1527,7 +1528,7 @@ #: ../src/services/services-tool.c:106 msgid "Services Settings" -msgstr "مۇلازىمەت تەڭشىكى" +msgstr "مۇلازىمەتلەر تەڭشىكى" #: ../src/shares/callbacks.c:196 msgid "Are you sure you want to delete this share?" @@ -1551,7 +1552,7 @@ #: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" -msgstr "بۇ مۇندەرىجىنى باشقا كومپيۇتېرلارغا ھەمبەھىرلەش" +msgstr "بۇ مۇندەرىجىنى باشقا كومپيۇتېرلارغا ھەمبەھىرلەيدۇ" #: ../src/shares/nfs-acl-table.c:50 msgid "Allowed host/network" @@ -1559,15 +1560,15 @@ #: ../src/shares/share-nfs-add-hosts.c:117 msgid "Specify hostname" -msgstr "بەلگىلەنگەن ئاساسىي ئاپپارات ئاتى" +msgstr "ئاساسىي ئاپپارات ئاتىنى بەلگىلىمەك" #: ../src/shares/share-nfs-add-hosts.c:124 msgid "Specify IP address" -msgstr "بەلگىلەنگەن IP ئادرېس" +msgstr "IP ئادرېسنى بەلگىلىمەك" #: ../src/shares/share-nfs-add-hosts.c:131 msgid "Specify network" -msgstr "بەلگىلەنگەن تور" +msgstr "تورنى بەلگىلىمەك" #: ../src/shares/shares.desktop.in.in.h:1 msgid "Configure which folders are available for your network neighborhood" @@ -1592,7 +1593,7 @@ #: ../src/shares/share-settings.c:462 #, c-format msgid "Settings for folder '%s'" -msgstr "'%s' مۇندەرىجە تەڭشىكى" +msgstr "قىسقۇچ '%s'نىڭ تەڭشەكلىرى" #: ../src/shares/share-settings.c:469 msgid "Share Folder" @@ -1600,28 +1601,23 @@ #: ../src/shares/shares-tool.c:152 msgid "Sharing services are not installed" -msgstr "ھەمبەھىر مۇلازىمىتى قاچىلانمىدى" +msgstr "ھەمبەھىر مۇلازىمىتى قاچىلانماپتۇ" #: ../src/shares/shares-tool.c:154 msgid "" "You need to install at least either Samba or NFS in order to share your " "folders." -msgstr "" -"سىز ھېچ بولمىغاندا Samba ياكى NFS قاچىلىسىڭىز ئاندىن مۇندەرىجىنى ھەمبەھىر " -"قىلالايسىز." +msgstr "سىز ھېچ بولمىغاندا Samba ياكى NFS قاچىلىسىڭىز ئاندىن مۇندەرىجىنى ھەمبەھىر قىلالايسىز." -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "دۇنيا خەرىتىسى" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." -msgstr "" -"چاشقىنەكتە مەشغۇلات قىلىنىدىغان خەرىتە بۆلىكىدىن ۋاقىت رايونىنى تاللىغىلى " -"بولىدۇ. ھەرپتاختا ئىشلەتكۈچىلىرى تۆۋەندىكى بىرىكمە رامكىدىن ۋاقىت رايونى " -"تاللىسا بولىدۇ." +msgstr "چاشقىنەكتە مەشغۇلات قىلىنىدىغان خەرىتە بۆلىكىدىن ۋاقىت رايونىنى تاللىغىلى بولىدۇ. ھەرپتاختا ئىشلەتكۈچىلىرى تۆۋەندىكى بىرىكمە رامكىدىن ۋاقىت رايونى تاللىسا بولىدۇ." #: ../src/time/time.desktop.in.in.h:1 msgid "Change system time, date, and timezone" @@ -1631,40 +1627,37 @@ msgid "Time and Date" msgstr "ۋاقىت ۋە چېسلا" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP قوللاش قاچىلانمىغان" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." -msgstr "" -"سىستېمىغا NTP قوللاشنى قاچىلاپ ئاكتىپلاڭ، شۇ چاغدا يەرلىك ۋاقىت مۇلازىمېتىرى " -"بىلەن تۇتاش تور ۋاقىت مۇلازىمېتىرىنى قەدەمداش قىلىش ئىقتىدارىنى قوزغاتقىلى " -"بولىدۇ." +msgstr "سىستېمىغا NTP قوللاشنى قاچىلاپ ئاكتىپلاڭ، شۇ چاغدا يەرلىك ۋاقىت مۇلازىمېتىرى بىلەن ئىنتېرنېت ۋاقىت مۇلازىمېتىرىنى قەدەمداش قىلىش ئىقتىدارىنى قوزغاتقىلى بولىدۇ." -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "NTP قوزغات" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "NTP چەكلە" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "سىستېما سائىتىنى قەدەمداشلا" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" -msgstr "تۇتاش تور مۇلازىمېتىرى بىلەن قەدەمداشلىقنى ساقلا" +msgstr "ئىنتېرنېت مۇلازىمېتىرى بىلەن قەدەمداشلىقنى ساقلا" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "قولدا" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "ۋاقىت ۋە چېسلا تەڭشىكى" @@ -1674,7 +1667,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "بۇنداق بولغاندا سىستېمىنى ئىشلەتكىلى بولمايدۇ." @@ -1685,9 +1678,7 @@ #: ../src/users/group-settings.c:74 msgid "This may leave files with invalid group ID in the filesystem." -msgstr "" -"بۇنداق بولغاندا ھۆججەت سىستېمىسىدىكى بەزى ھۆججەت گۇرۇپپا ID ئىناۋەتسىز " -"بولىدۇ." +msgstr "بۇنداق بولغاندا ھۆججەت سىستېمىسىدىكى بەزى ھۆججەت گۇرۇپپا ID ئىناۋەتسىز بولىدۇ." #: ../src/users/group-settings.c:144 msgid "New group" @@ -1718,9 +1709,7 @@ msgid "" "Please set a valid group name consisting of a lower case letter followed by " "lower case letters and numbers." -msgstr "" -"ئىناۋەتلىك گۇرۇپپا ئاتىدىن بىرنى بەلگىلەڭ، بىرىنچى ھەرپى كىچىك يېزىلسۇن، " -"كېيىنكى ھەرپلەرگە كىچىك يېزىلىشتىكى ھەرپ ۋە سان كەلسە بولىدۇ." +msgstr "ئىناۋەتلىك گۇرۇپپا ئاتىدىن بىرنى بەلگىلەڭ، بىرىنچى ھەرپى كىچىك يېزىلسۇن، كېيىنكى ھەرپلەرگە كىچىك يېزىلىشتىكى ھەرپ ۋە سان كەلسە بولىدۇ." #: ../src/users/group-settings.c:229 #, c-format @@ -1750,100 +1739,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "\"%s\" گۇرۇپپىغا پەرقلىق رەقەملىك بەلگە تاللاڭ." -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "گۇرۇپپا ئاتى" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "تىزىمغا كىرگەندە سورىما" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "تىزىمغا كىرگەندە سورا" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" -msgstr "نازارەت سىستېما كۈندىلىك خاتىرىسى" +msgstr "سىستېما كۈندىلىك خاتىرىسىنى كۆزەتمەك" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "سىستېما باشقۇرۇش" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "ئۈن ئۈسكۈنىسى ئىشلەت" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" -msgstr "CD-ROM قوزغاتقۇچ ئىشلەت" +msgstr "CD-ROM قوزغاتقۇچىنى ئىشلەت" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "CDs / DVDs غا يازماق" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "مودېم ئىشلەت" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" -msgstr "مودېم ئىشلىتىپ ئىنتېرنېتقا ئۇلا" +msgstr "مودېم ئىشلىتىپ ئىنتېرنېتقا باغلىنىدۇ" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "فاكىس يوللاش ۋە قوبۇللاش" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "يۇمشاق دىسكا قوزغاتقۇچ ئىشلەت" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" -msgstr "ئىشلەتكۈچى بوشلۇق ھۆججەت سىستېمىسى يۈكلەيدۇ (FUSE)" +msgstr "ئىشلەتكۈچى بوشلۇق ھۆججەت سىستېمىسى ئېگەرلەيدۇ (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "پرىنتېر سەپلەش" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" -msgstr "سىملىق ۋە سىمسىز تورغا ئۇلايدۇ" +msgstr "سىملىق ۋە سىمسىز تورغا باغلانماق" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "سىرتقى ئۈسكۈنىلەرنى ئاپتوماتىك زىيارەت قىلىدۇ" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" -msgstr "كومپيۇتېرنى ئېسىپ قويىدۇ ياكى ئۇخلىتىدۇ" +msgstr "كومپيۇتېرنى ۋاقىتلىق توختىتىدۇ ياكى ئۇخلىتىدۇ" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "/proc ھۆججەت سىستېما زىيارىتى" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" -msgstr "scanner ئىشلەت" +msgstr "شولىلىغۇچ ئىشلەت" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "ماگنىتلىق لېنتا ئۈسكۈنىسى ئىشلەت" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "USB ئۈسكۈنىسى ئىشلەت" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "VirtualBox مەۋھۇملاشتۇرۇش لايىھىسى ئىشلەت" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "سىن ئۈسكۈنىسى ئىشلەت" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "باشقۇرغۇچى ھوقۇقىغا ئېرىشىشكە بولىدۇ" @@ -1855,21 +1844,17 @@ msgid "" "Can change anything on the system, including installing and upgrading " "software." -msgstr "" -"سىستېمىدىكى ھەممە نەرسىنى ئۆزگەرتەلەيسىز، ئورنىتىش ۋە يۇمشاق دېتال يېڭىلاشمۇ " -"بۇنىڭ ئىچىدە." +msgstr "سىستېمىدىكى ھەممە نەرسىنى ئۆزگەرتەلەيسىز، ئورنىتىش ۋە يۇمشاق دېتال يېڭىلاشمۇ بۇنىڭ ئىچىدە." #: ../src/users/user-profiles.conf.in.h:3 msgid "" "Can perform common tasks. Can't install software or change settings " "affecting all users." -msgstr "" -"ئادەتتىكى ۋەزىپىنى ئىجرا قىلالمايدۇ. يۇمشاق دېتال ئورنىتالمايدۇ ياكى ھەممە " -"ئىشلەتكۈچىگە تەسىر كۆرسىتىدىغان تەڭشەكنى ئۆزگەرتەلمەيدۇ." +msgstr "ئادەتتىكى ۋەزىپىنى ئىجرا قىلالمايدۇ. يۇمشاق دېتال ئورنىتالمايدۇ ياكى ھەممە ئىشلەتكۈچىگە تەسىر كۆرسىتىدىغان تەڭشەكنى ئۆزگەرتەلمەيدۇ." #: ../src/users/user-profiles.conf.in.h:4 msgid "Desktop user" -msgstr "ئۈستەل ئۈستى ئىشلەتكۈچىسى" +msgstr "ئۈستەلئۈستى ئىشلەتكۈچىسى" #: ../src/users/run-passwd.c:421 msgid "Authentication failed" @@ -1931,9 +1916,7 @@ msgid "" "User passwords must be longer than 5 characters and preferably formed by " "numbers, letters and special characters." -msgstr "" -"ئىشلەتكۈچى ئىمى چوقۇم 5 ھەرپتىن كۆپ بولسۇن، ئەڭ ياخشىسى ھەرپ، سان، ئالاھىدە " -"ھەرپ بەلگىلەردىن تەركىب تاپسۇن." +msgstr "ئىشلەتكۈچى ئىمى چوقۇم 5 ھەرپتىن كۆپ بولسۇن، ئەڭ ياخشىسى ھەرپ، سان، ئالاھىدە ھەرپ بەلگىلەردىن تەركىب تاپسۇن." #: ../src/users/user-password.c:101 msgid "Password confirmation is not correct" @@ -1943,15 +1926,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "ئىككى تېكىست رامكىسىغا كىرگۈزگەن ئىمنىڭ ئوخشاشلىقىنى جەزملەڭ." -#: ../src/users/user-password.c:445 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "باشقا ئىم تاللاڭ." -#: ../src/users/user-password.c:456 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "ھازىرقى ئىمنى قايتا كىرگۈزۈڭ." -#: ../src/users/user-password.c:463 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "ئىمنى ئۆزگەرتكىلى بولمىدى" @@ -1970,16 +1953,14 @@ #: ../src/users/user-settings.c:109 msgid "Can't delete the only administrator account" -msgstr "بىردىنبىر باشقۇرغۇچىنى ئۆچۈرەلمەيدۇ" +msgstr "باشقۇرغۇچىنىلا ئۆچۈرگىلى بولمايدۇ" #: ../src/users/user-settings.c:111 #, c-format msgid "" "%s is the only administrator on this computer. Deleting this account would " "lock you out of administrating the system." -msgstr "" -"%s بۇ كومپيۇتېردىكى بىردىنبىر باشقۇرغۇچى. بۇ ھېسابات ئۆچۈرۈلسە سىستېمىنى " -"باشقۇرالمايسىز." +msgstr "%s بۇ كومپيۇتېردىكى بىردىنبىر باشقۇرغۇچى. بۇ ھېسابات ئۆچۈرۈلسە سىستېمىنى باشقۇرالمايسىز." #: ../src/users/user-settings.c:121 #, c-format @@ -1992,11 +1973,7 @@ "Files owned by user %s in %s can be completely removed if you don't " "need them anymore. You may want to back them up before deleting the account, " "or keep them so that an administrator can save them later." -msgstr "" -"%s ئىشلەتكۈچىنىڭ %sدىكى ھۆججىتىنى پۈتۈنلەي چىقىرىۋەتكىلى بولىدۇ، " -"ئەگەر ئۇنىڭغا ئېھتىياجلىق بولمىسىڭىز. ھېساباتنى ئۆچۈرۈشتىن ئىلگىرى ئۇلارنى " -"زاپاسلىۋالسىڭىز بولىدۇ ياكى ئۇلارنى ساقلاپ قېلىپ سىستېما باشقۇرغۇچى كېيىن " -"ساقلىۋالسىمۇ بولىدۇ." +msgstr "%s ئىشلەتكۈچىنىڭ %sدىكى ھۆججىتىنى پۈتۈنلەي چىقىرىۋەتكىلى بولىدۇ، ئەگەر ئۇنىڭغا ئېھتىياجلىق بولمىسىڭىز. ھېساباتنى ئۆچۈرۈشتىن ئىلگىرى ئۇلارنى زاپاسلىۋالسىڭىز بولىدۇ ياكى ئۇلارنى ساقلاپ قېلىپ سىستېما باشقۇرغۇچى كېيىن ساقلىۋالسىمۇ بولىدۇ." #: ../src/users/user-settings.c:132 msgid "Keep Files" @@ -2010,47 +1987,44 @@ msgid "Delete Files" msgstr "ھۆججەت ئۆچۈر" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "ئالاھىدە ئىشلەتكۈچى" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "ئىختىيارى" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "يوق" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "ئىزاھات \"%c\" دا ئىناۋەتسىز ھەرپ بار" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "بۇ ھەرپنىڭ ئىشلىتىلمىگەنلىكىنى تەكشۈرۈڭ." -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "باش مۇندەرىجىنىڭ يولى تولۇق ئەمەس" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." -msgstr "" -"باش مۇندەرىجىنىڭ تولۇق يولىنى كىرگۈزۈڭ\n" +msgstr "باش مۇندەرىجىنىڭ تولۇق يولىنى كىرگۈزۈڭ\n" "مەسىلەن: /home/john." -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 -#, fuzzy -#| msgid "Home directory already exists" +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" -msgstr "باش مۇندەرىجە بۇرۇنلا مەۋجۇت" +msgstr "ماكان مۇندەرىجە بۇرۇنلا مەۋجۇت، ئۇنى ئىشلىتەمسىز؟" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2059,36 +2033,34 @@ "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." -msgstr "" +msgstr "%s ئۈچۈن بېكىتىلگەن ماكان مۇندەرىجە %s مەۋجۇت. بۇ مۇندەرىجىدىكى ھۆججەتلەرنى ئىشلىتەمسىز ياكى %s دىكى ھۆججەتلەرنى يېڭى ماكان مۇندەرىجىگە كۆچۈرەمسىز؟\n" +"\n" +"ئىككىلىنىپ قالسىڭىز، سانلىق-مەلۇماتلارنىڭ يوقالماسلىقى ئۈچۈن يېڭى مۇندەرىجىنى ئىشلىتىپ، كونا مۇندەرىجىدىكى ھۆججەتلەرنى كېيىن كۆچۈرۈۋالسىڭىزمۇ بولىدۇ." -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" -msgstr "" +msgstr "كونا ھۆججەت بىلەن ئالماشتۇر(_R)" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" -msgstr "" +msgstr "ئۆزگەرتىشتىن ۋاز كەچ(_C)" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 -#, fuzzy -#| msgid "Keep Files" +#: ../src/users/user-settings.c:470 msgid "_Use New Files" -msgstr "ھۆججەتنى ساقلاپ قال" +msgstr "يېڭى ھۆججەت ئىشلەت(_U)" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" -msgstr "" +msgstr "ئىشلەتكۈچىنى يېڭى ماكان مۇندەرىجىنىڭ ئىگىسى قىل(_O)" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 -#, fuzzy -#| msgid "Incomplete path in home directory" +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" -msgstr "باش مۇندەرىجىنىڭ يولى تولۇق ئەمەس" +msgstr "كونا ماكان مۇندەرىجىنى ئۆچۈر(_D)" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2096,23 +2068,23 @@ "use a completely empty home directory?\n" "\n" "In doubt, keep the files, and remove them later if needed." -msgstr "" +msgstr "%s ئۈچۈن بېكىتىلگەن ماكان مۇندەرىجە %s مەۋجۇت. بۇ مۇندەرىجىدىكى ھۆججەتلەرنى ئىشلىتەمسىز ياكى ھەممە نەرسىنى ئۆچۈرۈپ پۈتۈنلەي قۇرۇق بولغان ماكان مۇندەرىجىنى ئىشلىتەمسىز؟\n" +"\n" +"ئىككىلىنىپ قالسىڭىز، ھۆججەتلەرنى ساقلاپ قېلىپ، زۆرۈر بولغاندا كېيىن ئۆچۈرسىڭىزمۇ بولىدۇ." -#: ../src/users/user-settings.c:503 -#, fuzzy -#| msgid "Delete Files" +#: ../src/users/user-settings.c:508 msgid "_Delete Files" -msgstr "ھۆججەت ئۆچۈر" +msgstr "ھۆججەت ئۆچۈر(_D)" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" -msgstr "" +msgstr "مەۋجۇت ھۆججەت ئىشلەت(_U)" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" -msgstr "" +msgstr "كونا ماكان مۇندەرىجىنى يېڭى ئورۇنغا كۆچۈرەمدۇ؟" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2121,81 +2093,94 @@ "\n" "If you choose to copy the files to the new location, it's safe to delete the " "old directory." -msgstr "" +msgstr "%s ئۈچۈن بېكىتىلگەن ماكان مۇندەرىجە %s مەۋجۇت ئەمەس. كونا ماكان مۇندەرىجىدىكى(%s) مەزمۇنلارنى كۆچۈرۈپ كېلەمسىز؟ پۈتۈنلەي قۇرۇق بولغان ماكان مۇندەرىجىنى ئىشلىتەمسىز؟\n" +"\n" +"ئەگەر يېڭى ئورۇنغا كۆچۈرسىڭىز، كونا مۇندەرىجىنى ئۆچۈرۈۋەتسىڭىزمۇ بولۇۋېرىدۇ." -#: ../src/users/user-settings.c:539 -#, fuzzy -#| msgid "Use this directory" +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" -msgstr "مۇشۇ مۇندەرىجىنى ئىشلەت" +msgstr "بوش مۇندەرىجىنى ئىشلەت(_U)" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" -msgstr "" +msgstr "كونا ھۆججەتنى كۆچۈر(_P)" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "root ئىشلەتكۈچىنىڭ ID سى ئۆزگەرتىلمەسلىكى كېرەك" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" -msgstr "ئىسلەتكۇچى ID سى %d ئاللىقاچان %s ئىشلەتكۈچى تەرىپىدىن ئىشلىتىلگەن" +msgstr "%d ئىشلەتكۈچى ID سى ئاللىقاچان %s ئىشلەتكۈچى تەرىپىدىن ئىشلىتىلگەن" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." -msgstr " %s ئۈچۈن ئوخشىمىغان رەقەملىك ID كىرگۈزۈڭ." +msgstr "%s ئۈچۈن ئوخشىمىغان رەقەملىك كىملىك كىرگۈزۈڭ." -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "shell يولى تولۇق ئەمەس" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." -msgstr "" -"shell نىڭ تولۇق يولىنى كىرگۈزۈڭ\n" +msgstr "shell نىڭ تولۇق يولىنى كىرگۈزۈڭ\n" "مەسىلەن: /bin/bash." -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "باشقۇرغۇچى ھوقۇقىدىن ئېلىۋەتكىلى بولمىدى." -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." -msgstr "" -"%s كومپيۇتېردىكى بىردىن-بىر باشقۇرغۇچى. ئۇنىڭ ھوقۇقىنى ئېلىۋەتسىڭىز، " -"سىستېمىڭىز مەڭگۈ باشقۇرغۇچىسىز ھالەتتە قالىدۇ." +msgstr "%s كومپيۇتېردىكى بىردىن-بىر باشقۇرغۇچى. ئۇنىڭ ھوقۇقىنى ئېلىۋەتسىڭىز، سىستېمىڭىز مەڭگۈ باشقۇرغۇچىسىز ھالەتتە قالىدۇ." -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "ئۆزىڭىزنىڭ باشقۇرغۇچىلىق ھوقۇقىڭىزنى ئېلىۋەتمەكچى بولۇۋاتىسىز." -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." -msgstr "" -"%s باشقۇرغۇچىلىق ھوقۇقىنى يۈرگۈزەلمەيدۇ. ئۇ ئۆزىنىڭ باشقۇرغۇچىلىق ھوقۇقىنى " -"ئەمدى ئەسلىگە كەلتۈرەلمەيدۇ." +msgstr "%s باشقۇرغۇچىلىق ھوقۇقىنى يۈرگۈزەلمەيدۇ. ئۇ ئۆزىنىڭ باشقۇرغۇچىلىق ھوقۇقىنى ئەمدى ئەسلىگە كەلتۈرەلمەيدۇ." -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "باشقۇرغۇچى ھوقۇقىدىن ۋاز كەچ" -#: ../src/users/user-settings.c:1469 -msgid "Applying changes to user settings..." +#: ../src/users/user-settings.c:1416 +#| msgid "You can't change user ID while the user is logged in." +msgid "You cannot change the user ID for the superuser account." +msgstr "" + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." msgstr "" -#: ../src/users/users-tool.c:288 +#: ../src/users/user-settings.c:1434 +#| msgid "You can't change user ID while the user is logged in." +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "" + +#: ../src/users/user-settings.c:1512 +msgid "Applying changes to user settings..." +msgstr "ئۆزگەرتىشنى ئىشلەتكۈچى تەڭشىكىگە قوللىنىۋاتىدۇ…" + +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "ئىشلەتكۈچى تەڭشىكى" diff -Nru gnome-system-tools-2.32.0/po/zh_CN.po gnome-system-tools-3.0.0/po/zh_CN.po --- gnome-system-tools-2.32.0/po/zh_CN.po 2010-09-13 09:28:10.000000000 +0000 +++ gnome-system-tools-3.0.0/po/zh_CN.po 2011-04-02 12:55:08.000000000 +0000 @@ -1,19 +1,20 @@ # Simplified Chinese translation of gnome-system-tools -# Copyright (C) 2010 Free Software Foundation, Inc. +# Copyright (C) 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the gnome-system-tools package. # Xun Zhang , 2003. # QAed by lark and fundawang, 2004. # Eleanor Chen , 2010. # Tao Wang , 2010. # Dean Lee , 2010. +# Yinghua Wang , 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-system-tools master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"system-tools&component=general\n" -"POT-Creation-Date: 2010-09-05 21:38+0000\n" -"PO-Revision-Date: 2010-09-06 21:06+0800\n" +"system-tools&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-13 15:52+0000\n" +"PO-Revision-Date: 2011-03-18 21:27+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" @@ -238,7 +239,7 @@ msgid "_Subnet mask:" msgstr "子网掩码(_S)：" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "用户名(_U)：" @@ -664,78 +665,74 @@ msgstr "用户名必须以字母开始！" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "您不能在用户已经登录时更改用户 ID。" - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "添加配置(_A)" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "高级设置(_A)：" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." msgstr "更改(_C)..." -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "注释(_C)" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "当前密码(_P)：" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "自定义(_C)" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "警告和密码过期间的天数(_D)：" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "启用账户(_E)" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "加密主目录以保护敏感数据(_E)" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "生成(_G)" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "主目录(_H)：" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "家庭电话(_H)：" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "主组(_M)：" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "管理组(_M)" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "名称(_N)：" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "密码(_P)：" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell：" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "工作电话(_W)：" @@ -757,6 +754,11 @@ "Whether the users-admin tool should show the root user in the users list." msgstr "用户管理工具是否在用户列表中显示 root 用户。" +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "获取系统权限出错：%s" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "本工具不支持您正在运行的平台" @@ -789,7 +791,7 @@ msgstr "系统管理员不允许您访问系统配置。" #. OPERATION_COMMIT -#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:685 +#: ../src/common/gst-tool.c:196 ../src/common/gst-tool.c:704 msgid "You are not allowed to modify the system configuration." msgstr "您不被允许修改系统配置。" @@ -802,19 +804,23 @@ msgid "An unknown error occurred." msgstr "发生未知的错误。" -#: ../src/common/gst-tool.c:422 +#: ../src/common/gst-tool.c:414 +msgid "Help" +msgstr "帮助" + +#: ../src/common/gst-tool.c:445 msgid "Could not display help" msgstr "无法显示帮助" -#: ../src/common/gst-tool.c:616 +#: ../src/common/gst-tool.c:635 msgid "The system configuration has potentially changed." msgstr "系统配置可能已更改。" -#: ../src/common/gst-tool.c:618 +#: ../src/common/gst-tool.c:637 msgid "Update content? This will lose any modification in course." msgstr "更新内容吗？这将会丢失所有正进行的修改。" -#: ../src/common/gst-tool.c:687 +#: ../src/common/gst-tool.c:706 #, c-format msgid "" "An error occurred while checking for authorizations: %s\n" @@ -823,6 +829,42 @@ "在检查授权的时候发生了一个错误：%s\n" "您可以作为 bug 报告这个问题。" +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "锁定" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "解锁" + +#: ../src/common/um-lockbutton.c:374 +msgid "Locked" +msgstr "已锁定" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" +"对话框已解锁。\n" +"点击来避免更多的更改" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" +"对话框已锁定。\n" +"点击来进行更改" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" +"系统策略不允许进行更改。\n" +"联系您的系统管理员" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -865,51 +907,51 @@ msgid "Change _Host name" msgstr "更改主机名(_H)" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "自动配置(DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "本地 Zeroconf 网络(IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "静态 IP 地址" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP 密钥(ASCII)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP 密钥(十六进制)" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA 个人" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 个人" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN 调制解调器" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "串行调制解调器" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr " %s 属性" @@ -1588,11 +1630,11 @@ "folders." msgstr "您需要至少安装 Samba 或 NFS 才能共享文件夹。" -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "世界地图" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1608,11 +1650,11 @@ msgid "Time and Date" msgstr "时间和日期" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "NTP 支持未安装" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." @@ -1620,27 +1662,27 @@ "请在系统中安装并激活 NTP 支持，以启用将您的本地时间服务器与 Internet 时间服务" "器同步的功能。" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "启用 NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "禁用 NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "同步系统时钟" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "与互联网服务器保持同步" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "手动" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "时间和日期设置" @@ -1650,7 +1692,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "这将使得系统不可用。" @@ -1722,100 +1764,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "请为组“%s”选择不同的数字标识符。" -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "组名" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "登录时不询问" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "登录时询问" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "监视系统日志" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "管理系统" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "使用音频设备" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "使用 CD-ROM 驱动器" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "刻录CD/DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "使用调制解调器" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "使用调制解调器连接到互联网" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "发送和接受传真" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "使用软盘驱动器" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "挂载用户空间文件系统(FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "配置打印机" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "连接到无线网络和以太网" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "自动访问外部存储设备" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "挂起和休眠计算机" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "访问 /proc 文件系统" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "使用扫描仪" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "使用磁带机" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "使用USB设备" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "使用 VirtualBox 虚拟化解决方案" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "使用视频设备" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "可以获得管理员权限" @@ -1909,15 +1951,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "请检查您在两个文本框中输入的密码相同。" -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "请选择其它密码。" -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "请再次输入您当前的密码。" -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "无法更改密码" @@ -1972,33 +2014,33 @@ msgid "Delete Files" msgstr "删除文件" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "超级用户" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "自定义" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "无" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "注释中存在无效字符“%c”" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "请检查未使用此字符。" -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "主目录的路径不完整" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2006,11 +2048,11 @@ "请输入主目录的完整路径\n" "如：/home/john。" -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "新的主目录已存在，是否使用它?" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2025,30 +2067,30 @@ "\n" "如果有所顾虑，请使用新目录以避免丢失数据，稍后再从旧目录复制文件。" -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "使用旧文件替换(_R)" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "取消变更(_C)" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "使用新文件(_U)" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "将用户设为新主目录的所有者(_O)" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "删除旧的主目录(_D)" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2062,19 +2104,19 @@ "\n" "如果有所顾虑，请保留这些文件，如果需要则稍后移除它们。" -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "删除文件(_D)" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "使用现存文件(_U)" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "将旧主目录复制到新位置？" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2089,35 +2131,35 @@ "\n" "如果您选择复制文件到新地点，则可以放心删除旧目录。" -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "使用空目录(_U)" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "复制旧文件(_P)" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "root 用户的 ID 不应修改" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "用户 ID %d 已被用户 %s 使用了" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "请为 %s 选择不同的数字标识符。" -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "shell 的路径不完整" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2125,37 +2167,55 @@ "请输入 shell 的完整路径\n" "如：/bin/bash。" -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "不能撤销管理员权限" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." msgstr "%s 是计算机上唯一的管理员。放弃此用户的管理器权限将使您不能管理系统。" -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "您将放弃自己的管理权限" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." msgstr "%s 不再能执行管理任务。此账户将不被允许重新获得管理权限。" -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "放弃管理权限" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +msgid "You cannot change the user ID for the superuser account." +msgstr "您不能更改超级账户的用户 ID。" + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" +"您不能禁用自己的账户或更改自己的主目录和用户 ID。请从其他用户的会话中运行此程" +"序来编辑这些设置。" + +#: ../src/users/user-settings.c:1434 +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "您不能在用户已经登录的条件下更改用户的主目录。" + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." msgstr "正在将更改应用到用户设置..." -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "用户设置" @@ -2265,9 +2325,6 @@ #~ msgstr "" #~ "要使用此工具，您需要有管理员权限。请输入密码，以便修改您的系统配置。" -#~ msgid "_Unlock" -#~ msgstr "解锁(_U)" - #~ msgid "This action is not allowed" #~ msgstr "不允许此动作" diff -Nru gnome-system-tools-2.32.0/po/zh_HK.po gnome-system-tools-3.0.0/po/zh_HK.po --- gnome-system-tools-2.32.0/po/zh_HK.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/zh_HK.po 2011-02-12 16:38:38.000000000 +0000 @@ -2,20 +2,21 @@ # Copyright (C) 2001-07 Free Software Foundation, Inc. # Abel Cheung , 2001-2003. # Chao-Hsiung Liao , 2004. -# Chao-Hsiung Liao , 2006. +# Chao-Hsiung Liao , 2006, 2010. # Woodman Tuen , 2006-07. # Ching-Hung Lin , 2006. -# Kevin_Wei_2 , 2010 -# +# Kevin_Wei_2 , 2010. +# Wei-Lun Chao , 2010. # msgid "" msgstr "" -"Project-Id-Version: gnome-system-tools 2.31.1\n" +"Project-Id-Version: gnome-system-tools 2.91.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-23 19:54+0800\n" -"PO-Revision-Date: 2010-08-23 19:54+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" +"POT-Creation-Date: 2011-01-07 09:48+0800\n" +"PO-Revision-Date: 2011-01-07 09:48+0800\n" +"Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (Hong Kong) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -237,7 +238,7 @@ msgid "_Subnet mask:" msgstr "子網絡遮罩(_S):" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "使用者名稱(_U):" @@ -660,78 +661,74 @@ msgstr "使用者名稱必須以字母開頭！" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "你不能在使用者處於登入狀態時改變使用者 ID。" - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "新增設定檔(_A)" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "進階設定(_A)" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." -msgstr "改變(_C)..." +msgstr "改變(_C)…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "備註(_C)" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "目前的密碼(_C):" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "自選(_C)" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "密碼過期前，於指定日數發出警告(_D):" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "啟用帳號(_E)" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "加密家目錄以保護敏感資料(_E)" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "產生(_G)" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "個人目錄(_H):" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "家用電話(_H):" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "主要羣組(_M):" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "管理羣組(_M):" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "名稱(_N):" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "密碼(_P):" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "工作電話(_W):" @@ -753,6 +750,11 @@ "Whether the users-admin tool should show the root user in the users list." msgstr "「使用者-管理」工具應否顯示在使用者清單中的 root 使用者。" +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "你所執行的平臺尚未被本工具支援" @@ -763,11 +765,11 @@ "If you know for sure that it works like one of the platforms listed below, " "you can select that and continue. Note, however, that this might damage the " "system configuration or downright cripple your computer." -msgstr "如果你肯定本系統和以下列出的其中一種作業平台運作方式類似，則可以選取該平台並繼續。然而請注意，這樣做有可能會破壞系統的設定甚至損害你的電腦。" +msgstr "如果你肯定本系統和以下列出的其中一種作業平臺運作方式類似，則可以選取該平臺並繼續。然而請注意，這樣做有可能會破壞系統的設定甚至損害你的電腦。" #: ../src/common/gst-platform-dialog.c:212 msgid "Unsupported platform" -msgstr "不支援的平台" +msgstr "不支援的平臺" #: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" @@ -817,6 +819,38 @@ "在檢查驗證時發生錯誤：%s\n" "你可以將這個錯誤匯報給開發者。" +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "" + +#: ../src/common/um-lockbutton.c:374 +#, fuzzy +#| msgid "Loud" +msgid "Locked" +msgstr "高" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -859,51 +893,51 @@ msgid "Change _Host name" msgstr "更改主機名稱(_H)" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "自動設定(DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "本地無配置連網 (Zeroconf) 網絡 (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "固定 IP 地址" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP 密碼匙 (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP 密碼匙（十六進位）" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA 個人版" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 個人版" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN 數據機" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "序列埠數據機" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "%s 屬性" @@ -1231,7 +1265,7 @@ #. GST_ROLE_SYSTEM_CONFIGURATION_MANAGEMENT #: ../src/services/service.c:59 msgid "School management platform" -msgstr "學校管理平台" +msgstr "學校管理平臺" #. GST_ROLE_SCHOOL_MANAGEMENT_PLATFORM #: ../src/services/service.c:60 @@ -1521,7 +1555,7 @@ #: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." -msgstr "共享資料夾(_S)..." +msgstr "共享資料夾(_S)…" #: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" @@ -1582,11 +1616,11 @@ "folders." msgstr "你至少要安裝 Samba 或 NFS 來分享的資料夾。" -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "世界地圖" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1600,37 +1634,37 @@ msgid "Time and Date" msgstr "時間及日期設定" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "沒有安裝 NTP 支援" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." msgstr "請在系統安裝並啟用 NTP 支援，令你的本地時間伺服器能與網絡時間伺服器進行同步。" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "啟用 NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "停用 NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "系統時鐘同步" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "與網絡伺服器保持同步" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "手動" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "時間及日期設定" @@ -1640,7 +1674,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "這樣會讓系統停留在無法使用的狀態。" @@ -1712,100 +1746,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "請為羣組「%s」選擇不同的數字識別碼。" -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "羣組名稱" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "不在登入時詢問" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "登入時詢問" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "監視系統日誌" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "管理此系統" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "使用音效裝置" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "使用光碟機" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "燒錄 CD / DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "使用數據機" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "經由數據機連線到互聯網" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "傳送與接收傳真" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "使用軟碟機" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "掛載使用者層級檔案系統 (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "設定打印機" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "連線到無線和乙太網絡" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "自動存取外部的儲存裝置" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "將電腦暫停與休眠" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "存取 /proc 檔案系統" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "使用掃描器" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "使用磁帶機" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "使用 USB 裝置" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "使用 VirtualBox 虛擬化解決方案" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "使用視像裝置" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "可以得到管理者權限" @@ -1899,15 +1933,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "請檢查你是否在兩個文字欄位中提供相同的密碼。" -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "請選擇其他密碼。" -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "請再次輸入你目前的密碼。" -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "密碼無法更改" @@ -1933,7 +1967,7 @@ msgid "" "%s is the only administrator on this computer. Deleting this account would " "lock you out of administrating the system." -msgstr "%s 是這台電腦上唯一的系統管理者。刪除這個帳號會導致你無法管理這個系統。" +msgstr "%s 是這臺電腦上唯一的系統管理者。刪除這個帳號會導致你無法管理這個系統。" #: ../src/users/user-settings.c:121 #, c-format @@ -1960,33 +1994,33 @@ msgid "Delete Files" msgstr "刪除檔案" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "超級使用者" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "自選" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "沒有" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "備註中出現無效的字符“%c”" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "請檢查有無使用此不正確的字符。" -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "個人目錄含有不完整的路徑" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -1994,16 +2028,16 @@ "請輸入家目錄的完整路徑\n" "例如：/home/john。" -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "新的家目錄已經存在，是否使用它？" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." @@ -2012,30 +2046,30 @@ "\n" "如果不確定，使用新的目錄可以避免資料遺失，並且在稍後才從舊目錄複製檔案。" -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "以舊的檔案取代(_R)" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "取消更改(_C)" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "使用新的檔案(_U)" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "將使用者設為新家目錄的擁有者(_O)" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "刪除舊的家目錄(_D)" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2048,19 +2082,19 @@ "\n" "如果不確定，先保留檔案，並且在稍後才根據需求刪除它們。" -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "刪除檔案(_D)" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "使用現有的檔案(_U)" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "是否將舊的家目錄複製到新位置？" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2074,35 +2108,35 @@ "\n" "如果你選擇將檔案複製到新的位置，把舊的目錄刪除也無妨。" -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "使用空的目錄(_U)" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "複製舊的檔案(_P)" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "不應修改 root 使用者的 ID" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "使用者 ID %d 已經被使用者 %s 所用" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "請為 %s 選擇不同的數字識別碼。" -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "shell 含有不完整的路徑" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2110,37 +2144,57 @@ "請輸入 shell 的完整路徑\n" "例如：/bin/bash。" -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "不能註銷系統管理者權限" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." -msgstr "%s 是這台電腦上唯一的系統管理者。註銷這個帳號的系統管理者權限會導致你無法管理這個系統。" +msgstr "%s 是這臺電腦上唯一的系統管理者。註銷這個帳號的系統管理者權限會導致你無法管理這個系統。" -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "你即將註銷自己的系統管理者權限" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " "won't be allowed to get administration rights back on its own." msgstr "%s 將不再能進行管理層級的工作。往後這個帳號無法自行取回系統管理者權限。" -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "放棄系統管理者權限" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +#, fuzzy +#| msgid "You can't change user ID while the user is logged in." +msgid "You cannot change the user ID for the superuser account." +msgstr "你不能在使用者處於登入狀態時改變使用者 ID。" + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" + +#: ../src/users/user-settings.c:1434 +#, fuzzy +#| msgid "You can't change user ID while the user is logged in." +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "你不能在使用者處於登入狀態時改變使用者 ID。" + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." -msgstr "正在套用更改到使用者設定值..." +msgstr "正在套用更改到使用者設定值…" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "使用者設定值" diff -Nru gnome-system-tools-2.32.0/po/zh_TW.po gnome-system-tools-3.0.0/po/zh_TW.po --- gnome-system-tools-2.32.0/po/zh_TW.po 2010-08-30 14:59:42.000000000 +0000 +++ gnome-system-tools-3.0.0/po/zh_TW.po 2011-02-12 16:38:38.000000000 +0000 @@ -2,20 +2,21 @@ # Copyright (C) 2001-07 Free Software Foundation, Inc. # Abel Cheung , 2001-2003. # Chao-Hsiung Liao , 2004. -# Chao-Hsiung Liao , 2006. +# Chao-Hsiung Liao , 2006, 2010. # Woodman Tuen , 2006-07. # Ching-Hung Lin , 2006. -# Kevin_Wei_2 , 2010 -# +# Kevin_Wei_2 , 2010. +# Wei-Lun Chao , 2010. # msgid "" msgstr "" -"Project-Id-Version: gnome-system-tools 2.31.1\n" +"Project-Id-Version: gnome-system-tools 2.91.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-23 19:54+0800\n" -"PO-Revision-Date: 2010-08-22 19:44+0800\n" -"Last-Translator: Chao-Hsiung Liao \n" +"POT-Creation-Date: 2011-01-07 09:48+0800\n" +"PO-Revision-Date: 2010-10-16 12:00+0800\n" +"Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (Taiwan) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -237,7 +238,7 @@ msgid "_Subnet mask:" msgstr "子網路遮罩(_S):" -#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:82 +#: ../interfaces/network.ui.h:55 ../interfaces/users.ui.h:81 msgid "_Username:" msgstr "使用者名稱(_U):" @@ -664,78 +665,74 @@ msgstr "使用者名稱必須以字母開頭！" #: ../interfaces/users.ui.h:64 -msgid "You can't change user ID while the user is logged in." -msgstr "您不能在使用者處於登入狀態時改變使用者 ID。" - -#: ../interfaces/users.ui.h:65 msgid "_Add Profile" msgstr "新增設定檔(_A)" -#: ../interfaces/users.ui.h:66 +#: ../interfaces/users.ui.h:65 msgid "_Advanced Settings" msgstr "進階設定(_A)" -#: ../interfaces/users.ui.h:67 +#: ../interfaces/users.ui.h:66 msgid "_Change..." -msgstr "改變(_C)..." +msgstr "改變(_C)…" -#: ../interfaces/users.ui.h:68 +#: ../interfaces/users.ui.h:67 msgid "_Comments" msgstr "備註(_C)" -#: ../interfaces/users.ui.h:69 +#: ../interfaces/users.ui.h:68 msgid "_Current password:" msgstr "目前的密碼(_C):" -#: ../interfaces/users.ui.h:70 +#: ../interfaces/users.ui.h:69 msgid "_Custom" msgstr "自訂(_C)" -#: ../interfaces/users.ui.h:71 +#: ../interfaces/users.ui.h:70 msgid "_Days between warning and password expiration:" msgstr "密碼過期前，於指定日數發出警告(_D):" -#: ../interfaces/users.ui.h:72 +#: ../interfaces/users.ui.h:71 msgid "_Enable Account" msgstr "啟用帳號(_E)" -#: ../interfaces/users.ui.h:73 +#: ../interfaces/users.ui.h:72 msgid "_Encrypt home folder to protect sensitive data" msgstr "加密家目錄以保護敏感資料(_E)" -#: ../interfaces/users.ui.h:74 +#: ../interfaces/users.ui.h:73 msgid "_Generate" msgstr "產生(_G)" -#: ../interfaces/users.ui.h:75 +#: ../interfaces/users.ui.h:74 msgid "_Home directory:" msgstr "個人目錄(_H):" -#: ../interfaces/users.ui.h:76 +#: ../interfaces/users.ui.h:75 msgid "_Home phone:" msgstr "住家電話(_H):" -#: ../interfaces/users.ui.h:77 +#: ../interfaces/users.ui.h:76 msgid "_Main group:" msgstr "主要群組(_M):" -#: ../interfaces/users.ui.h:78 +#: ../interfaces/users.ui.h:77 msgid "_Manage Groups" msgstr "管理群組(_M):" -#: ../interfaces/users.ui.h:79 +#: ../interfaces/users.ui.h:78 msgid "_Name:" msgstr "名稱(_N):" -#: ../interfaces/users.ui.h:80 +#: ../interfaces/users.ui.h:79 msgid "_Password:" msgstr "密碼(_P):" -#: ../interfaces/users.ui.h:81 +#: ../interfaces/users.ui.h:80 msgid "_Shell:" msgstr "_Shell:" -#: ../interfaces/users.ui.h:83 +#: ../interfaces/users.ui.h:82 msgid "_Work phone:" msgstr "工作電話(_W):" @@ -757,6 +754,11 @@ "Whether the users-admin tool should show the root user in the users list." msgstr "「使用者-管理」工具應否顯示在使用者清單中的 root 使用者。" +#: ../src/common/gst-dialog.c:254 +#, c-format +msgid "Error accessing system permissions: %s" +msgstr "" + #: ../src/common/gst-platform-dialog.c:179 msgid "The platform you are running is not supported by this tool" msgstr "您所執行的平臺尚未被本工具支援" @@ -768,12 +770,12 @@ "you can select that and continue. Note, however, that this might damage the " "system configuration or downright cripple your computer." msgstr "" -"如果您肯定本系統和以下列出的其中一種作業平台運作方式類似，則可以選取該平台並" +"如果您肯定本系統和以下列出的其中一種作業平臺運作方式類似，則可以選取該平臺並" "繼續。然而請注意，這樣做有可能會破壞系統的設定甚至損害您的電腦。" #: ../src/common/gst-platform-dialog.c:212 msgid "Unsupported platform" -msgstr "不支援的平台" +msgstr "不支援的平臺" #: ../src/common/gst-tool.c:188 msgid "The configuration could not be loaded" @@ -823,6 +825,38 @@ "在檢查驗證時發生錯誤：%s\n" "您可以將這個錯誤回報給開發者。" +#: ../src/common/um-lockbutton.c:356 +msgid "Lock" +msgstr "" + +#: ../src/common/um-lockbutton.c:365 +msgid "Unlock" +msgstr "" + +#: ../src/common/um-lockbutton.c:374 +#, fuzzy +#| msgid "Loud" +msgid "Locked" +msgstr "高" + +#: ../src/common/um-lockbutton.c:383 +msgid "" +"Dialog is unlocked.\n" +"Click to prevent further changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:392 +msgid "" +"Dialog is locked.\n" +"Click to make changes" +msgstr "" + +#: ../src/common/um-lockbutton.c:401 +msgid "" +"System policy prevents changes.\n" +"Contact your system administrator" +msgstr "" + #: ../src/network/address-list.c:76 ../src/network/hosts.c:31 #: ../src/shares/table.c:38 ../src/users/table.c:40 msgid "_Add" @@ -865,51 +899,51 @@ msgid "Change _Host name" msgstr "更改主機名稱(_H)" -#: ../src/network/connection.c:40 +#: ../src/network/connection.c:42 msgid "Automatic configuration (DHCP)" msgstr "自動設定(DHCP)" -#: ../src/network/connection.c:41 +#: ../src/network/connection.c:43 msgid "Local Zeroconf network (IPv4 LL)" msgstr "本地無配置連網 (Zeroconf) 網路 (IPv4 LL)" -#: ../src/network/connection.c:42 +#: ../src/network/connection.c:44 msgid "Static IP address" msgstr "固定 IP 地址" -#: ../src/network/connection.c:46 +#: ../src/network/connection.c:48 msgid "WEP key (ascii)" msgstr "WEP 金鑰 (ascii)" -#: ../src/network/connection.c:47 +#: ../src/network/connection.c:49 msgid "WEP key (hexadecimal)" msgstr "WEP 金鑰（十六進位）" -#: ../src/network/connection.c:48 +#: ../src/network/connection.c:50 msgid "WPA Personal" msgstr "WPA 個人版" -#: ../src/network/connection.c:49 +#: ../src/network/connection.c:51 msgid "WPA2 Personal" msgstr "WPA2 個人版" -#: ../src/network/connection.c:53 +#: ../src/network/connection.c:55 msgid "GPRS/UMTS" msgstr "GPRS/UMTS" -#: ../src/network/connection.c:54 +#: ../src/network/connection.c:56 msgid "ISDN modem" msgstr "ISDN 數據機" -#: ../src/network/connection.c:55 +#: ../src/network/connection.c:57 msgid "Serial modem" msgstr "序列埠數據機" -#: ../src/network/connection.c:56 +#: ../src/network/connection.c:58 msgid "PPPoE" msgstr "PPPoE" -#: ../src/network/connection.c:769 +#: ../src/network/connection.c:771 #, c-format msgid "%s Properties" msgstr "%s 屬性" @@ -1237,7 +1271,7 @@ #. GST_ROLE_SYSTEM_CONFIGURATION_MANAGEMENT #: ../src/services/service.c:59 msgid "School management platform" -msgstr "學校管理平台" +msgstr "學校管理平臺" #. GST_ROLE_SCHOOL_MANAGEMENT_PLATFORM #: ../src/services/service.c:60 @@ -1527,7 +1561,7 @@ #: ../src/shares/nautilus/nautilus-shares.c:151 msgid "_Share Folder..." -msgstr "共享資料夾(_S)..." +msgstr "共享資料夾(_S)…" #: ../src/shares/nautilus/nautilus-shares.c:152 msgid "Share this folder with other computers" @@ -1588,11 +1622,11 @@ "folders." msgstr "您至少要安裝 Samba 或 NFS 來分享的資料夾。" -#: ../src/time/e-map/e-map.c:620 +#: ../src/time/e-map/e-map.c:775 msgid "World Map" msgstr "世界地圖" -#: ../src/time/e-map/e-map.c:622 +#: ../src/time/e-map/e-map.c:777 msgid "" "Mouse-based interactive map widget for selecting timezone. Keyboard users " "should instead select the timezone from the drop-down combination box below." @@ -1608,38 +1642,38 @@ msgid "Time and Date" msgstr "時間及日期設定" -#: ../src/time/time-tool.c:398 +#: ../src/time/time-tool.c:394 msgid "NTP support is not installed" msgstr "沒有安裝 NTP 支援" -#: ../src/time/time-tool.c:400 +#: ../src/time/time-tool.c:396 msgid "" "Please install and activate NTP support in the system to enable " "synchronization of your local time server with internet time servers." msgstr "" "請在系統安裝並啟用 NTP 支援，令您的本地時間伺服器能與網路時間伺服器進行同步。" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Enabling NTP" msgstr "啟用 NTP" -#: ../src/time/time-tool.c:429 +#: ../src/time/time-tool.c:425 msgid "Disabling NTP" msgstr "停用 NTP" -#: ../src/time/time-tool.c:441 +#: ../src/time/time-tool.c:437 msgid "Synchronizing system clock" msgstr "系統時鐘同步" -#: ../src/time/time-tool.c:521 +#: ../src/time/time-tool.c:517 msgid "Keep synchronized with Internet servers" msgstr "與網路伺服器保持同步" -#: ../src/time/time-tool.c:522 +#: ../src/time/time-tool.c:518 msgid "Manual" msgstr "手動" -#: ../src/time/time-tool.c:665 +#: ../src/time/time-tool.c:661 msgid "Time and Date Settings" msgstr "時間及日期設定" @@ -1649,7 +1683,7 @@ #: ../src/users/group-settings.c:58 ../src/users/group-settings.c:221 #: ../src/users/group-settings.c:258 ../src/users/user-settings.c:88 -#: ../src/users/user-settings.c:605 +#: ../src/users/user-settings.c:610 msgid "This would leave the system unusable." msgstr "這樣會讓系統停留在無法使用的狀態。" @@ -1723,100 +1757,100 @@ msgid "Please choose a different numeric identifier for group \"%s\"." msgstr "請為群組「%s」選擇不同的數字識別碼。" -#: ../src/users/groups-table.c:44 +#: ../src/users/groups-table.c:47 msgid "Group name" msgstr "群組名稱" #. TRANSLATORS: This applies to a password. Keep the string short. -#: ../src/users/main.c:74 ../src/users/user-settings.c:347 +#: ../src/users/main.c:74 ../src/users/user-settings.c:352 msgid "Not asked on login" msgstr "不在登入時詢問" -#: ../src/users/main.c:74 ../src/users/user-settings.c:349 +#: ../src/users/main.c:74 ../src/users/user-settings.c:354 msgid "Asked on login" msgstr "登入時詢問" -#: ../src/users/privileges-table.c:53 +#: ../src/users/privileges-table.c:55 msgid "Monitor system logs" msgstr "監視系統日誌" -#: ../src/users/privileges-table.c:54 +#: ../src/users/privileges-table.c:56 msgid "Administer the system" msgstr "管理此系統" -#: ../src/users/privileges-table.c:55 +#: ../src/users/privileges-table.c:57 msgid "Use audio devices" msgstr "使用音效裝置" -#: ../src/users/privileges-table.c:56 +#: ../src/users/privileges-table.c:58 msgid "Use CD-ROM drives" msgstr "使用光碟機" -#: ../src/users/privileges-table.c:57 +#: ../src/users/privileges-table.c:59 msgid "Burn CDs / DVDs" msgstr "燒錄 CD / DVD" -#: ../src/users/privileges-table.c:58 +#: ../src/users/privileges-table.c:60 msgid "Use modems" msgstr "使用數據機" -#: ../src/users/privileges-table.c:59 +#: ../src/users/privileges-table.c:61 msgid "Connect to Internet using a modem" msgstr "經由數據機連線到網際網路" -#: ../src/users/privileges-table.c:60 +#: ../src/users/privileges-table.c:62 msgid "Send and receive faxes" msgstr "傳送與接收傳真" -#: ../src/users/privileges-table.c:61 +#: ../src/users/privileges-table.c:63 msgid "Use floppy drives" msgstr "使用軟碟機" -#: ../src/users/privileges-table.c:62 +#: ../src/users/privileges-table.c:64 msgid "Mount user-space filesystems (FUSE)" msgstr "掛載使用者層級檔案系統 (FUSE)" -#: ../src/users/privileges-table.c:63 +#: ../src/users/privileges-table.c:65 msgid "Configure printers" msgstr "設定印表機" -#: ../src/users/privileges-table.c:64 +#: ../src/users/privileges-table.c:66 msgid "Connect to wireless and ethernet networks" msgstr "連線到無線和乙太網路" -#: ../src/users/privileges-table.c:65 +#: ../src/users/privileges-table.c:67 msgid "Access external storage devices automatically" msgstr "自動存取外部的儲存裝置" -#: ../src/users/privileges-table.c:66 +#: ../src/users/privileges-table.c:68 msgid "Suspend and hibernate the computer" msgstr "將電腦暫停與休眠" -#: ../src/users/privileges-table.c:67 +#: ../src/users/privileges-table.c:69 msgid "Access /proc filesystem" msgstr "存取 /proc 檔案系統" -#: ../src/users/privileges-table.c:68 +#: ../src/users/privileges-table.c:70 msgid "Use scanners" msgstr "使用掃描器" -#: ../src/users/privileges-table.c:69 +#: ../src/users/privileges-table.c:71 msgid "Use tape drives" msgstr "使用磁帶機" -#: ../src/users/privileges-table.c:70 +#: ../src/users/privileges-table.c:72 msgid "Use USB devices" msgstr "使用 USB 裝置" -#: ../src/users/privileges-table.c:71 +#: ../src/users/privileges-table.c:73 msgid "Use VirtualBox virtualization solution" msgstr "使用 VirtualBox 虛擬化解決方案" -#: ../src/users/privileges-table.c:72 +#: ../src/users/privileges-table.c:74 msgid "Use video devices" msgstr "使用視訊裝置" -#: ../src/users/privileges-table.c:73 +#: ../src/users/privileges-table.c:75 msgid "Be able to get administrator privileges" msgstr "可以得到管理者權限" @@ -1910,15 +1944,15 @@ msgid "Check that you have provided the same password in both text fields." msgstr "請檢查您是否在兩個文字欄位中提供相同的密碼。" -#: ../src/users/user-password.c:426 +#: ../src/users/user-password.c:443 msgid "Please choose another password." msgstr "請選擇其他密碼。" -#: ../src/users/user-password.c:437 +#: ../src/users/user-password.c:454 msgid "Please type again your current password." msgstr "請再次輸入您目前的密碼。" -#: ../src/users/user-password.c:444 +#: ../src/users/user-password.c:461 msgid "Password could not be changed" msgstr "密碼無法變更" @@ -1945,7 +1979,7 @@ "%s is the only administrator on this computer. Deleting this account would " "lock you out of administrating the system." msgstr "" -"%s 是這台電腦上唯一的系統管理者。刪除這個帳號會導致您無法管理這個系統。" +"%s 是這臺電腦上唯一的系統管理者。刪除這個帳號會導致您無法管理這個系統。" #: ../src/users/user-settings.c:121 #, c-format @@ -1974,33 +2008,33 @@ msgid "Delete Files" msgstr "刪除檔案" -#: ../src/users/user-settings.c:330 +#: ../src/users/user-settings.c:335 msgid "Superuser" msgstr "超級使用者" -#: ../src/users/user-settings.c:335 +#: ../src/users/user-settings.c:340 msgid "Custom" msgstr "自訂" #. TRANSLATORS: This applies to a password. -#: ../src/users/user-settings.c:344 +#: ../src/users/user-settings.c:349 msgid "None" msgstr "沒有" -#: ../src/users/user-settings.c:393 +#: ../src/users/user-settings.c:398 #, c-format msgid "Invalid character \"%c\" in comment" msgstr "備註中出現無效的字元“%c”" -#: ../src/users/user-settings.c:394 +#: ../src/users/user-settings.c:399 msgid "Check that this character is not used." msgstr "請檢查有無使用此不正確的字元。" -#: ../src/users/user-settings.c:426 +#: ../src/users/user-settings.c:431 msgid "Incomplete path in home directory" msgstr "個人目錄含有不完整的路徑" -#: ../src/users/user-settings.c:427 +#: ../src/users/user-settings.c:432 msgid "" "Please enter full path for home directory\n" "i.e.: /home/john." @@ -2008,16 +2042,16 @@ "請輸入家目錄的完整路徑\n" "例如：/home/john。" -#: ../src/users/user-settings.c:447 ../src/users/user-settings.c:491 +#: ../src/users/user-settings.c:452 ../src/users/user-settings.c:496 msgid "New home directory already exists, use it?" msgstr "新的家目錄已經存在，是否使用它？" -#: ../src/users/user-settings.c:449 +#: ../src/users/user-settings.c:454 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " -"Do you want to use files from this directory, or copy the contents of %" -"s to the new home, overwriting it?\n" +"Do you want to use files from this directory, or copy the contents of " +"%s to the new home, overwriting it?\n" "\n" "In doubt, use the new directory to avoid losing data, and copy files from " "the old directory later." @@ -2027,30 +2061,30 @@ "\n" "如果不確定，使用新的目錄可以避免資料遺失，並且在稍後才從舊目錄複製檔案。" -#: ../src/users/user-settings.c:461 +#: ../src/users/user-settings.c:466 msgid "_Replace With Old Files" msgstr "以舊的檔案取代(_R)" -#: ../src/users/user-settings.c:462 ../src/users/user-settings.c:504 -#: ../src/users/user-settings.c:540 +#: ../src/users/user-settings.c:467 ../src/users/user-settings.c:509 +#: ../src/users/user-settings.c:545 msgid "_Cancel Change" msgstr "取消變更(_C)" #. TRANSLATORS: This means "use the files from the new location", #. * as opposed to those from the old location. -#: ../src/users/user-settings.c:465 +#: ../src/users/user-settings.c:470 msgid "_Use New Files" msgstr "使用新的檔案(_U)" -#: ../src/users/user-settings.c:470 ../src/users/user-settings.c:510 +#: ../src/users/user-settings.c:475 ../src/users/user-settings.c:515 msgid "Make user the _owner of the new home directory" msgstr "將使用者設為新家目錄的擁有者(_O)" -#: ../src/users/user-settings.c:473 ../src/users/user-settings.c:547 +#: ../src/users/user-settings.c:478 ../src/users/user-settings.c:552 msgid "_Delete old home directory" msgstr "刪除舊的家目錄(_D)" -#: ../src/users/user-settings.c:493 +#: ../src/users/user-settings.c:498 #, c-format msgid "" "The home directory for %s has been set to %s, which already exists. " @@ -2064,19 +2098,19 @@ "\n" "如果不確定，先保留檔案，並且在稍後才依需求刪除它們。" -#: ../src/users/user-settings.c:503 +#: ../src/users/user-settings.c:508 msgid "_Delete Files" msgstr "刪除檔案(_D)" -#: ../src/users/user-settings.c:505 +#: ../src/users/user-settings.c:510 msgid "_Use Existing Files" msgstr "使用現有的檔案(_U)" -#: ../src/users/user-settings.c:526 +#: ../src/users/user-settings.c:531 msgid "Copy old home directory to new location?" msgstr "是否將舊的家目錄複製到新位置？" -#: ../src/users/user-settings.c:528 +#: ../src/users/user-settings.c:533 #, c-format msgid "" "The home directory for %s has been set to %s, which doesn't exist. " @@ -2086,40 +2120,40 @@ "If you choose to copy the files to the new location, it's safe to delete the " "old directory." msgstr "" -"%s 的家目錄被設定為 %s，但是它還不存在。您想要複製舊的家目錄 (%" -"s) 裡的檔案，或是使用完全空白的家目錄？\n" +"%s 的家目錄被設定為 %s，但是它還不存在。您想要複製舊的家目錄 (" +"%s) 裡的檔案，或是使用完全空白的家目錄？\n" "\n" "如果您選擇將檔案複製到新的位置，把舊的目錄刪除也無妨。" -#: ../src/users/user-settings.c:539 +#: ../src/users/user-settings.c:544 msgid "_Use Empty Directory" msgstr "使用空的目錄(_U)" #. TRANSLATORS: This means "copy files from the old home directory". -#: ../src/users/user-settings.c:542 +#: ../src/users/user-settings.c:547 msgid "Co_py Old Files" msgstr "複製舊的檔案(_P)" -#: ../src/users/user-settings.c:604 +#: ../src/users/user-settings.c:609 msgid "ID for the root user should not be modified" msgstr "不應修改 root 使用者的 ID" #. check that UID is free -#: ../src/users/user-settings.c:608 +#: ../src/users/user-settings.c:613 #, c-format msgid "User ID %d is already used by user %s" msgstr "使用者 ID %d 已經被使用者 %s 所用" -#: ../src/users/user-settings.c:610 +#: ../src/users/user-settings.c:615 #, c-format msgid "Please choose a different numeric identifier for %s." msgstr "請為 %s 選擇不同的數字識別碼。" -#: ../src/users/user-settings.c:628 +#: ../src/users/user-settings.c:633 msgid "Incomplete path in shell" msgstr "shell 含有不完整的路徑" -#: ../src/users/user-settings.c:629 +#: ../src/users/user-settings.c:634 msgid "" "Please enter full path for shell\n" "i.e.: /bin/bash." @@ -2127,24 +2161,24 @@ "請輸入 shell 的完整路徑\n" "例如：/bin/bash。" -#: ../src/users/user-settings.c:663 +#: ../src/users/user-settings.c:668 msgid "Can't revoke administration rights" msgstr "不能註銷系統管理者權限" -#: ../src/users/user-settings.c:666 +#: ../src/users/user-settings.c:671 #, c-format msgid "" "%s is the only administrator on this computer. Revoking administration " "rights for this account would lock you out of administrating the system." msgstr "" -"%s 是這台電腦上唯一的系統管理者。註銷這個帳號的系統管理者權限會導致您無法管理" +"%s 是這臺電腦上唯一的系統管理者。註銷這個帳號的系統管理者權限會導致您無法管理" "這個系統。" -#: ../src/users/user-settings.c:683 +#: ../src/users/user-settings.c:688 msgid "You are about to revoke your own administration rights" msgstr "您即將註銷自己的系統管理者權限" -#: ../src/users/user-settings.c:686 +#: ../src/users/user-settings.c:691 #, c-format msgid "" "%s will no longer be able to perform administrative tasks. This account " @@ -2152,15 +2186,35 @@ msgstr "" "%s 將不再能進行管理層級的工作。往後這個帳號無法自行取回系統管理者權限。" -#: ../src/users/user-settings.c:691 +#: ../src/users/user-settings.c:696 msgid "Give up administration rights" msgstr "放棄系統管理者權限" -#: ../src/users/user-settings.c:1459 +#: ../src/users/user-settings.c:1416 +#, fuzzy +#| msgid "You can't change user ID while the user is logged in." +msgid "You cannot change the user ID for the superuser account." +msgstr "您不能在使用者處於登入狀態時改變使用者 ID。" + +#: ../src/users/user-settings.c:1424 +msgid "" +"You cannot disable your own account, nor change your own home directory or " +"user ID. Run this program from another user's session to edit these settings." +msgstr "" + +#: ../src/users/user-settings.c:1434 +#, fuzzy +#| msgid "You can't change user ID while the user is logged in." +msgid "" +"You cannot change an account's home directory or user ID while the user is " +"logged in." +msgstr "您不能在使用者處於登入狀態時改變使用者 ID。" + +#: ../src/users/user-settings.c:1512 msgid "Applying changes to user settings..." -msgstr "正在套用變更到使用者設定值..." +msgstr "正在套用變更到使用者設定值…" -#: ../src/users/users-tool.c:288 +#: ../src/users/users-tool.c:300 msgid "Users Settings" msgstr "使用者設定值" diff -Nru gnome-system-tools-2.32.0/README gnome-system-tools-3.0.0/README --- gnome-system-tools-2.32.0/README 2009-08-25 20:50:03.000000000 +0000 +++ gnome-system-tools-3.0.0/README 2011-02-19 10:17:32.000000000 +0000 @@ -34,13 +34,12 @@ Introduction: http://www.gnome.org/projects/gst/ -Whitepaper: http://www.ximian.com/tech/ximian-setup-tools.php3 - Mailing list: http://mail.gnome.org/mailman/listinfo/system-tools-list FTP: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/ -GNOME CVS: Module "gnome-system-tools". +GNOME git: Module "gnome-system-tools". + http://git.gnome.org/browse/gnome-system-tools IRC: irc.gnome.org, #gst @@ -51,6 +50,7 @@ Jacob Berkman Bradford Hovinen Carlos Garnacho Parro + Milan Bouchet-Valat Artists: Anna Dirks Jakub Steiner diff -Nru gnome-system-tools-2.32.0/src/common/gst-dialog.c gnome-system-tools-3.0.0/src/common/gst-dialog.c --- gnome-system-tools-2.32.0/src/common/gst-dialog.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/gst-dialog.c 2011-02-12 16:52:15.000000000 +0000 @@ -30,7 +30,8 @@ #include "gst-dialog.h" #ifdef HAVE_POLKIT -#include +#include +#include "um-lockbutton.h" #endif #define GST_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GST_TYPE_DIALOG, GstDialogPrivate)) @@ -43,12 +44,13 @@ gchar *title; gchar *widget_name; - gboolean lock_button; + gboolean show_lock_button; GtkBuilder *builder; GtkWidget *child; #ifdef HAVE_POLKIT - GtkWidget *polkit_button; + GPermission *permission; + GtkWidget *lock_button; #endif GSList *policy_widgets; @@ -96,7 +98,7 @@ PROP_TOOL, PROP_WIDGET_NAME, PROP_TITLE, - PROP_LOCK_BUTTON + PROP_SHOW_LOCK_BUTTON }; enum { @@ -112,14 +114,12 @@ gst_dialog_class_init (GstDialogClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); object_class->set_property = gst_dialog_set_property; object_class->constructor = gst_dialog_constructor; object_class->finalize = gst_dialog_finalize; - dialog_class->response = gst_dialog_response; widget_class->delete_event = gst_dialog_delete_event; widget_class->realize = gst_dialog_realize; @@ -148,10 +148,10 @@ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, - PROP_LOCK_BUTTON, - g_param_spec_boolean ("lock_button", - "Lock button", - "Show PolkitLockButton", + PROP_SHOW_LOCK_BUTTON, + g_param_spec_boolean ("show_lock_button", + "Show Lock button", + "Whether to show lock button", TRUE, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); @@ -202,6 +202,8 @@ dialog = GST_DIALOG (object); priv = GST_DIALOG_GET_PRIVATE (dialog); + g_signal_connect (object, "response", G_CALLBACK(gst_dialog_response), NULL); + if (priv->tool && priv->widget_name) { priv->builder = gtk_builder_new (); @@ -235,18 +237,35 @@ if (priv->tool) { const gchar *action; GtkWidget *action_area; + GError *error = NULL; /* Some tools don't use the lock button at all */ - if (priv->lock_button) { + if (priv->show_lock_button) { action = oobs_session_get_authentication_action (priv->tool->session); - priv->polkit_button = polkit_lock_button_new (action); + priv->permission = polkit_permission_new_sync (action, NULL, NULL, &error); + + if (!priv->permission) { + GtkWidget *message_dialog; + + message_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("Error accessing system permissions: %s"), + error->message); + gtk_dialog_run (GTK_DIALOG (message_dialog)); + + exit (-1); + } + + priv->lock_button = um_lock_button_new (priv->permission); action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); - gtk_box_pack_start (GTK_BOX (action_area), priv->polkit_button, TRUE, TRUE, 0); - gtk_widget_show (priv->polkit_button); + gtk_box_pack_start (GTK_BOX (action_area), priv->lock_button, TRUE, TRUE, 0); + gtk_widget_show (priv->lock_button); - g_signal_connect_swapped (priv->polkit_button, "changed", - G_CALLBACK (gst_dialog_lock_changed), dialog); + g_signal_connect_swapped (priv->permission, "notify", + G_CALLBACK (gst_dialog_lock_changed), dialog); } } #endif @@ -282,8 +301,8 @@ case PROP_TITLE: priv->title = g_value_dup_string (value); break; - case PROP_LOCK_BUTTON: - priv->lock_button = g_value_get_boolean (value); + case PROP_SHOW_LOCK_BUTTON: + priv->show_lock_button = g_value_get_boolean (value); break; } } @@ -353,14 +372,13 @@ } GstDialog* -gst_dialog_new (GstTool *tool, const char *widget, const char *title, gboolean lock_button) +gst_dialog_new (GstTool *tool, const char *widget, const char *title, gboolean show_lock_button) { return g_object_new (GST_TYPE_DIALOG, - "has-separator", FALSE, "tool", tool, "widget-name", widget, "title", title, - "lock-button", lock_button, + "show-lock-button", show_lock_button, NULL); } @@ -652,9 +670,7 @@ priv = GST_DIALOG_GET_PRIVATE (dialog); - return (polkit_lock_button_get_is_authorized (POLKIT_LOCK_BUTTON (priv->polkit_button)) || - (polkit_lock_button_get_can_obtain (POLKIT_LOCK_BUTTON (priv->polkit_button)) && - !polkit_lock_button_get_is_visible (POLKIT_LOCK_BUTTON (priv->polkit_button)))); + return g_permission_get_allowed (priv->permission); #else return TRUE; #endif diff -Nru gnome-system-tools-2.32.0/src/common/gst-platform-dialog.c gnome-system-tools-3.0.0/src/common/gst-platform-dialog.c --- gnome-system-tools-2.32.0/src/common/gst-platform-dialog.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/gst-platform-dialog.c 2010-12-12 17:35:29.000000000 +0000 @@ -407,7 +407,6 @@ g_return_val_if_fail (OOBS_IS_SESSION (session), NULL); return g_object_new (GST_TYPE_PLATFORM_DIALOG, - "has-separator", FALSE, "session", session, NULL); } diff -Nru gnome-system-tools-2.32.0/src/common/gst-tool.c gnome-system-tools-3.0.0/src/common/gst-tool.c --- gnome-system-tools-2.32.0/src/common/gst-tool.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/gst-tool.c 2011-02-26 17:52:42.000000000 +0000 @@ -64,7 +64,7 @@ PROP_NAME, PROP_TITLE, PROP_ICON, - PROP_LOCK_BUTTON + PROP_SHOW_LOCK_BUTTON }; typedef struct _GstAsyncData { @@ -111,10 +111,10 @@ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, - PROP_LOCK_BUTTON, - g_param_spec_boolean ("lock_button", - "Lock button", - "Show PolkitLockButton", + PROP_SHOW_LOCK_BUTTON, + g_param_spec_boolean ("show_lock_button", + "Show lock button", + "Whether to show lock button", TRUE, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); } @@ -237,7 +237,7 @@ tool->ui_path = g_strdup_printf (INTERFACES_DIR "/%s.ui", tool->name); widget_name = g_strdup_printf ("%s_admin", tool->name); - tool->main_dialog = gst_dialog_new (tool, widget_name, tool->title, tool->lock_button); + tool->main_dialog = gst_dialog_new (tool, widget_name, tool->title, tool->show_lock_button); g_free (widget_name); } @@ -275,8 +275,8 @@ case PROP_ICON: tool->icon = g_value_dup_string (value); break; - case PROP_LOCK_BUTTON: - tool->lock_button = g_value_get_boolean (value); + case PROP_SHOW_LOCK_BUTTON: + tool->show_lock_button = g_value_get_boolean (value); break; } } @@ -374,6 +374,9 @@ { GdkScreen *screen; GError *error = NULL; + GdkAppLaunchContext *launch_context; + GAppInfo *app_info; + GtkWidget *dialog; gchar *help_file, *help_file_xml, *command, *uri; const gchar **langs, *lang; gint i; @@ -407,28 +410,44 @@ command = g_strconcat ("gnome-help ghelp://", uri, NULL); } + + app_info = g_app_info_create_from_commandline (command, _("Help"), + G_APP_INFO_CREATE_NONE, + &error); + screen = gtk_window_get_screen (GTK_WINDOW (tool->main_dialog)); - gdk_spawn_command_line_on_screen (screen, command, &error); + g_free (command); g_free (uri); + g_free (help_file_xml); + g_free (help_file); - if (error) { - GtkWidget *dialog; + if (error) + goto error; - dialog = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog), - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Could not display help")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - g_error_free (error); - } + launch_context = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (launch_context, screen); + g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error); - g_free (help_file_xml); - g_free (help_file); + g_object_unref (launch_context); + g_object_unref (app_info); + + if (error) + goto error; + + return; + +error: + dialog = gtk_message_dialog_new (GTK_WINDOW (tool->main_dialog), + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("Could not display help")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", error->message); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_error_free (error); } static gboolean diff -Nru gnome-system-tools-2.32.0/src/common/gst-tool.h gnome-system-tools-3.0.0/src/common/gst-tool.h --- gnome-system-tools-2.32.0/src/common/gst-tool.h 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/gst-tool.h 2010-12-12 17:39:02.000000000 +0000 @@ -47,7 +47,7 @@ gchar *name; gchar *title; gchar *icon; - gboolean lock_button; + gboolean show_lock_button; OobsSession *session; GPtrArray *objects; diff -Nru gnome-system-tools-2.32.0/src/common/Makefile.am gnome-system-tools-3.0.0/src/common/Makefile.am --- gnome-system-tools-2.32.0/src/common/Makefile.am 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/Makefile.am 2010-12-12 17:39:02.000000000 +0000 @@ -18,6 +18,11 @@ gst-service-role.c gst-service-role.h \ gst.h +if HAVE_POLKIT +libsetuptool_a_SOURCES += \ + um-lockbutton.c um-lockbutton.h +endif + EXTRA_DIST = CommonMakefile $(headers) -include $(top_srcdir)/git.mk diff -Nru gnome-system-tools-2.32.0/src/common/Makefile.in gnome-system-tools-3.0.0/src/common/Makefile.in --- gnome-system-tools-2.32.0/src/common/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -40,13 +40,12 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/DirsMakefile ChangeLog +@HAVE_POLKIT_TRUE@am__append_1 = \ +@HAVE_POLKIT_TRUE@ um-lockbutton.c um-lockbutton.h + subdir = src/common ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -63,9 +62,14 @@ am__v_at_0 = @ libsetuptool_a_AR = $(AR) $(ARFLAGS) libsetuptool_a_LIBADD = +am__libsetuptool_a_SOURCES_DIST = gst-dialog.c gst-dialog.h gst-tool.c \ + gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ + gst-filter.c gst-filter.h gst-service-role.c \ + gst-service-role.h gst.h um-lockbutton.c um-lockbutton.h +@HAVE_POLKIT_TRUE@am__objects_1 = um-lockbutton.$(OBJEXT) am_libsetuptool_a_OBJECTS = gst-dialog.$(OBJEXT) gst-tool.$(OBJEXT) \ gst-platform-dialog.$(OBJEXT) gst-filter.$(OBJEXT) \ - gst-service-role.$(OBJEXT) + gst-service-role.$(OBJEXT) $(am__objects_1) libsetuptool_a_OBJECTS = $(am_libsetuptool_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -94,7 +98,7 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsetuptool_a_SOURCES) -DIST_SOURCES = $(libsetuptool_a_SOURCES) +DIST_SOURCES = $(am__libsetuptool_a_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -107,8 +111,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,11 +132,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -153,26 +156,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -195,14 +201,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -211,6 +212,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -234,7 +237,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -277,14 +279,10 @@ -DSYSCONFDIR=\""$(sysconfdir)"\" -DPREFIX=\""$(prefix)"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" noinst_LIBRARIES = libsetuptool.a -libsetuptool_a_SOURCES = \ - gst-dialog.c gst-dialog.h \ - gst-tool.c gst-tool.h \ - gst-platform-dialog.c gst-platform-dialog.h \ - gst-filter.c gst-filter.h \ - gst-service-role.c gst-service-role.h \ - gst.h - +libsetuptool_a_SOURCES = gst-dialog.c gst-dialog.h gst-tool.c \ + gst-tool.h gst-platform-dialog.c gst-platform-dialog.h \ + gst-filter.c gst-filter.h gst-service-role.c \ + gst-service-role.h gst.h $(am__append_1) EXTRA_DIST = CommonMakefile $(headers) all: all-am @@ -339,6 +337,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-platform-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-service-role.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gst-tool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-lockbutton.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -Nru gnome-system-tools-2.32.0/src/common/um-lockbutton.c gnome-system-tools-3.0.0/src/common/um-lockbutton.c --- gnome-system-tools-2.32.0/src/common/um-lockbutton.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/um-lockbutton.c 2010-12-12 17:39:02.000000000 +0000 @@ -0,0 +1,638 @@ +/* + * Copyright (C) 2010 Red Hat, Inc. + * Author: Matthias Clasen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "um-lockbutton.h" + +#include +#include +#include + +#define P_(s) s + +struct _UmLockButtonPrivate +{ + GPermission *permission; + + gchar *text_lock; + gchar *text_unlock; + gchar *text_not_authorized; + + gchar *tooltip_lock; + gchar *tooltip_unlock; + gchar *tooltip_not_authorized; + + GtkWidget *box; + GtkWidget *eventbox; + GtkWidget *image; + GtkWidget *button; + GtkWidget *notebook; + + GtkWidget *label_lock; + GtkWidget *label_unlock; + GtkWidget *label_not_authorized; + + GCancellable *cancellable; + + gboolean constructed; +}; + +enum +{ + PROP_0, + PROP_PERMISSION, + PROP_TEXT_LOCK, + PROP_TEXT_UNLOCK, + PROP_TEXT_NOT_AUTHORIZED, + PROP_TOOLTIP_LOCK, + PROP_TOOLTIP_UNLOCK, + PROP_TOOLTIP_NOT_AUTHORIZED +}; + +enum +{ + CHANGED_SIGNAL, + LAST_SIGNAL, +}; + +static guint signals[LAST_SIGNAL] = {0, }; + +static void update_state (UmLockButton *button); + +static void on_permission_changed (GPermission *permission, + GParamSpec *pspec, + gpointer user_data); + +static void on_clicked (GtkButton *button, + gpointer user_data); + +static void on_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); + +G_DEFINE_TYPE (UmLockButton, um_lock_button, GTK_TYPE_BIN); + +static void +um_lock_button_finalize (GObject *object) +{ + UmLockButton *button = UM_LOCK_BUTTON (object); + UmLockButtonPrivate *priv = button->priv; + + g_free (priv->text_lock); + g_free (priv->text_unlock); + g_free (priv->text_not_authorized); + + g_free (priv->tooltip_lock); + g_free (priv->tooltip_unlock); + g_free (priv->tooltip_not_authorized); + + if (priv->cancellable != NULL) + { + g_cancellable_cancel (priv->cancellable); + g_object_unref (priv->cancellable); + } + + g_signal_handlers_disconnect_by_func (priv->permission, + on_permission_changed, + button); + + g_object_unref (priv->permission); + + G_OBJECT_CLASS (um_lock_button_parent_class)->finalize (object); +} + +static void +um_lock_button_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + UmLockButton *button = UM_LOCK_BUTTON (object); + UmLockButtonPrivate *priv = button->priv; + + switch (property_id) + { + case PROP_PERMISSION: + g_value_set_object (value, priv->permission); + break; + + case PROP_TEXT_LOCK: + g_value_set_string (value, priv->text_lock); + break; + + case PROP_TEXT_UNLOCK: + g_value_set_string (value, priv->text_unlock); + break; + + case PROP_TEXT_NOT_AUTHORIZED: + g_value_set_string (value, priv->text_not_authorized); + break; + + case PROP_TOOLTIP_LOCK: + g_value_set_string (value, priv->tooltip_lock); + break; + + case PROP_TOOLTIP_UNLOCK: + g_value_set_string (value, priv->tooltip_unlock); + break; + + case PROP_TOOLTIP_NOT_AUTHORIZED: + g_value_set_string (value, priv->tooltip_not_authorized); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +um_lock_button_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + UmLockButton *button = UM_LOCK_BUTTON (object); + UmLockButtonPrivate *priv = button->priv; + + switch (property_id) + { + case PROP_PERMISSION: + priv->permission = g_value_get_object (value); + break; + + case PROP_TEXT_LOCK: + g_free (priv->text_lock); + priv->text_lock = g_value_dup_string (value); + break; + + case PROP_TEXT_UNLOCK: + g_free (priv->text_unlock); + priv->text_unlock = g_value_dup_string (value); + break; + + case PROP_TEXT_NOT_AUTHORIZED: + g_free (priv->text_not_authorized); + priv->text_not_authorized = g_value_dup_string (value); + break; + + case PROP_TOOLTIP_LOCK: + g_free (priv->tooltip_lock); + priv->tooltip_lock = g_value_dup_string (value); + break; + + case PROP_TOOLTIP_UNLOCK: + g_free (priv->tooltip_unlock); + priv->tooltip_unlock = g_value_dup_string (value); + break; + + case PROP_TOOLTIP_NOT_AUTHORIZED: + g_free (priv->tooltip_not_authorized); + priv->tooltip_not_authorized = g_value_dup_string (value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } + + if (priv->constructed) + update_state (button); +} + +static void +um_lock_button_init (UmLockButton *button) +{ + button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, + UM_TYPE_LOCK_BUTTON, + UmLockButtonPrivate); +} + +static void +um_lock_button_constructed (GObject *object) +{ + UmLockButton *button = UM_LOCK_BUTTON (object); + UmLockButtonPrivate *priv = button->priv; + + priv->constructed = TRUE; + + g_signal_connect (priv->permission, "notify", + G_CALLBACK (on_permission_changed), button); + + priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_container_add (GTK_CONTAINER (button), priv->box); + + priv->eventbox = gtk_event_box_new (); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->eventbox), FALSE); + gtk_container_add (GTK_CONTAINER (priv->box), priv->eventbox); + gtk_widget_show (priv->eventbox); + + priv->image = gtk_image_new (); /* image is set in update_state() */ + gtk_container_add (GTK_CONTAINER (priv->eventbox), priv->image); + gtk_widget_show (priv->image); + + priv->notebook = gtk_notebook_new (); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_widget_show (priv->notebook); + + priv->button = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (priv->button), priv->notebook); + gtk_widget_show (priv->button); + + priv->label_lock = gtk_label_new (""); /* text is set in update_state */ + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->label_lock, NULL); + gtk_widget_show (priv->label_lock); + + priv->label_unlock = gtk_label_new (""); + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->label_unlock, NULL); + gtk_widget_show (priv->label_unlock); + + priv->label_not_authorized = gtk_label_new (""); + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->label_not_authorized, NULL); + gtk_widget_show (priv->label_not_authorized); + + gtk_box_pack_start (GTK_BOX (priv->box), priv->button, FALSE, FALSE, 0); + gtk_widget_show (priv->button); + + g_signal_connect (priv->eventbox, "button-press-event", + G_CALLBACK (on_button_press), button); + g_signal_connect (priv->button, "clicked", + G_CALLBACK (on_clicked), button); + + gtk_widget_set_no_show_all (priv->box, TRUE); + + update_state (button); + + if (G_OBJECT_CLASS (um_lock_button_parent_class)->constructed != NULL) + G_OBJECT_CLASS (um_lock_button_parent_class)->constructed (object); +} + +static void +um_lock_button_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + UmLockButtonPrivate *priv = UM_LOCK_BUTTON (widget)->priv; + + gtk_widget_get_preferred_width (priv->box, minimum, natural); +} + +static void +um_lock_button_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + UmLockButtonPrivate *priv = UM_LOCK_BUTTON (widget)->priv; + + gtk_widget_get_preferred_height (priv->box, minimum, natural); +} + +static void +um_lock_button_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + UmLockButtonPrivate *priv = UM_LOCK_BUTTON (widget)->priv; + GtkRequisition requisition; + GtkAllocation child_allocation; + + gtk_widget_set_allocation (widget, allocation); + gtk_widget_get_preferred_size (priv->box, &requisition, NULL); + child_allocation.x = allocation->x; + child_allocation.y = allocation->y; + child_allocation.width = requisition.width; + child_allocation.height = requisition.height; + gtk_widget_size_allocate (priv->box, &child_allocation); +} + +static void +um_lock_button_class_init (UmLockButtonClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + gobject_class->finalize = um_lock_button_finalize; + gobject_class->get_property = um_lock_button_get_property; + gobject_class->set_property = um_lock_button_set_property; + gobject_class->constructed = um_lock_button_constructed; + + widget_class->get_preferred_width = um_lock_button_get_preferred_width; + widget_class->get_preferred_height = um_lock_button_get_preferred_height; + widget_class->size_allocate = um_lock_button_size_allocate; + + g_type_class_add_private (klass, sizeof (UmLockButtonPrivate)); + + g_object_class_install_property (gobject_class, PROP_PERMISSION, + g_param_spec_object ("permission", + P_("Permission"), + P_("The GPermission object controlling this button"), + G_TYPE_PERMISSION, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TEXT_LOCK, + g_param_spec_string ("text-lock", + P_("Lock Text"), + P_("The text to display when prompting the user to lock"), + _("Lock"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TEXT_UNLOCK, + g_param_spec_string ("text-unlock", + P_("Unlock Text"), + P_("The text to display when prompting the user to unlock"), + _("Unlock"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TEXT_NOT_AUTHORIZED, + g_param_spec_string ("text-not-authorized", + P_("Not Authorized Text"), + P_("The text to display when prompting the user cannot obtain authorization"), + _("Locked"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TOOLTIP_LOCK, + g_param_spec_string ("tooltip-lock", + P_("Lock Tooltip"), + P_("The tooltip to display when prompting the user to lock"), + _("Dialog is unlocked.\nClick to prevent further changes"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TOOLTIP_UNLOCK, + g_param_spec_string ("tooltip-unlock", + P_("Unlock Tooltip"), + P_("The tooltip to display when prompting the user to unlock"), + _("Dialog is locked.\nClick to make changes"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_TOOLTIP_NOT_AUTHORIZED, + g_param_spec_string ("tooltip-not-authorized", + P_("Not Authorized Tooltip"), + P_("The tooltip to display when prompting the user cannot obtain authorization"), + _("System policy prevents changes.\nContact your system administrator"), + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); +} + +/** + * um_lock_button_new: + * @permission: a #GPermission + * + * Creates a new lock button which reflects the @permission. + * + * Returns: a new #UmLockButton + * + * Since: 3.0 + */ +GtkWidget * +um_lock_button_new (GPermission *permission) +{ + g_return_val_if_fail (permission != NULL, NULL); + + return GTK_WIDGET (g_object_new (UM_TYPE_LOCK_BUTTON, + "permission", permission, + NULL)); +} + +static void +update_state (UmLockButton *button) +{ + UmLockButtonPrivate *priv = button->priv; + gint page; + const gchar *tooltip; + gboolean sensitive; + gboolean visible; + GIcon *icon; + + visible = TRUE; + sensitive = TRUE; + + gtk_label_set_text (GTK_LABEL (priv->label_lock), priv->text_lock); + gtk_label_set_text (GTK_LABEL (priv->label_unlock), priv->text_unlock); + gtk_label_set_text (GTK_LABEL (priv->label_not_authorized), priv->text_not_authorized); + + if (g_permission_get_allowed (priv->permission)) + { + if (g_permission_get_can_release (priv->permission)) + { + page = 0; + tooltip = priv->tooltip_lock; + sensitive = TRUE; + } + else + { + page = 0; + tooltip = ""; + visible = FALSE; + } + } + else + { + if (g_permission_get_can_acquire (priv->permission)) + { + page = 1; + tooltip = button->priv->tooltip_unlock; + sensitive = TRUE; + } + else + { + page = 2; + tooltip = button->priv->tooltip_not_authorized; + sensitive = FALSE; + } + } + + if (g_permission_get_allowed (priv->permission)) + { + gchar *names[3]; + + names[0] = "changes-allow-symbolic"; + names[1] = "changes-allow"; + names[2] = NULL; + icon = g_themed_icon_new_from_names (names, -1); + } + else + { + gchar *names[3]; + + names[0] = "changes-prevent-symbolic"; + names[1] = "changes-prevent"; + names[2] = NULL; + icon = g_themed_icon_new_from_names (names, -1); + } + + gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon, GTK_ICON_SIZE_BUTTON); + g_object_unref (icon); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page); + gtk_widget_set_tooltip_markup (priv->box, tooltip); + + gtk_widget_set_sensitive (priv->box, sensitive); + + if (visible) + gtk_widget_show (priv->box); + else + gtk_widget_hide (priv->box); +} + +static void +on_permission_changed (GPermission *permission, + GParamSpec *pspec, + gpointer user_data) +{ + UmLockButton *button = UM_LOCK_BUTTON (user_data); + + update_state (button); +} + +static void +acquire_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + UmLockButton *button = UM_LOCK_BUTTON (user_data); + UmLockButtonPrivate *priv = button->priv; + GError *error; + gboolean res; + + error = NULL; + res = g_permission_acquire_finish (priv->permission, result, &error); + + if (error) + { + g_warning ("Error acquiring permission: %s", error->message); + g_error_free (error); + } + + g_object_unref (priv->cancellable); + priv->cancellable = NULL; + + update_state (button); +} + +static void +release_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + UmLockButton *button = UM_LOCK_BUTTON (user_data); + UmLockButtonPrivate *priv = button->priv; + GError *error; + gboolean res; + + error = NULL; + res = g_permission_release_finish (priv->permission, result, &error); + + if (error) + { + g_warning ("Error releasing permission: %s", error->message); + g_error_free (error); + } + + g_object_unref (priv->cancellable); + priv->cancellable = NULL; + + update_state (button); +} + +static void +handle_click (UmLockButton *button) +{ + UmLockButtonPrivate *priv = button->priv; + + if (!g_permission_get_allowed (priv->permission) && + g_permission_get_can_acquire (priv->permission)) + { + /* if we already have a pending interactive check, then do nothing */ + if (priv->cancellable != NULL) + goto out; + + priv->cancellable = g_cancellable_new (); + + g_permission_acquire_async (priv->permission, + priv->cancellable, + acquire_cb, + button); + } + else if (g_permission_get_allowed (priv->permission) && + g_permission_get_can_release (priv->permission)) + { + /* if we already have a pending interactive check, then do nothing */ + if (priv->cancellable != NULL) + goto out; + + priv->cancellable = g_cancellable_new (); + + g_permission_release_async (priv->permission, + priv->cancellable, + release_cb, + button); + } + + out: ; +} + +static void +on_clicked (GtkButton *_button, + gpointer user_data) + +{ + handle_click (UM_LOCK_BUTTON (user_data)); +} + +static void +on_button_press (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + handle_click (UM_LOCK_BUTTON (user_data)); +} + +/** + * um_lock_button_get_permission: + * @button: a #UmLockButton + * + * Obtains the #GPermission object that controls @button. + * + * Returns: the #GPermission of @button + * + * Since: 3.0 + */ +GPermission * +um_lock_button_get_permission (UmLockButton *button) +{ + g_return_val_if_fail (UM_IS_LOCK_BUTTON (button), NULL); + + return button->priv->permission; +} + diff -Nru gnome-system-tools-2.32.0/src/common/um-lockbutton.h gnome-system-tools-3.0.0/src/common/um-lockbutton.h --- gnome-system-tools-2.32.0/src/common/um-lockbutton.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/src/common/um-lockbutton.h 2010-12-12 17:39:02.000000000 +0000 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2010 Red Hat, Inc. + * Author: Matthias Clasen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __UM_LOCK_BUTTON_H__ +#define __UM_LOCK_BUTTON_H__ + +#include +#include + +G_BEGIN_DECLS + +#define UM_TYPE_LOCK_BUTTON (um_lock_button_get_type ()) +#define UM_LOCK_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UM_TYPE_LOCK_BUTTON, UmLockButton)) +#define UM_LOCK_BUTTON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), UM_LOCK_BUTTON, UmLockButtonClass)) +#define UM_IS_LOCK_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UM_TYPE_LOCK_BUTTON)) +#define UM_IS_LOCK_BUTTON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UM_TYPE_LOCK_BUTTON)) +#define UM_LOCK_BUTTON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UM_TYPE_LOCK_BUTTON, UmLockButtonClass)) + +typedef struct _UmLockButton UmLockButton; +typedef struct _UmLockButtonClass UmLockButtonClass; +typedef struct _UmLockButtonPrivate UmLockButtonPrivate; + +struct _UmLockButton +{ + GtkBin parent; + + UmLockButtonPrivate *priv; +}; + +struct _UmLockButtonClass +{ + GtkBinClass parent_class; + + void (*reserved0) (void); + void (*reserved1) (void); + void (*reserved2) (void); + void (*reserved3) (void); + void (*reserved4) (void); + void (*reserved5) (void); + void (*reserved6) (void); + void (*reserved7) (void); +}; + +GType um_lock_button_get_type (void) G_GNUC_CONST; +GtkWidget *um_lock_button_new (GPermission *permission); +GPermission *um_lock_button_get_permission (UmLockButton *button); + + +G_END_DECLS + +#endif /* __UM_LOCK_BUTTON_H__ */ diff -Nru gnome-system-tools-2.32.0/src/Makefile.in gnome-system-tools-3.0.0/src/Makefile.in --- gnome-system-tools-2.32.0/src/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/src/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -36,11 +36,7 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,8 +101,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -128,11 +122,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -151,26 +146,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -193,14 +191,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -209,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -232,7 +227,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/network/connection.c gnome-system-tools-3.0.0/src/network/connection.c --- gnome-system-tools-2.32.0/src/network/connection.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/network/connection.c 2010-12-12 17:24:40.000000000 +0000 @@ -21,6 +21,8 @@ #include #include +#include + #include "gst.h" #include "network-tool.h" #include "connection.h" @@ -113,7 +115,7 @@ } static void -connection_essids_combo_init (GtkComboBoxEntry *combo) +connection_essids_combo_init (GtkComboBox *combo) { GtkTreeModel *model; GtkCellRenderer *renderer; @@ -138,10 +140,10 @@ renderer, "value", 2); /* reuse text cell renderer for the essid */ - gtk_combo_box_entry_set_text_column (combo, 1); + gtk_combo_box_set_entry_text_column (combo, 1); - g_signal_connect (gtk_bin_get_child (GTK_BIN (combo)), "changed", - G_CALLBACK (on_dialog_changed), tool); + g_signal_connect (G_OBJECT (combo), "changed", + G_CALLBACK (on_dialog_changed), tool); } static void @@ -670,9 +672,9 @@ gcd->isp_frame = gst_dialog_get_widget (tool->main_dialog, "isp_data"); gcd->account_frame = gst_dialog_get_widget (tool->main_dialog, "isp_account_data"); - gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (gcd->serial_port), 0); + gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (gcd->serial_port), 0); - connection_essids_combo_init (GTK_COMBO_BOX_ENTRY (gcd->essid)); + connection_essids_combo_init (GTK_COMBO_BOX (gcd->essid)); connection_pppoe_combo_init (GTK_COMBO_BOX (gcd->pppoe_interface_combo)); return gcd; diff -Nru gnome-system-tools-2.32.0/src/network/ifaces-list.c gnome-system-tools-3.0.0/src/network/ifaces-list.c --- gnome-system-tools-2.32.0/src/network/ifaces-list.c 2010-06-07 21:51:49.000000000 +0000 +++ gnome-system-tools-3.0.0/src/network/ifaces-list.c 2010-12-12 17:40:18.000000000 +0000 @@ -292,7 +292,7 @@ config_method = oobs_iface_ethernet_get_configuration_method (OOBS_IFACE_ETHERNET (iface)); if (config_method && strcmp (config_method, "static") == 0) - g_string_append_printf (str, "%s %s %s %s", + g_string_append_printf (str, "%s %s %s %s", _("Address:"), oobs_iface_ethernet_get_ip_address (OOBS_IFACE_ETHERNET (iface)), _("Subnet mask:"), @@ -302,7 +302,7 @@ } else if (OOBS_IS_IFACE_PLIP (iface)) { - g_string_append_printf (str, "%s %s %s %s", + g_string_append_printf (str, "%s %s %s %s", _("Address:"), oobs_iface_plip_get_address (OOBS_IFACE_PLIP (iface)), _("Remote address:"), @@ -316,12 +316,12 @@ if (strcmp (type, "modem") == 0 || strcmp (type, "isdn") == 0) - g_string_append_printf (str,"%s %s %s %s", + g_string_append_printf (str,"%s %s %s %s", _("Type:"), type, _("Phone number:"), oobs_iface_ppp_get_phone_number (OOBS_IFACE_PPP (iface))); else if (strcmp (type, "gprs") == 0) - g_string_append_printf (str, "%s %s %s %s", + g_string_append_printf (str, "%s %s %s %s", _("Type:"), type, _("Access point name:"), oobs_iface_ppp_get_apn (OOBS_IFACE_PPP (iface))); @@ -330,13 +330,13 @@ OobsIfaceEthernet *ethernet; ethernet = oobs_iface_ppp_get_ethernet (OOBS_IFACE_PPP (iface)); - g_string_append_printf (str, "%s %s %s %s", + g_string_append_printf (str, "%s %s %s %s", _("Type:"), type, _("Ethernet interface:"), oobs_iface_get_device_name (OOBS_IFACE (ethernet))); } else - g_string_append_printf (str, "%s %s", _("Type:"), type); + g_string_append_printf (str, "%s %s", _("Type:"), type); } text = str->str; diff -Nru gnome-system-tools-2.32.0/src/network/locations-combo.c gnome-system-tools-3.0.0/src/network/locations-combo.c --- gnome-system-tools-2.32.0/src/network/locations-combo.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/network/locations-combo.c 2010-12-12 17:35:29.000000000 +0000 @@ -354,7 +354,7 @@ priv->save_dialog = gtk_dialog_new_with_buttons (_("Save location"), GTK_WINDOW (priv->tool->main_dialog), - GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_MODAL, NULL); gtk_dialog_add_button (GTK_DIALOG (priv->save_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); button = gtk_dialog_add_button (GTK_DIALOG (priv->save_dialog), GTK_STOCK_SAVE, GTK_RESPONSE_OK); diff -Nru gnome-system-tools-2.32.0/src/network/Makefile.in gnome-system-tools-3.0.0/src/network/Makefile.in --- gnome-system-tools-2.32.0/src/network/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/src/network/Makefile.in 2011-04-03 20:04:15.000000000 +0000 @@ -45,11 +45,7 @@ bin_PROGRAMS = network-admin$(EXEEXT) subdir = src/network ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -137,8 +133,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -160,11 +154,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -183,26 +178,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -225,14 +223,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -241,6 +234,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -264,7 +259,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/services/main.c gnome-system-tools-3.0.0/src/services/main.c --- gnome-system-tools-2.32.0/src/services/main.c 2010-01-29 14:14:41.000000000 +0000 +++ gnome-system-tools-3.0.0/src/services/main.c 2010-12-19 21:23:37.000000000 +0000 @@ -50,6 +50,9 @@ table_create (); service_settings_table_create (); + gtk_window_set_default_size (GTK_WINDOW (GST_TOOL (tool)->main_dialog), + 400, 550); + gtk_widget_show (GTK_WIDGET (tool->main_dialog)); gtk_main (); diff -Nru gnome-system-tools-2.32.0/src/services/Makefile.in gnome-system-tools-3.0.0/src/services/Makefile.in --- gnome-system-tools-2.32.0/src/services/Makefile.in 2010-09-27 16:15:56.000000000 +0000 +++ gnome-system-tools-3.0.0/src/services/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -45,11 +45,7 @@ bin_PROGRAMS = services-admin$(EXEEXT) subdir = src/services ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -128,8 +124,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -151,11 +145,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -174,26 +169,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -216,14 +214,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -232,6 +225,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -255,7 +250,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/services/service-settings-table.c gnome-system-tools-3.0.0/src/services/service-settings-table.c --- gnome-system-tools-2.32.0/src/services/service-settings-table.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/services/service-settings-table.c 2010-12-12 17:35:30.000000000 +0000 @@ -167,7 +167,7 @@ { GtkTreeModel *combo_model; GtkCellRenderer *renderer; - GtkObject *adjustment; + GtkAdjustment *adjustment; /* runlevel name */ renderer = gtk_cell_renderer_text_new (); diff -Nru gnome-system-tools-2.32.0/src/services/services-tool.c gnome-system-tools-3.0.0/src/services/services-tool.c --- gnome-system-tools-2.32.0/src/services/services-tool.c 2010-02-13 22:35:40.000000000 +0000 +++ gnome-system-tools-3.0.0/src/services/services-tool.c 2010-12-12 17:39:02.000000000 +0000 @@ -105,6 +105,6 @@ "name", "services", "title", _("Services Settings"), "icon", "network-server", - "lock-button", FALSE, + "show-lock-button", FALSE, NULL); } diff -Nru gnome-system-tools-2.32.0/src/shares/Makefile.in gnome-system-tools-3.0.0/src/shares/Makefile.in --- gnome-system-tools-2.32.0/src/shares/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/shares/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -45,11 +45,7 @@ bin_PROGRAMS = shares-admin$(EXEEXT) subdir = src/shares ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -167,8 +163,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -190,11 +184,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -213,26 +208,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -255,14 +253,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -271,6 +264,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -294,7 +289,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/shares/nautilus/Makefile.in gnome-system-tools-3.0.0/src/shares/nautilus/Makefile.in --- gnome-system-tools-2.32.0/src/shares/nautilus/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/shares/nautilus/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -37,11 +37,7 @@ subdir = src/shares/nautilus DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -124,8 +120,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -147,11 +141,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -170,26 +165,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -212,14 +210,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -228,6 +221,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -251,7 +246,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/time/e-map/e-map.c gnome-system-tools-3.0.0/src/time/e-map/e-map.c --- gnome-system-tools-2.32.0/src/time/e-map/e-map.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/e-map/e-map.c 2010-12-12 17:35:30.000000000 +0000 @@ -32,14 +32,17 @@ #include "e-map.h" #include "e-map-marshal.h" +#define E_MAP_TWEEN_TIMEOUT_MSECS 25 +#define E_MAP_TWEEN_DURATION_MSECS 150 + /* Scroll step increment */ #define SCROLL_STEP_SIZE 32 /* */ -#define E_MAP_GET_WIDTH(map) gdk_pixbuf_get_width(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf) -#define E_MAP_GET_HEIGHT(map) gdk_pixbuf_get_height(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf) +#define E_MAP_GET_WIDTH(map) gtk_adjustment_get_upper((map)->priv->hadjustment) +#define E_MAP_GET_HEIGHT(map) gtk_adjustment_get_upper((map)->priv->vadjustment) /* Zoom state - keeps track of animation hacks */ @@ -52,18 +55,36 @@ } EMapZoomState; +/* The Tween struct used for zooming */ + +typedef struct _EMapTween EMapTween; + +struct _EMapTween { + guint start_time; + guint end_time; + double longitude_offset; + double latitude_offset; + double zoom_factor; +}; + /* Private part of the EMap structure */ struct _EMapPrivate { /* Pointer to map image */ - GdkPixbuf *map_pixbuf, *map_render_pixbuf; + GdkPixbuf *map_pixbuf; + cairo_surface_t *map_render_surface; /* Settings */ gboolean frozen, smooth_zoom; /* Adjustments for scrolling */ - GtkAdjustment *hadj; - GtkAdjustment *vadj; + GtkAdjustment *hadjustment; + GtkAdjustment *vadjustment; + + /* GtkScrollablePolicy needs to be checked when + * driving the scrollable adjustment values */ + guint hscroll_policy : 1; + guint vscroll_policy : 1; /* Current scrolling offsets */ gint xofs, yofs; @@ -74,120 +95,229 @@ /* Dots */ GPtrArray *points; + + /* Tweens */ + GSList *tweens; + GTimer *timer; + guint timer_current_ms; + guint tween_id; +}; + +/* Properties */ + +enum { + PROP_0, + + /* For scrollable interface */ + PROP_HADJUSTMENT, + PROP_VADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_VSCROLL_POLICY }; /* Internal prototypes */ -static void e_map_class_init (EMapClass *class); -static void e_map_init (EMap *view); static void e_map_finalize (GObject *object); -static void e_map_destroy (GtkObject *object); -static void e_map_unmap (GtkWidget *widget); +static void e_map_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void e_map_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); static void e_map_realize (GtkWidget *widget); static void e_map_unrealize (GtkWidget *widget); -static void e_map_size_request (GtkWidget *widget, GtkRequisition *requisition); +static void e_map_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height); +static void e_map_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width); static void e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gint e_map_button_press (GtkWidget *widget, GdkEventButton *event); static gint e_map_button_release (GtkWidget *widget, GdkEventButton *event); static gint e_map_motion (GtkWidget *widget, GdkEventMotion *event); -static gint e_map_expose (GtkWidget *widget, GdkEventExpose *event); +static gint e_map_draw (GtkWidget *widget, cairo_t *cr); static gint e_map_key_press (GtkWidget *widget, GdkEventKey *event); -static void e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustment *vadj); -static void update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays); -static void set_scroll_area (EMap *view); -static void request_paint_area (EMap *view, GdkRectangle *area); -static void center_at (EMap *map, gint x, gint y, gboolean scroll); -static void smooth_center_at (EMap *map, gint x, gint y); +/* GtkScrollable implementation */ +static void e_map_set_hadjustment_values (EMap *map); +static void e_map_set_vadjustment_values (EMap *map); +static void e_map_set_hadjustment (EMap *map, + GtkAdjustment *adjustment); +static void e_map_set_vadjustment (EMap *map, + GtkAdjustment *adjustment); +static void e_map_adjustment_changed (GtkAdjustment *adjustment, + EMap *map); + +static void e_map_get_current_location (EMap *map, double *longitude, double *latitude); +static void e_map_world_to_render_surface (EMap *map, gdouble world_longitude, gdouble world_latitude, + gdouble *win_x, gdouble *win_y); +static void update_render_surface (EMap *map, gboolean render_overlays); +static void set_scroll_area (EMap *view, gint width, gint height); +static void center_at (EMap *map, double longitude, double latitude); static void scroll_to (EMap *view, gint x, gint y); -static void zoom_do (EMap *map); static gint load_map_background (EMap *view, gchar *name); -static void adjustment_changed_cb (GtkAdjustment *adj, gpointer data); static void update_and_paint (EMap *map); static void update_render_point (EMap *map, EMapPoint *point); static void repaint_point (EMap *map, EMapPoint *point); -static GtkWidgetClass *parent_class; +/* ------ * + * Tweens * + * ------ */ -/* ----------------- * - * Widget management * - * ----------------- */ +static gboolean +e_map_is_tweening (EMap *view) +{ + return view->priv->timer != NULL; +} -/** - * e_map_get_type: - * @void: - * - * Registers the #EMap class if necessary, and returns the type ID - * associated to it. - * - * Return value: The type ID of the #EMap class. - **/ +static void +e_map_stop_tweening (EMap *view) +{ + EMapPrivate *priv = view->priv; + + g_assert (priv->tweens == NULL); + + if (!e_map_is_tweening (view)) + return; + + g_timer_destroy (priv->timer); + priv->timer = NULL; + g_source_remove (priv->tween_id); + priv->tween_id = 0; +} -GType -e_map_get_type (void) +static void +e_map_tween_destroy (EMap *view, EMapTween *tween) { - static GType type = 0; + EMapPrivate *priv = view->priv; - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (EMapClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) e_map_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EMap), - 0, /* n_preallocs */ - (GInstanceInitFunc) e_map_init, - NULL /* value_table */ - }; + priv->tweens = g_slist_remove (priv->tweens, tween); + g_slice_free (EMapTween, tween); - type = g_type_register_static ( - GTK_TYPE_WIDGET, "EMap", &type_info, 0); - } + if (priv->tweens == NULL) + e_map_stop_tweening (view); +} + +static gboolean +e_map_do_tween_cb (gpointer data) +{ + EMap *view = data; + EMapPrivate *priv = view->priv; + GSList *walk; + + priv->timer_current_ms = g_timer_elapsed (priv->timer, NULL) * 1000; + gtk_widget_queue_draw (GTK_WIDGET (view)); + + /* Can't use for loop here, because we need to advance + * the list before deleting. + */ + walk = priv->tweens; + while (walk) + { + EMapTween *tween = walk->data; - return type; + walk = walk->next; + + if (tween->end_time <= priv->timer_current_ms) + e_map_tween_destroy (view, tween); + } + + return TRUE; } +static void +e_map_start_tweening (EMap *view) +{ + EMapPrivate *priv = view->priv; + + if (e_map_is_tweening (view)) + return; + + priv->timer = g_timer_new (); + priv->timer_current_ms = 0; + priv->tween_id = gdk_threads_add_timeout (E_MAP_TWEEN_TIMEOUT_MSECS, + e_map_do_tween_cb, + view); + g_timer_start (priv->timer); +} + +static void +e_map_tween_new (EMap *view, guint msecs, double longitude_offset, double latitude_offset, double zoom_factor) +{ + EMapPrivate *priv = view->priv; + EMapTween *tween; + + if (!priv->smooth_zoom) + return; + + e_map_start_tweening (view); + + tween = g_slice_new (EMapTween); + + tween->start_time = priv->timer_current_ms; + tween->end_time = tween->start_time + msecs; + tween->longitude_offset = longitude_offset; + tween->latitude_offset = latitude_offset; + tween->zoom_factor = zoom_factor; + + priv->tweens = g_slist_prepend (priv->tweens, tween); + + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + +G_DEFINE_TYPE_WITH_CODE ( + EMap, + e_map, + GTK_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) + +static void +e_map_tween_new_from (EMap *view, guint msecs, double longitude, double latitude, double zoom) +{ + double current_longitude, current_latitude; + + e_map_get_current_location (view, ¤t_longitude, ¤t_latitude); + + e_map_tween_new (view, + msecs, + longitude - current_longitude, + latitude - current_latitude, + zoom / e_map_get_magnification (view)); +} + +/* ----------------- * + * Widget management * + * ----------------- */ + /* Class initialization function for the map view */ static void e_map_class_init (EMapClass *class) { GObjectClass *gobject_class; - GtkObjectClass *object_class; GtkWidgetClass *widget_class; gobject_class = (GObjectClass *) class; - object_class = (GtkObjectClass *) class; widget_class = (GtkWidgetClass *) class; - parent_class = g_type_class_ref(GTK_TYPE_WIDGET); - gobject_class->finalize = e_map_finalize; + gobject_class->set_property = e_map_set_property; + gobject_class->get_property = e_map_get_property; - object_class->destroy = e_map_destroy; - - class->set_scroll_adjustments = e_map_set_scroll_adjustments; - widget_class->set_scroll_adjustments_signal = g_signal_new ("set_scroll_adjustments", - G_OBJECT_CLASS_TYPE (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EMapClass, set_scroll_adjustments), - NULL, NULL, - g_cclosure_user_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, 2, - GTK_TYPE_ADJUSTMENT, - GTK_TYPE_ADJUSTMENT); + /* Scrollable interface properties */ + g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment"); + g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment"); + g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy"); + g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy"); - widget_class->unmap = e_map_unmap; widget_class->realize = e_map_realize; widget_class->unrealize = e_map_unrealize; - widget_class->size_request = e_map_size_request; + widget_class->get_preferred_height = e_map_get_preferred_height; + widget_class->get_preferred_width = e_map_get_preferred_width; widget_class->size_allocate = e_map_size_allocate; widget_class->button_press_event = e_map_button_press; widget_class->button_release_event = e_map_button_release; widget_class->motion_notify_event = e_map_motion; - widget_class->expose_event = e_map_expose; + widget_class->draw = e_map_draw; widget_class->key_press_event = e_map_key_press; } @@ -197,8 +327,11 @@ e_map_init (EMap *view) { EMapPrivate *priv; + GtkWidget *widget; gchar *map_file_name = g_build_filename (PIXMAPS_DIR, "world_map-960.png", NULL); + widget = GTK_WIDGET (view); + priv = g_new0 (EMapPrivate, 1); view->priv = priv; @@ -209,29 +342,8 @@ priv->zoom_state = E_MAP_ZOOMED_OUT; priv->points = g_ptr_array_new (); - gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE); - gtk_widget_set_has_window (GTK_WIDGET (view), TRUE); -} - -/* Destroy handler for the map view */ - -static void -e_map_destroy (GtkObject *object) -{ - EMap *view; - EMapPrivate *priv; - - g_return_if_fail (object != NULL); - g_return_if_fail (E_IS_MAP (object)); - - view = E_MAP (object); - priv = view->priv; - - g_signal_handlers_disconnect_by_func (priv->hadj, adjustment_changed_cb, view); - g_signal_handlers_disconnect_by_func (priv->vadj, adjustment_changed_cb, view); - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); + gtk_widget_set_can_focus (widget, TRUE); + gtk_widget_set_has_window (widget, TRUE); } /* Finalize handler for the map view */ @@ -248,11 +360,9 @@ view = E_MAP (object); priv = view->priv; - g_object_unref((priv->hadj)); - priv->hadj = NULL; - - g_object_unref((priv->vadj)); - priv->vadj = NULL; + while (priv->tweens) + e_map_tween_destroy (view, priv->tweens->data); + e_map_stop_tweening (view); if (priv->map_pixbuf) { @@ -260,29 +370,77 @@ priv->map_pixbuf = NULL; } - if (priv->map_render_pixbuf) - { - g_object_unref (priv->map_render_pixbuf); - priv->map_render_pixbuf = NULL; - } + /* gone in unrealize */ + g_assert (priv->map_render_surface == NULL); g_free (priv); view->priv = NULL; - if (G_OBJECT_CLASS (parent_class)->finalize) - (*G_OBJECT_CLASS (parent_class)->finalize) (object); + G_OBJECT_CLASS (e_map_parent_class)->finalize (object); } -/* Unmap handler for the map view */ - static void -e_map_unmap (GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (E_IS_MAP (widget)); - - if (GTK_WIDGET_CLASS (parent_class)->unmap) - (*GTK_WIDGET_CLASS (parent_class)->unmap) (widget); +e_map_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EMap *map; + + map = E_MAP (object); + + switch (prop_id) + { + case PROP_HADJUSTMENT: + e_map_set_hadjustment (map, g_value_get_object (value)); + break; + case PROP_VADJUSTMENT: + e_map_set_vadjustment (map, g_value_get_object (value)); + break; + case PROP_HSCROLL_POLICY: + map->priv->hscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (map)); + break; + case PROP_VSCROLL_POLICY: + map->priv->vscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (map)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +e_map_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EMap *map; + + map = E_MAP (object); + + switch (prop_id) + { + case PROP_HADJUSTMENT: + g_value_set_object (value, map->priv->hadjustment); + break; + case PROP_VADJUSTMENT: + g_value_set_object (value, map->priv->vadjustment); + break; + case PROP_HSCROLL_POLICY: + g_value_set_enum (value, map->priv->hscroll_policy); + break; + case PROP_VSCROLL_POLICY: + g_value_set_enum (value, map->priv->vscroll_policy); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } /* Realize handler for the map view */ @@ -309,13 +467,12 @@ attr.width = allocation.width; attr.height = allocation.height; attr.wclass = GDK_INPUT_OUTPUT; - attr.visual = gdk_rgb_get_visual (); - attr.colormap = gdk_rgb_get_colormap (); + attr.visual = gtk_widget_get_visual (widget); attr.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK; - attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; window = gdk_window_new ( gtk_widget_get_parent_window (widget), &attr, attr_mask); @@ -326,41 +483,56 @@ style = gtk_style_attach (style, window); gtk_widget_set_style (widget, style); - gdk_window_set_back_pixmap (window, NULL, FALSE); - update_render_pixbuf (E_MAP (widget), GDK_INTERP_BILINEAR, TRUE); + update_render_surface (E_MAP (widget), TRUE); } -/* Unrealize handler for the map view */ - static void e_map_unrealize (GtkWidget *widget) { + EMap *view = E_MAP (widget); + EMapPrivate *priv = view->priv; + + cairo_surface_destroy (priv->map_render_surface); + priv->map_render_surface = NULL; + + if (GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) + (*GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) (widget); +} + +/* Size requests handlers for the map view */ + +static void +e_map_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height) +{ + EMap *view; + EMapPrivate *priv; + g_return_if_fail (widget != NULL); g_return_if_fail (E_IS_MAP (widget)); - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); -} + view = E_MAP (widget); + priv = view->priv; -/* Size_request handler for the map view */ + /* TODO: Put real sizes here. */ + + *minimum_height = *natural_height = gdk_pixbuf_get_height (priv->map_pixbuf); +} static void -e_map_size_request (GtkWidget *widget, GtkRequisition *requisition) +e_map_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width) { EMap *view; EMapPrivate *priv; g_return_if_fail (widget != NULL); g_return_if_fail (E_IS_MAP (widget)); - g_return_if_fail (requisition != NULL); view = E_MAP (widget); priv = view->priv; /* TODO: Put real sizes here. */ - requisition->width = gdk_pixbuf_get_width (priv->map_pixbuf); - requisition->height = gdk_pixbuf_get_height (priv->map_pixbuf); + *minimum_width = *natural_width = gdk_pixbuf_get_width (priv->map_pixbuf); } /* Size_allocate handler for the map view */ @@ -369,7 +541,6 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { EMap *view; - GdkRectangle area; g_return_if_fail (widget != NULL); g_return_if_fail (E_IS_MAP (widget)); @@ -390,14 +561,10 @@ window, allocation->x, allocation->y, allocation->width, allocation->height); - area.x = 0; - area.y = 0; - area.width = allocation->width; - area.height = allocation->height; - request_paint_area (E_MAP (widget), &area); + gtk_widget_queue_draw (widget); } - update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE); + update_render_surface (view, TRUE); } /* Button press handler for the map view */ @@ -440,85 +607,82 @@ */ } -/* Expose handler for the map view */ - -static gint -e_map_expose (GtkWidget *widget, GdkEventExpose *event) +static double +e_map_get_tween_effect (EMap *view, EMapTween *tween) { - EMap *view; + double elapsed; - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (E_IS_MAP (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); + elapsed = (double) (view->priv->timer_current_ms - tween->start_time) / tween->end_time; - view = E_MAP (widget); - - request_paint_area (view, &event->area); - return TRUE; + return MAX (0.0, 1.0 - elapsed); } -/* Set_scroll_adjustments handler for the map view */ - static void -e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustment *vadj) +e_map_apply_tween (EMapTween *tween, double effect, double *longitude, double *latitude, double *zoom) { - EMap *view; - EMapPrivate *priv; - gboolean need_adjust; - - g_return_if_fail (widget != NULL); - g_return_if_fail (E_IS_MAP (widget)); + *zoom *= pow (tween->zoom_factor, effect); + *longitude += tween->longitude_offset * effect; + *latitude += tween->latitude_offset * effect; +} - view = E_MAP (widget); - priv = view->priv; +static void +e_map_tweens_compute_matrix (EMap *view, cairo_matrix_t *matrix) +{ + EMapPrivate *priv = view->priv; + GSList *walk; + double zoom, x, y, latitude, longitude, effect; + GtkAllocation allocation; - if (hadj) g_return_if_fail (GTK_IS_ADJUSTMENT (hadj)); - else hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); + if (!e_map_is_tweening (view)) + { + cairo_matrix_init_translate (matrix, -priv->xofs, -priv->yofs); + return; + } - if (vadj) g_return_if_fail (GTK_IS_ADJUSTMENT (vadj)); - else vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); + e_map_get_current_location (view, &longitude, &latitude); + zoom = 1.0; - if (priv->hadj && priv->hadj != hadj) - { - g_signal_handlers_disconnect_by_func (priv->hadj, - adjustment_changed_cb, - view); - g_object_unref (priv->hadj); - } + for (walk = priv->tweens; walk; walk = walk->next) + { + EMapTween *tween = walk->data; - if (priv->vadj && priv->vadj != vadj) - { - g_signal_handlers_disconnect_by_func (priv->vadj, - adjustment_changed_cb, - view); - g_object_unref (priv->vadj); - } + effect = e_map_get_tween_effect (view, tween); + e_map_apply_tween (tween, effect, &longitude, &latitude, &zoom); + } - need_adjust = FALSE; + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); + cairo_matrix_init_translate (matrix, + allocation.width / 2.0, + allocation.height / 2.0); - if (priv->hadj != hadj) - { - priv->hadj = hadj; - g_object_ref_sink (priv->hadj); + e_map_world_to_render_surface (view, + longitude, latitude, + &x, &y); + cairo_matrix_scale (matrix, zoom, zoom); + cairo_matrix_translate (matrix, -x, -y); +} - g_signal_connect (priv->hadj, "value_changed", - G_CALLBACK (adjustment_changed_cb), view); +/* Draw handler for the map view */ - need_adjust = TRUE; - } +static gboolean +e_map_draw (GtkWidget *widget, cairo_t *cr) +{ + EMap *view; + EMapPrivate *priv; + cairo_matrix_t matrix; - if (priv->vadj != vadj) - { - priv->vadj = vadj; - g_object_ref_sink (priv->vadj); + view = E_MAP (widget); + priv = view->priv; - g_signal_connect (priv->vadj, "value_changed", - G_CALLBACK (adjustment_changed_cb), view); + e_map_tweens_compute_matrix (view, &matrix); + cairo_transform (cr, &matrix); - need_adjust = TRUE; - } + cairo_set_source_surface (cr, + priv->map_render_surface, + 0, 0); + cairo_paint (cr); - if (need_adjust) adjustment_changed_cb (NULL, view); + return FALSE; } /* Key press handler for the map view */ @@ -536,25 +700,25 @@ switch (event->keyval) { - case GDK_Up: + case GDK_KEY_Up: do_scroll = TRUE; xofs = 0; yofs = -SCROLL_STEP_SIZE; break; - case GDK_Down: + case GDK_KEY_Down: do_scroll = TRUE; xofs = 0; yofs = SCROLL_STEP_SIZE; break; - case GDK_Left: + case GDK_KEY_Left: do_scroll = TRUE; xofs = -SCROLL_STEP_SIZE; yofs = 0; break; - case GDK_Right: + case GDK_KEY_Right: do_scroll = TRUE; xofs = SCROLL_STEP_SIZE; yofs = 0; @@ -570,27 +734,18 @@ gint upper; gint x, y; - page_size = gtk_adjustment_get_page_size (priv->hadj); - upper = gtk_adjustment_get_upper (priv->hadj); + page_size = gtk_adjustment_get_page_size (priv->hadjustment); + upper = gtk_adjustment_get_upper (priv->hadjustment); x = CLAMP (priv->xofs + xofs, 0, upper - page_size); - page_size = gtk_adjustment_get_page_size (priv->vadj); - upper = gtk_adjustment_get_upper (priv->vadj); + page_size = gtk_adjustment_get_page_size (priv->vadjustment); + upper = gtk_adjustment_get_upper (priv->vadjustment); y = CLAMP (priv->yofs + yofs, 0, upper - page_size); scroll_to (view, x, y); - g_signal_handlers_block_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - g_signal_handlers_block_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - - gtk_adjustment_set_value (priv->hadj, x); - gtk_adjustment_set_value (priv->vadj, y); - - g_signal_emit_by_name (priv->hadj, "value_changed"); - g_signal_emit_by_name (priv->vadj, "value_changed"); - - g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + gtk_adjustment_set_value (priv->hadjustment, x); + gtk_adjustment_set_value (priv->vadjustment, y); } return TRUE; @@ -642,8 +797,8 @@ priv = map->priv; g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); - width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - height = gdk_pixbuf_get_height (priv->map_render_pixbuf); + width = E_MAP_GET_WIDTH (map); + height = E_MAP_GET_HEIGHT (map); *world_longitude = (win_x + priv->xofs - (gdouble) width / 2.0) / ((gdouble) width / 2.0) * 180.0; @@ -651,24 +806,33 @@ ((gdouble) height / 2.0) * 90.0; } -void -e_map_world_to_window (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y) +static void +e_map_world_to_render_surface (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y) { - EMapPrivate *priv; gint width, height; - g_return_if_fail (map); + width = E_MAP_GET_WIDTH (map); + height = E_MAP_GET_HEIGHT (map); - priv = map->priv; - g_return_if_fail (priv->map_render_pixbuf); + *win_x = (width / 2.0 + (width / 2.0) * world_longitude / 180.0); + *win_y = (height / 2.0 - (height / 2.0) * world_latitude / 90.0); +} + +void +e_map_world_to_window (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y) +{ + EMapPrivate *priv; + + g_return_if_fail (E_IS_MAP (map)); + g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); g_return_if_fail (world_longitude >= -180.0 && world_longitude <= 180.0); g_return_if_fail (world_latitude >= -90.0 && world_latitude <= 90.0); - width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - height = gdk_pixbuf_get_height (priv->map_render_pixbuf); + priv = map->priv; - *win_x = (width / 2.0 + (width / 2.0) * world_longitude / 180.0) - priv->xofs; - *win_y = (height / 2.0 - (height / 2.0) * world_latitude / 90.0) - priv->yofs; + e_map_world_to_render_surface (map, world_longitude, world_latitude, win_x, win_y); + *win_x -= priv->xofs; + *win_y -= priv->yofs; #ifdef DEBUG printf ("Map size: (%d, %d)\nCoords: (%.1f, %.1f) -> (%.1f, %.1f)\n---\n", width, height, world_longitude, world_latitude, *win_x, *win_y); @@ -687,41 +851,54 @@ else return 1.0; } +static void +e_map_set_zoom (EMap *view, EMapZoomState zoom) +{ + EMapPrivate *priv = view->priv; + + if (priv->zoom_state == zoom) + return; + + priv->zoom_state = zoom; + update_render_surface (view, TRUE); + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + void e_map_zoom_to_location (EMap *map, gdouble longitude, gdouble latitude) { EMapPrivate *priv; + double prevlong, prevlat; + double prevzoom; g_return_if_fail (map); g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); priv = map->priv; + e_map_get_current_location (map, &prevlong, &prevlat); + prevzoom = e_map_get_magnification (map); - if (priv->zoom_state == E_MAP_ZOOMED_IN) e_map_zoom_out (map); - else if (priv->zoom_state != E_MAP_ZOOMED_OUT) return; + e_map_set_zoom (map, E_MAP_ZOOMED_IN); + center_at (map, longitude, latitude); - priv->zoom_state = E_MAP_ZOOMING_IN; - priv->zoom_target_long = longitude; - priv->zoom_target_lat = latitude; - - zoom_do (map); + e_map_tween_new_from (map, E_MAP_TWEEN_DURATION_MSECS, prevlong, prevlat, prevzoom); } void e_map_zoom_out (EMap *map) { - EMapPrivate *priv; + double longitude, latitude; + double prevzoom; g_return_if_fail (map); g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); - priv = map->priv; - - if (priv->zoom_state != E_MAP_ZOOMED_IN) return; + e_map_get_current_location (map, &longitude, &latitude); + prevzoom = e_map_get_magnification (map); + e_map_set_zoom (map, E_MAP_ZOOMED_OUT); + center_at (map, longitude, latitude); - priv->zoom_state = E_MAP_ZOOMING_OUT; - zoom_do (map); - priv->zoom_state = E_MAP_ZOOMED_OUT; + e_map_tween_new_from (map, E_MAP_TWEEN_DURATION_MSECS, longitude, latitude, prevzoom); } void @@ -789,7 +966,7 @@ /* FIXME: Re-scaling the whole pixbuf is more than a little * overkill when just one point is removed */ - update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); + update_render_surface (map, TRUE); repaint_point (map, point); } @@ -849,7 +1026,7 @@ gdouble x, y; priv = map->priv; - if (!priv->map_render_pixbuf) return FALSE; + if (!priv->map_render_surface) return FALSE; e_map_world_to_window (map, point->longitude, point->latitude, &x, &y); gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); @@ -868,7 +1045,7 @@ EMapPoint *point_chosen = NULL, *point; gdouble min_dist = 0.0, dist; gdouble dx, dy; - guint i; + gint i; priv = map->priv; @@ -896,26 +1073,10 @@ * ------------------ */ static void -repaint_visible (EMap *map) -{ - GdkRectangle area; - GtkAllocation allocation; - - gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - - area.x = 0; - area.y = 0; - area.width = allocation.width; - area.height = allocation.height; - - request_paint_area (map, &area); -} - -static void update_and_paint (EMap *map) { - update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); - repaint_visible (map); + update_render_surface (map, TRUE); + gtk_widget_queue_draw (GTK_WIDGET (map)); } static gint @@ -932,22 +1093,57 @@ if (priv->map_pixbuf) g_object_unref (priv->map_pixbuf); priv->map_pixbuf = pb0; - update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE); + update_render_surface (view, TRUE); return TRUE; } static void -update_render_pixbuf (EMap *map, - GdkInterpType interp, - gboolean render_overlays) +set_scroll_area (EMap *view, int width, int height) +{ + EMapPrivate *priv; + GtkAllocation allocation; + + priv = view->priv; + + if (!gtk_widget_get_realized (GTK_WIDGET (view))) return; + if (!priv->hadjustment || !priv->vadjustment) return; + + g_object_freeze_notify (G_OBJECT (priv->hadjustment)); + g_object_freeze_notify (G_OBJECT (priv->vadjustment)); + + gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); + + priv->xofs = CLAMP (priv->xofs, 0, width - allocation.width); + priv->yofs = CLAMP (priv->yofs, 0, height - allocation.height); + + gtk_adjustment_configure (priv->hadjustment, + priv->xofs, + 0, width, + SCROLL_STEP_SIZE, + allocation.width / 2, + allocation.width); + gtk_adjustment_configure (priv->vadjustment, + priv->yofs, + 0, height, + SCROLL_STEP_SIZE, + allocation.height / 2, + allocation.height); + + g_object_thaw_notify (G_OBJECT (priv->hadjustment)); + g_object_thaw_notify (G_OBJECT (priv->vadjustment)); +} + +static void +update_render_surface (EMap *map, + gboolean render_overlays) { EMapPrivate *priv; EMapPoint *point; GtkAllocation allocation; gint width, height, orig_width, orig_height; gdouble zoom; - guint i; + gint i; if (!gtk_widget_get_realized (GTK_WIDGET (map))) return; @@ -976,20 +1172,26 @@ /* Reallocate the pixbuf */ - if (priv->map_render_pixbuf) g_object_unref (priv->map_render_pixbuf); - priv->map_render_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, /* No alpha */ - 8, width, height); + if (priv->map_render_surface) cairo_surface_destroy (priv->map_render_surface); + priv->map_render_surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (map)), + CAIRO_CONTENT_COLOR, + width, height); /* Scale the original map into the rendering pixbuf */ if (width > 1 && height > 1) { - gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0, /* Dest (x, y) */ - width, height, 0, 0, /* Offset (x, y) */ - zoom, zoom, /* Scale (x, y) */ - interp); + cairo_t *cr = cairo_create (priv->map_render_surface); + cairo_scale (cr, (double) width / orig_width, (double) height / orig_height); + gdk_cairo_set_source_pixbuf (cr, priv->map_pixbuf, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); } + /* Compute image offsets with respect to window */ + + set_scroll_area (map, width, height); + if (render_overlays) { /* Add points */ @@ -1000,126 +1202,53 @@ update_render_point (map, point); } } - - /* Compute image offsets with respect to window */ - - set_scroll_area (map); } -/* Queues a repaint of the specified area in window coordinates */ - -static void -request_paint_area (EMap *view, GdkRectangle *area) -{ - EMapPrivate *priv; - gint width, height; - - if (!gtk_widget_is_drawable (GTK_WIDGET (view)) || - !gtk_widget_get_realized (GTK_WIDGET (view))) return; - - priv = view->priv; - if (!priv->map_render_pixbuf) return; - - width = MIN (area->width, E_MAP_GET_WIDTH (view)); - height = MIN (area->height, E_MAP_GET_HEIGHT (view)); - - /* This satisfies paranoia. To be removed */ - - if (priv->xofs + width > gdk_pixbuf_get_width (priv->map_render_pixbuf)) - width = gdk_pixbuf_get_width (priv->map_render_pixbuf) - priv->xofs; - - if (priv->yofs + height > gdk_pixbuf_get_height (priv->map_render_pixbuf)) - height = gdk_pixbuf_get_height (priv->map_render_pixbuf) - priv->yofs; - - /* We rely on the fast case always being the case, since we load and - * preprocess the source pixbuf ourselves */ - - if (gdk_pixbuf_get_colorspace (priv->map_render_pixbuf) == GDK_COLORSPACE_RGB && !gdk_pixbuf_get_has_alpha (priv->map_render_pixbuf) && - gdk_pixbuf_get_bits_per_sample (priv->map_render_pixbuf) == 8) - { - GtkStyle *style; - GdkWindow *window; - guchar *pixels; - gint rowstride; - - style = gtk_widget_get_style (GTK_WIDGET (view)); - window = gtk_widget_get_window (GTK_WIDGET (view)); - - rowstride = gdk_pixbuf_get_rowstride (priv->map_render_pixbuf); - pixels = gdk_pixbuf_get_pixels (priv->map_render_pixbuf) + - (area->y + priv->yofs) * rowstride + 3 * - (area->x + priv->xofs); - gdk_draw_rgb_image_dithalign ( - window, style->black_gc, area->x, area->y, - width, height, GDK_RGB_DITHER_NORMAL, pixels, - rowstride, 0, 0); - return; - } - -#ifdef DEBUG - g_print ("Doing hard redraw.\n"); -#endif -} - -static void -put_pixel_with_clipping (GdkPixbuf *pixbuf, gint x, gint y, guint rgba) -{ - gint width, height; - gint rowstride, n_channels; - guchar *pixels, *pixel; - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - rowstride = gdk_pixbuf_get_rowstride (pixbuf); - n_channels = gdk_pixbuf_get_n_channels (pixbuf); - pixels = gdk_pixbuf_get_pixels (pixbuf); - - if (x < 0 || x >= width || y < 0 || y >= height) - return; - - pixel = pixels + (y * rowstride) + (x * n_channels); - - *pixel = (rgba >> 24); - *(pixel + 1) = (rgba >> 16) & 0x000000ff; - *(pixel + 2) = (rgba >> 8) & 0x000000ff; - - if (n_channels > 3) - { - *(pixel + 3) = rgba & 0x000000ff; - } -} - -/* Redraw point in client pixbuf */ +/* Redraw point in client surface */ static void update_render_point (EMap *map, EMapPoint *point) { EMapPrivate *priv; - GdkPixbuf *pb; + cairo_t *cr; gdouble px, py; + static guchar mask1[] = { 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }; + static guchar mask2[] = { 0x00, 0xff, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, + 0x00, 0xff, 0x00, 0x00 }; + cairo_surface_t *mask; priv = map->priv; - pb = priv->map_render_pixbuf; - if (!pb) return; + + if (priv->map_render_surface == NULL) + return; + + cr = cairo_create (priv->map_render_surface); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); - px += priv->xofs; - py += priv->yofs; + px = floor (px + priv->xofs); + py = floor (py + priv->yofs); + + cairo_set_source_rgb (cr, 0, 0, 0); + mask = cairo_image_surface_create_for_data (mask1, CAIRO_FORMAT_A8, 5, 5, 8); + cairo_mask_surface (cr, mask, px - 2, py - 2); + cairo_surface_destroy (mask); + + cairo_set_source_rgba (cr, + ((point->rgba >> 24) & 0xff) / 255.0, + ((point->rgba >> 16) & 0xff) / 255.0, + ((point->rgba >> 8) & 0xff) / 255.0, + ( point->rgba & 0xff) / 255.0); + mask = cairo_image_surface_create_for_data (mask2, CAIRO_FORMAT_A8, 3, 3, 4); + cairo_mask_surface (cr, mask, px - 1, py - 1); + cairo_surface_destroy (mask); - put_pixel_with_clipping (pb, px, py, point->rgba); - put_pixel_with_clipping (pb, px - 1, py, point->rgba); - put_pixel_with_clipping (pb, px + 1, py, point->rgba); - put_pixel_with_clipping (pb, px, py - 1, point->rgba); - put_pixel_with_clipping (pb, px, py + 1, point->rgba); - - put_pixel_with_clipping (pb, px - 2, py, 0x000000ff); - put_pixel_with_clipping (pb, px + 2, py, 0x000000ff); - put_pixel_with_clipping (pb, px, py - 2, 0x000000ff); - put_pixel_with_clipping (pb, px, py + 2, 0x000000ff); - put_pixel_with_clipping (pb, px - 1, py - 1, 0x000000ff); - put_pixel_with_clipping (pb, px - 1, py + 1, 0x000000ff); - put_pixel_with_clipping (pb, px + 1, py - 1, 0x000000ff); - put_pixel_with_clipping (pb, px + 1, py + 1, 0x000000ff); + cairo_destroy (cr); } /* Repaint point on X server */ @@ -1127,52 +1256,27 @@ static void repaint_point (EMap *map, EMapPoint *point) { - GdkRectangle area; gdouble px, py; - if (!e_map_point_is_in_view (map, point)) return; + if (!gtk_widget_is_drawable (GTK_WIDGET (map))) + return; e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); - area.x = (gint) px - 2; - area.y = (gint) py - 2; - area.width = 5; - area.height = 5; - request_paint_area (map, &area); + gtk_widget_queue_draw_area (GTK_WIDGET (map), + (gint) px - 2, (gint) py - 2, + 5, 5); } static void -center_at (EMap *map, gint x, gint y, gboolean scroll) +center_at (EMap *map, double longitude, double latitude) { EMapPrivate *priv; GtkAllocation allocation; gint pb_width, pb_height; + double x, y; - priv = map->priv; - - pb_width = E_MAP_GET_WIDTH (map); - pb_height = E_MAP_GET_HEIGHT (map); - - gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - - x = CLAMP (x - (allocation.width / 2), 0, pb_width - allocation.width); - y = CLAMP (y - (allocation.height / 2), 0, pb_height - allocation.height); - - if (scroll) - scroll_to (map, x, y); - else { - priv->xofs = x; - priv->yofs = y; - } -} - -static void -smooth_center_at (EMap *map, gint x, gint y) -{ - EMapPrivate *priv; - GtkAllocation allocation; - gint pb_width, pb_height; - gint dx, dy; + e_map_world_to_render_surface (map, longitude, latitude, &x, &y); priv = map->priv; @@ -1184,16 +1288,10 @@ x = CLAMP (x - (allocation.width / 2), 0, pb_width - allocation.width); y = CLAMP (y - (allocation.height / 2), 0, pb_height - allocation.height); - for (;;) - { - if (priv->xofs == x && priv->yofs == y) - break; - - dx = (x < priv->xofs) ? -1 : (x > priv->xofs) ? 1 : 0; - dy = (y < priv->yofs) ? -1 : (y > priv->yofs) ? 1 : 0; + gtk_adjustment_set_value (priv->hadjustment, x); + gtk_adjustment_set_value (priv->vadjustment, y); - scroll_to (map, priv->xofs + dx, priv->yofs + dy); - } + gtk_widget_queue_draw (GTK_WIDGET (map)); } /* Scrolls the view to the specified offsets. Does not perform range checking! */ @@ -1203,14 +1301,6 @@ { EMapPrivate *priv; gint xofs, yofs; - GdkWindow *window; - GtkAllocation allocation; - GdkGC *gc; - gint src_x, src_y; - gint dest_x, dest_y; -#if 0 /* see comment below */ - GdkEvent *event; -#endif priv = view->priv; @@ -1225,539 +1315,148 @@ priv->xofs = x; priv->yofs = y; - if (!gtk_widget_is_drawable (GTK_WIDGET (view))) - return; - - gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); - - if (abs (xofs) >= allocation.width || abs (yofs) >= allocation.height) - { - GdkRectangle area; - - area.x = 0; - area.y = 0; - area.width = allocation.width; - area.height = allocation.height; - - request_paint_area (view, &area); - return; - } - - window = gtk_widget_get_window (GTK_WIDGET (view)); - - /* Copy the window area */ - - src_x = xofs < 0 ? 0 : xofs; - src_y = yofs < 0 ? 0 : yofs; - dest_x = xofs < 0 ? -xofs : 0; - dest_y = yofs < 0 ? -yofs : 0; - - gc = gdk_gc_new (window); - gdk_gc_set_exposures (gc, TRUE); - - gdk_draw_drawable ( - GDK_DRAWABLE (window), - gc, GDK_DRAWABLE (window), - src_x, src_y, dest_x, dest_y, - allocation.width - abs (xofs), - allocation.height - abs (yofs)); - - g_object_unref (gc); - - /* Add the scrolled-in region */ - - if (xofs) - { - GdkRectangle r; - - r.x = xofs < 0 ? 0 : allocation.width - xofs; - r.y = 0; - r.width = abs (xofs); - r.height = allocation.height; - - request_paint_area (view, &r); - } - - if (yofs) - { - GdkRectangle r; - - r.x = 0; - r.y = yofs < 0 ? 0 : allocation.height - yofs; - r.width = allocation.width; - r.height = abs (yofs); - - request_paint_area (view, &r); - } - - /* Process graphics exposures */ - - /* XXX gdk_event_get_graphics_expose() is deprecated now. - * The map widget seems to work fine without this logic - * (I think it was just an optimization) but leaving it - * intact in case I'm wrong and we need to rewrite it. */ -#if 0 - while ((event = gdk_event_get_graphics_expose (window)) != NULL) - { - gtk_widget_event (GTK_WIDGET (view), event); - - if (event->expose.count == 0) - { - gdk_event_free (event); - break; - } - - gdk_event_free (event); - } -#endif + gtk_widget_queue_draw (GTK_WIDGET (view)); } -static gint divide_seq[] = +static void +e_map_get_current_location (EMap *map, double *longitude, double *latitude) { - /* Dividends for divisor of 2 */ - - -2, - - 1, - - /* Dividends for divisor of 4 */ - - -4, - - 1, 3, - - /* Dividends for divisor of 8 */ - - -8, - - 1, 5, 3, 7, - - /* Dividends for divisor of 16 */ - - -16, - - 1, 9, 5, 13, 3, 11, 7, 15, - - /* Dividends for divisor of 32 */ - - -32, - - 1, 17, 9, 25, 5, 21, 13, 29, 3, 19, - 11, 27, 7, 23, 15, 31, - - /* Dividends for divisor of 64 */ - - -64, - - 1, 33, 17, 49, 9, 41, 25, 57, 5, 37, - 21, 53, 13, 45, 29, 61, 3, 35, 19, 51, - 11, 43, 27, 59, 7, 39, 23, 55, 15, 47, - 31, 63, - - /* Dividends for divisor of 128 */ - - -128, - - 1, 65, 33, 97, 17, 81, 49, 113, 9, 73, - 41, 105, 25, 89, 57, 121, 5, 69, 37, 101, - 21, 85, 53, 117, 13, 77, 45, 109, 29, 93, - 61, 125, 3, 67, 35, 99, 19, 83, 51, 115, - 11, 75, 43, 107, 27, 91, 59, 123, 7, 71, - 39, 103, 23, 87, 55, 119, 15, 79, 47, 111, - 31, 95, 63, 127, - - /* Dividends for divisor of 256 */ - - -256, - - 1, 129, 65, 193, 33, 161, 97, 225, 17, 145, - 81, 209, 49, 177, 113, 241, 9, 137, 73, 201, - 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, - 121, 249, 5, 133, 69, 197, 37, 165, 101, 229, - 21, 149, 85, 213, 53, 181, 117, 245, 13, 141, - 77, 205, 45, 173, 109, 237, 29, 157, 93, 221, - 61, 189, 125, 253, 3, 131, 67, 195, 35, 163, - 99, 227, 19, 147, 83, 211, 51, 179, 115, 243, - 11, 139, 75, 203, 43, 171, 107, 235, 27, 155, - 91, 219, 59, 187, 123, 251, 7, 135, 71, 199, - 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, - 119, 247, 15, 143, 79, 207, 47, 175, 111, 239, - 31, 159, 95, 223, 63, 191, 127, 255, + GtkAllocation allocation; - 0 -}; + gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); -typedef enum -{ - AXIS_X, - AXIS_Y + e_map_window_to_world (map, + allocation.width / 2.0, allocation.height / 2.0, + longitude, latitude); } -AxisType; + +/* GtkScrollable implementation */ static void -blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint target_y, gint total_width, gint total_height, gfloat zoom_factor) +e_map_set_hadjustment_values (EMap *map) { - GdkGC *gc; - AxisType strong_axis; - gfloat axis_factor, axis_counter; - gint zoom_chunk; - gint divisor_width = 0, divisor_height = 0; - gint divide_width_index, divide_height_index; - gint area_width, area_height; - gint i, j; - gint line; - - /* Set up the GC we'll be using */ - - gc = gdk_gc_new (window); - gdk_gc_set_exposures (gc, FALSE); - - /* Get area constraints */ + GtkAllocation allocation; + EMapPrivate *priv = map->priv; + GtkAdjustment *adj = priv->hadjustment; + gdouble old_value; + gdouble new_value; + gdouble new_upper; - gdk_drawable_get_size (GDK_DRAWABLE (window), &area_width, &area_height); + gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - /* Initialize area division array indexes */ + old_value = gtk_adjustment_get_value (adj); + new_upper = MAX (allocation.width, gdk_pixbuf_get_width (priv->map_pixbuf)); - divide_width_index = divide_height_index = 0; - - /* Initialize axis counter */ - - axis_counter = 0.0; - - /* Find the strong axis (which is the basis for iteration) and the ratio - * at which the other axis will be scaled. - * - * Also determine how many lines to expand in one fell swoop, and store - * this figure in zoom_chunk. */ - - if (area_width > area_height) - { - strong_axis = AXIS_X; - axis_factor = (gdouble) area_height / (gdouble) area_width; - zoom_chunk = MAX (1, area_width / 250); - i = (area_width * (zoom_factor - 1.0)) / zoom_chunk; - } - else - { - strong_axis = AXIS_Y; - axis_factor = (gdouble) area_width / (gdouble) area_height; - zoom_chunk = MAX (1, area_height / 250); - i = (area_height * (zoom_factor - 1.0)) / zoom_chunk; - } - - /* Go, go, devil bunnies! Gogo devil bunnies! */ - - for (; i > 0; i--) - { - /* Reset division sequence table indexes as necessary */ - - if (!divide_seq[divide_width_index]) divide_width_index = 0; - if (!divide_seq[divide_height_index]) divide_height_index = 0; - - /* Set new divisor if found in table */ - - if (divide_seq[divide_width_index] < 0) - divisor_width = abs (divide_seq[divide_width_index++]); - if (divide_seq[divide_height_index] < 0) - divisor_height = abs (divide_seq[divide_height_index++]); - - /* Widen */ - - if (strong_axis == AXIS_X || axis_counter >= 1.0) - { - line = ((divide_seq[divide_width_index] * area_width) / divisor_width) + 0.5; - - if ((line < target_x && target_x > area_width / 2) || (line > target_x && target_x > (area_width / 2) + zoom_chunk)) - { - /* Push left */ - - for (j = 0; j < zoom_chunk - 1; j++) - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line, 0, line + j + 1, 0, 1, area_height); - - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), zoom_chunk, 0, 0, 0, line, area_height); - if (line > target_x) target_x -= zoom_chunk; - } - else - { - /* Push right */ - - for (j = 0; j < zoom_chunk - 1; j++) - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line + j - (zoom_chunk - 1), 0, 1, area_height); - - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line, 0, area_width - line, area_height); - if (line < target_x) target_x += zoom_chunk; - } - } + g_object_set (adj, + "lower", 0.0, + "upper", new_upper, + "page-size", (gdouble)allocation.height, + "step-increment", allocation.height * 0.1, + "page-increment", allocation.height * 0.9, + NULL); - if (strong_axis == AXIS_Y || axis_counter >= 1.0) - { - /* Heighten */ - - line = ((divide_seq[divide_height_index] * area_height) / divisor_height) + 0.5; - - if ((line < target_y && target_y > area_height / 2) || (line > target_y && target_y > (area_height / 2) + zoom_chunk)) - { - /* Push up */ - - for (j = 0; j < zoom_chunk - 1; j++) - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line, 0, line + j + 1, area_width, 1); - - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, zoom_chunk, 0, 0, area_width, line); - if (line > target_y) target_y -= zoom_chunk; - } - else - { - /* Push down */ - - for (j = 0; j < zoom_chunk - 1; j++) - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_WINDOW (window), 0, line - zoom_chunk, 0, line + j - (zoom_chunk - 1), area_width, 1); - - gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line - zoom_chunk, 0, line, area_width, area_height - line); - if (line < target_y) target_y += zoom_chunk; - } - } - - divide_width_index++; - divide_height_index++; - if (axis_counter >= 1.0) axis_counter -= 1.0; - axis_counter += axis_factor; - } - - /* Free our GC */ - - g_object_unref (gc); + new_value = CLAMP (old_value, 0, new_upper - allocation.width); + if (new_value != old_value) + gtk_adjustment_set_value (adj, new_value); } static void -zoom_in_smooth (EMap *map) +e_map_set_vadjustment_values (EMap *map) { - GtkAllocation allocation; - GdkRectangle area; - EMapPrivate *priv; - GdkWindow *window; - gint width, height; - gdouble x, y; - - g_return_if_fail (map); - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); - - gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - - area.x = 0; - area.y = 0; - area.width = allocation.width; - area.height = allocation.height; - - priv = map->priv; - window = gtk_widget_get_window (GTK_WIDGET (map)); - width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - height = gdk_pixbuf_get_height (priv->map_render_pixbuf); - - /* Center the target point as much as possible */ - - e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); - smooth_center_at (map, x + priv->xofs, y + priv->yofs); - - /* Render and paint a temporary map without overlays, so they don't get in - * the way (look ugly) while zooming */ - - update_render_pixbuf (map, GDK_INTERP_BILINEAR, FALSE); - request_paint_area (map, &area); - - /* Find out where in the area we're going to zoom to */ + GtkAllocation allocation; + EMapPrivate *priv = map->priv; + GtkAdjustment *adj = priv->vadjustment; + gdouble old_value; + gdouble new_value; + gdouble new_upper; - e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); + gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - /* Pre-render the zoomed-in map, so we can put it there quickly when the - * blowup sequence ends */ + old_value = gtk_adjustment_get_value (adj); + new_upper = MAX (allocation.height, gdk_pixbuf_get_height (priv->map_pixbuf)); - priv->zoom_state = E_MAP_ZOOMED_IN; - update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); + g_object_set (adj, + "lower", 0.0, + "upper", new_upper, + "page-size", (gdouble)allocation.height, + "step-increment", allocation.height * 0.1, + "page-increment", allocation.height * 0.9, + NULL); - /* Do the blowup */ - - blowup_window_area (window, priv->xofs, priv->yofs, x, y, width, height, 1.68); - - /* Set new scroll offsets and paint the zoomed map */ - - e_map_world_to_window (map, priv->zoom_target_long, priv->zoom_target_lat, &x, &y); - priv->xofs = CLAMP (priv->xofs + x - area.width / 2.0, 0, E_MAP_GET_WIDTH (map) - area.width); - priv->yofs = CLAMP (priv->yofs + y - area.height / 2.0, 0, E_MAP_GET_HEIGHT (map) - area.height); - - request_paint_area (map, &area); + new_value = CLAMP (old_value, 0, new_upper - allocation.height); + if (new_value != old_value) + gtk_adjustment_set_value (adj, new_value); } static void -zoom_in (EMap *map) +e_map_set_hadjustment (EMap *map, GtkAdjustment *adjustment) { - GtkAllocation allocation; - GdkRectangle area; - EMapPrivate *priv; - gdouble x, y; + EMapPrivate *priv = map->priv; - priv = map->priv; - - gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); - - area.x = 0; - area.y = 0; - area.width = allocation.width; - area.height = allocation.height; + if (adjustment && priv->hadjustment == adjustment) + return; - priv->zoom_state = E_MAP_ZOOMED_IN; + if (priv->hadjustment != NULL) + { + g_signal_handlers_disconnect_matched (priv->hadjustment, + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, map); + g_object_unref (priv->hadjustment); + } - update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); + if (!adjustment) + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, + 0.0, 0.0, 0.0); - e_map_world_to_window ( - map, priv->zoom_target_long, - priv->zoom_target_lat, &x, &y); - priv->xofs = CLAMP ( - priv->xofs + x - area.width / 2.0, - 0, E_MAP_GET_WIDTH (map) - area.width); - priv->yofs = CLAMP ( - priv->yofs + y - area.height / 2.0, - 0, E_MAP_GET_HEIGHT (map) - area.height); + g_signal_connect (adjustment, "value-changed", + G_CALLBACK (e_map_adjustment_changed), map); + priv->hadjustment = g_object_ref_sink (adjustment); + e_map_set_hadjustment_values (map); - request_paint_area (map, &area); + g_object_notify (G_OBJECT (map), "hadjustment"); } static void -zoom_out (EMap *map) +e_map_set_vadjustment (EMap *map, GtkAdjustment *adjustment) { - GtkAllocation allocation; - GdkRectangle area; - EMapPrivate *priv; - gdouble longitude, latitude; - gdouble x, y; + EMapPrivate *priv = map->priv; - priv = map->priv; + if (adjustment && priv->vadjustment == adjustment) + return; - gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); + if (priv->vadjustment != NULL) + { + g_signal_handlers_disconnect_matched (priv->vadjustment, + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, map); + g_object_unref (priv->vadjustment); + } - area.x = 0; - area.y = 0; - area.width = allocation.width; - area.height = allocation.height; - - /* Must be done before update_render_pixbuf() */ - - e_map_window_to_world ( - map, area.width / 2, area.height / 2, - &longitude, &latitude); + if (!adjustment) + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, + 0.0, 0.0, 0.0); - priv->zoom_state = E_MAP_ZOOMED_OUT; - update_render_pixbuf (map, GDK_INTERP_BILINEAR, TRUE); + g_signal_connect (adjustment, "value-changed", + G_CALLBACK (e_map_adjustment_changed), map); + priv->vadjustment = g_object_ref_sink (adjustment); + e_map_set_vadjustment_values (map); - e_map_world_to_window (map, longitude, latitude, &x, &y); - center_at (map, x + priv->xofs, y + priv->yofs, FALSE); -/* request_paint_area (map, &area); */ - repaint_visible (map); + g_object_notify (G_OBJECT (map), "vadjustment"); } static void -zoom_do (EMap *map) +e_map_adjustment_changed (GtkAdjustment *adjustment, EMap *map) { - EMapPrivate *priv; + EMapPrivate *priv = map->priv; - priv = map->priv; - g_signal_handlers_block_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); - g_signal_handlers_block_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); - - if (priv->zoom_state == E_MAP_ZOOMING_IN) - { - if (e_map_get_smooth_zoom (map)) zoom_in_smooth (map); - else zoom_in (map); - } - else if (priv->zoom_state == E_MAP_ZOOMING_OUT) - { -/* if (e_map_get_smooth_zoom(map)) zoom_out_smooth(map); */ - zoom_out (map); - } - - g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); - g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); - - set_scroll_area(map); -} - -/* Callback used when an adjustment is changed */ - -static void -adjustment_changed_cb (GtkAdjustment *adj, gpointer data) -{ - EMap *view; + if (gtk_widget_get_realized (GTK_WIDGET (map))) + { gint hadj_value; gint vadj_value; - view = E_MAP (data); - - hadj_value = gtk_adjustment_get_value (view->priv->hadj); - vadj_value = gtk_adjustment_get_value (view->priv->vadj); - - scroll_to (view, hadj_value, vadj_value); -} - -static void -set_scroll_area (EMap *view) -{ - EMapPrivate *priv; - GtkAllocation allocation; - gint upper, page_size; - - priv = view->priv; - - if (!gtk_widget_get_realized (GTK_WIDGET (view))) return; - if (!priv->hadj || !priv->vadj) return; - - g_object_freeze_notify (G_OBJECT (priv->hadj)); - g_object_freeze_notify (G_OBJECT (priv->vadj)); - - gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); - - /* Set scroll increments */ - - gtk_adjustment_set_page_size (priv->hadj, allocation.width); - gtk_adjustment_set_page_increment (priv->hadj, allocation.width / 2); - gtk_adjustment_set_step_increment (priv->hadj, SCROLL_STEP_SIZE); - - gtk_adjustment_set_page_size (priv->vadj, allocation.height); - gtk_adjustment_set_page_increment (priv->vadj, allocation.height / 2); - gtk_adjustment_set_step_increment (priv->vadj, SCROLL_STEP_SIZE); - - /* Set scroll bounds and new offsets */ - - gtk_adjustment_set_lower (priv->hadj, 0); - if (priv->map_render_pixbuf) { - gint width = gdk_pixbuf_get_width (priv->map_render_pixbuf); - gtk_adjustment_set_upper (priv->hadj, width); - } - - gtk_adjustment_set_lower (priv->vadj, 0); - if (priv->map_render_pixbuf) { - gint height = gdk_pixbuf_get_height (priv->map_render_pixbuf); - gtk_adjustment_set_upper (priv->vadj, height); - } - - g_object_thaw_notify (G_OBJECT (priv->hadj)); - g_object_thaw_notify (G_OBJECT (priv->vadj)); + hadj_value = gtk_adjustment_get_value (priv->hadjustment); + vadj_value = gtk_adjustment_get_value (priv->vadjustment); - upper = gtk_adjustment_get_upper (priv->hadj); - page_size = gtk_adjustment_get_page_size (priv->hadj); - priv->xofs = CLAMP (priv->xofs, 0, upper - page_size); - - upper = gtk_adjustment_get_upper (priv->vadj); - page_size = gtk_adjustment_get_page_size (priv->vadj); - priv->yofs = CLAMP (priv->yofs, 0, upper - page_size); - - g_signal_handlers_block_matched ( - priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - gtk_adjustment_set_value (priv->hadj, priv->xofs); - g_signal_handlers_unblock_matched ( - priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - - g_signal_handlers_block_matched ( - priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); - gtk_adjustment_set_value (priv->vadj, priv->yofs); - g_signal_handlers_unblock_matched ( - priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + scroll_to (map, hadj_value, vadj_value); + } } diff -Nru gnome-system-tools-2.32.0/src/time/e-map/e-map-test.c gnome-system-tools-3.0.0/src/time/e-map/e-map-test.c --- gnome-system-tools-2.32.0/src/time/e-map/e-map-test.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/e-map/e-map-test.c 2010-10-13 10:06:28.000000000 +0000 @@ -0,0 +1,93 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +#include "e-map.h" + +GtkWidget *window, *scroll; +EMap *map; +EMapPoint *point = NULL, *highlight_point = NULL; +int id; + + +static gint +flash(gpointer data) +{ + if (!point) return TRUE; + + if (e_map_point_get_color_rgba (point) == 0xf010d0ff) + e_map_point_set_color_rgba (map, point, 0x000000ff); + else + e_map_point_set_color_rgba (map, point, 0xf010d0ff); + + return(TRUE); +} + + +static gboolean +motion (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) +{ + double longitude, latitude; + + e_map_window_to_world (map, (double) event->x, (double) event->y, + &longitude, &latitude); + + if (highlight_point && highlight_point != point) + e_map_point_set_color_rgba (map, highlight_point, 0xf010d0ff); + + highlight_point = + e_map_get_closest_point (map, longitude, latitude, TRUE); + + if (highlight_point && highlight_point != point) + e_map_point_set_color_rgba (map, highlight_point, 0xffff60ff); + + return(TRUE); +} + + +static gboolean +button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data) +{ + double longitude, latitude; + + e_map_window_to_world (map, (double) event->x, (double) event->y, + &longitude, &latitude); + + if (event->button != 1) + e_map_zoom_out (map); + else + e_map_zoom_to_location (map, longitude, latitude); + + if (point) e_map_point_set_color_rgba (map, point, 0xf010d0ff); + + point = highlight_point; + + return TRUE; +} + + +int +main (int argc, char *argv[]) +{ + gtk_init (&argc, &argv); + + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + scroll = gtk_scrolled_window_new(GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); + map = e_map_new(); + + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(scroll)); + gtk_container_add(GTK_CONTAINER(scroll), GTK_WIDGET(map)); + + e_map_set_smooth_zoom(E_MAP(map), TRUE); + e_map_add_point(E_MAP(map), NULL, 40.0, 0.0, 0xf010d0ff); + e_map_add_point(E_MAP(map), NULL, 10.0, 0.0, 0xf010d0ff); + point = e_map_add_point(E_MAP(map), NULL, 25.0, 40.0, 0xf010d0ff); + + g_signal_connect(G_OBJECT (map), "motion-notify-event", + G_CALLBACK (motion), NULL); + g_signal_connect(G_OBJECT(map), "button-press-event", + G_CALLBACK (button_pressed), NULL); + + gtk_widget_show_all(window); + id = g_timeout_add(100, flash, NULL); + gtk_main(); + return(0); +} diff -Nru gnome-system-tools-2.32.0/src/time/e-map/Makefile.am gnome-system-tools-3.0.0/src/time/e-map/Makefile.am --- gnome-system-tools-2.32.0/src/time/e-map/Makefile.am 2009-09-21 12:59:55.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/e-map/Makefile.am 2010-10-13 10:06:28.000000000 +0000 @@ -31,3 +31,8 @@ $(BUILT_SOURCES) -include $(top_srcdir)/git.mk + +noinst_PROGRAMS = e-map-test + +e_map_test_SOURCES = e-map-test.c +e_map_test_LDADD = libemap.a diff -Nru gnome-system-tools-2.32.0/src/time/e-map/Makefile.in gnome-system-tools-3.0.0/src/time/e-map/Makefile.in --- gnome-system-tools-2.32.0/src/time/e-map/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/e-map/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -19,6 +19,7 @@ # This file is included in src/common/CommonMakefile, # in src/common/Makefile.am and in interfaces/Makefile.am + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -40,13 +41,10 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../../../DirsMakefile $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ChangeLog +noinst_PROGRAMS = e-map-test$(EXEEXT) subdir = src/time/e-map ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -66,15 +64,19 @@ am__objects_1 = e-map-marshal.$(OBJEXT) am_libemap_a_OBJECTS = e-map.$(OBJEXT) $(am__objects_1) libemap_a_OBJECTS = $(am_libemap_a_OBJECTS) +PROGRAMS = $(noinst_PROGRAMS) +am_e_map_test_OBJECTS = e-map-test.$(OBJEXT) +e_map_test_OBJECTS = $(am_e_map_test_OBJECTS) +e_map_test_DEPENDENCIES = libemap.a +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ @@ -92,8 +94,8 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libemap_a_SOURCES) -DIST_SOURCES = $(libemap_a_SOURCES) +SOURCES = $(libemap_a_SOURCES) $(e_map_test_SOURCES) +DIST_SOURCES = $(libemap_a_SOURCES) $(e_map_test_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -106,8 +108,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -129,11 +129,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -152,26 +153,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ $(LDADD) LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -194,14 +198,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -210,6 +209,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -233,7 +234,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -282,6 +282,8 @@ e-map.c e-map.h \ $(BUILT_SOURCES) +e_map_test_SOURCES = e-map-test.c +e_map_test_LDADD = libemap.a all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -325,6 +327,18 @@ $(AM_V_AR)$(libemap_a_AR) libemap.a $(libemap_a_OBJECTS) $(libemap_a_LIBADD) $(AM_V_at)$(RANLIB) libemap.a +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +e-map-test$(EXEEXT): $(e_map_test_OBJECTS) $(e_map_test_DEPENDENCIES) + @rm -f e-map-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(e_map_test_OBJECTS) $(e_map_test_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -332,6 +346,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-map-marshal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-map-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/e-map.Po@am__quote@ .c.o: @@ -449,7 +464,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(PROGRAMS) installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -481,7 +496,7 @@ clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -552,17 +567,18 @@ .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am e-map-marshal.h: e-map-marshal.list diff -Nru gnome-system-tools-2.32.0/src/time/Makefile.am gnome-system-tools-3.0.0/src/time/Makefile.am --- gnome-system-tools-2.32.0/src/time/Makefile.am 2009-09-21 12:59:55.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/Makefile.am 2011-01-06 11:17:34.000000000 +0000 @@ -15,8 +15,8 @@ CLEANFILES = $(GST_TOOL_CLEANFILES) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) -time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a -time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a +time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) +time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES) time_admin_SOURCES = \ time-tool.c time-tool.h \ tz.c tz.h \ diff -Nru gnome-system-tools-2.32.0/src/time/Makefile.in gnome-system-tools-3.0.0/src/time/Makefile.in --- gnome-system-tools-2.32.0/src/time/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -45,11 +45,7 @@ bin_PROGRAMS = time-admin$(EXEEXT) subdir = src/time ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,8 +161,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -188,11 +182,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -211,26 +206,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -253,14 +251,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -269,6 +262,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -292,7 +287,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ @@ -339,8 +333,8 @@ SUBDIRS = e-map CLEANFILES = $(GST_TOOL_CLEANFILES) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) -time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a -time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a +time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) +time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES) time_admin_SOURCES = \ time-tool.c time-tool.h \ tz.c tz.h \ diff -Nru gnome-system-tools-2.32.0/src/time/ntp-servers-list.c gnome-system-tools-3.0.0/src/time/ntp-servers-list.c --- gnome-system-tools-2.32.0/src/time/ntp-servers-list.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/ntp-servers-list.c 2010-12-12 12:16:01.000000000 +0000 @@ -41,8 +41,6 @@ { "ntp2.cmc.ec.gc.ca", "Eastern Canada" }, { "wuarchive.wustl.edu", "Missouri, USA" }, { "clock.psu.edu", "Pennsylvania, USA" }, - { "gilbreth.ecn.purdue.edu", "Indiana, USA" }, - { "molecule.ecn.purdue.edu", "Indiana, USA" }, { "ntp.tmc.edu", "Texas, USA" }, { "louie.udel.edu", "Delaware, USA" }, { "ntp0.cornell.edu", "New York, USA" }, @@ -53,39 +51,16 @@ { "ntp2b.mcc.ac.uk", "England, Europe" }, { "ntp.maths.tcd.ie", "Ireland, Europe" }, { "ntp.cs.strath.ac.uk", "Scotland, Europe" }, - { "bernina.ethz.ch", "Switzerland, Europe" }, { "ntp.univ-lyon1.fr", "France, Europe" }, { "tick.keso.fi", "Finland, Europe" }, { "fartein.ifi.uio.no", "Norway, Europe" }, - { "ntp1.arnes.si", "Slovenia, Europe" }, - { "ntp2.arnes.si", "Slovenia, Europe" }, - { "time.esec.com.au", "Australia" }, { "ntp.adelaide.edu.au", "South Australia" }, { "time.nuri.net", "Korea, Asia" }, { "ntp.cs.mu.oz.au", "Melbourne, Australia" }, { "swisstime.ethz.ch", "Zurich, Switzerland" }, - { "ntp.cesnet.cz", "Prague, Czech Republic" }, - { "ntpa2.kph.uni-mainz.de", "Mainz, Germany" }, - { "ntps1-0.cs.tu-berlin.de", "Berlin, Germany" }, - { "ntps1-1.cs.tu-berlin.de", "Berlin, Germany" }, - { "ntps1-2.uni-erlangen.de", "Erlangen, Germany" }, - { "canon.inria.fr", "Rocquencourt, France" }, - { "chronos.cru.fr", "Britany, France" }, { "stdtime.gov.hk", "Hong Kong, China" }, - { "clock.cuhk.edu.hk", "Hong Kong, China" }, - { "time.ien.it", "Torino, Italy" }, { "ntp.jst.mfeed.ad.jp", "Japan" }, - { "cronos.cenam.mx", "Queretaro, Mexico" }, - { "ntp0.nl.net", "Amsterdam, The Netherlands" }, - { "ntp1.nl.net", "Amsterdam, The Netherlands" }, - { "ntp2.nl.net", "Amsterdam, The Netherlands" }, { "time.service.uit.no", "Norway" }, - { "ntp.certum.pl", "Poland" }, - { "vega.cbk.poznan.pl", "Borowiec, Poland" }, - { "time1.stupi.se", "Stockholm, Sweden" }, - { "goodtime.ijs.si", "Ljubljana, Slovenia" }, - { "ntp2.ja.net", "United Kingdom" }, - { "laikas.pfi.lt", "Lithuania" }, { NULL } }; diff -Nru gnome-system-tools-2.32.0/src/time/time-tool.c gnome-system-tools-3.0.0/src/time/time-tool.c --- gnome-system-tools-2.32.0/src/time/time-tool.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/time/time-tool.c 2010-12-12 17:35:29.000000000 +0000 @@ -345,7 +345,6 @@ { GstTool *tool = GST_TOOL (time_tool); GtkWidget *w; - GtkCellRenderer *cell; GPtrArray *locs; guint i; @@ -357,14 +356,11 @@ gtk_widget_show (GTK_WIDGET (time_tool->tzmap->map)); w = gst_dialog_get_widget (tool->main_dialog, "location_combo"); - cell = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (w), cell, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (w), cell, "text", 0, NULL); locs = tz_get_locations (e_tz_map_get_tz_db (time_tool->tzmap)); for (i = 0; i < locs->len; i++) - gtk_combo_box_append_text (GTK_COMBO_BOX (w), - tz_location_get_zone (g_ptr_array_index (locs, i))); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w), + tz_location_get_zone (g_ptr_array_index (locs, i))); time_tool->timezone_dialog = gst_dialog_get_widget (tool->main_dialog, "time_zone_window"); } @@ -466,7 +462,7 @@ gtk_container_remove (GTK_CONTAINER (container), gtk_bin_get_child (GTK_BIN (container))); gtk_container_add (GTK_CONTAINER (container), widget); - gtk_widget_show_all (container); + gtk_widget_show (container); } static void @@ -761,9 +757,9 @@ gst_dialog_add_edit_dialog (tool->main_dialog, time_tool->timezone_dialog); - gtk_widget_show_all (time_tool->timezone_dialog); + gtk_widget_show (time_tool->timezone_dialog); gtk_dialog_run (GTK_DIALOG (time_tool->timezone_dialog)); - gtk_widget_hide_all (time_tool->timezone_dialog); + gtk_widget_hide (time_tool->timezone_dialog); gst_dialog_remove_edit_dialog (tool->main_dialog, time_tool->timezone_dialog); diff -Nru gnome-system-tools-2.32.0/src/users/callbacks.c gnome-system-tools-3.0.0/src/users/callbacks.c --- gnome-system-tools-2.32.0/src/users/callbacks.c 2010-03-24 13:40:22.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/callbacks.c 2010-12-17 18:49:06.000000000 +0000 @@ -178,11 +178,6 @@ dialog = gst_dialog_get_widget (tool->main_dialog, "groups_dialog"); - /* Force reloading configuration. This is needed when an user was just - * created/deleted, in which case groups may have changed. */ - oobs_object_update (GST_USERS_TOOL (tool)->groups_config); - gst_users_tool_update_gui (tool); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (tool->main_dialog)); while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_HELP); gtk_widget_hide (dialog); diff -Nru gnome-system-tools-2.32.0/src/users/groups-table.c gnome-system-tools-3.0.0/src/users/groups-table.c --- gnome-system-tools-2.32.0/src/users/groups-table.c 2010-02-06 12:01:03.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/groups-table.c 2010-12-17 15:27:29.000000000 +0000 @@ -31,6 +31,9 @@ extern GstTool *tool; +static GtkListStore *groups_model = NULL; +static GtkTreeModelSort *groups_sort_model = NULL; + static void add_group_columns (GtkTreeView *treeview) { @@ -51,38 +54,27 @@ gtk_tree_view_insert_column (treeview, column, -1); } -static GtkTreeModel* -create_groups_model (void) -{ - GtkTreeModel *sort_model; - GtkListStore *store; - - store = gtk_list_store_new (COL_GROUP_LAST, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_OBJECT); - - /* Sort model */ - sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store)); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), - COL_GROUP_NAME, GTK_SORT_ASCENDING); - - return sort_model; -} - void create_groups_table (void) { GtkWidget *groups_table; - GtkTreeModel *model; GtkTreeSelection *selection; GtkWidget *popup; groups_table = gst_dialog_get_widget (tool->main_dialog, "groups_table"); - model = create_groups_model (); - gtk_tree_view_set_model (GTK_TREE_VIEW (groups_table), model); - g_object_unref (model); + groups_model = gtk_list_store_new (COL_GROUP_LAST, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_OBJECT); + + /* Sort model */ + groups_sort_model = GTK_TREE_MODEL_SORT (gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (groups_model))); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (groups_sort_model), + COL_GROUP_NAME, GTK_SORT_ASCENDING); + gtk_tree_view_set_model (GTK_TREE_VIEW (groups_table), GTK_TREE_MODEL (groups_sort_model)); + g_object_unref (groups_model); + g_object_unref (groups_sort_model); add_group_columns (GTK_TREE_VIEW (groups_table)); @@ -107,23 +99,13 @@ GtkTreeModel * groups_table_get_model () { - GtkWidget *groups_table; - GtkTreeModel *sort_model; - - groups_table = gst_dialog_get_widget (tool->main_dialog, "groups_table"); - sort_model = gtk_tree_view_get_model (GTK_TREE_VIEW (groups_table)); - - return gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); + return GTK_TREE_MODEL (groups_model); } void groups_table_set_group (OobsGroup *group, GtkTreeIter *iter) { - GtkTreeModel *model; - - model = groups_table_get_model (); - - gtk_list_store_set (GTK_LIST_STORE (model), iter, + gtk_list_store_set (groups_model, iter, COL_GROUP_NAME, oobs_group_get_name (group), COL_GROUP_ID, oobs_group_get_gid (group), COL_GROUP_OBJECT, group, @@ -133,23 +115,41 @@ void groups_table_add_group (OobsGroup *group) { - GtkTreeModel *model; - GtkTreeIter iter; + gtk_list_store_insert_with_values (groups_model, NULL, G_MAXINT, + COL_GROUP_NAME, oobs_group_get_name (group), + COL_GROUP_ID, oobs_group_get_gid (group), + COL_GROUP_OBJECT, group, + -1); +} - model = groups_table_get_model (); +void +groups_table_clear (void) +{ + gtk_list_store_clear (groups_model); +} - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - groups_table_set_group (group, &iter); +/* + * Detach the model from the tree view before massive insert, + * for performance reasons. + */ +void +groups_table_begin_insertions (void) +{ + GtkWidget *groups_table; + + groups_table = gst_dialog_get_widget (tool->main_dialog, "groups_table"); + + gtk_tree_view_set_model (GTK_TREE_VIEW (groups_table), NULL); } void -groups_table_clear (void) +groups_table_end_insertions (void) { - GtkTreeModel *model; + GtkWidget *groups_table; - model = groups_table_get_model (); + groups_table = gst_dialog_get_widget (tool->main_dialog, "groups_table"); - gtk_list_store_clear (GTK_LIST_STORE (model)); + gtk_tree_view_set_model (GTK_TREE_VIEW (groups_table), GTK_TREE_MODEL (groups_sort_model)); } /* @@ -160,14 +160,10 @@ { GtkWidget *groups_table; GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeModel *sort_model; GtkTreePath *path; GList *paths, *elem, *list = NULL; groups_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "groups_table"); - sort_model = gtk_tree_view_get_model (GTK_TREE_VIEW (groups_table)); - model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (groups_table)); paths = elem = gtk_tree_selection_get_selected_rows (selection, NULL); @@ -176,10 +172,11 @@ return NULL; while (elem) { - path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (sort_model), + path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (groups_sort_model), elem->data); - list = g_list_prepend (list, gtk_tree_row_reference_new (model, path)); + list = g_list_prepend (list, gtk_tree_row_reference_new (GTK_TREE_MODEL (groups_model), + path)); gtk_tree_path_free (path); elem = elem->next; diff -Nru gnome-system-tools-2.32.0/src/users/groups-table.h gnome-system-tools-3.0.0/src/users/groups-table.h --- gnome-system-tools-2.32.0/src/users/groups-table.h 2010-01-30 14:20:51.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/groups-table.h 2010-12-16 11:15:23.000000000 +0000 @@ -57,6 +57,8 @@ void groups_table_set_group (OobsGroup *group, GtkTreeIter *iter); void groups_table_add_group (OobsGroup *group); +void groups_table_begin_insertions (void); +void groups_table_end_insertions (void); GList *groups_table_get_row_references (); diff -Nru gnome-system-tools-2.32.0/src/users/Makefile.in gnome-system-tools-3.0.0/src/users/Makefile.in --- gnome-system-tools-2.32.0/src/users/Makefile.in 2010-09-27 16:15:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/Makefile.in 2011-04-03 20:04:16.000000000 +0000 @@ -45,11 +45,7 @@ bin_PROGRAMS = users-admin$(EXEEXT) subdir = src/users ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.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)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -171,8 +167,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -194,11 +188,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GST_CFLAGS = @GST_CFLAGS@ @@ -217,26 +212,29 @@ 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@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ @@ -259,14 +257,9 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ -POLKIT_GTK_CFLAGS = @POLKIT_GTK_CFLAGS@ -POLKIT_GTK_LIBS = @POLKIT_GTK_LIBS@ POLKIT_LIBS = @POLKIT_LIBS@ 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@ @@ -275,6 +268,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ 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@ @@ -298,7 +293,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gnomelocaledir = @gnomelocaledir@ gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ diff -Nru gnome-system-tools-2.32.0/src/users/privileges-table.c gnome-system-tools-3.0.0/src/users/privileges-table.c --- gnome-system-tools-2.32.0/src/users/privileges-table.c 2010-02-08 21:31:21.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/privileges-table.c 2010-12-16 11:15:23.000000000 +0000 @@ -35,6 +35,8 @@ extern GstTool *tool; +static GtkListStore *privileges_model = NULL; + enum { COL_MEMBER, COL_DESCRIPTION, @@ -100,20 +102,13 @@ static void on_user_privilege_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer data) { - GtkTreeModel *model, *child_model; GtkTreePath *path = gtk_tree_path_new_from_string (path_str); - GtkTreeIter iter, child_iter; + GtkTreeIter iter; OobsGroup *group; gboolean value; - model = (GtkTreeModel*) data; - - if (gtk_tree_model_get_iter (model, &iter, path)) { - child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), - &child_iter, &iter); - - gtk_tree_model_get (child_model, &child_iter, + if (gtk_tree_model_get_iter (GTK_TREE_MODEL (privileges_model), &iter, path)) { + gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter, COL_MEMBER, &value, COL_GROUP, &group, -1); @@ -121,7 +116,7 @@ * possibly showing a warning/error dialog */ if (!value || strcmp (oobs_group_get_name (group), ADMIN_GROUP) != 0 || user_settings_check_revoke_admin_rights ()) - gtk_list_store_set (GTK_LIST_STORE (child_model), &child_iter, COL_MEMBER, !value, -1); + gtk_list_store_set (privileges_model, &iter, COL_MEMBER, !value, -1); g_object_unref (group); } @@ -129,43 +124,20 @@ gtk_tree_path_free (path); } -static gboolean -privileges_table_visible_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gboolean visible; - gchar *str; - - gtk_tree_model_get (model, iter, - COL_DESCRIPTION, &str, - -1); - visible = (str != NULL); - g_free (str); - - return visible; -} - void create_user_privileges_table (void) { GtkWidget *list; - GtkTreeModel *model, *filter_model; GtkCellRenderer *renderer; GtkTreeViewColumn *column; list = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = GTK_TREE_MODEL (gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_OBJECT)); - filter_model = gtk_tree_model_filter_new (model, NULL); - gtk_tree_view_set_model (GTK_TREE_VIEW (list), filter_model); - g_object_unref (filter_model); - g_object_unref (model); - - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), COL_DESCRIPTION, GTK_SORT_ASCENDING); - gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), - privileges_table_visible_func, - NULL, NULL); + privileges_model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_OBJECT); + gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (privileges_model)); + g_object_unref (privileges_model); + + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (privileges_model), COL_DESCRIPTION, GTK_SORT_ASCENDING); column = gtk_tree_view_column_new (); @@ -176,7 +148,7 @@ "active", COL_MEMBER, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", - G_CALLBACK (on_user_privilege_toggled), filter_model); + G_CALLBACK (on_user_privilege_toggled), NULL); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_end (column, renderer, TRUE); @@ -193,54 +165,40 @@ privileges_table_add_group (OobsGroup *group) { const PrivilegeDescription *p; - GtkWidget *table; - GtkTreeModel *model; - GtkListStore *store; - GtkTreeIter iter; p = privilege_search (oobs_group_get_name (group)); if (p == NULL) /* Ignore groups that don't match a privilege */ return; - table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); - store = GTK_LIST_STORE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model))); - - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COL_MEMBER, FALSE, - COL_DESCRIPTION, (p) ? _(p->privilege) : NULL, - COL_GROUP, group, - -1); + gtk_list_store_insert_with_values (privileges_model, NULL, G_MAXINT, + COL_MEMBER, FALSE, + COL_DESCRIPTION, (p) ? _(p->privilege) : NULL, + COL_GROUP, group, + -1); } void privileges_table_set_from_user (OobsUser *user) { - GtkWidget *table; - GtkTreeModel *model, *child_model; GtkTreeIter iter; gboolean valid; OobsGroup *group; GList *users; - table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); - child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - valid = gtk_tree_model_get_iter_first (child_model, &iter); + valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter); while (valid) { - gtk_tree_model_get (child_model, &iter, + gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter, COL_GROUP, &group, -1); users = oobs_group_get_users (group); - gtk_list_store_set (GTK_LIST_STORE (child_model), &iter, + gtk_list_store_set (privileges_model, &iter, COL_MEMBER, (g_list_find (users, user) != NULL), -1); g_list_free (users); g_object_unref (group); - valid = gtk_tree_model_iter_next (child_model, &iter); + valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter); } } @@ -270,47 +228,37 @@ void privileges_table_set_from_profile (GstUserProfile *profile) { - GtkWidget *table; - GtkTreeModel *model, *child_model; GtkTreeIter iter; gboolean valid; OobsGroup *group; - table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); - child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - valid = gtk_tree_model_get_iter_first (child_model, &iter); + valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter); while (valid) { - gtk_tree_model_get (child_model, &iter, + gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter, COL_GROUP, &group, -1); - gtk_list_store_set (GTK_LIST_STORE (child_model), &iter, + gtk_list_store_set (privileges_model, &iter, COL_MEMBER, find_group_in_profile (group, profile), -1); g_object_unref (group); - valid = gtk_tree_model_iter_next (child_model, &iter); + valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter); } } void privileges_table_save (OobsUser *user) { - GtkWidget *table; - GtkTreeModel *model, *child_model; GtkTreeIter iter; OobsGroup *group; gboolean valid, member; - table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); - child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - valid = gtk_tree_model_get_iter_first (child_model, &iter); + valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (privileges_model), &iter); while (valid) { - gtk_tree_model_get (child_model, &iter, + gtk_tree_model_get (GTK_TREE_MODEL (privileges_model), &iter, COL_GROUP, &group, COL_MEMBER, &member, -1); @@ -319,19 +267,12 @@ else oobs_group_remove_user (group, user); - valid = gtk_tree_model_iter_next (child_model, &iter); + valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (privileges_model), &iter); } } void privileges_table_clear (void) { - GtkWidget *table; - GtkTreeModel *model, *child_model; - - table = gst_dialog_get_widget (tool->main_dialog, "user_privileges"); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (table)); - child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - - gtk_list_store_clear (GTK_LIST_STORE (child_model)); + gtk_list_store_clear (privileges_model); } diff -Nru gnome-system-tools-2.32.0/src/users/table.c gnome-system-tools-3.0.0/src/users/table.c --- gnome-system-tools-2.32.0/src/users/table.c 2010-01-30 14:20:51.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/table.c 2010-12-16 12:51:37.000000000 +0000 @@ -106,7 +106,7 @@ gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model); g_object_unref (model); - gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo), 0); + gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo), 0); } void @@ -178,10 +178,14 @@ profile->name); label = gtk_label_new (profile->description); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_misc_set_padding (GTK_MISC (label), 16, 0); gtk_label_set_attributes (GTK_LABEL (label), attributes); + /* To force a minimum size for the dialog, set a somewhat arbitrary length */ + gtk_label_set_width_chars (GTK_LABEL (label), 50); + gtk_table_attach_defaults (GTK_TABLE (table), radio, 0, ncols, nrows + i, nrows + i + 1); diff -Nru gnome-system-tools-2.32.0/src/users/user-password.c gnome-system-tools-3.0.0/src/users/user-password.c --- gnome-system-tools-2.32.0/src/users/user-password.c 2010-09-13 11:49:49.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/user-password.c 2010-12-17 18:53:30.000000000 +0000 @@ -323,10 +323,9 @@ * to the password-less option should be committed, and close dialog. */ static void -finish_password_change () +finish_password_change (gboolean passwd_provided) { GtkWidget *user_passwd_dialog; - GtkWidget *passwd_entry; GtkWidget *nocheck_toggle; OobsUser *user; OobsGroup *no_passwd_login_group; @@ -334,7 +333,6 @@ gboolean is_self; user_passwd_dialog = gst_dialog_get_widget (tool->main_dialog, "user_passwd_dialog"); - passwd_entry = gst_dialog_get_widget (tool->main_dialog, "user_settings_passwd1"); nocheck_toggle = gst_dialog_get_widget (tool->main_dialog, "user_passwd_no_check"); user = users_table_get_current (); is_self = oobs_self_config_is_user_self (OOBS_SELF_CONFIG (GST_USERS_TOOL (tool)->self_config), @@ -352,7 +350,7 @@ * Else, we would believe the account is enabled, while it's not, * and we would allow password-less login, which is unexpected. */ if (oobs_user_get_password_disabled (user) - && strlen (gtk_entry_get_text (GTK_ENTRY (passwd_entry))) == 0) + && !passwd_provided) { /* Force removing user from this group, since results are unexpected */ if (no_passwd_login_group) @@ -434,7 +432,7 @@ if (!error) { - finish_password_change (); + finish_password_change (TRUE); passwd_destroy (passwd_handler); return; @@ -539,7 +537,7 @@ } /* If empty, directly handle password-less option, don't change password */ else if (strlen (passwd) == 0) { - finish_password_change (); + finish_password_change (FALSE); g_object_unref (user); return; } @@ -564,7 +562,7 @@ /* For other users, set password via the backends */ else { oobs_user_set_password (user, passwd); - finish_password_change (); + finish_password_change (TRUE); } g_object_unref (user); diff -Nru gnome-system-tools-2.32.0/src/users/user-settings.c gnome-system-tools-3.0.0/src/users/user-settings.c --- gnome-system-tools-2.32.0/src/users/user-settings.c 2010-09-13 11:49:49.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/user-settings.c 2010-12-17 18:49:06.000000000 +0000 @@ -173,6 +173,10 @@ config = OOBS_USERS_CONFIG (GST_USERS_TOOL (tool)->users_config); result = oobs_users_config_delete_user (config, user); if (result == OOBS_RESULT_OK) { + /* Take into account the possible deletion of user's main group. + * If we update groups here, the 'changed' signal will be blocked, and + * if it happens after 2 seconds, it will trigger a confirmation dialog. */ + g_idle_add (gst_users_tool_update_groups_async, tool); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); retval = TRUE; } @@ -319,7 +323,8 @@ face_image = gst_dialog_get_widget (tool->main_dialog, "user_settings_face"); face = user_settings_get_user_face (user, 60); gtk_image_set_from_pixbuf (GTK_IMAGE (face_image), face); - g_object_unref (face); + if (face) + g_object_unref (face); profile_label = gst_dialog_get_widget (tool->main_dialog, "user_settings_profile"); profile_button = gst_dialog_get_widget (tool->main_dialog, "edit_user_profile_button"); @@ -896,32 +901,38 @@ used_login = oobs_users_config_is_login_used (config, item1->str); if (nwords2 > 0 && !used_login && !isdigit(item1->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), item1->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + item1->str); /* if there's only one word, would be the same as item1 */ if (nwords2 > 1) { /* add other items */ used_login = oobs_users_config_is_login_used (config, item2->str); if (!used_login && !isdigit(item2->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), item2->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + item2->str); used_login = oobs_users_config_is_login_used (config, item3->str); if (!used_login && !isdigit(item3->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), item3->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + item3->str); used_login = oobs_users_config_is_login_used (config, item4->str); if (!used_login && !isdigit(item4->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), item4->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + item4->str); /* add the last word */ used_login = oobs_users_config_is_login_used (config, last_word->str); if (!used_login && !isdigit(last_word->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), last_word->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + last_word->str); /* ...and the first one */ used_login = oobs_users_config_is_login_used (config, first_word->str); if (!used_login && !isdigit(first_word->str[0])) - gtk_combo_box_append_text (GTK_COMBO_BOX (user_login), first_word->str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (user_login), + first_word->str); } @@ -954,10 +965,10 @@ gboolean empty_login; gboolean valid_login; gboolean valid_name; - char *login; - char *c; + const char *login; + const char *c; - login = gtk_combo_box_get_active_text (login_combo); + login = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (login_combo)))); login_entry = gtk_bin_get_child (GTK_BIN (login_combo)); validate_button = gst_dialog_get_widget (tool->main_dialog, "user_new_validate_button"); notice_image = gst_dialog_get_widget (tool->main_dialog, "user_new_notice_image"); @@ -1080,7 +1091,7 @@ /* Create user with base data entered by the user. Main group will be automatically managed by the backends, following the system configuration. */ - login = gtk_combo_box_get_active_text (GTK_COMBO_BOX (user_login)); + login = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (user_login)))); fullname = gtk_entry_get_text (GTK_ENTRY (user_name)); encrypt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (encrypted_home)); user = oobs_user_new (login); @@ -1122,6 +1133,11 @@ users_table_select_path (user_path); gtk_tree_path_free (user_path); + /* Take into account possibly new main group for user. + * If we update groups here, the 'changed' signal will be blocked, + * and if it happens after 2 seconds, it will trigger a confirmation dialog. */ + g_idle_add (gst_users_tool_update_groups_async, tool); + /* Finally, run the password edit dialog. * User can hit cancel, leaving the account disabled */ on_edit_user_passwd (NULL, NULL); @@ -1277,14 +1293,14 @@ if (profile) { radio = g_hash_table_lookup (radios, profile->name); - gtk_widget_set_sensitive (custom_radio, FALSE); + gtk_widget_hide (custom_radio); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - gtk_widget_set_sensitive (custom_label, FALSE); + gtk_widget_hide (custom_label); } else { - gtk_widget_set_sensitive (custom_radio, TRUE); + gtk_widget_show (custom_radio); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (custom_radio), TRUE); - gtk_widget_set_sensitive (custom_label, FALSE); + gtk_widget_show (custom_label); } response = run_edit_dialog (GTK_DIALOG (user_profile_dialog), @@ -1333,7 +1349,11 @@ GtkWidget *user_advanced_dialog; GtkWidget *face_image; GtkWidget *name_label; - GtkWidget *uid_notice; + GtkWidget *active_notice; + GtkWidget *active_label; + GtkWidget *uid_entry; + GtkWidget *locked_checkbox; + GtkWidget *home_entry; GtkWidget *widget; GtkTreeModel *model; GtkTreeIter iter; @@ -1374,30 +1394,53 @@ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_shell"); set_entry_text (gtk_bin_get_child (GTK_BIN (widget)), oobs_user_get_shell (user)); - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); - set_entry_text (widget, oobs_user_get_home_directory (user)); - - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user)); + home_entry = gst_dialog_get_widget (tool->main_dialog, "user_settings_home"); + set_entry_text (home_entry, oobs_user_get_home_directory (user)); - widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_locked_account"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), oobs_user_get_password_disabled (user)); + uid_entry = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid"); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (uid_entry), oobs_user_get_uid (user)); + locked_checkbox = gst_dialog_get_widget (tool->main_dialog, "user_settings_locked_account"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (locked_checkbox), + oobs_user_get_password_disabled (user)); /* show a notice if the user is logged in */ - uid_notice = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid_disabled"); + active_notice = gst_dialog_get_widget (tool->main_dialog, "user_settings_active_notice"); + active_label = gst_dialog_get_widget (tool->main_dialog, "user_settings_active_label"); if (oobs_user_is_root (user)) { - gtk_widget_set_sensitive (widget, FALSE); - gtk_widget_hide (uid_notice); + gtk_widget_set_sensitive (locked_checkbox, TRUE); + gtk_widget_set_sensitive (home_entry, TRUE); + gtk_widget_set_sensitive (uid_entry, FALSE); + gtk_label_set_text (GTK_LABEL (active_label), + _("You cannot change the user ID for the superuser account.")); + gtk_widget_show (active_notice); + } + else if (oobs_self_config_is_user_self (OOBS_SELF_CONFIG (GST_USERS_TOOL (tool)->self_config), user)) { + gtk_widget_set_sensitive (locked_checkbox, FALSE); + gtk_widget_set_sensitive (home_entry, FALSE); + gtk_widget_set_sensitive (uid_entry, FALSE); + gtk_label_set_text (GTK_LABEL (active_label), + _("You cannot disable your own account, " + "nor change your own home directory or user ID. " + "Run this program from another user's session to edit these settings.")); + gtk_widget_show (active_notice); } else if (oobs_user_get_active (user)) { - gtk_widget_set_sensitive (widget, FALSE); - gtk_widget_show (uid_notice); + gtk_widget_set_sensitive (locked_checkbox, FALSE); + gtk_widget_set_sensitive (home_entry, FALSE); + gtk_widget_set_sensitive (uid_entry, FALSE); + gtk_label_set_text (GTK_LABEL (active_label), + _("You cannot change an account's home directory or user ID " + "while the user is logged in.")); + gtk_widget_show (active_notice); } else { - gtk_widget_set_sensitive (widget, TRUE); - gtk_widget_hide (uid_notice); + gtk_widget_set_sensitive (locked_checkbox, TRUE); + gtk_widget_set_sensitive (home_entry, TRUE); + gtk_widget_set_sensitive (uid_entry, TRUE); + + gtk_widget_hide (active_notice); } privileges_table_set_from_user (user); @@ -1442,7 +1485,7 @@ /* Leaving user in the password-less login group would still allow him to login, * which defeats the purpose of disabling account */ no_passwd_login_group = - oobs_groups_config_get_from_name (GST_USERS_TOOL (tool)->groups_config, + oobs_groups_config_get_from_name (OOBS_GROUPS_CONFIG (GST_USERS_TOOL (tool)->groups_config), NO_PASSWD_LOGIN_GROUP); if (password_disabled && no_passwd_login_group) oobs_group_remove_user (no_passwd_login_group, user); diff -Nru gnome-system-tools-2.32.0/src/users/users-table.c gnome-system-tools-3.0.0/src/users/users-table.c --- gnome-system-tools-2.32.0/src/users/users-table.c 2010-08-22 13:01:52.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/users-table.c 2010-12-16 11:15:23.000000000 +0000 @@ -32,6 +32,8 @@ extern GstTool *tool; +static GtkListStore *users_model = NULL; + static void add_user_columns (GtkTreeView *treeview) { @@ -90,14 +92,18 @@ return show; } -static GtkTreeModel* -create_users_model (GstUsersTool *tool) +void +create_users_table (GstUsersTool *tool) { - GtkListStore *store; + GtkWidget *users_table; + GtkTreeSelection *selection; GtkTreeModel *filter_model; GtkTreeModel *sort_model; - - store = gtk_list_store_new (COL_USER_LAST, + GtkWidget *popup; + + users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table"); + + users_model = gtk_list_store_new (COL_USER_LAST, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, @@ -109,7 +115,7 @@ OOBS_TYPE_LIST_ITER); /* Filter model */ - filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); + filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (users_model), NULL); gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), users_model_filter, tool, NULL); @@ -118,23 +124,9 @@ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COL_USER_LOGIN, GTK_SORT_ASCENDING); - return sort_model; -} + gtk_tree_view_set_model (GTK_TREE_VIEW (users_table), sort_model); + g_object_unref (users_model); -void -create_users_table (GstUsersTool *tool) -{ - GtkWidget *users_table; - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkWidget *popup; - - users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table"); - - model = create_users_model (tool); - gtk_tree_view_set_model (GTK_TREE_VIEW (users_table), model); - g_object_unref (model); - add_user_columns (GTK_TREE_VIEW (users_table)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (users_table)); @@ -160,29 +152,17 @@ GtkTreeModel * users_table_get_model () { - GtkWidget *users_table; - GtkTreeModel *sort_model; - GtkTreeModel *filter_model; - - users_table = gst_dialog_get_widget (GST_TOOL (tool)->main_dialog, "users_table"); - - sort_model = gtk_tree_view_get_model (GTK_TREE_VIEW (users_table)); - filter_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); - - return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + return GTK_TREE_MODEL (users_model); } void users_table_set_user (OobsUser *user, GtkTreeIter *iter) { - GtkTreeModel *model; GdkPixbuf *face; const char *name; const char *login; char *label; - model = users_table_get_model (); - face = user_settings_get_user_face (user, 48); name = oobs_user_get_full_name_fallback (user); login = oobs_user_get_login_name (user); @@ -190,7 +170,7 @@ label = g_markup_printf_escaped ("%s\n%s", name, login); - gtk_list_store_set (GTK_LIST_STORE (model), iter, + gtk_list_store_set (users_model, iter, COL_USER_FACE, face, COL_USER_NAME, name, COL_USER_LOGIN, login, @@ -213,25 +193,18 @@ GtkTreePath * users_table_add_user (OobsUser *user) { - GtkTreeModel *model; GtkTreeIter iter; - model = users_table_get_model (); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_append (users_model, &iter); users_table_set_user (user, &iter); - return gtk_tree_model_get_path (model, &iter); + return gtk_tree_model_get_path (GTK_TREE_MODEL (users_model), &iter); } void users_table_clear (void) { - GtkTreeModel *model; - - model = users_table_get_model (); - - gtk_list_store_clear (GTK_LIST_STORE (model)); + gtk_list_store_clear (users_model); } /* diff -Nru gnome-system-tools-2.32.0/src/users/users-tool.c gnome-system-tools-3.0.0/src/users/users-tool.c --- gnome-system-tools-2.32.0/src/users/users-tool.c 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/users-tool.c 2010-12-17 18:49:06.000000000 +0000 @@ -59,16 +59,12 @@ gpointer user_data) { GstTool *tool = GST_TOOL (user_data); - GtkWidget *widget; - GtkTreeModel *sort_model, *filter_model; GST_USERS_TOOL (tool)->showall = g_settings_get_boolean (settings, "showall"); GST_USERS_TOOL (tool)->showroot = g_settings_get_boolean (settings, "showroot"); - widget = gst_dialog_get_widget (tool->main_dialog, "users_table"); - sort_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - filter_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + /* We need to reload the users table since unshown users aren't added */ + gst_tool_update_gui (tool); } static void @@ -137,7 +133,7 @@ { OobsList *list; OobsListIter iter; - GObject *user; + OobsUser *user; OobsUser *self; GtkTreePath *path; gboolean valid; @@ -149,11 +145,11 @@ valid = oobs_list_get_iter_first (list, &iter); while (valid) { - user = oobs_list_get (list, &iter); - path = users_table_add_user (OOBS_USER (user)); + user = OOBS_USER (oobs_list_get (list, &iter)); + path = users_table_add_user (user); gst_tool_add_configuration_object (GST_TOOL (tool), OOBS_OBJECT (user), FALSE); - if (self == (OobsUser *) user) + if (self == user) users_table_select_path (path); g_object_unref (user); @@ -171,7 +167,9 @@ gboolean valid; groups_table_clear (); + groups_table_begin_insertions (); privileges_table_clear (); + list = oobs_groups_config_get_groups (OOBS_GROUPS_CONFIG (tool->groups_config)); valid = oobs_list_get_iter_first (list, &iter); @@ -187,6 +185,8 @@ g_object_unref (group); valid = oobs_list_iter_next (list, &iter); } + + groups_table_end_insertions (); } static void @@ -263,6 +263,18 @@ update_shells (GST_USERS_TOOL (tool)); } +/* + * Function called via g_idle_add() when we need to allow signals + * to be processed before updating. + */ +gboolean +gst_users_tool_update_groups_async (gpointer data) +{ + update_groups (GST_USERS_TOOL (data)); + + return FALSE; +} + static void gst_users_tool_update_config (GstTool *tool) { @@ -287,6 +299,6 @@ "name", "users", "title", _("Users Settings"), "icon", "config-users", - "lock-button", FALSE, + "show-lock-button", FALSE, NULL); } diff -Nru gnome-system-tools-2.32.0/src/users/users-tool.h gnome-system-tools-3.0.0/src/users/users-tool.h --- gnome-system-tools-2.32.0/src/users/users-tool.h 2010-05-24 17:09:57.000000000 +0000 +++ gnome-system-tools-3.0.0/src/users/users-tool.h 2010-12-17 18:49:06.000000000 +0000 @@ -61,12 +61,13 @@ GstToolClass parent_class; }; -GType gst_users_tool_get_type (void); +GType gst_users_tool_get_type (void); -GstTool *gst_users_tool_new (void); +GstTool *gst_users_tool_new (void); -void gst_users_tool_update_gui (GstTool *tool); +void gst_users_tool_update_gui (GstTool *tool); +gboolean gst_users_tool_update_groups_async (gpointer data); G_END_DECLS