diff -Nru gnome-dictionary-3.8.0/ABOUT-NLS gnome-dictionary-3.10.0/ABOUT-NLS --- gnome-dictionary-3.8.0/ABOUT-NLS 2013-07-21 16:32:42.000000000 +0000 +++ gnome-dictionary-3.10.0/ABOUT-NLS 1970-01-01 00:00:00.000000000 +0000 @@ -1,1068 +0,0 @@ -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-dictionary-3.8.0/Makefile.am gnome-dictionary-3.10.0/Makefile.am --- gnome-dictionary-3.8.0/Makefile.am 2013-07-05 12:29:50.000000000 +0000 +++ gnome-dictionary-3.10.0/Makefile.am 2013-10-06 16:15:35.000000000 +0000 @@ -1,5 +1,7 @@ SUBDIRS = libgdict src data docs help po +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + EXTRA_DIST = TODO README AUTHORS COPYING.docs COPYING.libs DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff -Nru gnome-dictionary-3.8.0/Makefile.in gnome-dictionary-3.10.0/Makefile.in --- gnome-dictionary-3.8.0/Makefile.in 2013-07-21 16:32:48.000000000 +0000 +++ gnome-dictionary-3.10.0/Makefile.in 2013-10-06 16:42:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -81,19 +81,14 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in ABOUT-NLS AUTHORS COPYING NEWS README \ - TODO compile config.guess config.rpath config.sub install-sh \ - missing ltmain.sh + $(srcdir)/config.h.in AUTHORS COPYING NEWS README TODO compile \ + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -240,16 +235,15 @@ GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@ GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@ GDICT_VERSION = @GDICT_VERSION@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -261,7 +255,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -270,26 +263,20 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -308,7 +295,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -317,8 +303,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -381,6 +365,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = libgdict src data docs help po +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} EXTRA_DIST = TODO README AUTHORS COPYING.docs COPYING.libs DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc all: config.h @@ -423,8 +408,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -632,16 +617,10 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) diff -Nru gnome-dictionary-3.8.0/NEWS gnome-dictionary-3.10.0/NEWS --- gnome-dictionary-3.8.0/NEWS 2013-07-20 08:42:24.000000000 +0000 +++ gnome-dictionary-3.10.0/NEWS 2013-10-06 16:39:30.000000000 +0000 @@ -1,8 +1,42 @@ -GNOME Dictionary 3.8.0 2012-07-20 +GNOME Dictionary 3.10.0 2013-10-06 ================================================================================ + • Code fixes: - * Translation updates - * Re-written help in Mallard (Sindhu S, Ekaterina Gerasimova) +Alexandre Franke: Fix typo +Andika Triwidada: + Fix #706556, tag typo + Fixed typo in string +Antono Vasiljev: Fix bugzilla product in .desktop file +Florian Müllner: sidebar: Do not select unrealized menu items +Nguyễn Thái Ngọc Duy: + po/vi.po: import from Damned Lies + po/vi.po: revert two strings, committed by accident previously +Piotr Drąg: Fix broken tags in German help translation +Robert Roth: Fix Ctrl+A and Ctrl+C in the search field +Seán de Búrca:Fix autogen and configure + + • Translation updates: + +Many thanks to our translators: + +Andika Triwidada, Alexnadre Franke, A S Alam, +Aman, António Lima, Balázs Úr, Changwoo Ryu, Daniel Korostil, Daniel Mustieles, +Enrico Nicoletto, Fabio Tomat, Fran Diéguez, Ihar Hrachyshka, Inaki Larranaga +Murgoitio, Jiro Matsuzawa, Kenneth Nielsen, Mattias Põldaru, Pavol Klačanský, +Rūdolfs Mazurs, Seán de Búrca, Timo Jyrinki, Trần Ngọc Quân, Мирослав Николић + +for adding/updating translations in: + +Indonesian, French, Punjabi, Portuguese, Hungarian, Korean, Ukrainian, Spanish, +Brazilian Portuguese, Friulian, Galician, Belarusian, Basque, Japanese, Danish, +Estonian, Slovak, Latvian, Irish, Finnish, Vietnamese and Serbian. + +GNOME Dictionary 3.9.0 2013-08-21 +================================================================================ + + • Translation updates: + Tajik, Spanish, Gujarati, Breton, Hebrew, Galician, Russian, Tranditional + Chinese, Slovenian, Brazillian Portuguese. GNOME Dictionary 3.6.0 2012-09-25 ================================================================================ diff -Nru gnome-dictionary-3.8.0/aclocal.m4 gnome-dictionary-3.10.0/aclocal.m4 --- gnome-dictionary-3.8.0/aclocal.m4 2013-07-21 16:32:46.000000000 +0000 +++ gnome-dictionary-3.10.0/aclocal.m4 2013-10-06 16:42:06.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -20,537 +20,583 @@ 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'.])]) -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, - AS_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 - - 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) --strict --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) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +# Copyright (C) 2002-2013 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. -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) +# 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.13' +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.13.4], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +# _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], []) -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 "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) +# 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.13.4])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -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_AUX_DIR_EXPAND -*- Autoconf -*- -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# 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/../..'. # -# 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. +# 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. # -# 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. +# $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 # -# 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|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -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]) +# 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. # -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# 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. # -# 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` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# 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. -# _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 +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` +]) +# AM_CONDITIONAL -*- Autoconf -*- -# 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 -# +# Copyright (C) 1997-2013 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]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$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])]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# Copyright (C) 1999-2013 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. -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 --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# 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... - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: -$$1_PKG_ERRORS +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# 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 -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" 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=]) -_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. +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". + rm -rf conftest.dir + 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 -_PKG_TEXT + 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]) -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 + 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 10 /bin/sh. + echo '/* dummy */' > 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 + ;; + msvc7 | msvc7msys | 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_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR + 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]) +]) -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +# 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 +]) -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - -AC_DEFUN([YELP_HELP_INIT], -[ -AC_REQUIRE([AC_PROG_LN_S]) -m4_pattern_allow([AM_V_at]) -m4_pattern_allow([AM_V_GEN]) -m4_pattern_allow([AM_DEFAULT_VERBOSITY]) -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], - [path where help files are installed]),, - [with_help_dir='${datadir}/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) -AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) -if test x"$ITSTOOL" = x; then - AC_MSG_ERROR([itstool not found]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) -AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) -if test x"$XMLLINT" = x; then - AC_MSG_ERROR([xmllint not found]) -fi +# Generate code to set up dependency tracking. -*- Autoconf -*- -YELP_HELP_RULES=' -HELP_ID ?= -HELP_POT ?= -HELP_FILES ?= -HELP_EXTRA ?= -HELP_MEDIA ?= -HELP_LINGUAS ?= +# Copyright (C) 1999-2013 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. -_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) -_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) -_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) -_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) -_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) -_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) -_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) -_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) -_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) -_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) -_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) -_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf 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"` + # 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'`; 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 -all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) -.PHONY: pot -pot: $(_HELP_POTFILE) -$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) +# 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"]) +]) -.PHONY: repo -repo: $(_HELP_POTFILE) - $(AM_V_at)for po in $(_HELP_POFILES); do \ - if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ - msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ - done +# Do all the work for Automake. -*- Autoconf -*- -$(_HELP_POFILES): - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi - $(AM_V_GEN)if ! test -f "[$]@"; then \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ - else \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ - rm "$(notdir [$]@).tmp"); \ - fi +# Copyright (C) 1996-2013 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. -$(_HELP_MOFILES): %.mo: %.po - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_GEN)msgfmt -o "[$]@" "$<" +# 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. -$(_HELP_LC_FILES): $(_HELP_LINGUAS) -$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) -$(_HELP_LC_STAMPS): %.stamp: %.mo -$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ - mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ - if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ - (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ - touch "[$]@" +# 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.65])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 -.PHONY: clean-help -mostlyclean-am: $(if $(HELP_ID),clean-help) -clean-help: - rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) +# 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]) -EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +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], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [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 -distdir: distdir-help-files -distdir-help-files: - @for lc in C $(HELP_LINGUAS); do \ - $(MKDIR_P) "$(distdir)/$$lc"; \ - for file in $(HELP_FILES); do \ - if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ - cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ - done; \ - done; \ +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -.PHONY: check-help -check: check-help -check-help: - for lc in C $(_HELP_LINGUAS); do \ - if test -d "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - for page in $(HELP_FILES); do \ - echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ - $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ - done; \ - done +# 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([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# 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])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro 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])]) -.PHONY: install-help -install-data-am: $(if $(HELP_ID),install-help) -install-help: - @for lc in C $(_HELP_LINGUAS); do \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ - done - @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - mdir=`dirname "$$f"`; \ - if test "x$mdir" = "x."; then mdir=""; fi; \ - if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ - if test -f "$$d$$lc/$$f"; then \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ - elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ - fi; \ - done; \ - done -.PHONY: uninstall-help -uninstall-am: $(if $(HELP_ID),uninstall-help) -uninstall-help: - for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir$$f"; \ - rm -f "$$helpdir$$f"; \ - done; \ - done; -' -AC_SUBST([YELP_HELP_RULES]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) -]) +# 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) 2002-2013 Free Software Foundation, Inc. +# 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-2013 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_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.14' -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.14], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +# 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])]) -# _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], []) +# Copyright (C) 2003-2013 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_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.14])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# 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])]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001-2013 Free Software Foundation, Inc. # @@ -558,52 +604,81 @@ # 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` +# 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 ]) -# AM_CONDITIONAL -*- Autoconf -*- +# Copyright (C) 1999-2013 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_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. # @@ -611,1081 +686,921 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$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='#' +# 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)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, 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 --is-lightweight"; then + am_missing_run="$MISSING " else - $1_TRUE='#' - $1_FALSE= + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) 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])]) +]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2013 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_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# 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... - +# _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_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# 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 +# _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)])]) -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" 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=]) +# _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_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". - rm -rf conftest.dir - 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 +# Check to make sure that the build environment is sane. -*- Autoconf -*- - 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]) +# Copyright (C) 1996-2013 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 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 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# 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 - # 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 - ;; - msvc7 | msvc7msys | 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 +# 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 ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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 + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - cd .. - rm -rf conftest.dir + # 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 + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : else - am_cv_$1_dependencies_compiler_type=none + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) 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]) -]) - - -# 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 +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file ]) +# Copyright (C) 2009-2013 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_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl +# 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], [dnl AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +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 +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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])]) -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf 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"` - # 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'`; 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 +# Copyright (C) 2006-2013 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_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# 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"]) -]) +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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. -# 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. - -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - -# 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.65])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 - -# 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]) +# _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. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -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], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [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 +# We'll 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_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -# 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([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# 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])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro 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 + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. + [pax], + [], -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. + [m4_fatal([Unknown tar format])]) -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . + AC_MSG_CHECKING([how to create a $1 tar archive]) -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi]) + 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 -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 -# 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. + # 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 -# 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]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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 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. +# 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. -# 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 +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +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 -AC_SUBST([install_sh])]) +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 -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# 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. +# 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]) -# 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=. +# _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` + test "x$?" != "x0" && pkg_failed=yes ], + [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 - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) + _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 -# Check to see how 'make' treats includes. -*- Autoconf -*- +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# Copyright (C) 2001-2013 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_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# 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 -]) +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.]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +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 --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Copyright (C) 1997-2013 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. + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# 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)]) +$$1_PKG_ERRORS -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, 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 --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Copyright (C) 2003-2013 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])[]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. -# 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 FIXME we are no longer going to remove this! adjust warning -dnl FIXME message accordingly. -AC_DIAGNOSE([obsolete], -[$0: this macro is deprecated, and will soon be removed. -You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, -and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) -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 -]) +_PKG_TEXT -# Helper functions for option handling. -*- Autoconf -*- +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 -# Copyright (C) 2001-2013 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_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR -# _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_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)])]) +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl -# Copyright (C) 1999-2013 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_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +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, + AS_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 -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas -# Copyright (C) 2001-2013 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. +mostlyclean-am: clean-gsettings-schemas -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ -# Copyright (C) 1996-2013 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. +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# 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 +.SECONDARY: $(gsettings_SCHEMAS) -# 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 ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - 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 - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi - # 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 - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - 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]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) +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) -# Copyright (C) 2009-2013 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. +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -# 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], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -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 -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +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 "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) ]) -# Copyright (C) 2001-2013 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 _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_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])]) +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) -# Copyright (C) 2006-2013 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_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) +fi -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) +fi -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= -# Check how to create a tarball. -*- Autoconf -*- +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) -# Copyright (C) 2004-2013 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. +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); -# _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. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi - [pax], - [], +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" - [m4_fatal([Unknown tar format])]) +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" - AC_MSG_CHECKING([how to create a $1 tar archive]) +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) - 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 +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ - # 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 +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done - # 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 - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +]) -m4_include([m4/gettext.m4]) m4_include([m4/gtk-doc.m4]) -m4_include([m4/iconv.m4]) -m4_include([m4/intlmacosx.m4]) m4_include([m4/intltool.m4]) -m4_include([m4/lib-ld.m4]) -m4_include([m4/lib-link.m4]) -m4_include([m4/lib-prefix.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) -m4_include([m4/nls.m4]) -m4_include([m4/po.m4]) -m4_include([m4/progtest.m4]) diff -Nru gnome-dictionary-3.8.0/config.h.in gnome-dictionary-3.10.0/config.h.in --- gnome-dictionary-3.8.0/config.h.in 2013-07-21 16:32:47.000000000 +0000 +++ gnome-dictionary-3.10.0/config.h.in 2013-10-06 16:42:08.000000000 +0000 @@ -3,34 +3,12 @@ /* Define whether IPv6 support is enabled */ #undef ENABLE_IPV6 -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - /* The name of the gettext domain */ #undef GETTEXT_PACKAGE -/* 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 if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* 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 @@ -62,6 +40,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff -Nru gnome-dictionary-3.8.0/config.rpath gnome-dictionary-3.10.0/config.rpath --- gnome-dictionary-3.8.0/config.rpath 2013-07-21 16:32:42.000000000 +0000 +++ gnome-dictionary-3.10.0/config.rpath 1970-01-01 00:00:00.000000000 +0000 @@ -1,666 +0,0 @@ -#! /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=/' <. # @@ -591,12 +591,11 @@ # Identity of this package. PACKAGE_NAME='gnome-dictionary' PACKAGE_TARNAME='gnome-dictionary' -PACKAGE_VERSION='3.8.0' -PACKAGE_STRING='gnome-dictionary 3.8.0' +PACKAGE_VERSION='3.10.0' +PACKAGE_STRING='gnome-dictionary 3.10.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-dictionary' PACKAGE_URL='http://live.gnome.org/GnomeUtils' -gt_needs= # Factoring default headers for most tests. ac_includes_default="\ #include @@ -658,6 +657,7 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -701,18 +701,6 @@ ac_ct_CXX CXXFLAGS CXX -POSUB -LTLIBINTL -LIBINTL -INTLLIBS -LTLIBICONV -LIBICONV -INTL_MACOSX_LIBS -XGETTEXT_EXTRA_OPTIONS -XGETTEXT_015 -GMSGFMT_015 -MSGFMT_015 -GETTEXT_MACRO_VERSION PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -853,14 +841,11 @@ enable_silent_rules enable_nls enable_dependency_tracking -with_gnu_ld -enable_rpath -with_libiconv_prefix -with_libintl_prefix enable_static enable_shared with_pic enable_fast_install +with_gnu_ld with_sysroot enable_libtool_lock enable_debug @@ -1434,7 +1419,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-dictionary 3.8.0 to adapt to many kinds of systems. +\`configure' configures gnome-dictionary 3.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,7 +1491,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-dictionary 3.8.0:";; + short | recursive ) echo "Configuration of gnome-dictionary 3.10.0:";; esac cat <<\_ACEOF @@ -1521,7 +1506,6 @@ do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build - --disable-rpath do not hardcode runtime library paths --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] @@ -1539,11 +1523,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=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 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1646,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-dictionary configure 3.8.0 +gnome-dictionary configure 3.10.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1811,48 +1790,6 @@ } # ac_fn_c_check_func -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_cxx_try_compile LINENO # ---------------------------- # Try to compile conftest.$ac_ext, and return whether this succeeded. @@ -1928,6 +1865,48 @@ } # ac_fn_c_try_cpp +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2045,7 +2024,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-dictionary $as_me 3.8.0, which was +It was created by gnome-dictionary $as_me 3.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2325,7 +2304,6 @@ >$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 @@ -2540,7 +2518,7 @@ program_prefix=${target_alias}- # require automake 1.10 -am__api_version='1.14' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3026,7 +3004,7 @@ # Define the identity of the package. PACKAGE='gnome-dictionary' - VERSION='3.8.0' + VERSION='3.10.0' cat >>confdefs.h <<_ACEOF @@ -3077,47 +3055,6 @@ -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4031,65 +3968,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4814,1994 +4692,96 @@ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$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 - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$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 - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.22 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $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; } - PKG_CONFIG="" - fi -fi - - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - - - - GETTEXT_MACRO_VERSION=0.17 - - - - -# 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 - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "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 ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -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 ${ac_cv_path_GMSGFMT+:} false; 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 as_fn_executable_p "$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 - - - - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac - - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - 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 - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - rm -f messages.po - - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - 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 - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 -MSGMERGE="$ac_cv_path_MSGMERGE" -if test "$MSGMERGE" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - 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 ${acl_cv_path_LD+:} false; 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 ${acl_cv_prog_gnu_ld+:} false; 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 ${acl_cv_rpath+:} false; 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 - 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 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - - - - - - - - - - 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" - fi - fi - -fi - - LIBICONV= - LTLIBICONV= - INCICONV= - LIBICONV_PREFIX= - 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"; 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/"'*$,,'` - LIBICONV_PREFIX="$basedir" - 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"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; 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 ${gt_cv_func_CFPreferencesCopyAppValue+:} false; 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 () -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_CFPreferencesCopyAppValue=yes -else - gt_cv_func_CFPreferencesCopyAppValue=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_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -$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 ${gt_cv_func_CFLocaleCopyCurrent+:} false; 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 - - - - - - - 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 \${$gt_func_gnugettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -int -main () -{ -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 : - eval "$gt_func_gnugettext_libc=yes" -else - eval "$gt_func_gnugettext_libc=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -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 ${am_cv_func_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - 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 () -{ -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_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#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 -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 ${am_cv_func_iconv_works+:} false; 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; - } - } -#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 - - 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 - -$as_echo "#define HAVE_ICONV 1" >>confdefs.h - - 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 - - - - - - - - - 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" - fi - fi - -fi - - LIBINTL= - LTLIBINTL= - INCINTL= - LIBINTL_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='intl ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; 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/"'*$,,'` - LIBINTL_PREFIX="$basedir" - 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"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; 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 - - { $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 \${$gt_func_gnugettext_libintl+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 () -{ -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 : - eval "$gt_func_gnugettext_libintl=yes" -else - 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" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - 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 -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 - - { $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 - 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 - - 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" - - 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 + break 2 fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - INTLLIBS="$LIBINTL" - - - - +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$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 + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.22 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $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; } + PKG_CONFIG="" + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7342,65 +5322,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7529,6 +5450,131 @@ fi +if test "x$CC" != xcc; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } +fi +set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +rm -f conftest2.* +if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi +else + eval ac_cv_prog_cc_${ac_cc}_c_o=no +fi +rm -f core conftest* + +fi +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then + { $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; } + +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h + +fi + +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -19553,16 +17599,53 @@ - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $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 + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -19572,7 +17655,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK_PATH="$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 @@ -19583,10 +17666,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19985,7 +18068,8 @@ .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) @@ -20795,7 +18879,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-dictionary $as_me 3.8.0, which was +This file was extended by gnome-dictionary $as_me 3.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20862,7 +18946,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-dictionary config.status 3.8.0 +gnome-dictionary config.status 3.10.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20982,13 +19066,6 @@ # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -# 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%}" - # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -21377,7 +19454,6 @@ case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libgdict/Makefile") CONFIG_FILES="$CONFIG_FILES libgdict/Makefile" ;; @@ -22081,119 +20157,6 @@ done } ;; - "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 ;; "libtool":C) # See if we are running on zsh, and set the options which allow our diff -Nru gnome-dictionary-3.8.0/configure.ac gnome-dictionary-3.10.0/configure.ac --- gnome-dictionary-3.8.0/configure.ac 2013-07-21 08:07:46.000000000 +0000 +++ gnome-dictionary-3.10.0/configure.ac 2013-10-06 16:19:08.000000000 +0000 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([gnome-dictionary], [3.8.0], +AC_INIT([gnome-dictionary], [3.10.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-dictionary], [gnome-dictionary], [http://live.gnome.org/GnomeUtils]) @@ -20,9 +20,6 @@ IT_PROG_INTLTOOL(0.40.0) PKG_PROG_PKG_CONFIG([0.22]) -AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.17]) - AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX diff -Nru gnome-dictionary-3.8.0/data/Makefile.in gnome-dictionary-3.10.0/data/Makefile.in --- gnome-dictionary-3.8.0/data/Makefile.in 2013-07-21 16:32:48.000000000 +0000 +++ gnome-dictionary-3.10.0/data/Makefile.in 2013-10-06 16:42:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -83,15 +83,11 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/org.gnome.dictionary.gschema.xml.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -191,16 +187,15 @@ GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@ GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@ GDICT_VERSION = @GDICT_VERSION@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -212,7 +207,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -221,26 +215,20 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -259,7 +247,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -268,8 +255,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -Nru gnome-dictionary-3.8.0/data/gnome-dictionary.desktop.in.in gnome-dictionary-3.10.0/data/gnome-dictionary.desktop.in.in --- gnome-dictionary-3.8.0/data/gnome-dictionary.desktop.in.in 2013-07-05 12:29:50.000000000 +0000 +++ gnome-dictionary-3.10.0/data/gnome-dictionary.desktop.in.in 2013-10-06 08:39:54.000000000 +0000 @@ -11,6 +11,5 @@ NotShowIn=KDE; X-GNOME-DocPath=gnome-dictionary/gnome-dictionary.xml X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-utils -X-GNOME-Bugzilla-Component=gdict +X-GNOME-Bugzilla-Product=gnome-dictionary X-GNOME-Bugzilla-Version=@VERSION@ diff -Nru gnome-dictionary-3.8.0/debian/changelog gnome-dictionary-3.10.0/debian/changelog --- gnome-dictionary-3.8.0/debian/changelog 2013-08-28 22:33:10.000000000 +0000 +++ gnome-dictionary-3.10.0/debian/changelog 2013-10-22 05:44:24.000000000 +0000 @@ -1,3 +1,15 @@ +gnome-dictionary (3.10.0-1~saucy1) saucy; urgency=medium + + * Copied from debian + + -- Rico Tzschichholz Tue, 22 Oct 2013 07:44:24 +0200 + +gnome-dictionary (3.10.0-1) unstable; urgency=low + + * New upstream release. + + -- Andreas Henriksson Thu, 17 Oct 2013 20:20:54 +0200 + gnome-dictionary (3.8.0-1) unstable; urgency=low [ Jeremy Bicha ] diff -Nru gnome-dictionary-3.8.0/debian/control gnome-dictionary-3.10.0/debian/control --- gnome-dictionary-3.8.0/debian/control 2013-08-28 22:37:16.000000000 +0000 +++ gnome-dictionary-3.10.0/debian/control 2013-10-22 05:44:29.000000000 +0000 @@ -2,7 +2,6 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: gnome-dictionary Section: gnome Priority: optional diff -Nru gnome-dictionary-3.8.0/docs/Makefile.in gnome-dictionary-3.10.0/docs/Makefile.in --- gnome-dictionary-3.8.0/docs/Makefile.in 2013-07-21 16:32:48.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/Makefile.in 2013-10-06 16:42:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -81,15 +81,11 @@ subdir = docs DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -216,16 +212,15 @@ GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@ GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@ GDICT_VERSION = @GDICT_VERSION@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -237,7 +232,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -246,26 +240,20 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -284,7 +272,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -293,8 +280,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -Nru gnome-dictionary-3.8.0/docs/reference/Makefile.in gnome-dictionary-3.10.0/docs/reference/Makefile.in --- gnome-dictionary-3.8.0/docs/reference/Makefile.in 2013-07-21 16:32:48.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/Makefile.in 2013-10-06 16:42:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -81,15 +81,11 @@ subdir = docs/reference DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -216,16 +212,15 @@ GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@ GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@ GDICT_VERSION = @GDICT_VERSION@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -237,7 +232,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -246,26 +240,20 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -284,7 +272,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -293,8 +280,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/Makefile.in gnome-dictionary-3.10.0/docs/reference/gdict/Makefile.in --- gnome-dictionary-3.8.0/docs/reference/gdict/Makefile.in 2013-07-21 16:32:48.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/gdict/Makefile.in 2013-10-06 16:42:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -88,15 +88,11 @@ $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs/reference/gdict ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -163,16 +159,15 @@ GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@ GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@ GDICT_VERSION = @GDICT_VERSION@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -184,7 +179,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -193,26 +187,20 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -231,7 +219,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -240,8 +227,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -406,7 +391,7 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @@ -643,6 +628,11 @@ uninstall-am uninstall-local +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @ENABLE_GTK_DOC_FALSE@all-local: diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictClientContext.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictClientContext.html --- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictClientContext.html 2013-07-21 16:33:49.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictClientContext.html 2013-10-06 16:43:19.000000000 +0000 @@ -2,26 +2,19 @@ -GdictClientContext +GNOME Dictionary Library Reference Manual: GdictClientContext - + - - - - - - - - - + + + + +
@@ -460,6 +457,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.19.1 \ No newline at end of file diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictDatabaseChooser.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictDatabaseChooser.html --- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictDatabaseChooser.html 2013-07-21 16:33:49.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictDatabaseChooser.html 2013-10-06 16:43:19.000000000 +0000 @@ -2,26 +2,19 @@ -GdictDatabaseChooser +GNOME Dictionary Library Reference Manual: GdictDatabaseChooser - + -
- - - - - - - - + + + + +
@@ -629,6 +626,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.19.1 \ No newline at end of file diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictDefbox.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictDefbox.html --- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictDefbox.html 2013-07-21 16:33:49.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictDefbox.html 2013-10-06 16:43:19.000000000 +0000 @@ -2,26 +2,19 @@ -GdictDefbox +GNOME Dictionary Library Reference Manual: GdictDefbox - + -
- - - - - - - - + + + + +
@@ -788,6 +785,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.19.1 \ No newline at end of file diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSource.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSource.html --- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSource.html 2013-07-21 16:33:49.000000000 +0000 +++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSource.html 2013-10-06 16:43:19.000000000 +0000 @@ -2,34 +2,31 @@ -GdictSource +GNOME Dictionary Library Reference Manual: GdictSource - + -
- - - - - - - - + + + + +
@@ -571,17 +568,16 @@

-
-
- - - - - - - 
1

-

-
+
+#include <gdict/gdict.h>
+ GdictSource *source = gdict_source_new ();
+ 
+ gdict_source_set_name (source, "My Source");
+ gdict_source_set_transport (source, GDICT_SOURCE_TRANSPORT_DICTD,
+                             "hostname", "dictionary-server.org",
+                             "port", 2628,
+                             NULL);
+

 

 

 

@@ -810,6 +806,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSourceChooser.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSourceChooser.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSourceChooser.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSourceChooser.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,26 +2,19 @@
 
-GdictSourceChooser
+GNOME Dictionary Library Reference Manual: GdictSourceChooser
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -606,6 +603,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSourceLoader.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSourceLoader.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSourceLoader.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSourceLoader.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,26 +2,19 @@
 
-GdictSourceLoader
+GNOME Dictionary Library Reference Manual: GdictSourceLoader
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -428,6 +425,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSpeller.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSpeller.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictSpeller.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictSpeller.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,26 +2,19 @@
 
-GdictSpeller
+GNOME Dictionary Library Reference Manual: GdictSpeller
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -454,6 +451,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictStrategyChooser.html gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictStrategyChooser.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/GdictStrategyChooser.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/GdictStrategyChooser.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,26 +2,19 @@
 
-GdictStrategyChooser
+GNOME Dictionary Library Reference Manual: GdictStrategyChooser
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -591,6 +588,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ch05.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ch05.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ch05.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ch05.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
-Base widgets
+GNOME Dictionary Library Reference Manual: Base widgets
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -33,6 +33,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ch06.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ch06.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ch06.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ch06.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Advanced widgets
+GNOME Dictionary Library Reference Manual: Advanced widgets
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -36,6 +36,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/context-types.html gnome-dictionary-3.10.0/docs/reference/gdict/html/context-types.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/context-types.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/context-types.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Context Implementations
+GNOME Dictionary Library Reference Manual: Context Implementations
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -30,6 +30,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/context.html gnome-dictionary-3.10.0/docs/reference/gdict/html/context.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/context.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/context.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Dictionary Context
+GNOME Dictionary Library Reference Manual: Dictionary Context
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -37,6 +37,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-Gdict-Utilities.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-Gdict-Utilities.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-Gdict-Utilities.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-Gdict-Utilities.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,30 +2,27 @@
 
 
 
-Gdict Utilities
+GNOME Dictionary Library Reference Manual: Gdict Utilities
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -311,6 +308,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-Gdict-Version-Checking.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-Gdict-Version-Checking.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-Gdict-Version-Checking.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-Gdict-Version-Checking.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,30 +2,27 @@
 
-Gdict Version Checking
+GNOME Dictionary Library Reference Manual: Gdict Version Checking
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -149,6 +146,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-GdictContext.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-GdictContext.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-GdictContext.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-GdictContext.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,30 +2,27 @@
 
-GdictContext
+GNOME Dictionary Library Reference Manual: GdictContext
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
-
-
-
+
+
+
+
+
 

 

 

@@ -940,6 +937,6 @@
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-utils.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-utils.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict-utils.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict-utils.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
-Gdict Utilities
+GNOME Dictionary Library Reference Manual: Gdict Utilities
-
+
-

 
 
 
 
 
 
 
 
 
 
 
 
 

-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -33,6 +33,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdict.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdict.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Part II. The GNOME Dictionary Library
+GNOME Dictionary Library Reference Manual: Part II. The GNOME Dictionary Library
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -56,6 +56,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/gdictui.html gnome-dictionary-3.10.0/docs/reference/gdict/html/gdictui.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/gdictui.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/gdictui.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Part III. The GNOME Dictionary Library Widgets
+GNOME Dictionary Library Reference Manual: Part III. The GNOME Dictionary Library Widgets
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -59,6 +59,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/home.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/home.png differ
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/index.html gnome-dictionary-3.10.0/docs/reference/gdict/html/index.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/index.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/index.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,12 +2,12 @@
 
 
 
-GNOME Dictionary Library Reference Manual
+GNOME Dictionary Library Reference Manual: GNOME Dictionary Library Reference Manual
 
 
 
 
-
+
 
 
 
@@ -98,6 +98,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/introduction.html gnome-dictionary-3.10.0/docs/reference/gdict/html/introduction.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/introduction.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/introduction.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Part I. Introduction
+GNOME Dictionary Library Reference Manual: Part I. Introduction
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -37,6 +37,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ix01.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ix01.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ix01.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ix01.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Index
+GNOME Dictionary Library Reference Manual: Index
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -456,6 +456,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ix02.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ix02.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ix02.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ix02.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Index of deprecated symbols
+GNOME Dictionary Library Reference Manual: Index of deprecated symbols
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -26,6 +26,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ix03.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ix03.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ix03.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ix03.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Index of new symbols in 0.10
+GNOME Dictionary Library Reference Manual: Index of new symbols in 0.10
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -78,6 +78,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/ix04.html gnome-dictionary-3.10.0/docs/reference/gdict/html/ix04.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/ix04.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/ix04.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,21 +2,21 @@
 
 
 
-Index of new symbols in 0.12
+GNOME Dictionary Library Reference Manual: Index of new symbols in 0.12
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -77,6 +77,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/left-insensitive.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/left-insensitive.png differ
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/left.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/left.png differ
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/right-insensitive.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/right-insensitive.png differ
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/right.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/right.png differ
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/sources.html gnome-dictionary-3.10.0/docs/reference/gdict/html/sources.html
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/sources.html	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/sources.html	2013-10-06 16:43:19.000000000 +0000
@@ -2,22 +2,22 @@
 
 
 
-Dictionary Source
+GNOME Dictionary Library Reference Manual: Dictionary Source
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -39,6 +39,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.19.1

 
 
\ No newline at end of file
diff -Nru gnome-dictionary-3.8.0/docs/reference/gdict/html/style.css gnome-dictionary-3.10.0/docs/reference/gdict/html/style.css
--- gnome-dictionary-3.8.0/docs/reference/gdict/html/style.css	2013-07-21 16:33:49.000000000 +0000
+++ gnome-dictionary-3.10.0/docs/reference/gdict/html/style.css	2013-10-06 16:43:19.000000000 +0000
@@ -1,3 +1,7 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
@@ -53,9 +57,9 @@
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    /* tango:aluminum 2 */
+    background: #d3d7cf;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -65,18 +69,18 @@
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
@@ -89,9 +93,9 @@
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    /* tango:aluminum 2 */
+    background: #d3d7cf;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -102,7 +106,7 @@
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -156,14 +160,37 @@
 
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
 }
 
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
+}
+
 .footer
 {
   padding-top: 3.5em;
@@ -173,6 +200,18 @@
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 2em;
+}
+
+.informalexample,
+.example
+{
+  margin: 2em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
@@ -190,6 +229,7 @@
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
 .note h3, .warning h3
 {
@@ -200,6 +240,21 @@
   margin-bottom: 0.0em
 }
 
+p + div.section
+{
+  margin-top: 2.5em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 2.5em;
+}
+
 /* blob links */
 h2 .extralinks, h3 .extralinks
 {
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/up-insensitive.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/up-insensitive.png differ
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/docs/reference/gdict/html/up.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/docs/reference/gdict/html/up.png differ
diff -Nru gnome-dictionary-3.8.0/gtk-doc.make gnome-dictionary-3.10.0/gtk-doc.make
--- gnome-dictionary-3.8.0/gtk-doc.make	2013-07-21 16:32:43.000000000 +0000
+++ gnome-dictionary-3.10.0/gtk-doc.make	2013-10-06 16:41:58.000000000 +0000
@@ -49,7 +49,12 @@
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 
 if ENABLE_GTK_DOC
 if GTK_DOC_BUILD_HTML
diff -Nru gnome-dictionary-3.8.0/help/C/find.page gnome-dictionary-3.10.0/help/C/find.page
--- gnome-dictionary-3.8.0/help/C/find.page	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/C/find.page	2013-10-01 13:07:21.000000000 +0000
@@ -25,14 +25,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/C/similar-words.page gnome-dictionary-3.10.0/help/C/similar-words.page
--- gnome-dictionary-3.8.0/help/C/similar-words.page	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/C/similar-words.page	2013-10-01 13:07:21.000000000 +0000
@@ -26,7 +26,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/Makefile.in gnome-dictionary-3.10.0/help/Makefile.in
--- gnome-dictionary-3.8.0/help/Makefile.in	2013-07-21 16:32:48.000000000 +0000
+++ gnome-dictionary-3.10.0/help/Makefile.in	2013-10-06 16:42:09.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -81,15 +81,11 @@
 subdir = help
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -156,16 +152,15 @@
 GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@
 GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@
 GDICT_VERSION = @GDICT_VERSION@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -177,7 +172,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
@@ -186,26 +180,20 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -224,7 +212,6 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -233,8 +220,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
diff -Nru gnome-dictionary-3.8.0/help/ca/find.page gnome-dictionary-3.10.0/help/ca/find.page
--- gnome-dictionary-3.8.0/help/ca/find.page	2013-07-21 16:33:27.000000000 +0000
+++ gnome-dictionary-3.10.0/help/ca/find.page	2013-10-06 16:42:27.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/ca/similar-words.page gnome-dictionary-3.10.0/help/ca/similar-words.page
--- gnome-dictionary-3.8.0/help/ca/similar-words.page	2013-07-21 16:33:27.000000000 +0000
+++ gnome-dictionary-3.10.0/help/ca/similar-words.page	2013-10-06 16:42:28.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/cs/find.page gnome-dictionary-3.10.0/help/cs/find.page
--- gnome-dictionary-3.8.0/help/cs/find.page	2013-07-21 16:33:28.000000000 +0000
+++ gnome-dictionary-3.10.0/help/cs/find.page	2013-10-06 16:42:28.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/cs/similar-words.page gnome-dictionary-3.10.0/help/cs/similar-words.page
--- gnome-dictionary-3.8.0/help/cs/similar-words.page	2013-07-21 16:33:28.000000000 +0000
+++ gnome-dictionary-3.10.0/help/cs/similar-words.page	2013-10-06 16:42:28.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/da/find.page gnome-dictionary-3.10.0/help/da/find.page
--- gnome-dictionary-3.8.0/help/da/find.page	2013-07-21 16:33:28.000000000 +0000
+++ gnome-dictionary-3.10.0/help/da/find.page	2013-10-06 16:42:29.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/da/similar-words.page gnome-dictionary-3.10.0/help/da/similar-words.page
--- gnome-dictionary-3.8.0/help/da/similar-words.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/da/similar-words.page	2013-10-06 16:42:29.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/de/de.po gnome-dictionary-3.10.0/help/de/de.po
--- gnome-dictionary-3.8.0/help/de/de.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/de/de.po	2013-10-01 13:07:21.000000000 +0000
@@ -298,7 +298,7 @@
 #: C/introduction.page:39(media/p)
 msgid "Screenshot showing the Dictionary main window."
 msgstr ""
-"Ein Bildschirmfoto, welches das Hauptfenster von Wörterbuch zeigt."
+"Ein Bildschirmfoto, welches das Hauptfenster von Wörterbuch zeigt."
 
 #: C/keyboard-shortcuts.page:23(info/desc)
 msgid ""
@@ -714,7 +714,7 @@
 "use it outside of Dictionary."
 msgstr ""
 "Sie können eine Definition in eine Textdatei abspeichern. Dies kann "
-"praktisch sein, wenn Sie diese außerhalb von  Wörterbuch  nutzen "
+"praktisch sein, wenn Sie diese außerhalb von  Wörterbuch  nutzen "
 "möchten."
 
 #: C/save-definition.page:32(steps/title)
@@ -736,7 +736,7 @@
 "name."
 msgstr ""
 "Wählen Sie den Speicherort und einen Namen für die Datei. Sie möchten "
-"womöglich die .txt Dateiendung hinzufügen."
+"womöglich die .txt Dateiendung hinzufügen."
 
 #: C/save-definition.page:43(item/p)
 msgid "Press Save to save the definition."
diff -Nru gnome-dictionary-3.8.0/help/de/find.page gnome-dictionary-3.10.0/help/de/find.page
--- gnome-dictionary-3.8.0/help/de/find.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/de/find.page	2013-10-06 16:42:29.000000000 +0000
@@ -36,12 +36,14 @@
 
   Innerhalb einer Definition suchen
 
-  
Manche Wörterbücher sind sehr groß und enthalten viele Ergebnisse. Es bietet sich an sie zu durchsuchen, um den Abschnitt zu finden, der für Sie relevant ist.

+  
Some dictionary entries can be very long and can contain many results, so
+  you may wish to search them to find the section that is relevant to you.

 
   
     So finden Sie eine Definition:
     
-      
Wählen Sie Bearbeiten Suchen.

+      
Select Edit
+      Find.

     
     
       
Die Suchleiste wird am unteren Rand des Wörterbuch-Fensters erscheinen. Tippen Sie Ihren gesuchten Begriff, um innerhalb der Definition, die angezeigt wird, zu suchen.

diff -Nru gnome-dictionary-3.8.0/help/de/introduction.page gnome-dictionary-3.10.0/help/de/introduction.page
--- gnome-dictionary-3.8.0/help/de/introduction.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/de/introduction.page	2013-10-06 16:42:30.000000000 +0000
@@ -43,7 +43,7 @@
   

     Wörterbuch
     
-      
Screenshot showing the Dictionary main window.

+      
Ein Bildschirmfoto, welches das Hauptfenster von Wörterbuch zeigt.

     
   

 
diff -Nru gnome-dictionary-3.8.0/help/de/save-definition.page gnome-dictionary-3.10.0/help/de/save-definition.page
--- gnome-dictionary-3.8.0/help/de/save-definition.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/de/save-definition.page	2013-10-06 16:42:30.000000000 +0000
@@ -36,8 +36,7 @@
 
   Eine Definition speichern
 
-  
You can save a definition to a text file. This may be useful if you want
-  to use it outside of Dictionary.

+  
Sie können eine Definition in eine Textdatei abspeichern. Dies kann praktisch sein, wenn Sie diese außerhalb von  Wörterbuch  nutzen möchten.

 
   
     Um eine Definition zu speichern:
@@ -45,9 +44,7 @@
       
Wählen Sie Datei Eine Kopie speichern aus.

     
     
-      
Chose where you want to save the definition to and a name for the
-      file. You may want to add a .txt file extension to the end
-      of the file name.

+      
Wählen Sie den Speicherort und einen Namen für die Datei. Sie möchten womöglich die .txt Dateiendung hinzufügen.

     
     
       
Drücken Sie Speichern, um die Definition abzuspeichern.

diff -Nru gnome-dictionary-3.8.0/help/de/similar-words.page gnome-dictionary-3.10.0/help/de/similar-words.page
--- gnome-dictionary-3.8.0/help/de/similar-words.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/de/similar-words.page	2013-10-06 16:42:30.000000000 +0000
@@ -37,7 +37,8 @@
 
   Identische Wörter
 
-  
Wörterbuch zeigt nur eine Definition aus Ihren Wörterbüchern an. So prüfen Sie die Suchergebnisse aus anderen Wörterbüchern:

+  
Dictionary will only display the definition from one of your
+  dictionaries. To check if there are search results in other dictionaries:

 
   
     
diff -Nru gnome-dictionary-3.8.0/help/el/find.page gnome-dictionary-3.10.0/help/el/find.page
--- gnome-dictionary-3.8.0/help/el/find.page	2013-07-21 16:33:29.000000000 +0000
+++ gnome-dictionary-3.10.0/help/el/find.page	2013-10-06 16:42:30.000000000 +0000
@@ -42,12 +42,14 @@
 
   Αναζήτηση σε έναν ορισμό
 
-  
Μερικά λεξικά μπορεί να είναι πολύ μεγάλα και μπορούν να περιέχουν πολλά αποτελέσματα, έτσι ίσως θελήσετε να τα αναζητήσετε για να βρείτε την ενότητα που είναι σχετική με σας.

+  
Some dictionary entries can be very long and can contain many results, so
+  you may wish to search them to find the section that is relevant to you.

 
   
     Για να βρείτε ορισμούς:
     
-      
Επιλέξτε Επεξεργασία Εύρεση.

+      
Select Edit
+      Find.

     
     
       
Η γραμμή Εύρεση θα εμφανιστεί στο τέλος του παραθύρου Λεξικό. Πληκτρολογήστε τον όρο αναζήτησης για να ψάξετε τον ορισμό που εμφανίζεται προς το παρόν.

diff -Nru gnome-dictionary-3.8.0/help/el/similar-words.page gnome-dictionary-3.10.0/help/el/similar-words.page
--- gnome-dictionary-3.8.0/help/el/similar-words.page	2013-07-21 16:33:30.000000000 +0000
+++ gnome-dictionary-3.10.0/help/el/similar-words.page	2013-10-06 16:42:30.000000000 +0000
@@ -43,7 +43,8 @@
 
   Παρόμοιες λέξεις
 
-  
Το Λεξικό θα εμφανίσει μόνο τον ορισμό από ένα από τα λεξικά σας. Για να ελέγξετε αν υπάρχουν αποτελέσματα αναζήτησης σε άλλα λεξικά:

+  
Dictionary will only display the definition from one of your
+  dictionaries. To check if there are search results in other dictionaries:

 
   
     
diff -Nru gnome-dictionary-3.8.0/help/en_GB/find.page gnome-dictionary-3.10.0/help/en_GB/find.page
--- gnome-dictionary-3.8.0/help/en_GB/find.page	2013-07-21 16:33:30.000000000 +0000
+++ gnome-dictionary-3.10.0/help/en_GB/find.page	2013-10-06 16:42:31.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/en_GB/similar-words.page gnome-dictionary-3.10.0/help/en_GB/similar-words.page
--- gnome-dictionary-3.8.0/help/en_GB/similar-words.page	2013-07-21 16:33:30.000000000 +0000
+++ gnome-dictionary-3.10.0/help/en_GB/similar-words.page	2013-10-06 16:42:31.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/es/es.po gnome-dictionary-3.10.0/help/es/es.po
--- gnome-dictionary-3.8.0/help/es/es.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/es/es.po	2013-10-01 13:07:21.000000000 +0000
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dictionary.HEAD\n"
-"POT-Creation-Date: 2013-04-08 12:02+0000\n"
-"PO-Revision-Date: 2013-04-08 18:30+0200\n"
+"POT-Creation-Date: 2013-08-27 14:44+0000\n"
+"PO-Revision-Date: 2013-09-02 17:00+0200\n"
 "Last-Translator: Daniel Mustieles \n"
 "Language-Team: Español \n"
 "Language: \n"
@@ -29,6 +29,24 @@
 "Jorge González , 2005, 2007-2008.\n"
 "Francisco Javier F. Serrador  2006."
 
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:22(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/gnome-dictionary-icon.png' "
+"md5='2f50c3a71e57be0b41efd43c2f7fae60'"
+msgstr ""
+"external ref='figures/gnome-dictionary-icon.png' "
+"md5='2f50c3a71e57be0b41efd43c2f7fae60'"
+
 #: C/index.page:8(info/title)
 msgctxt "text"
 msgid "Dictionary"
@@ -213,8 +231,11 @@
 msgstr "Buscar con una definición"
 
 #: C/find.page:28(page/p)
+#| msgid ""
+#| "Some dictionary entires can be very long and can contain many results, so "
+#| "you may wish to search them to find the section that is relevant to you."
 msgid ""
-"Some dictionary entires can be very long and can contain many results, so "
+"Some dictionary entries can be very long and can contain many results, so "
 "you may wish to search them to find the section that is relevant to you."
 msgstr ""
 "Algunas entradas de diccionarios puede ser muy largas y pueden contener "
@@ -226,8 +247,11 @@
 msgstr "Para buscar definiciones:"
 
 #: C/find.page:34(item/p)
+#| msgid ""
+#| "Select Edit Find."
 msgid ""
-"Select Edit FindEdit Find."
 msgstr ""
 "Seleccione Editar Dictionary will only display the definition from one your "
+#| "dictionaries. To check if there are search results in other dictionaries:"
 msgid ""
-"Dictionary will only display the definition from one your "
+"Dictionary will only display the definition from one of your "
 "dictionaries. To check if there are search results in other dictionaries:"
 msgstr ""
 "Diccionario sólo mostrará la definición de uno de sus "
@@ -778,7 +802,6 @@
 "Para ver la palabra similar, pulse dos veces en la entrada."
 
 #: C/source-add-local.page:20(page/title)
-#| msgid "Dictionary Sources"
 msgid "Add local dictionary sources"
 msgstr "Añadir una fuente de diccionarios local"
 
@@ -959,7 +982,6 @@
 "está usando actualmente sin cambiar sus preferencias predeterminadas."
 
 #: C/sources-select.page:32(steps/title)
-#| msgid "Port: the port of the dictionary server"
 msgid "Temporarily change the dictionary source:"
 msgstr "Cambiar temporalmente la fuente de diccionarios:"
 
@@ -976,7 +998,6 @@
 msgstr "Pulse dos veces sobre el diccionario que quiere usar."
 
 #: C/text-copy.page:23(info/desc)
-#| msgid "Save a copy of a definition to a text file."
 msgid "Select and copy a definition to another application."
 msgstr "Seleccionar y copiar una definición a otra aplicación."
 
@@ -1027,14 +1048,6 @@
 
 #~ msgctxt "_"
 #~ msgid ""
-#~ "external ref='figures/gnome-dictionary-application.png' "
-#~ "md5='fb48a9e5863bfb2b3811df2e28489eb7'"
-#~ msgstr ""
-#~ "external ref='figures/gnome-dictionary-application.png' "
-#~ "md5='fb48a9e5863bfb2b3811df2e28489eb7'"
-
-#~ msgctxt "_"
-#~ msgid ""
 #~ "external ref='figures/gnome-dictionary-lookup.png' "
 #~ "md5='c41c96af4de54f457a2081aad009a8d0'"
 #~ msgstr ""
diff -Nru gnome-dictionary-3.8.0/help/eu/find.page gnome-dictionary-3.10.0/help/eu/find.page
--- gnome-dictionary-3.8.0/help/eu/find.page	2013-07-21 16:33:31.000000000 +0000
+++ gnome-dictionary-3.10.0/help/eu/find.page	2013-10-06 16:42:32.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/eu/similar-words.page gnome-dictionary-3.10.0/help/eu/similar-words.page
--- gnome-dictionary-3.8.0/help/eu/similar-words.page	2013-07-21 16:33:31.000000000 +0000
+++ gnome-dictionary-3.10.0/help/eu/similar-words.page	2013-10-06 16:42:33.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/fi/find.page gnome-dictionary-3.10.0/help/fi/find.page
--- gnome-dictionary-3.8.0/help/fi/find.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fi/find.page	2013-10-06 16:42:33.000000000 +0000
@@ -24,14 +24,14 @@
 
   Search within a definition
 
-  
Some dictionary entires can be very long and can contain many results, so
+  
Some dictionary entries can be very long and can contain many results, so
   you may wish to search them to find the section that is relevant to you.

 
   
     To find definitions:
     
       
Select Edit
-      Find.

+      Find.

     
     
       
The Find bar will appear at the bottom of the
diff -Nru gnome-dictionary-3.8.0/help/fi/similar-words.page gnome-dictionary-3.10.0/help/fi/similar-words.page
--- gnome-dictionary-3.8.0/help/fi/similar-words.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fi/similar-words.page	2013-10-06 16:42:33.000000000 +0000
@@ -25,7 +25,7 @@
 
   Similar words
 
-  
Dictionary will only display the definition from one your
+  
Dictionary will only display the definition from one of your
   dictionaries. To check if there are search results in other dictionaries:

 
   
diff -Nru gnome-dictionary-3.8.0/help/fr/definition.page gnome-dictionary-3.10.0/help/fr/definition.page
--- gnome-dictionary-3.8.0/help/fr/definition.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/definition.page	2013-10-06 16:42:34.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Find the definition of a word or term.
+    Trouver la définition d'un mot ou d'un terme.
 
   
     
@@ -37,34 +37,23 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Look up a word or term
+  Recherche d'un mot ou d'un terme
 
-  
You can use Dictionary to look up the meaning of a
-  term. A term can be a single word such as apple or a
-  compound word such as chopping board. The search result may
-  also show you the origin, importance and usage of a word. To look up a
-  term:

+  
Vous pouvez utiliser Dictionnaire pour chercher le sens d'un mot. Cela peut aussi bien être un simple mot comme pomme ou un mot composé tel que conseil d'administration. Le résultat de la recherche peut également vous préciser l'origine, l'importance et l'usage d'un mot. Pour rechercher un mot :

 
   
     
-      
Type in the term that you want to search for next to
-      Look up.

+      
Tapez le mot que vous voulez rechercher à côté de Rechercher.

     
     
-      
Press Return or Look up: to
-      search.

+      
Appuyez sur Entrée ou Rechercher : afin d'effectuer une recherche.

     
   
 
-  
Dictionary will search your selected dictionary source and
-  show you the result from the first dictionary in the source. To view results
-  from the other dictionaries that are in the same source, select
-  View
-  Similar Words to pop up a
-  sidebar that shows all the results.

+  
Dictionnaire recherche dans la source de dictionnaires que vous avez sélectionné et affiche le résultat du premier dictionnaire de cette source. Pour afficher les résultats des autres dictionnaires qui appartiennent à la même source, sélectionnez Affichage Mots similaires afin de faire apparaître une barre latérale qui montre tous les résultats.

 
 
diff -Nru gnome-dictionary-3.8.0/help/fr/dictionary-select.page gnome-dictionary-3.10.0/help/fr/dictionary-select.page
--- gnome-dictionary-3.8.0/help/fr/dictionary-select.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/dictionary-select.page	2013-10-06 16:42:34.000000000 +0000
@@ -35,35 +35,28 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Select a different dictionary
+  Sélection d'un dictionnaire différent
 
-  
A single dictionary source may have many
-  different dictionaries. You can search any of these
-  dictionaries.

+  
Une seule source de dictionnaire peut contenir plusieurs dictionnaires. Vous pouvez chercher dans celui que vous voulez.

 
   
-    Select a dictionary
+    Sélection d'un dictionnaire
     
-      
Select View
-      Available Databases. A sidebar
-      listing the available dictionaries for your currently selected dictionary
-      source will open.

+      
Sélectionnez Affichage Bases de données disponibles. Une barre latérale liste les dictionnaires disponibles par rapport à la source de dictionnaires actuellement choisie s'affichera.

     
     
-      
Click twice on the dictionary that you want to use.

+      
Double-cliquez sur le dictionnaire que vous souhaitez utiliser.

     
   
 
-  
The next term that you look up will show
-  the result only from the selected dictionary.

+  
Le mot suivant que vous recherchez affiche le résultat uniquement à partir du dictionnaire sélectionné.

 
   
-    
Your dictionary selection will not be remembered next time you use
-    Dictionary.

+    
Le choix du dictionnaire ne sera pas mémorisé la prochaine fois que vous utiliserez Dictionnaire.

   
 
 
Binary files /tmp/T6QRcZo8AK/gnome-dictionary-3.8.0/help/fr/figures/gnome-dictionary.png and /tmp/akIB2uKHmA/gnome-dictionary-3.10.0/help/fr/figures/gnome-dictionary.png differ
diff -Nru gnome-dictionary-3.8.0/help/fr/find.page gnome-dictionary-3.10.0/help/fr/find.page
--- gnome-dictionary-3.8.0/help/fr/find.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/find.page	2013-10-06 16:42:34.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    Find text in a definition.
+    Rechercher un texte dans une définition.
 
   
     
@@ -36,32 +36,24 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Search within a definition
+  Recherche dans une définition
 
-  
Some dictionary entires can be very long and can contain many results, so
-  you may wish to search them to find the section that is relevant to you.

+  
Certaines définitions du dictionnaire peuvent être très longues et peuvent contenir plusieurs résultats, donc vous devriez utiliser l'outil de recherche pour trouver la section qui vous intéresse.

 
   
-    To find definitions:
+    Pour trouver une définition :
     
-      
Select Edit
-      Find.

+      
Sélectionnez Édition Rechercher.

     
     
-      
The Find bar will appear at the bottom of the
-      Dictionary window. Type in your search term to search within
-      the definition that is currently displayed.

+      
La barre de recherche apparaît en bas de la fenêtre de Dictionnaire. Tapez-y votre mot pour faire une recherche dans la définition actuellement affichée.

     
     
-      
Click Previous or
-      Next to scroll through the results. The search
-      will not wrap around: in other words, it will not go to the top of the
-      page when you are on the last result and click
-      Next.

+      
Cliquez sur Précédent ou Suivant pour faire défiler les résultats. Le recherche ne s'effectue pas en boucle : en d'autres mots, la recherche ne repart pas en haut de la page quand vous êtes au dernier résultat et que vous appuyez sur Suivant.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/fr.po gnome-dictionary-3.10.0/help/fr/fr.po
--- gnome-dictionary-3.8.0/help/fr/fr.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/fr.po	2013-10-01 13:07:21.000000000 +0000
@@ -5,13 +5,13 @@
 #
 # Jonathan Ernst , 2006.
 # Claude Paroz , 2006.
-# Mickael Albertus , 2012.
+# Mickael Albertus , 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils-dictionary documentation\n"
-"POT-Creation-Date: 2012-09-15 15:05+0000\n"
-"PO-Revision-Date: 2012-09-15 21:37+0200\n"
+"POT-Creation-Date: 2013-08-24 13:57+0000\n"
+"PO-Revision-Date: 2013-08-24 17:09+0200\n"
 "Last-Translator: Mickael Albertus \n"
 "Language-Team: français \n"
 "Language: \n"
@@ -28,7 +28,7 @@
 msgstr ""
 "Jonathan Ernst , 2006\n"
 "Claude Paroz , 2006\n"
-"Mickael Albertus , 2012"
+"Mickael Albertus , 2012-2013"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -39,830 +39,1316 @@
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:150(imagedata)
+#: C/index.page:22(media)
 msgctxt "_"
 msgid ""
-"external ref='figures/gnome-dictionary-application.png' "
-"md5='fb48a9e5863bfb2b3811df2e28489eb7'"
+"external ref='figures/gnome-dictionary-icon.png' "
+"md5='2f50c3a71e57be0b41efd43c2f7fae60'"
 msgstr ""
-"external ref='figures/gnome-dictionary-application.png' "
-"md5='fb48a9e5863bfb2b3811df2e28489eb7'"
+"external ref='figures/gnome-dictionary-icon.png' "
+"md5='2f50c3a71e57be0b41efd43c2f7fae60'"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:179(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-lookup.png' "
-"md5='c41c96af4de54f457a2081aad009a8d0'"
-msgstr ""
-"external ref='figures/gnome-dictionary-lookup.png' "
-"md5='c41c96af4de54f457a2081aad009a8d0'"
+#: C/index.page:8(info/title)
+msgctxt "text"
+msgid "Dictionary"
+msgstr "Dictionnaire"
+
+#: C/index.page:11(credit/name) C/definition.page:11(credit/name)
+#: C/dictionary-select.page:11(credit/name) C/find.page:10(credit/name)
+#: C/introduction.page:10(credit/name)
+#: C/keyboard-shortcuts.page:11(credit/name) C/pref.page:9(credit/name)
+#: C/print-font.page:11(credit/name) C/print.page:12(credit/name)
+#: C/prob-retrieving-definition.page:11(credit/name)
+#: C/save-definition.page:10(credit/name) C/similar-words.page:11(credit/name)
+#: C/source-add-local.page:11(credit/name)
+#: C/sources-default.page:10(credit/name)
+#: C/sources-delete.page:11(credit/name) C/sources-edit.page:10(credit/name)
+#: C/sources.page:12(credit/name) C/sources-select.page:12(credit/name)
+#: C/text-copy.page:11(credit/name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#: C/index.page:13(credit/years) C/definition.page:13(credit/years)
+#: C/definition.page:18(credit/years)
+#: C/dictionary-select.page:13(credit/years)
+#: C/dictionary-select.page:18(credit/years) C/find.page:12(credit/years)
+#: C/find.page:17(credit/years) C/introduction.page:12(credit/years)
+#: C/introduction.page:17(credit/years)
+#: C/keyboard-shortcuts.page:13(credit/years)
+#: C/keyboard-shortcuts.page:18(credit/years)
+#: C/print-font.page:13(credit/years) C/print-font.page:18(credit/years)
+#: C/print.page:14(credit/years) C/print.page:19(credit/years)
+#: C/prob-retrieving-definition.page:13(credit/years)
+#: C/prob-retrieving-definition.page:18(credit/years)
+#: C/save-definition.page:12(credit/years)
+#: C/save-definition.page:17(credit/years)
+#: C/similar-words.page:13(credit/years) C/similar-words.page:18(credit/years)
+#: C/source-add-local.page:13(credit/years)
+#: C/sources-default.page:12(credit/years)
+#: C/sources-default.page:17(credit/years)
+#: C/sources-delete.page:13(credit/years)
+#: C/sources-delete.page:18(credit/years) C/sources-edit.page:12(credit/years)
+#: C/sources-edit.page:17(credit/years) C/sources.page:14(credit/years)
+#: C/sources.page:19(credit/years) C/sources-select.page:14(credit/years)
+#: C/sources-select.page:19(credit/years) C/text-copy.page:13(credit/years)
+#: C/text-copy.page:18(credit/years)
+msgid "2013"
+msgstr "2013"
+
+#: C/index.page:18(info/desc)
+msgid "Look up word definitions in Dictionary."
+msgstr "Rechercher des définitions de mots avec Dictionnaire."
+
+#: C/index.page:21(page/title)
+msgid "<_:media-1/> Dictionary Help"
+msgstr "<_:media-1/> Manuel du Dictionnaire"
+
+#: C/index.page:26(section/title)
+msgid "Features"
+msgstr "Fonctionnalités"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:221(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-find.png' "
-"md5='d8bf0677084e2d9998a7942faaab5379'"
-msgstr ""
-"external ref='figures/gnome-dictionary-find.png' "
-"md5='d8bf0677084e2d9998a7942faaab5379'"
+#: C/index.page:30(section/title)
+msgid "Preferences"
+msgstr "Préférences"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:262(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-preferences-source.png' "
-"md5='5470b15e64e66924477f150c4f47e96d'"
-msgstr ""
-"external ref='figures/gnome-dictionary-preferences-source.png' "
-"md5='5470b15e64e66924477f150c4f47e96d'"
+#: C/index.page:34(section/title)
+msgid "Common problems and solutions"
+msgstr "Problèmes courants et solutions"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:282(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-add-source.png' "
-"md5='d059507fee77bb176fce53373951756b'"
-msgstr ""
-"external ref='figures/gnome-dictionary-add-source.png' "
-"md5='d059507fee77bb176fce53373951756b'"
+#: C/definition.page:16(credit/name) C/dictionary-select.page:16(credit/name)
+#: C/find.page:15(credit/name) C/introduction.page:15(credit/name)
+#: C/keyboard-shortcuts.page:16(credit/name) C/print-font.page:16(credit/name)
+#: C/print.page:17(credit/name)
+#: C/prob-retrieving-definition.page:16(credit/name)
+#: C/save-definition.page:15(credit/name) C/similar-words.page:16(credit/name)
+#: C/sources-default.page:15(credit/name)
+#: C/sources-delete.page:16(credit/name) C/sources-edit.page:15(credit/name)
+#: C/sources.page:17(credit/name) C/sources-select.page:17(credit/name)
+#: C/text-copy.page:16(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:351(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-preferences-print.png' "
-"md5='12a65f07cb333db4c7ba743d1d12a00f'"
-msgstr ""
-"external ref='figures/gnome-dictionary-preferences-print.png' "
-"md5='12a65f07cb333db4c7ba743d1d12a00f'"
+#: C/definition.page:23(info/desc)
+msgid "Find the definition of a word or term."
+msgstr "Trouver la définition d'un mot ou d'un terme."
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:385(imagedata)
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-applet.png' "
-"md5='538c7fa191540f99dd964963a1079677'"
-msgstr ""
-"external ref='figures/gnome-dictionary-applet.png' "
-"md5='538c7fa191540f99dd964963a1079677'"
+#: C/definition.page:27(page/title)
+msgid "Look up a word or term"
+msgstr "Recherche d'un mot ou d'un terme"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:421(imagedata)
-msgctxt "_"
+#: C/definition.page:29(page/p)
 msgid ""
-"external ref='figures/gnome-dictionary-applet-window.png' "
-"md5='e26ac4847d2e7b53c6bba7d8e1a519c4'"
+"You can use Dictionary to look up the meaning of a term. "
+"A term can be a single word such as apple or a compound word "
+"such as chopping board. The search result may also show you "
+"the origin, importance and usage of a word. To look up a term:"
 msgstr ""
-"external ref='figures/gnome-dictionary-applet-window.png' "
-"md5='e26ac4847d2e7b53c6bba7d8e1a519c4'"
-
-#: C/index.docbook:24(articleinfo/title)
-msgid "Dictionary Manual"
-msgstr "Manuel du dictionnaire"
-
-#: C/index.docbook:27(abstract/para)
-msgid ""
-"Dictionary enables you to look up definitions and correct spellings of words."
-msgstr ""
-"Le Dictionnaire permet de consulter des définitions et de corriger "
-"l'orthographe."
-
-#: C/index.docbook:33(articleinfo/copyright)
-msgid "2005 Emmanuele Bassi"
-msgstr "2005 Emmanuele Bassi"
-
-#: C/index.docbook:48(publisher/publishername)
-#: C/index.docbook:83(revdescription/para)
-msgid "GNOME Documentation Project"
-msgstr "Le projet de documentation GNOME"
-
-#: C/index.docbook:2(legalnotice/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 ""
-"Permission vous est donnée de copier, distribuer et/ou modifier ce document "
-"selon les termes de la Licence GNU Free Documentation License, Version 1.1 "
-"ou ultérieure publiée par la Free Software Foundation sans section "
-"inaltérable, sans texte de première page de couverture ni texte de dernière "
-"page de couverture. Vous trouverez un exemplaire de cette licence en suivant "
-"ce lien ou dans le fichier "
-"COPYING-DOCS fourni avec le présent manuel."
-
-#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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 ""
-"Ce manuel fait partie de la collection de manuels GNOME distribués selon les "
-"termes de la licence de documentation libre GNU. Si vous souhaitez "
-"distribuer ce manuel indépendamment de la collection, vous devez joindre un "
-"exemplaire de la licence au document, comme indiqué dans la section 6 de "
-"celle-ci."
-
-#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 ""
-"La plupart des noms utilisés par les entreprises pour distinguer leurs "
-"produits et services sont des marques déposées. Lorsque ces noms "
-"apparaissent dans la documentation GNOME et que les membres du projet de "
-"Documentation GNOME sont informés de l'existence de ces marques déposées, "
-"soit ces noms entiers, soit leur première lettre est en majuscule."
-
-#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/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 ""
-"LE PRÉSENT DOCUMENT EST FOURNI « TEL QUEL », SANS AUCUNE GARANTIE, EXPRESSE "
-"OU IMPLICITE, Y COMPRIS, ET SANS LIMITATION, LES GARANTIES DE BONNE QUALITÉ "
-"MARCHANDE OU D'APTITUDE À UN EMPLOI PARTICULIER OU AUTORISÉ DU DOCUMENT OU "
-"DE SA VERSION MODIFIÉE. L'UTILISATEUR ASSUME TOUT RISQUE RELATIF À LA "
-"QUALITÉ, À LA PERTINENCE ET À LA PERFORMANCE DU DOCUMENT OU DE SA VERSION DE "
-"MISE À JOUR. SI LE DOCUMENT OU SA VERSION MODIFIÉE S'AVÉRAIT DÉFECTUEUSE, "
-"L'UTILISATEUR (ET NON LE RÉDACTEUR INITIAL, L'AUTEUR, NI TOUT AUTRE "
-"PARTICIPANT) ENDOSSERA LES COÛTS DE TOUTE INTERVENTION, RÉPARATION OU "
-"CORRECTION NÉCESSAIRE. CETTE DÉNÉGATION DE RESPONSABILITÉ CONSTITUE UNE "
-"PARTIE ESSENTIELLE DE CETTE LICENCE. AUCUNE UTILISATION DE CE DOCUMENT OU DE "
-"SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ "
-"SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; "
-
-#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/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 ""
-"EN AUCUNE CIRCONSTANCE ET SOUS AUCUNE INTERPRÉTATION DE LA LOI, QU'IL "
-"S'AGISSE DE RESPONSABILITÉ CIVILE (Y COMPRIS LA NÉGLIGENCE), CONTRACTUELLE "
-"OU AUTRE, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT PARTICIPANT ET TOUT "
-"DISTRIBUTEUR DE CE DOCUMENTOU DE SA VERSION DE MISE À JOUR AINSI QUE TOUT "
-"FOURNISSEUR DE QUELQUE PARTIE QUE CE SOIT NE POURRONT ÊTRE TENUS "
-"RESPONSABLES À L'ÉGARD DE QUICONQUE POUR TOUT DOMMAGE DIRECT, INDIRECT, "
-"PARTICULIER OU ACCIDENTEL DE TOUT TYPE Y COMPRIS, SANS LIMITATION, LES "
-"DOMMAGES LIÉS À LA PERTE DE CLIENTÈLE, AUX ARRÊTS DE TRAVAIL, AUX "
-"DÉFAILLANCES ET AUX DYSFONCTIONNEMENTS INFORMATIQUES OU TOUT AUTRE DOMMAGE "
-"OU PERTE LIÉE À L'UTILISATION DU PRÉSENT DOCUMENT ET DE SES VERSIONS DE MISE "
-"À JOUR, ET CE MÊME SI CES PARTIES ONT ÉTÉ INFORMÉES DE LA POSSIBILITÉ DE "
-"TELS DOMMAGES."
-
-#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: "
-"<_:orderedlist-1/>"
-msgstr ""
-"LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES "
-"DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : <_:orderedlist-1/>"
-
-#: C/index.docbook:54(authorgroup/author)
-msgid ""
-"Emmanuele Bassi  "
-"
ebassi@gmail.com
 "
-msgstr ""
-"Emmanuele Bassi  "
-"
ebassi@gmail.com
 "
-
-#: C/index.docbook:82(revdescription/para)
-msgid "Emmanuele Bassi"
-msgstr "Emmanuele Bassi"
-
-#: C/index.docbook:78(revhistory/revision)
-msgid ""
-"Dictionary Manual V1.0.0 January 2005 <_:"
-"revdescription-1/>"
-msgstr ""
-"Manuel de Dictionnaire V1.0.0 Janvier 2005 <_:revdescription-1/>"
-
-#: C/index.docbook:88(articleinfo/releaseinfo)
-msgid "This manual describes version 2.14.0 of Dictionary."
-msgstr "Ce manuel décrit la version 2.14.0 du dictionnaire"
-
-#: C/index.docbook:90(legalnotice/title)
-msgid "Feedback"
-msgstr "Votre avis"
-
-#: C/index.docbook:91(legalnotice/para)
-msgid ""
-"To report a bug or make a suggestion regarding the Dictionary application or "
-"this manual, follow the directions in the GNOME Feedback Page."
-msgstr ""
-"Pour rapporter une anomalie ou émettre une suggestion concernant le "
-"Dictionnaire ou ce manuel, procédez comme indiqué sur la page de réactions sur GNOME."
-
-#: C/index.docbook:100(article/indexterm)
-msgid "Dictionary"
-msgstr "Dictionnaire"
+"Vous pouvez utiliser Dictionnaire pour chercher le sens d'un "
+"mot. Cela peut aussi bien être un simple mot comme pomme ou un mot composé tel que conseil d'administration. Le "
+"résultat de la recherche peut également vous préciser l'origine, "
+"l'importance et l'usage d'un mot. Pour rechercher un mot :"
 
-#: C/index.docbook:107(sect1/title)
-msgid "Introduction"
-msgstr "Introduction"
-
-#: C/index.docbook:109(sect1/para)
+#: C/definition.page:37(item/p)
 msgid ""
-"The Dictionary application enables you to search "
-"words and terms on a dictionary source."
+"Type in the term that you want to search for next to Look up."
 msgstr ""
-"Le Dictionnaire permet de rechercher des "
-"définitions de mots et de termes à partir d'un dictionnaire source."
-
-#: C/index.docbook:116(sect1/title)
-msgid "Getting Started"
-msgstr "Premiers pas"
-
-#: C/index.docbook:120(sect2/title)
-msgid "To Start Dictionary"
-msgstr "Démarrage du Dictionnaire"
+"Tapez le mot que vous voulez rechercher à côté de Rechercher."
 
-#: C/index.docbook:122(sect2/para)
+#: C/definition.page:41(item/p)
 msgid ""
-"You can start Dictionary in the following ways:"
+"Press Return or Look up: to search."
 msgstr ""
-"Le Dictionnaire peut être lancé de plusieurs "
-"manières :"
+"Appuyez sur Entrée ou Rechercher : "
+"afin d'effectuer une recherche."
 
-#: C/index.docbook:127(varlistentry/term)
-msgid "Applications menu"
-msgstr "Menu Applications"
-
-#: C/index.docbook:129(listitem/para)
+#: C/definition.page:46(page/p)
 msgid ""
-"Choose Accessories "
-"Dictionary."
+"Dictionary will search your selected dictionary source and show "
+"you the result from the first dictionary in the source. To view results from "
+"the other dictionaries that are in the same source, select View Similar Words to pop up a sidebar that "
+"shows all the results."
 msgstr ""
-"Choisissez AccessoiresDictionnaire."
-
-#: C/index.docbook:135(varlistentry/term)
-msgid "Command line"
-msgstr "Ligne de commande"
+"Dictionnaire recherche dans la source de dictionnaires que vous avez "
+"sélectionné et affiche le résultat du premier dictionnaire de cette source. "
+"Pour afficher les résultats des autres dictionnaires qui appartiennent à la "
+"même source, sélectionnez Affichage Mots similaires afin de faire apparaître une barre latérale qui montre tous "
+"les résultats."
 
-#: C/index.docbook:137(listitem/para)
-msgid "Execute the following command: gnome-dictionary"
-msgstr "Exécutez la commande suivante : gnome-dictionary"
+#: C/dictionary-select.page:25(page/title)
+msgid "Select a different dictionary"
+msgstr "Sélection d'un dictionnaire différent"
 
-#: C/index.docbook:142(sect2/para)
+#: C/dictionary-select.page:27(page/p)
 msgid ""
-"Once started, the Dictionary window is displayed:"
+"A single dictionary source may have many "
+"different dictionaries. You can search any of these dictionaries."
 msgstr ""
-"La fenêtre suivante est affichée au lancement du Dictionnaire :"
+"Une seule source de dictionnaire peut contenir "
+"plusieurs dictionnaires. Vous pouvez chercher dans celui que vous voulez."
 
-#: C/index.docbook:146(figure/title) C/index.docbook:175(figure/title)
-#: C/index.docbook:217(figure/title) C/index.docbook:258(figure/title)
-#: C/index.docbook:278(figure/title) C/index.docbook:347(figure/title)
-msgid "Dictionary Window"
-msgstr "Fenêtre du Dictionnaire"
+#: C/dictionary-select.page:32(steps/title)
+msgid "Select a dictionary"
+msgstr "Sélection d'un dictionnaire"
 
-#: C/index.docbook:148(screenshot/mediaobject)
+#: C/dictionary-select.page:34(item/p)
 msgid ""
-"   Shows Dictionary main "
-"window."
+"Select View Available Databases. A sidebar listing the available "
+"dictionaries for your currently selected dictionary source will open."
 msgstr ""
-"   Affiche la fenêtre "
-"principale du Dictionnaire."
-
-#: C/index.docbook:163(sect1/title)
-msgid "Usage"
-msgstr "Utilisation"
+"Sélectionnez Affichage Bases de données disponibles. Une barre latérale "
+"liste les dictionnaires disponibles par rapport à la source de dictionnaires "
+"actuellement choisie s'affichera."
 
-#: C/index.docbook:166(sect2/title)
-msgid "Looking up a word"
-msgstr "Recherche d'un mot"
-
-#: C/index.docbook:168(sect2/para)
-msgid ""
-"To look up a word, type it into the entry field and "
-"press Enter."
-msgstr ""
-"Pour rechercher un mot, saisissez-le dans la zone de recherche et appuyez sur Entrée."
+#: C/dictionary-select.page:40(item/p)
+msgid "Click twice on the dictionary that you want to use."
+msgstr "Double-cliquez sur le dictionnaire que vous souhaitez utiliser."
 
-#: C/index.docbook:171(sect2/para)
+#: C/dictionary-select.page:44(page/p)
 msgid ""
-"If some definition for the word is found, it will appear inside the main "
-"window area:"
+"The next term that you look up will show "
+"the result only from the selected dictionary."
 msgstr ""
-"Si une définition du mot est trouvée, elle apparaît dans la zone principale "
-"de la fenêtre :"
+"Le mot suivant que vous recherchez affiche "
+"le résultat uniquement à partir du dictionnaire sélectionné."
 
-#: C/index.docbook:177(screenshot/mediaobject)
+#: C/dictionary-select.page:48(note/p)
 msgid ""
-"   Shows a definition "
-"inside the Dictionary main window."
+"Your dictionary selection will not be remembered next time you use "
+"Dictionary."
 msgstr ""
-"   Affiche une définition à "
-"l'intérieur de la fenêtre principale du Dictionnaire."
+"Le choix du dictionnaire ne sera pas mémorisé la prochaine fois que vous "
+"utiliserez Dictionnaire."
 
-#: C/index.docbook:186(sect2/para)
-msgid ""
-"Otherwise, an error dialog will appear, with a message explaining the nature "
-"of the error."
-msgstr "Dans le cas contraire, un message d'erreur explicatif apparaîtra."
+#: C/find.page:22(info/desc)
+msgid "Find text in a definition."
+msgstr "Rechercher un texte dans une définition."
 
-#: C/index.docbook:192(sect2/title)
-msgid "Save look up results"
-msgstr "Enregistrement des résultats d'une recherche"
+#: C/find.page:26(page/title) C/keyboard-shortcuts.page:74(td/p)
+msgid "Search within a definition"
+msgstr "Recherche dans une définition"
 
-#: C/index.docbook:194(sect2/para)
+#: C/find.page:28(page/p)
 msgid ""
-"To save the results of a look up, choose FileSave a Copy. Enter a name "
-"for the file in the Save a Copy dialog, then click "
-"Save."
+"Some dictionary entries can be very long and can contain many results, so "
+"you may wish to search them to find the section that is relevant to you."
 msgstr ""
-"Pour enregistrer les résultats d'une recherche, choisissez "
-"FichierEnregistrer une copie. Saisissez un nom de fichier dans la boîte de "
-"dialogue Enregistrer une copie, puis cliquez sur "
-"Enregistrer."
+"Certaines définitions du dictionnaire peuvent être très longues et peuvent "
+"contenir plusieurs résultats, donc vous devriez utiliser l'outil de "
+"recherche pour trouver la section qui vous intéresse."
 
-#: C/index.docbook:199(sect2/title)
-msgid "Print look up results"
-msgstr "Impression des résultats d'une recherche"
+#: C/find.page:32(steps/title)
+msgid "To find definitions:"
+msgstr "Pour trouver une définition :"
 
-#: C/index.docbook:201(sect2/para)
+#: C/find.page:34(item/p)
 msgid ""
-"To print the results of a look up, choose FilePrint."
+"Select Edit Find."
 msgstr ""
-"Pour imprimer les résultats d'une recherche, choisissez "
-"FichierImprimer."
+"Sélectionnez Édition Rechercher."
 
-#: C/index.docbook:203(sect2/para)
+#: C/find.page:38(item/p)
 msgid ""
-"Inside the Print dialog you can select the printer to "
-"use, the paper format, the number of copies."
+"The Find bar will appear at the bottom of the Dictionary window. Type in your search term to search within the definition that "
+"is currently displayed."
 msgstr ""
-"Dans la boîte de dialogue Imprimer, il est possible de "
-"choisir l'imprimante, le format du papier et le nombre de copies."
+"La barre de recherche apparaît en bas de la fenêtre de "
+"Dictionnaire. Tapez-y votre mot pour faire une recherche dans la "
+"définition actuellement affichée."
 
-#: C/index.docbook:206(sect2/para)
+#: C/find.page:43(item/p)
 msgid ""
-"To see a preview of what will be printed, click Preview."
+"Click Previous or Next to scroll through the results. The search will not wrap around: in "
+"other words, it will not go to the top of the page when you are on the last "
+"result and click Next."
 msgstr ""
-"Pour prévisualiser l'impression, cliquez sur Aperçu avant "
-"impression."
-
-#: C/index.docbook:209(sect2/para)
-msgid "To print, click Print."
-msgstr "Pour imprimer, cliquez sur Imprimer."
+"Cliquez sur Précédent ou Suivant pour faire défiler les résultats. Le recherche ne "
+"s'effectue pas en boucle : en d'autres mots, la recherche ne repart pas en "
+"haut de la page quand vous êtes au dernier résultat et que vous appuyez sur "
+"Suivant."
 
-#: C/index.docbook:214(sect2/title)
-msgid "Find Text"
-msgstr "Recherche de texte"
-
-#: C/index.docbook:219(screenshot/mediaobject)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/introduction.page:38(media)
+msgctxt "_"
 msgid ""
-"   Shows the Dictionary "
-"Find pane inside the main window."
+"external ref='figures/gnome-dictionary.png' "
+"md5='80df283344ecd9b03b88309f8ee9912d'"
 msgstr ""
-"   Affiche le volet de "
-"recherche à l'intérieur de la fenêtre principale du Dictionnaire."
+"external ref='figures/gnome-dictionary.png' "
+"md5='80df283344ecd9b03b88309f8ee9912d'"
 
-#: C/index.docbook:229(sect2/para)
-msgid ""
-"To find text inside the results of a look up, perform the following steps:"
-msgstr ""
-"Pour rechercher du texte à l'intérieur des résultats d'une requête, "
-"effectuez les opérations suivantes :"
+#: C/introduction.page:22(info/desc)
+msgid "What is Dictionary?"
+msgstr "Présentation du Dictionnaire"
 
-#: C/index.docbook:233(listitem/para)
-msgid ""
-"Choose  Edit Find "
-" to display the Find pane."
-msgstr ""
-"Choisissez ÉditionRechercher afin d'afficher le volet Rechercher."
+#: C/introduction.page:26(page/title)
+msgid "Introduction"
+msgstr "Introduction"
 
-#: C/index.docbook:235(listitem/para)
+#: C/introduction.page:28(page/p)
 msgid ""
-"Type the text you want to find inside the Search entry."
+"Dictionary is an application for looking up term definitions. It "
+"searches for definitions using an online DICT server. The default "
+"DICT server is at http://dict.org."
 msgstr ""
-"Saisissez le texte souhaité dans le champ Rechercher."
+"Dictionnaire est une application permettant de rechercher des "
+"définitions de mot. Celle-ci recherche les définitions via un serveur "
+"DICT en ligne. Le serveur DICT par défaut est http://dict.org."
 
-#: C/index.docbook:237(listitem/para)
+#: C/introduction.page:33(page/p)
 msgid ""
-"To find the next occurrence of the text, click Next. "
-"To find the previous occurrence of the text, click Previous."
+"Start using Dictionary by looking up a "
+"definition!"
 msgstr ""
-"Pour rechercher la prochaine occurrence du texte, cliquez sur le bouton "
-"Suivant. Pour rechercher l'occurrence précédente, "
-"cliquez sur Précédent."
+"Commencez à utiliser Dictionnaire en recherchant une définition !"
 
-#: C/index.docbook:248(sect1/title) C/index.docbook:438(sect2/title)
-msgid "Preferences"
-msgstr "Préférences"
-
-#: C/index.docbook:250(sect1/para)
-msgid ""
-"To change the Dictionary application preferences, "
-"choose EditPreferences."
-msgstr ""
-"Pour modifier les préférences de l'application Dictionnaire, choisissez ÉditionPréférences."
-
-#: C/index.docbook:255(sect2/title)
-msgid "Dictionary Sources"
-msgstr "Sources de dictionnaires"
+#: C/introduction.page:37(figure/title)
+msgid "Dictionary"
+msgstr "Dictionnaire"
 
-#: C/index.docbook:260(screenshot/mediaobject)
-msgid ""
-"   Shows the "
-"Source tab of the Preferences dialog."
+#: C/introduction.page:39(media/p)
+msgid "Screenshot showing the Dictionary main window."
 msgstr ""
-"   Affiche "
-"l'onglet des sources de la fenêtre des préférences."
+"Capture d'écran montrant la fenêtre principal du Dictionnaire."
 
-#: C/index.docbook:269(sect2/para)
+#: C/keyboard-shortcuts.page:23(info/desc)
 msgid ""
-"To change the dictionary source used to look up words, select the desired "
-"source from the list."
+"You can use keyboard shortcuts to navigate around Dictionary more "
+"efficiently."
 msgstr ""
-"Pour modifier la source du dictionnaire utilisé pour rechercher des mots, "
-"sélectionnez la source souhaitée dans la liste."
+"Vous pouvez utiliser des raccourcis clavier pour naviguer dans "
+"Dictionnaire plus efficacement."
 
-#: C/index.docbook:275(sect2/title)
-msgid "Adding a new source"
-msgstr "Ajout d'une nouvelle source de dictionnaire"
+#: C/keyboard-shortcuts.page:27(page/title)
+msgid "Keyboard shortcuts"
+msgstr "Raccourcis clavier"
 
-#: C/index.docbook:280(screenshot/mediaobject)
+#: C/keyboard-shortcuts.page:29(page/p)
 msgid ""
-"   Shows the Add Source "
-"dialog."
+"Keyboard shortcuts are combinations of keys that you can use instead of "
+"navigating through the menu. The following shortcuts are available:"
 msgstr ""
-"   Affiche la fenêtre de "
-"dialogue d'ajouts de sources."
+"Les raccourcis clavier sont des combinaisons de touche qui peuvent être "
+"utilisées au lieu d'utiliser les menus. Les raccourcis clavier suivants sont "
+"disponibles :"
 
-#: C/index.docbook:289(sect2/para)
-msgid "To add a new dictionary source, perform the following steps:"
-msgstr ""
-"Pour ajouter une nouvelle source de dictionnaire, effectuez les opérations "
-"suivantes :"
+#: C/keyboard-shortcuts.page:33(table/title)
+msgid "Navigate around Dictionary"
+msgstr "Naviguer dans Dictionnaire"
 
-#: C/index.docbook:292(listitem/para)
-msgid "Click on the Add button"
-msgstr "Cliquez sur le bouton Ajouter."
+#: C/keyboard-shortcuts.page:36(td/p) C/keyboard-shortcuts.page:68(td/p)
+#: C/keyboard-shortcuts.page:92(td/p) C/keyboard-shortcuts.page:120(td/p)
+msgid "Action"
+msgstr "Action"
 
-#: C/index.docbook:293(listitem/para)
-msgid ""
-"Edit the name of the new source inside the Description "
-"entry"
-msgstr ""
-"Saisissez le nom de la nouvelle source dans le champ Description."
+#: C/keyboard-shortcuts.page:37(td/p) C/keyboard-shortcuts.page:69(td/p)
+#: C/keyboard-shortcuts.page:93(td/p) C/keyboard-shortcuts.page:121(td/p)
+msgid "Shortcut"
+msgstr "Raccourci"
 
-#: C/index.docbook:294(listitem/para)
-msgid ""
-"Change the transport type of the new source using the Transport combo box"
-msgstr ""
-"Modifiez le type de transport de la nouvelle source dans la liste déroulante "
-"Transport."
+#: C/keyboard-shortcuts.page:42(td/p) C/print.page:36(section/title)
+msgid "Print preview"
+msgstr "Aperçu avant impression"
 
-#: C/index.docbook:295(listitem/para)
-msgid "Edit the attributes of the new source"
-msgstr "Modifiez les attributs de la nouvelle source."
+#: C/keyboard-shortcuts.page:43(td/p)
+msgid "ShiftCtrlP"
+msgstr "MajusculeCtrlP"
 
-#: C/index.docbook:296(listitem/para)
-msgid "Click Add"
-msgstr "Cliquez sur Ajouter."
+#: C/keyboard-shortcuts.page:46(td/p) C/print.page:67(section/title)
+msgid "Print"
+msgstr "Impression"
 
-#: C/index.docbook:299(sect2/para)
-msgid ""
-"Different source transport types uses different attributes. This is the list "
-"of available attributes per transport type:"
-msgstr ""
-"Différents types de transport de source utilisent des attributs différents. "
-"Voici la liste des attributs disponibles pour chaque type de transport :"
+#: C/keyboard-shortcuts.page:47(td/p)
+msgid "CtrlP"
+msgstr "CtrlP"
 
-#: C/index.docbook:306(entry/para)
-msgid "Transport"
-msgstr "Transport"
+#: C/keyboard-shortcuts.page:50(td/p)
+msgid "View sidebar"
+msgstr "Afficher la barre latérale"
 
-#: C/index.docbook:307(entry/para)
-msgid "Attributes"
-msgstr "Attributs"
+#: C/keyboard-shortcuts.page:51(td/p)
+msgid "F9"
+msgstr "F9"
 
-#: C/index.docbook:312(entry/para)
-msgid "Dictionary Server"
-msgstr "Serveur de dictionnaire"
+#: C/keyboard-shortcuts.page:54(td/p)
+msgid "Open a new Dictionary window"
+msgstr "Ouvrir une nouvelle fenêtre de Dictionnaire"
 
-#: C/index.docbook:314(entry/para)
-msgid "Hostname: the hostname of the dictionary server"
-msgstr "Nom d'hôte : le nom d'hôte du serveur de dictionnaire"
+#: C/keyboard-shortcuts.page:55(td/p)
+msgid "CtrlN"
+msgstr "CtrlN"
 
-#: C/index.docbook:315(entry/para)
-msgid "Port: the port of the dictionary server"
-msgstr "Port : le port du serveur de dictionnaire"
+#: C/keyboard-shortcuts.page:58(td/p)
+msgid "Close current Dictionary window"
+msgstr "Fermer la fenêtre de Dictionnaire actuelle"
 
-#: C/index.docbook:326(sect2/title)
-msgid "Removing a source"
-msgstr "Suppression d'une source"
+#: C/keyboard-shortcuts.page:59(td/p)
+msgid "CtrlW"
+msgstr "CtrlW"
 
-#: C/index.docbook:328(sect2/para)
-msgid "To remove a dictionary source, perform the following steps:"
-msgstr ""
-"Pour supprimer une source de dictionnaire, effectuez les opérations "
-"suivantes :"
+#: C/keyboard-shortcuts.page:65(table/title)
+msgid "Search shortcuts"
+msgstr "Raccourcis de recherche"
 
-#: C/index.docbook:331(listitem/para)
-msgid "Select the source you wish to remove"
-msgstr "Sélectionnez la source à supprimer."
+#: C/keyboard-shortcuts.page:75(td/p)
+msgid "/ or CtrlF"
+msgstr "/ ou CtrlF"
 
-#: C/index.docbook:332(listitem/para)
-msgid "Click the Remove button"
-msgstr "Cliquez sur le bouton Enlever."
+#: C/keyboard-shortcuts.page:78(td/p)
+msgid "Find next"
+msgstr "Rechercher le suivant"
 
-#: C/index.docbook:335(warning/para)
-msgid ""
-"If you remove a dictionary source it will be permanently deleted from the "
-"list of available sources. Also, as some sources might be defined system-"
-"wide you may actually not be able to remove them unless you have the right "
-"ownership privileges."
-msgstr ""
-"Si vous enlevez une source de dictionnaire, elle sera définitivement "
-"supprimée de la liste des ressources disponibles. D'autre part, comme "
-"certaines sources sont définies au niveau du système, il est possible que "
-"vous ne puissiez pas l'enlever si vous ne disposez pas des privilèges "
-"nécessaires."
+#: C/keyboard-shortcuts.page:79(td/p)
+msgid "CtrlG"
+msgstr "CtrlG"
 
-#: C/index.docbook:344(sect2/title)
-msgid "Print Options"
-msgstr "Options d'impression"
+#: C/keyboard-shortcuts.page:82(td/p)
+msgid "Find previous"
+msgstr "Rechercher le précédent"
 
-#: C/index.docbook:349(screenshot/mediaobject)
-msgid ""
-"   Shows the "
-"Print tab inside the Preferences dialog."
-msgstr ""
-"   Affiche "
-"l'onglet d'impression à l'intérieur de la fenêtre de préférences."
+#: C/keyboard-shortcuts.page:83(td/p)
+msgid "ShiftCtrlG"
+msgstr "MajusculeCtrlG"
 
-#: C/index.docbook:358(sect2/para)
-msgid ""
-"If you want to change the font name and size used when printing, perform the "
-"following steps:"
-msgstr ""
-"Si vous désirez modifier le nom de la police et la taille utilisée pour "
-"l'impression, effectuez les opérations suivantes :"
+#: C/keyboard-shortcuts.page:89(table/title)
+msgid "Navigate within a definition"
+msgstr "Naviguer dans une définition"
 
-#: C/index.docbook:362(listitem/para)
-msgid "Click on the Print Font button"
-msgstr "Cliquez sur le bouton Police d'impression."
+#: C/keyboard-shortcuts.page:98(td/p)
+msgid "Previous definition"
+msgstr "Définition précédente"
 
-#: C/index.docbook:363(listitem/para)
-msgid "Select the font and size you wish to use"
-msgstr "Sélectionnez la police et la taille de caractères de votre choix."
+#: C/keyboard-shortcuts.page:99(td/p)
+msgid "CtrlPage Up"
+msgstr "CtrlPage haut"
 
-#: C/index.docbook:364(listitem/para)
-msgid "Click Ok"
-msgstr "Cliquez sur Valider."
+#: C/keyboard-shortcuts.page:102(td/p)
+msgid "Next definition"
+msgstr "Définition suivante"
 
-#: C/index.docbook:373(sect1/title)
-msgid "The Dictionary Applet"
-msgstr "L'applet Dictionnaire"
+#: C/keyboard-shortcuts.page:103(td/p)
+msgid "CtrlPage Down"
+msgstr "CtrlPage bas"
 
-#: C/index.docbook:375(sect1/para)
-msgid ""
-"The Dictionary application comes with a panel "
-"applet, the Dictionary Applet. You can add the "
-"Dictionary Applet applet to a panel and look up "
-"words in dictionaries."
-msgstr ""
-"L'application Dictionnaire est fournie avec une "
-"applet de tableau de bord, l'applet Dictionnaire. "
-"Vous pouvez ajouter l'applet Dictionnaire à un "
-"tableau de bord et rechercher des mots dans des dictionnaires."
+#: C/keyboard-shortcuts.page:106(td/p)
+msgid "First definition"
+msgstr "Première définition"
 
-#: C/index.docbook:381(figure/title) C/index.docbook:417(figure/title)
-msgid "Dictionary Applet Window"
-msgstr "Fenêtre de l'applet Dictionnaire"
+#: C/keyboard-shortcuts.page:107(td/p)
+msgid "CtrlHome"
+msgstr "CtrlOrigine"
 
-#: C/index.docbook:383(screenshot/mediaobject)
-msgid ""
-"   Shows Dictionary Applet."
-""
-msgstr ""
-"   Affiche l'applet du "
-"Dictionnaire."
+#: C/keyboard-shortcuts.page:110(td/p)
+msgid "Last definition"
+msgstr "Dernière définition"
 
-#: C/index.docbook:395(sect2/title)
-msgid "To Start Dictionary Applet"
-msgstr "Démarrage de l'applet Dictionnaire"
+#: C/keyboard-shortcuts.page:111(td/p)
+msgid "CtrlEnd"
+msgstr "CtrlFin"
 
-#: C/index.docbook:397(sect2/para)
-msgid ""
-"To add Dictionary Applet to a panel, right-click "
-"on the panel, then choose Add to Panel. Select "
-"Dictionary Applet in the Add to the panel dialog, "
-"then click OK."
-msgstr ""
-"Pour ajouter l'applet Dictionnaire à un tableau "
-"de bord, cliquez avec le bouton droit de la souris sur un tableau de bord, "
-"puis choisissez Ajouter au tableau de bord. "
-"Sélectionnez l'applet Dictionnaire dans la boîte de dialogue "
-"Ajouter au tableau de bord, puis cliquez sur "
-"Ajouter."
+#: C/keyboard-shortcuts.page:117(table/title)
+msgid "Dictionary definitions shortcuts:"
+msgstr "Raccourcis des définitions du Dictionnaire :"
 
-#: C/index.docbook:406(sect2/title)
-msgid "Using the Dictionary Applet"
-msgstr "Utilisation de l'applet Dictionnaire"
+#: C/keyboard-shortcuts.page:126(td/p) C/similar-words.page:27(page/title)
+msgid "Similar words"
+msgstr "Mots similaires"
 
-#: C/index.docbook:408(sect2/para)
-msgid ""
-"To look up a word, type it into the entry field, and "
-"press Enter or right-click on the dictionary icon and then "
-"choose Look up."
-msgstr ""
-"Pour rechercher un mot, saisissez-le dans la zone de texte, puis appuyez sur Entrée ou cliquez avec le "
-"bouton droit sur l'icône du dictionnaire et choisissez "
-"Rechercher le texte sélectionné."
+#: C/keyboard-shortcuts.page:127(td/p)
+msgid "CtrlT"
+msgstr "CtrlT"
 
-#: C/index.docbook:413(sect2/para)
-msgid ""
-"If some definition for the word was found, a window will appear, with the "
-"text of the definitions:"
-msgstr ""
-"Si une définition du mot est trouvée, une fenêtre contenant le texte de la "
-"définition apparaît :"
-
-#: C/index.docbook:419(screenshot/mediaobject)
-msgid ""
-"   Shows Dictionary "
-"Applet main window."
-msgstr ""
-"   Affiche la fenêtre "
-"principale de l'applet du Dictionnaire."
-
-#: C/index.docbook:428(sect2/para)
-msgid ""
-"Click Save to save the definitions to a text file. "
-"Click Print to print the definitions. Click "
-"Clear to clear the definitions."
-msgstr ""
-"Cliquez sur Enregistrer pour enregistrer les "
-"définitions dans un fichier texte. Cliquez sur Imprimer pour imprimer les définitions. Cliquez sur Effacer pour effacer les définitions."
-
-#: C/index.docbook:432(sect2/para)
-msgid ""
-"You can make the window disappear by left-clicking on the dictionary icon or "
-"by pressing Esc."
-msgstr ""
-"Vous pouvez faire disparaître la fenêtre en cliquant avec le bouton gauche "
-"sur l'icône du Dictionnaire ou en appuyant sur Échap."
-
-#: C/index.docbook:440(sect2/para)
-msgid ""
-"To configure the Dictionary Applet, right-click "
-"on the dictionary icon, then choose Preferences."
-msgstr ""
-"Pour configurer l'applet Dictionnaire, cliquez "
-"avec le bouton droit sur l'icône du dictionnaire et choisissez "
-"Préférences."
-
-#: C/index.docbook:443(sect2/para)
-msgid ""
-"The Preferences dialog is the same used by the "
-"Dictionary application, so refer to "
-msgstr ""
-"La boîte de dialogue Préférences est la même que celle "
-"de l'application Dictionnaire, veuillez donc vous "
-"référer à ."
+#: C/keyboard-shortcuts.page:130(td/p) C/sources.page:28(page/title)
+msgid "Dictionary sources"
+msgstr "Sources de dictionnaires"
 
-#: C/legal.xml:9(para/ulink)
-msgid "link"
-msgstr "lien"
+#: C/keyboard-shortcuts.page:131(td/p)
+msgid "CtrlD"
+msgstr "CtrlD"
+
+#: C/keyboard-shortcuts.page:134(td/p)
+msgid "Available databases"
+msgstr "Bases de données disponibles"
+
+#: C/keyboard-shortcuts.page:135(td/p)
+msgid "CtrlB"
+msgstr "CtrlB"
+
+#: C/keyboard-shortcuts.page:138(td/p)
+msgid "Available strategies"
+msgstr "Stratégies disponibles"
+
+#: C/keyboard-shortcuts.page:139(td/p)
+msgid "CtrlR"
+msgstr "CtrlR"
+
+#: C/legal.xml:3(p/link)
+msgid "http://creativecommons.org/licenses/by-sa/3.0/"
+msgstr "http://creativecommons.org/licenses/by-sa/3.0/"
+
+#: C/legal.xml:3(license/p)
+msgid ""
+"This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 "
+"Unported License. To view a copy of this license, visit <_:link-1/> or send "
+"a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, "
+"California, 94041, USA."
+msgstr ""
+"Cette œuvre est distribuée sous licence Creative Commons Paternité-Partage "
+"des Conditions Initiales à l'Identique 3.0 Unported. Pour prendre "
+"connaissance du texte complet de la licence, consultez <_:link-1/> "
+"ou envoyez une lettre à Creative Commons, 444 Castro Street, Suite 900, "
+"Mountain View, California, 94041, USA."
+
+#: C/pref.page:15(info/desc)
+msgid "Manage your preferences."
+msgstr "Gérer vos préférences."
+
+#: C/pref.page:18(page/title)
+msgid "Dictionary preferences"
+msgstr "Préférences du Dictionnaire"
+
+#: C/print-font.page:23(info/desc)
+msgid "Select the font for printing definitions."
+msgstr "Sélectionner la police pour l'impression des définitions."
+
+#: C/print-font.page:27(page/title)
+msgid "Print font"
+msgstr "Police d'impression"
+
+#: C/print-font.page:29(page/p)
+msgid ""
+"You can change the default font face and size that are used for printing the "
+"definitions."
+msgstr ""
+"Vous pouvez modifier le nom de la police et la taille utilisée pour "
+"l'impression des définitions."
+
+#: C/print-font.page:33(steps/title)
+msgid "Change the font"
+msgstr "Modifier la police"
+
+#: C/print-font.page:35(item/p)
+msgid ""
+"Select Dictionary Preferences Print."
+msgstr ""
+"Sélectionnez Dictionnaire Préférences Imprimer."
+
+#: C/print-font.page:40(item/p)
+msgid "Click font selector button."
+msgstr "Cliquez sur le bouton de sélection de police."
+
+#: C/print-font.page:43(item/p)
+msgid "Select the font that you wish to use."
+msgstr "Sélectionnez la police que vous souhaitez utiliser."
+
+#: C/print-font.page:46(item/p)
+msgid ""
+"Drag the slider to the right to increase the font size or left to decrease "
+"it. Alternatively, you can type in the font size in the text box, or use the "
+"- and + buttons to decrease and increase the font size."
+msgstr ""
+"Faites glisser le curseur vers la droite pour augmenter la taille de la "
+"police ou la gauche pour la diminuer. À la place, vous pouvez taper la "
+"taille de la police dans la zone de texte, ou utilisez les boutons - et + afin de diminuer et augmenter la taille de la police."
+
+#: C/print-font.page:52(item/p)
+msgid "Click Select to save your font settings."
+msgstr ""
+"Cliquez sur Sélectionner pour enregistrer vos "
+"paramètres de police."
+
+#: C/print-font.page:56(page/p)
+msgid ""
+"The definition is not reflowed for printing, so if you choose a large font "
+"size, some of the text may be cut off."
+msgstr ""
+"La définition n'est pas adaptée pour l'impression, donc si vous choisissez "
+"une taille de police assez large, une partie du texte risque d'être coupée."
+
+#: C/print.page:24(info/desc)
+msgid "Print preview and print definitions."
+msgstr "Aperçu avant impression et impression des définitions."
+
+#: C/print.page:28(page/title)
+msgid "Print a definition"
+msgstr "Impression d'une définition"
+
+#: C/print.page:30(page/p)
+msgid ""
+"You can print a definition to paper or a file. Before printing, you should "
+"preview the definition as it would be printed to check that the text fits "
+"onto the page, especially if you have changed the print font size."
+msgstr ""
+"Vous pouvez imprimer une définition sur papier ou dans un fichier. Avant "
+"l'impression, vous devriez prévisualiser la définition telle qu'elle sera "
+"imprimée afin de vérifier que le texte tienne sur la page, surtout si vous "
+"avez changé la taille de la police d'impression."
+
+#: C/print.page:40(item/p)
+msgid ""
+"Select File Preview."
+msgstr ""
+"Sélectionnez Fichier Aperçu."
+
+#: C/print.page:44(item/p)
+msgid ""
+"A print preview window will open which will show you the definition exactly "
+"as it will be printed."
+msgstr ""
+"Une fenêtre d'aperçu avant impression vous affichera la définition "
+"exactement telle qu'elle sera imprimée."
+
+#: C/print.page:48(item/p)
+msgid "Use the toolbar to browse pages, adjust zoom level and page width."
+msgstr ""
+"Utilisez la barre d'outils pour naviguer à travers les pages, régler le "
+"niveau de zoom et la largeur de la page."
+
+#: C/print.page:52(item/p)
+msgid ""
+"Click the Print this document to print the "
+"definition or close the window to end the preview."
+msgstr ""
+"Cliquez sur Imprimer ce document pour imprimer "
+"la définition ou bien fermez la fenêtre pour arrêter la prévisualisation."
+
+#: C/print.page:58(note/p)
+msgid ""
+"The print button in the toolbar may not always work. If it does not work for "
+"you, close the window and select File Print."
+msgstr ""
+"Le bouton d'impression dans la barre d'outils ne fonctionne pas toujours. Si "
+"cela ne fonctionne pas pour vous, fermez la fenêtre et sélectionnez "
+"Fichier Imprimer."
+
+#: C/print.page:69(section/p)
+msgid ""
+"You need to have a printer set up to be able to print to paper."
+msgstr ""
+"Vous devez avoir une imprimante "
+"configurée pour être en mesure d'imprimer sur papier."
+
+#: C/print.page:74(item/p)
+msgid ""
+"Select File Print General."
+msgstr ""
+"Sélectionnez Fichier Imprimer Général."
+
+#: C/print.page:79(item/p)
+msgid ""
+"Select the printer that you want to use from the list of printers or select "
+"Print to File."
+msgstr ""
+"Sélectionnez l'imprimante que vous souhaitez utiliser à partir de la liste "
+"des imprimantes ou sélectionnez Imprimer dans un fichier."
+
+#: C/print.page:84(item/p)
+msgid ""
+"Chose your printing settings."
+msgstr ""
+"Choisissez vos paramètres "
+"d'impression."
+
+#: C/print.page:88(item/p)
+msgid "Press Print to print the definition."
+msgstr ""
+"Appuyez sur Imprimer afin d'imprimer la "
+"définition."
+
+#: C/prob-retrieving-definition.page:23(info/desc)
+msgid "Error while retrieving definitions."
+msgstr "Erreur lors de la récupération des définitions."
+
+#: C/prob-retrieving-definition.page:27(page/title)
+msgid "Cannot find definitions"
+msgstr "Définitions introuvables"
+
+#: C/prob-retrieving-definition.page:29(page/p)
+msgid ""
+"If you see the error message Error while retrieving definition "
+"when looking up a definition from any of the selected dictionaries, the problem is more likely one of the "
+"following:"
+msgstr ""
+"Si vous voyez le message d'erreur Erreur lors de la récupération de la "
+"définition pendant la recherche d'une définition à partir de l'un "
+"des dictionnaires utilisés, le problème "
+"est susceptible d'être l'un de ceux qui suivent :"
+
+#: C/prob-retrieving-definition.page:36(item/p)
+msgid ""
+"One or more of the selected DICT servers that are used to look up "
+"definitions may not be working. You can try waiting a while before looking up the definition again."
+msgstr ""
+"Un ou plusieurs des serveurs DICT sélectionnés qui sont utilisés "
+"pour rechercher des définitions peuvent ne pas fonctionner. Vous pouvez "
+"attendre un petit peu avant de rechercher "
+"la définition à nouveau."
+
+#: C/prob-retrieving-definition.page:42(item/p)
+msgid ""
+"You may not have a working Internet connection. For Dictionary to "
+"look up terms, your computer must be able "
+"to connect to dict.org."
+msgstr ""
+"Vous n'avez peut-être pas de connexion Internet. Afin que le "
+"Dictionnaire puisse rechercher des définitions, votre ordinateur "
+"doit être capable de se connecter "
+"à dict.org."
+
+#: C/save-definition.page:22(info/desc)
+msgid "Save a copy of a definition to a text file."
+msgstr "Enregistrer une copie d'une définition dans un fichier texte."
+
+#: C/save-definition.page:26(page/title)
+msgid "Save a definition"
+msgstr "Enregistrement d'une définition"
+
+#: C/save-definition.page:28(page/p)
+msgid ""
+"You can save a definition to a text file. This may be useful if you want to "
+"use it outside of Dictionary."
+msgstr ""
+"Vous pouvez enregistrer une définition dans un fichier texte. Cela peut être "
+"utile si vous voulez l'utiliser en dehors du Dictionnaire."
+
+#: C/save-definition.page:32(steps/title)
+msgid "To save a definition:"
+msgstr "Pour enregistrer une définition :"
+
+#: C/save-definition.page:34(item/p)
+msgid ""
+"Select File Save a "
+"Copy…."
+msgstr ""
+"Sélectionnez Fichier Enregistrer une copie…."
+
+#: C/save-definition.page:38(item/p)
+msgid ""
+"Chose where you want to save the definition to and a name for the file. You "
+"may want to add a .txt file extension to the end of the file "
+"name."
+msgstr ""
+"Choisissez l'endroit où vous souhaitez enregistrer la définition et un nom "
+"pour le fichier. Vous pouvez aussi ajouter l'extension de fichier ."
+"txt à la fin du nom de fichier."
+
+#: C/save-definition.page:43(item/p)
+msgid "Press Save to save the definition."
+msgstr ""
+"Appuyez sur Enregistrer pour sauvegarder la "
+"définition."
+
+#: C/similar-words.page:23(info/desc)
+msgid "View related results in other dictionaries."
+msgstr "Voir les résultats connexes dans les autres dictionnaires."
+
+#: C/similar-words.page:29(page/p)
+msgid ""
+"Dictionary will only display the definition from one of your "
+"dictionaries. To check if there are search results in other dictionaries:"
+msgstr ""
+"Dictionnaire affiche uniquement la définition à partir d'un de "
+"vos dictionnaires. Pour vérifier s'il y a des résultats dans d'autres "
+"dictionnaires :"
+
+#: C/similar-words.page:34(item/p)
+msgid "Look up the desired term."
+msgstr "Rechercher le mot souhaité."
+
+#: C/similar-words.page:37(item/p)
+msgid ""
+"If the sidebar is not already visible, select View Similar Words."
+msgstr ""
+"Si la barre latérale n'est pas visible, sélectionnez Affichage Mots similaires."
+
+#: C/similar-words.page:42(item/p)
+msgid ""
+"The Similar Words sidebar will show search results from other "
+"dictionaries in your selected dictionary source. To view the similar word, "
+"double click on the entry."
+msgstr ""
+"La barre latérale Mots similaires affiche les résultats de "
+"recherche des autres dictionnaires à partir de la source de dictionnaires "
+"sélectionnée. Pour afficher le mot similaire, double-cliquez sur celui-ci."
+
+#: C/source-add-local.page:20(page/title)
+msgid "Add local dictionary sources"
+msgstr "Ajout de sources de dictionnaires locales"
+
+#: C/sources-default.page:24(page/title)
+msgid "Set a default dictionary source"
+msgstr "Définition d'une source de dictionnaires par défaut"
+
+#: C/sources-default.page:26(page/p)
+msgid ""
+"When you first use Dictionary, it should have some pre-installed "
+"dictionaries that you can use. You can change the default dictionary source to one that you would prefer to use "
+"instead."
+msgstr ""
+"Lorsque vous utilisez Dictionnaire pour la première fois, il "
+"devrait y avoir des dictionnaires pré-installés que vous pouvez utiliser. "
+"Vous pouvez modifier la source de dictionnaire "
+"par défaut pour celui que vous préférez utiliser à la place."
+
+#: C/sources-default.page:32(steps/title)
+msgid "Change the default dictionary source:"
+msgstr "Modifier la source de dictionnaires par défaut :"
+
+#: C/sources-default.page:34(item/p)
+msgid ""
+"Select Dictionary Preferences Source."
+msgstr ""
+"Sélectionnez Dictionnaire Préférences Source."
+
+#: C/sources-default.page:39(item/p)
+msgid "Select the dictionary source that you want to set as the default."
+msgstr ""
+"Sélectionnez la source de dictionnaires que vous souhaitez utiliser par "
+"défaut."
+
+#: C/sources-default.page:42(item/p)
+msgid "Your change will be saved automatically."
+msgstr "Vos modifications seront enregistrées automatiquement."
+
+#: C/sources-delete.page:25(page/title)
+msgid "Delete a dictionary source"
+msgstr "Suppression d'une source de dictionnaires"
+
+#: C/sources-delete.page:27(page/p)
+msgid ""
+"If you no longer need a specific dictionary source or if one stops working for you, you may want to delete it."
+msgstr ""
+"Si vous n'avez plus besoin d'une source de "
+"dictionnaires spécifique ou si celle-ci a arrêté de fonctionner, vous "
+"pouvez la supprimer."
+
+#: C/sources-delete.page:32(steps/title)
+msgid "Delete a dictionary source:"
+msgstr "Supprimer une source de dictionnaires :"
+
+#: C/sources-delete.page:34(item/p)
+msgid ""
+"Select Dictionary Preferences Source."
+msgstr ""
+"Sélectionnez Dictionnaire Préférences Source."
+
+#: C/sources-delete.page:39(item/p)
+msgid "Select the dictionary source that you want to delete."
+msgstr "Sélectionnez la source de dictionnaires à supprimer."
+
+#: C/sources-delete.page:42(item/p)
+msgid "Press Remove."
+msgstr "Appuyez sur Enlever."
+
+#: C/sources-delete.page:45(item/p)
+msgid ""
+"A dialog will pop up asking you to confirm that you wish to permanently "
+"delete the selected source. Once you confirm, the source will be deleted."
+msgstr ""
+"Une boîte de dialogue apparaîtra vous demandant de confirmer que vous "
+"souhaitez supprimer définitivement la source sélectionnée. Une fois "
+"confirmé, la source de dictionnaires sera supprimée."
+
+#: C/sources-edit.page:24(page/title)
+msgid "Edit a dictionary source"
+msgstr "Modification d'une source de dictionnaires"
+
+#: C/sources-edit.page:26(page/p)
+msgid ""
+"You can customize a dictionary source to "
+"update details such as its description or remote address."
+msgstr ""
+"Vous pouvez personnaliser une source de "
+"dictionnaires pour mettre à jour les informations telles que la "
+"description ou les adresses distantes."
+
+#: C/sources-edit.page:30(steps/title)
+msgid "To edit a dictionary source:"
+msgstr "Pour modifier une source de dictionnaires :"
+
+#: C/sources-edit.page:32(item/p)
+msgid ""
+"Select Dictionary Preferences Source."
+msgstr ""
+"Sélectionnez Dictionnaire Préférences Source."
+
+#: C/sources-edit.page:37(item/p)
+msgid "Double click on the dictionary source you want to edit."
+msgstr ""
+"Double-cliquez sur la source de dictionnaires que vous souhaitez modifier."
+
+#: C/sources-edit.page:40(item/p)
+msgid "You can edit the following fields:"
+msgstr "Vous pouvez modifier les champs suivants :"
+
+#: C/sources-edit.page:43(item/p)
+msgid ""
+"Description is the name of the source as it will be displayed to "
+"you."
+msgstr ""
+"Description : le nom de la source telle qu'elle sera affichée "
+"pour vous."
+
+#: C/sources-edit.page:47(item/p)
+msgid "Transport is the type of server."
+msgstr "Transport est le type de serveur."
+
+#: C/sources-edit.page:50(item/p)
+msgid "Hostname is the location of the dictionary source."
+msgstr "Nom d'hôte est le nom d'hôte du serveur de dictionnaire"
+
+#: C/sources-edit.page:55(item/p)
+msgid "Port."
+msgstr "Port."
+
+#: C/sources-edit.page:60(item/p)
+msgid ""
+"View the dictionaries that are available in the dictionary source by "
+"selecting the Dictionaries tab."
+msgstr ""
+"Visualisez les dictionnaires qui sont disponibles avec la source de "
+"dictionnaires en sélectionnant l'onglet Dictionnaires"
+
+#: C/sources-edit.page:64(item/p)
+msgid "Press Close to save the settings."
+msgstr ""
+"Appuyez sur Fermer pour enregistrer les "
+"paramètres."
+
+#: C/sources.page:24(info/desc)
+msgid "Manage various dictionary sources."
+msgstr "Gérer les différentes sources de dictionnaires."
+
+#: C/sources.page:30(page/p)
+msgid ""
+"Dictionary uses dictionary sources to look up words that "
+"you search for. Dictionary sources are collections of one or more dictionary "
+"databases which are usually online, but can be installed on your machine as "
+"well."
+msgstr ""
+"Dictionnaire utilise des sources de dictionnaires pour "
+"rechercher les définitions des mots. Les sources de dictionnaires sont des "
+"collections d'une ou plusieurs bases de données de dictionnaire. Elles sont "
+"pour la plupart en ligne, mais peuvent être installées sur votre machines."
+
+#: C/sources.page:36(section/title)
+msgid "Manage your dictionary sources"
+msgstr "Gestion de vos sources de dictionnaires"
+
+#: C/sources-select.page:26(page/title)
+msgid "Select a dictionary source"
+msgstr "Sélection d'une source de dictionnaires"
+
+#: C/sources-select.page:28(page/p)
+msgid ""
+"You can change the dictionary source that you "
+"are currently using without changing your default preferences."
+msgstr ""
+"Vous pouvez modifier la source de dictionnaires que vous utilisez actuellement sans changer vos préférences par défaut."
+
+#: C/sources-select.page:32(steps/title)
+msgid "Temporarily change the dictionary source:"
+msgstr "Modifier temporairement la source de dictionnaires :"
+
+#: C/sources-select.page:34(item/p)
+msgid ""
+"Select View Dictionary Sources."
+msgstr ""
+"Sélectionnez Affichage Sources de dictionnaires."
+
+#: C/sources-select.page:38(item/p)
+msgid "Double click on the dictionary source that you want to use."
+msgstr ""
+"Double-cliquez sur la source de dictionnaires que vous souhaitez utiliser."
+
+#: C/text-copy.page:23(info/desc)
+msgid "Select and copy a definition to another application."
+msgstr "Sélectionner et copier une définition vers une autre application."
+
+#: C/text-copy.page:27(page/title)
+msgid "Copy definition"
+msgstr "Copie d'une définition"
+
+#: C/text-copy.page:29(page/p)
+msgid ""
+"You can copy and paste definitions from Dictionary to another "
+"application."
+msgstr ""
+"Vous pouvez copier et coller des définitions à partir de Dictionnaire vers d'autres applications."
+
+#: C/text-copy.page:33(steps/title)
+msgid "Copy a definition"
+msgstr "Copier une définition"
+
+#: C/text-copy.page:35(item/p)
+msgid ""
+"Select the text that you want to copy in Dictionary. "
+"Alternatively, you can select the whole definition using Edit Select All."
+msgstr ""
+"Sélectionnez le texte que vous souhaitez copier dans Dictionnaire. À la place, vous pouvez sélectionner la définition en entière en "
+"utilisant Édition Tout sélectionner."
+
+#: C/text-copy.page:41(item/p)
+msgid ""
+"Select Edit Copy."
+msgstr ""
+"Sélectionnez Édition Copier."
+
+#: C/text-copy.page:45(item/p)
+msgid ""
+"Paste the text into another application. This can usually be done using the "
+"CtrlP keyboard shortcut or through "
+"one of the menus."
+msgstr ""
+"Collez le texte dans une autre application. Ceci peut être fait en utilisant "
+"le raccourci clavier CtrlV ou via "
+"l'un des menus."
+
+#~ msgid ""
+#~ "To report a bug or make a suggestion regarding the Dictionary application "
+#~ "or this manual, follow the directions in the GNOME Feedback Page."
+#~ msgstr ""
+#~ "Pour rapporter une anomalie ou émettre une suggestion concernant le "
+#~ "Dictionnaire ou ce manuel, procédez comme indiqué sur la page de réactions sur GNOME."
+
+#~ msgid ""
+#~ "The Dictionary application enables you to "
+#~ "search words and terms on a dictionary source."
+#~ msgstr ""
+#~ "Le Dictionnaire permet de rechercher des "
+#~ "définitions de mots et de termes à partir d'un dictionnaire source."
+
+#~ msgid ""
+#~ "You can start Dictionary in the following ways:"
+#~ msgstr ""
+#~ "Le Dictionnaire peut être lancé de plusieurs "
+#~ "manières :"
+
+#~ msgid ""
+#~ "To look up a word, type it into the entry field and "
+#~ "press Enter."
+#~ msgstr ""
+#~ "Pour rechercher un mot, saisissez-le dans la zone de recherche et appuyez sur Entrée."
+
+#~ msgid ""
+#~ "If some definition for the word is found, it will appear inside the main "
+#~ "window area:"
+#~ msgstr ""
+#~ "Si une définition du mot est trouvée, elle apparaît dans la zone "
+#~ "principale de la fenêtre :"
+
+#~ msgid ""
+#~ "   Shows a definition "
+#~ "inside the Dictionary main window."
+#~ msgstr ""
+#~ "   Affiche une "
+#~ "définition à l'intérieur de la fenêtre principale du Dictionnaire."
+
+#~ msgid ""
+#~ "Otherwise, an error dialog will appear, with a message explaining the "
+#~ "nature of the error."
+#~ msgstr "Dans le cas contraire, un message d'erreur explicatif apparaîtra."
+
+#~ msgid "Save look up results"
+#~ msgstr "Enregistrement des résultats d'une recherche"
+
+#~ msgid ""
+#~ "To save the results of a look up, choose FileSave a Copy. Enter a name "
+#~ "for the file in the Save a Copy dialog, then click "
+#~ "Save."
+#~ msgstr ""
+#~ "Pour enregistrer les résultats d'une recherche, choisissez "
+#~ "FichierEnregistrer une copie. Saisissez un nom de fichier dans la boîte de "
+#~ "dialogue Enregistrer une copie, puis cliquez sur "
+#~ "Enregistrer."
+
+#~ msgid ""
+#~ "To print the results of a look up, choose FilePrint."
+#~ msgstr ""
+#~ "Pour imprimer les résultats d'une recherche, choisissez "
+#~ "FichierImprimer."
+
+#~ msgid ""
+#~ "Inside the Print dialog you can select the printer "
+#~ "to use, the paper format, the number of copies."
+#~ msgstr ""
+#~ "Dans la boîte de dialogue Imprimer, il est possible "
+#~ "de choisir l'imprimante, le format du papier et le nombre de copies."
+
+#~ msgid ""
+#~ "To see a preview of what will be printed, click Preview."
+#~ msgstr ""
+#~ "Pour prévisualiser l'impression, cliquez sur Aperçu avant "
+#~ "impression."
+
+#~ msgid "To print, click Print."
+#~ msgstr "Pour imprimer, cliquez sur Imprimer."
+
+#~ msgid ""
+#~ "   Shows the Dictionary "
+#~ "Find pane inside the main window."
+#~ msgstr ""
+#~ "   Affiche le volet de "
+#~ "recherche à l'intérieur de la fenêtre principale du Dictionnaire."
+
+#~ msgid ""
+#~ "To find text inside the results of a look up, perform the following steps:"
+#~ msgstr ""
+#~ "Pour rechercher du texte à l'intérieur des résultats d'une requête, "
+#~ "effectuez les opérations suivantes :"
+
+#~ msgid ""
+#~ "Choose  Edit Find  to display the Find pane."
+#~ msgstr ""
+#~ "Choisissez ÉditionRechercher afin d'afficher le volet Rechercher."
+
+#~ msgid ""
+#~ "Type the text you want to find inside the Search "
+#~ "entry."
+#~ msgstr ""
+#~ "Saisissez le texte souhaité dans le champ Rechercher."
+
+#~ msgid ""
+#~ "To find the next occurrence of the text, click Next. To find the previous occurrence of the text, click "
+#~ "Previous."
+#~ msgstr ""
+#~ "Pour rechercher la prochaine occurrence du texte, cliquez sur le bouton "
+#~ "Suivant. Pour rechercher l'occurrence précédente, "
+#~ "cliquez sur Précédent."
+
+#~ msgid ""
+#~ "To change the Dictionary application "
+#~ "preferences, choose EditPreferences."
+#~ msgstr ""
+#~ "Pour modifier les préférences de l'application Dictionnaire, choisissez ÉditionPréférences."
+
+#~ msgid ""
+#~ "   Shows "
+#~ "the Source tab of the Preferences dialog."
+#~ msgstr ""
+#~ "   Affiche "
+#~ "l'onglet des sources de la fenêtre des préférences."
+
+#~ msgid ""
+#~ "To change the dictionary source used to look up words, select the desired "
+#~ "source from the list."
+#~ msgstr ""
+#~ "Pour modifier la source du dictionnaire utilisé pour rechercher des mots, "
+#~ "sélectionnez la source souhaitée dans la liste."
+
+#~ msgid ""
+#~ "   Shows the Add "
+#~ "Source dialog."
+#~ msgstr ""
+#~ "   Affiche la fenêtre "
+#~ "de dialogue d'ajouts de sources."
+
+#~ msgid "To add a new dictionary source, perform the following steps:"
+#~ msgstr ""
+#~ "Pour ajouter une nouvelle source de dictionnaire, effectuez les "
+#~ "opérations suivantes :"
+
+#~ msgid ""
+#~ "Edit the name of the new source inside the Description entry"
+#~ msgstr ""
+#~ "Saisissez le nom de la nouvelle source dans le champ "
+#~ "Description."
+
+#~ msgid ""
+#~ "Change the transport type of the new source using the "
+#~ "Transport combo box"
+#~ msgstr ""
+#~ "Modifiez le type de transport de la nouvelle source dans la liste "
+#~ "déroulante Transport."
+
+#~ msgid ""
+#~ "Different source transport types uses different attributes. This is the "
+#~ "list of available attributes per transport type:"
+#~ msgstr ""
+#~ "Différents types de transport de source utilisent des attributs "
+#~ "différents. Voici la liste des attributs disponibles pour chaque type de "
+#~ "transport :"
+
+#~ msgid ""
+#~ "If you remove a dictionary source it will be permanently deleted from the "
+#~ "list of available sources. Also, as some sources might be defined system-"
+#~ "wide you may actually not be able to remove them unless you have the "
+#~ "right ownership privileges."
+#~ msgstr ""
+#~ "Si vous enlevez une source de dictionnaire, elle sera définitivement "
+#~ "supprimée de la liste des ressources disponibles. D'autre part, comme "
+#~ "certaines sources sont définies au niveau du système, il est possible que "
+#~ "vous ne puissiez pas l'enlever si vous ne disposez pas des privilèges "
+#~ "nécessaires."
+
+#~ msgid ""
+#~ "   Shows the "
+#~ "Print tab inside the Preferences dialog."
+#~ msgstr ""
+#~ "   Affiche "
+#~ "l'onglet d'impression à l'intérieur de la fenêtre de préférences."
+
+#~ msgid ""
+#~ "The Dictionary application comes with a panel "
+#~ "applet, the Dictionary Applet. You can add the "
+#~ "Dictionary Applet applet to a panel and look "
+#~ "up words in dictionaries."
+#~ msgstr ""
+#~ "L'application Dictionnaire est fournie avec "
+#~ "une applet de tableau de bord, l'applet Dictionnaire. Vous pouvez ajouter l'applet Dictionnaire à un tableau de bord et rechercher des mots dans des "
+#~ "dictionnaires."
+
+#~ msgid ""
+#~ "To add Dictionary Applet to a panel, right-"
+#~ "click on the panel, then choose Add to Panel. "
+#~ "Select Dictionary Applet in the Add to the panel dialog, then click OK."
+#~ msgstr ""
+#~ "Pour ajouter l'applet Dictionnaire à un "
+#~ "tableau de bord, cliquez avec le bouton droit de la souris sur un tableau "
+#~ "de bord, puis choisissez Ajouter au tableau de bord. Sélectionnez l'applet Dictionnaire dans la boîte de "
+#~ "dialogue Ajouter au tableau de bord, puis "
+#~ "cliquez sur Ajouter."
+
+#~ msgid ""
+#~ "To look up a word, type it into the entry field, and "
+#~ "press Enter or right-click on the dictionary icon and "
+#~ "then choose Look up."
+#~ msgstr ""
+#~ "Pour rechercher un mot, saisissez-le dans la zone de texte, puis appuyez sur Entrée ou cliquez avec le "
+#~ "bouton droit sur l'icône du dictionnaire et choisissez "
+#~ "Rechercher le texte sélectionné."
+
+#~ msgid ""
+#~ "If some definition for the word was found, a window will appear, with the "
+#~ "text of the definitions:"
+#~ msgstr ""
+#~ "Si une définition du mot est trouvée, une fenêtre contenant le texte de "
+#~ "la définition apparaît :"
+
+#~ msgid ""
+#~ "Click Save to save the definitions to a text file. "
+#~ "Click Print to print the definitions. Click "
+#~ "Clear to clear the definitions."
+#~ msgstr ""
+#~ "Cliquez sur Enregistrer pour enregistrer les "
+#~ "définitions dans un fichier texte. Cliquez sur Imprimer pour imprimer les définitions. Cliquez sur Effacer pour effacer les définitions."
+
+#~ msgid ""
+#~ "You can make the window disappear by left-clicking on the dictionary icon "
+#~ "or by pressing Esc."
+#~ msgstr ""
+#~ "Vous pouvez faire disparaître la fenêtre en cliquant avec le bouton "
+#~ "gauche sur l'icône du Dictionnaire ou en appuyant sur Échap."
+
+#~ msgid ""
+#~ "To configure the Dictionary Applet, right-"
+#~ "click on the dictionary icon, then choose Preferences."
+#~ msgstr ""
+#~ "Pour configurer l'applet Dictionnaire, cliquez "
+#~ "avec le bouton droit sur l'icône du dictionnaire et choisissez "
+#~ "Préférences."
+
+#~ msgid ""
+#~ "The Preferences dialog is the same used by the "
+#~ "Dictionary application, so refer to "
+#~ msgstr ""
+#~ "La boîte de dialogue Préférences est la même que "
+#~ "celle de l'application Dictionnaire, veuillez "
+#~ "donc vous référer à ."
 
-#: C/legal.xml:2(legalnotice/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 <_:ulink-1/> or in the file COPYING-DOCS distributed "
-"with this manual."
-msgstr ""
-"Permission vous est donnée de copier, distribuer et/ou modifier ce document "
-"selon les termes de la Licence GNU Free Documentation License, Version 1.1 "
-"ou ultérieure publiée par la Free Software Foundation sans section "
-"inaltérable, sans texte de première page de couverture ni texte de dernière "
-"page de couverture. Vous trouverez un exemplaire de cette licence en suivant "
-"ce <_:ulink-1/> ou dans le fichier COPYING-DOCS fourni avec le présent "
-"manuel."
diff -Nru gnome-dictionary-3.8.0/help/fr/index.page gnome-dictionary-3.10.0/help/fr/index.page
--- gnome-dictionary-3.8.0/help/fr/index.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/index.page	2013-10-06 16:42:34.000000000 +0000
@@ -3,7 +3,7 @@
 
   
     
-    Dictionary
+    Dictionnaire
 
     
       Sindhu S
@@ -13,7 +13,7 @@
 
     
 
-    Look up word definitions in Dictionary.
+    Rechercher des définitions de mots avec Dictionnaire.
   
     
       Jonathan Ernst
@@ -30,16 +30,14 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  
-    <media type="image" mime="image/png" its:translate="no" src="figures/gnome-dictionary-icon.png"/> Dictionary Help
-  
+  <media type="image" mime="image/png" its:translate="no" src="figures/gnome-dictionary-icon.png"/> Manuel du Dictionnaire
 
   

-    Features
+    Fonctionnalités
   

 
  

@@ -47,6 +45,6 @@
   

 
  

-    Common problems and solutions
+    Problèmes courants et solutions
   

 
diff -Nru gnome-dictionary-3.8.0/help/fr/introduction.page gnome-dictionary-3.10.0/help/fr/introduction.page
--- gnome-dictionary-3.8.0/help/fr/introduction.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/introduction.page	2013-10-06 16:42:34.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    What is Dictionary?
+    Présentation du Dictionnaire
 
   
     
@@ -36,24 +36,20 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
   Introduction
 
-  
Dictionary is an application for looking up term definitions.
-  It searches for definitions using an online DICT server. The
-  default DICT server is at
-  http://dict.org.

+  
Dictionnaire est une application permettant de rechercher des définitions de mot. Celle-ci recherche les définitions via un serveur DICT en ligne. Le serveur DICT par défaut est http://dict.org.

 
-  
Start using Dictionary by
-  looking up a definition!

+  
Commencez à utiliser Dictionnaire en recherchant une définition !

 
   

-    Dictionary
+    Dictionnaire
     
-      
Screenshot showing the Dictionary main window.

+      
Capture d'écran montrant la fenêtre principal du Dictionnaire.

     
   

 
diff -Nru gnome-dictionary-3.8.0/help/fr/keyboard-shortcuts.page gnome-dictionary-3.10.0/help/fr/keyboard-shortcuts.page
--- gnome-dictionary-3.8.0/help/fr/keyboard-shortcuts.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/keyboard-shortcuts.page	2013-10-06 16:42:34.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    You can use keyboard shortcuts to navigate around Dictionary more efficiently.
+    Vous pouvez utiliser des raccourcis clavier pour naviguer dans Dictionnaire plus efficacement.
 
   
     
@@ -36,122 +36,121 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Keyboard shortcuts
+  Raccourcis clavier
 
-  
Keyboard shortcuts are combinations of keys that you can use instead of
-  navigating through the menu. The following shortcuts are available:

+  
Les raccourcis clavier sont des combinaisons de touche qui peuvent être utilisées au lieu d'utiliser les menus. Les raccourcis clavier suivants sont disponibles :

 
   
-    Navigate around <app>Dictionary</app>
+    Naviguer dans <app>Dictionnaire</app>
-        
+        
-        
-        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        

     
       

         
Action
Shortcut
Raccourci

       

     
     
       
Print preview
ShiftCtrlP
Aperçu avant impression
MajusculeCtrlP

       

       
Print
Impression

         
CtrlP

       

       
View sidebar
Afficher la barre latérale

         
F9

       

       
Open a new Dictionary window
Ouvrir une nouvelle fenêtre de Dictionnaire

         
CtrlN

       

       
Close current Dictionary window
Fermer la fenêtre de Dictionnaire actuelle

         
CtrlW

       

     
   

 
   
-    Search shortcuts
+    Raccourcis de recherche
-        
+        
-        
-        
+        
+        
-        
+        
-        
-        
+        
+        

     
       

         
Action
Shortcut
Raccourci

       

     
     
       
Search within a definition
/ or CtrlF
Recherche dans une définition
/ ou CtrlF

       

       
Find next
Rechercher le suivant

         
CtrlG

       

       
Find previous
ShiftCtrlG
Rechercher le précédent
MajusculeCtrlG

       

     
   

 
   
-    Navigate within a definition
+    Naviguer dans une définition
-        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        
-        
-        
+        
+        

     
       

         
Action
Shortcut
Raccourci

       

     
     
       
Previous definition
CtrlPage Up
Définition précédente
CtrlPage haut

       

       
Next definition
CtrlPage Down
Définition suivante
CtrlPage bas

       

       
First definition
CtrlHome
Première définition
CtrlOrigine

       

       
Last definition
CtrlEnd
Dernière définition
CtrlFin

       

     
   

 
   
-    <app>Dictionary</app> definitions shortcuts:
+    Raccourcis des définitions du <app>Dictionnaire</app> :
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        
diff -Nru gnome-dictionary-3.8.0/help/fr/pref.page gnome-dictionary-3.10.0/help/fr/pref.page
--- gnome-dictionary-3.8.0/help/fr/pref.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/pref.page	2013-10-06 16:42:34.000000000 +0000
@@ -11,7 +11,7 @@
 
     
 
-    Manage your preferences.
+    Gérer vos préférences.
   
     
       Jonathan Ernst
@@ -28,10 +28,10 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  <app>Dictionary</app> preferences
+  Préférences du <app>Dictionnaire</app>
 
 
diff -Nru gnome-dictionary-3.8.0/help/fr/print-font.page gnome-dictionary-3.10.0/help/fr/print-font.page
--- gnome-dictionary-3.8.0/help/fr/print-font.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/print-font.page	2013-10-06 16:42:34.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Select the font for printing definitions.
+    Sélectionner la police pour l'impression des définitions.
 
   
     
@@ -37,40 +37,33 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Print font
+  Police d'impression
 
-  
You can change the default font face and size that are used for printing
-  the definitions.

+  
Vous pouvez modifier le nom de la police et la taille utilisée pour l'impression des définitions.

 
   
-    Change the font
+    Modifier la police
     
-      
Select Dictionary
-      Preferences
-      Print.

+      
Sélectionnez Dictionnaire Préférences Imprimer.

     
     
-      
Click font selector button.

+      
Cliquez sur le bouton de sélection de police.

     
     
-      
Select the font that you wish to use.

+      
Sélectionnez la police que vous souhaitez utiliser.

     
     
-      
Drag the slider to the right to increase the font size or left to
-      decrease it. Alternatively, you can type in the font size in the text box,
-      or use the - and + buttons to decrease and increase
-      the font size.

+      
Faites glisser le curseur vers la droite pour augmenter la taille de la police ou la gauche pour la diminuer. À la place, vous pouvez taper la taille de la police dans la zone de texte, ou utilisez les boutons - et + afin de diminuer et augmenter la taille de la police.

     
     
-      
Click Select to save your font settings.

+      
Cliquez sur Sélectionner pour enregistrer vos paramètres de police.

     
   
 
-  
The definition is not reflowed for printing, so if you choose a large font
-  size, some of the text may be cut off.

+  
La définition n'est pas adaptée pour l'impression, donc si vous choisissez une taille de police assez large, une partie du texte risque d'être coupée.

 
 
diff -Nru gnome-dictionary-3.8.0/help/fr/print.page gnome-dictionary-3.10.0/help/fr/print.page
--- gnome-dictionary-3.8.0/help/fr/print.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/print.page	2013-10-06 16:42:34.000000000 +0000
@@ -20,7 +20,7 @@
 
     
 
-    Print preview and print definitions.
+    Aperçu avant impression et impression des définitions.
 
   
     
@@ -38,71 +38,55 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Print a definition
+  Impression d'une définition
 
-  
You can print a definition to paper or a file. Before printing, you
-  should preview the definition as it would be printed to check that the text
-  fits onto the page, especially if you have changed the
-  print font size.

+  
Vous pouvez imprimer une définition sur papier ou dans un fichier. Avant l'impression, vous devriez prévisualiser la définition telle qu'elle sera imprimée afin de vérifier que le texte tienne sur la page, surtout si vous avez changé la taille de la police d'impression.

 
   

-    Print preview
+    Aperçu avant impression
 
     
       
-        
Select File
-        Preview.

+        
Sélectionnez Fichier Aperçu.

       
       
-        
A print preview window will open which will show you the definition
-        exactly as it will be printed.

+        
Une fenêtre d'aperçu avant impression vous affichera la définition exactement telle qu'elle sera imprimée.

       
       
-	
Use the toolbar to browse pages, adjust zoom level and page
-	width.

+	
Utilisez la barre d'outils pour naviguer à travers les pages, régler le niveau de zoom et la largeur de la page.

       
       
-        
Click the Print this document to print
-        the definition or close the window to end the preview.

+        
Cliquez sur Imprimer ce document pour imprimer la définition ou bien fermez la fenêtre pour arrêter la prévisualisation.

       
     
 
     
-      
The print button in the toolbar may not always work. If it does not
-      work for you, close the window and select
-      File
-      Print.

+      
Le bouton d'impression dans la barre d'outils ne fonctionne pas toujours. Si cela ne fonctionne pas pour vous, fermez la fenêtre et sélectionnez Fichier Imprimer.

     
 
   

 
   

-    Print
+    Impression
 
-    
You need to have a printer set
-    up to be able to print to paper.

+    
Vous devez avoir une imprimante configurée pour être en mesure d'imprimer sur papier.

 
     
       
-        
Select File
-        Print
-        General.

+        
Sélectionnez Fichier Imprimer Général.

       
       
-        
Select the printer that you want to use from the list of printers
-        or select
-        Print to File.

+        
Sélectionnez l'imprimante que vous souhaitez utiliser à partir de la liste des imprimantes ou sélectionnez Imprimer dans un fichier.

       
       
-        
Chose your printing
-        settings.

+        
Choisissez vos paramètres d'impression.

       
       
-        
Press Print to print the definition.

+        
Appuyez sur Imprimer afin d'imprimer la définition.

       
     
 
diff -Nru gnome-dictionary-3.8.0/help/fr/prob-retrieving-definition.page gnome-dictionary-3.10.0/help/fr/prob-retrieving-definition.page
--- gnome-dictionary-3.8.0/help/fr/prob-retrieving-definition.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/prob-retrieving-definition.page	2013-10-06 16:42:34.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Error while retrieving definitions.
+    Erreur lors de la récupération des définitions.
 
   
     
@@ -37,29 +37,20 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Cannot find definitions
+  Définitions introuvables
 
-  
If you see the error message
-  Error while retrieving definition when looking up a definition
-  from any of the selected dictionaries,
-  the problem is more likely one of the following:

+  
Si vous voyez le message d'erreur Erreur lors de la récupération de la définition pendant la recherche d'une définition à partir de l'un des dictionnaires utilisés, le problème est susceptible d'être l'un de ceux qui suivent :

 
   
     
-      
One or more of the selected DICT servers that are used to
-      look up definitions may not be working. You can try waiting a while
-      before looking up the definition
-      again.

+      
Un ou plusieurs des serveurs DICT sélectionnés qui sont utilisés pour rechercher des définitions peuvent ne pas fonctionner. Vous pouvez attendre un petit peu avant de rechercher la définition à nouveau.

     
     
-      
You may not have a working Internet connection. For
-      Dictionary to look up terms, your computer
-      must be able to connect to
-      dict.org.

+      
Vous n'avez peut-être pas de connexion Internet. Afin que le Dictionnaire puisse rechercher des définitions, votre ordinateur doit être capable de se connecter à dict.org.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/save-definition.page gnome-dictionary-3.10.0/help/fr/save-definition.page
--- gnome-dictionary-3.8.0/help/fr/save-definition.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/save-definition.page	2013-10-06 16:42:34.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    Save a copy of a definition to a text file.
+    Enregistrer une copie d'une définition dans un fichier texte.
 
   
     
@@ -36,28 +36,24 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Save a definition
+  Enregistrement d'une définition
 
-  
You can save a definition to a text file. This may be useful if you want
-  to use it outside of Dictionary.

+  
Vous pouvez enregistrer une définition dans un fichier texte. Cela peut être utile si vous voulez l'utiliser en dehors du Dictionnaire.

 
   
-    To save a definition:
+    Pour enregistrer une définition :
     
-      
Select File
-      Save a Copy….

+      
Sélectionnez Fichier Enregistrer une copie….

     
     
-      
Chose where you want to save the definition to and a name for the
-      file. You may want to add a .txt file extension to the end
-      of the file name.

+      
Choisissez l'endroit où vous souhaitez enregistrer la définition et un nom pour le fichier. Vous pouvez aussi ajouter l'extension de fichier .txt à la fin du nom de fichier.

     
     
-      
Press Save to save the definition.

+      
Appuyez sur Enregistrer pour sauvegarder la définition.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/similar-words.page gnome-dictionary-3.10.0/help/fr/similar-words.page
--- gnome-dictionary-3.8.0/help/fr/similar-words.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/similar-words.page	2013-10-06 16:42:34.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    View related results in other dictionaries.
+    Voir les résultats connexes dans les autres dictionnaires.
 
   
     
@@ -37,28 +37,23 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Similar words
+  Mots similaires
 
-  
Dictionary will only display the definition from one your
-  dictionaries. To check if there are search results in other dictionaries:

+  
Dictionnaire affiche uniquement la définition à partir d'un de vos dictionnaires. Pour vérifier s'il y a des résultats dans d'autres dictionnaires :

 
   
     
-      
Look up the desired term.

+      
Rechercher le mot souhaité.

     
     
-      
If the sidebar is not already visible, select
-      View
-      Similar Words.

+      
Si la barre latérale n'est pas visible, sélectionnez Affichage Mots similaires.

     
     
-      
The Similar Words sidebar will show search results from
-      other dictionaries in your selected dictionary source. To view the
-      similar word, double click on the entry.

+      
La barre latérale Mots similaires affiche les résultats de recherche des autres dictionnaires à partir de la source de dictionnaires sélectionnée. Pour afficher le mot similaire, double-cliquez sur celui-ci.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/source-add-local.page gnome-dictionary-3.10.0/help/fr/source-add-local.page
--- gnome-dictionary-3.8.0/help/fr/source-add-local.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/source-add-local.page	2013-10-06 16:42:34.000000000 +0000
@@ -30,11 +30,11 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Add local dictionary sources
+  Ajout de sources de dictionnaires locales
 
 
 
diff -Nru gnome-dictionary-3.8.0/help/fr/sources-default.page gnome-dictionary-3.10.0/help/fr/sources-default.page
--- gnome-dictionary-3.8.0/help/fr/sources-default.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/sources-default.page	2013-10-06 16:42:34.000000000 +0000
@@ -34,29 +34,24 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Set a default dictionary source
+  Définition d'une source de dictionnaires par défaut
 
-  
When you first use Dictionary, it should have some
-  pre-installed dictionaries that you can use. You can change the default
-  dictionary source to one that you would
-  prefer to use instead.

+  
Lorsque vous utilisez Dictionnaire pour la première fois, il devrait y avoir des dictionnaires pré-installés que vous pouvez utiliser. Vous pouvez modifier la source de dictionnaire par défaut pour celui que vous préférez utiliser à la place.

 
   
-    Change the default dictionary source:
+    Modifier la source de dictionnaires par défaut :
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Sélectionnez Dictionnaire Préférences Source.

     
     
-      
Select the dictionary source that you want to set as the default.

+      
Sélectionnez la source de dictionnaires que vous souhaitez utiliser par défaut.

     
     
-      
Your change will be saved automatically.

+      
Vos modifications seront enregistrées automatiquement.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/sources-delete.page gnome-dictionary-3.10.0/help/fr/sources-delete.page
--- gnome-dictionary-3.8.0/help/fr/sources-delete.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/sources-delete.page	2013-10-06 16:42:34.000000000 +0000
@@ -35,33 +35,27 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Delete a dictionary source
+  Suppression d'une source de dictionnaires
 
-  
If you no longer need a specific
-  dictionary source or if one stops
-  working for you, you may want to delete it.

+  
Si vous n'avez plus besoin d'une source de dictionnaires spécifique ou si celle-ci a arrêté de fonctionner, vous pouvez la supprimer.

 
   
-    Delete a dictionary source:
+    Supprimer une source de dictionnaires :
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Sélectionnez Dictionnaire Préférences Source.

     
     
-      
Select the dictionary source that you want to delete.

+      
Sélectionnez la source de dictionnaires à supprimer.

     
     
-      
Press Remove.

+      
Appuyez sur Enlever.

     
     
-      
A dialog will pop up asking you to confirm that you wish to
-      permanently delete the selected source. Once you confirm, the source will
-      be deleted.

+      
Une boîte de dialogue apparaîtra vous demandant de confirmer que vous souhaitez supprimer définitivement la source sélectionnée. Une fois confirmé, la source de dictionnaires sera supprimée.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/fr/sources-edit.page gnome-dictionary-3.10.0/help/fr/sources-edit.page
--- gnome-dictionary-3.8.0/help/fr/sources-edit.page	2013-07-21 16:33:32.000000000 +0000
+++ gnome-dictionary-3.10.0/help/fr/sources-edit.page	2013-10-06 16:42:34.000000000 +0000
@@ -34,37 +34,33 @@
     
       Mickael Albertus
       mickael.albertus@gmail.com
-      2012
+      2012-2013
     
   
 
-  Edit a dictionary source
+  Modification d'une source de dictionnaires
 
-  
You can customize a dictionary source to
-  update details such as its description or remote address.

+  
Vous pouvez personnaliser une source de dictionnaires pour mettre à jour les informations telles que la description ou les adresses distantes.

 
   
-    To edit a dictionary source:
+    Pour modifier une source de dictionnaires :
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Sélectionnez Dictionnaire Préférences Source.

     
     
-      
Double click on the dictionary source you want to edit.

+      
Double-cliquez sur la source de dictionnaires que vous souhaitez modifier.

     
     
-      
You can edit the following fields:

+      
Vous pouvez modifier les champs suivants :

       
         
-          
Description is the name of the source as it will be
-          displayed to you.

+          
Description : le nom de la source telle qu'elle sera affichée pour vous.

         
         
-          
Transport is the type of server.

+          
Transport est le type de serveur.

         
         
-          
Hostname is the location of the dictionary source.

+          
Nom d'hôte est le nom d'hôte du serveur de dictionnaire

         
         
           
-          
Port.

+          
Porto.

         
       
     
     
-      
View the dictionaries that are available in the dictionary source by
-      selecting the Dictionaries tab.

+      
Vexa os dicionarios que están dispoñíbeis na orixe de dicionarios seleccionando a lapela Dicionarios.

     
     
-      
Press Close to save the settings.

+      
Prema Pechar para gardar as preferencias.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/gl/sources-select.page gnome-dictionary-3.10.0/help/gl/sources-select.page
--- gnome-dictionary-3.8.0/help/gl/sources-select.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/gl/sources-select.page	2013-10-06 16:42:35.000000000 +0000
@@ -28,19 +28,17 @@
     
   
 
-  Select a dictionary source
+  Seleccione unha orixes de dicionario
 
-  
You can change the dictionary source
-  that you are currently using without changing your default preferences.

+  
Pode cambiar a orixe de dicionario que está usando actualmente sen cambiar as súas preferencias por omisión.

 
   
-    Temporarily change the dictionary source:
+    Para cambiar temporalmente a orixe de dicionarios:
     
-      
Select View
-      Dictionary Sources.

+      
Seleccione Ver Orixes de dicionario.

     
     
-      
Double click on the dictionary source that you want to use.

+      
Prema dúas veces sobre a orixe de dicionario que quere usar.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/gl/sources.page gnome-dictionary-3.10.0/help/gl/sources.page
--- gnome-dictionary-3.8.0/help/gl/sources.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/gl/sources.page	2013-10-06 16:42:35.000000000 +0000
@@ -20,7 +20,7 @@
 
     
 
-    Manage various dictionary sources.
+    Xestionar varias orixes de dicionario.
 
   
     
@@ -30,15 +30,12 @@
     
   
 
-  Dictionary sources
+  Orixes do dicionario
 
-  
Dictionary uses dictionary sources to look up words
-  that you search for. Dictionary sources are collections of one or more
-  dictionary databases which are usually online, but can be installed on your
-  machine as well.

+  
Dicionario usa orixes de dicionario para buscar palabras polas que buscar. As orixes de dicionario son coleccións de unha ou máis bases de datos de dicionarios que normalmente están en liña, pero que poden instalarse na súa máquina tamén.

 
   

-    Manage your dictionary sources
+    Xestionar as súas orixes de dicionario.
   

 
 
diff -Nru gnome-dictionary-3.8.0/help/gl/text-copy.page gnome-dictionary-3.10.0/help/gl/text-copy.page
--- gnome-dictionary-3.8.0/help/gl/text-copy.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/gl/text-copy.page	2013-10-06 16:42:35.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Select and copy a definition to another application.
+    Seleccionar e copiar unha definición a outro aplicativo.
 
   
     
@@ -29,27 +29,20 @@
     
   
 
-  Copy definition
+  Copiar definición
 
-  
You can copy and paste definitions from Dictionary to another
-  application.

+  
Pode copiar e pegar unha definición desde Dicionario noutros aplicativos.

 
   
-    Copy a definition
+    Copiar unha definición
     
-      
Select the text that you want to copy in Dictionary.
-      Alternatively, you can select the whole definition using
-      Edit
-      Select All.

+      
Seleccione o texto que quere copiar en Dicionario. De forma alternativa, pode seleccionar toda a definición usando Editar Seleccionar todo.

     
     
-      
Select Edit
-      Copy.

+      
Seleccione Editar Copiar.

     
     
-      
Paste the text into another application. This can usually be done
-      using the CtrlP keyboard shortcut
-      or through one of the menus.

+      
Pegue o texto noutro aplicativo. Isto normalmente faise usando o atallo de teclado CtrlP ou mediante un dos menús.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/definition.page gnome-dictionary-3.10.0/help/id/definition.page
--- gnome-dictionary-3.8.0/help/id/definition.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/definition.page	2013-10-06 16:42:35.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Find the definition of a word or term.
+    Cari definisi dari suatu kata atau istilah.
 
   
     
@@ -31,34 +31,23 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Look up a word or term
+  Mencari suatu kata atau istilah
 
-  
You can use Dictionary to look up the meaning of a
-  term. A term can be a single word such as apple or a
-  compound word such as chopping board. The search result may
-  also show you the origin, importance and usage of a word. To look up a
-  term:

+  
Anda dapat memakai Kamus untuk melihat arti dari suatu istilah. Suatu istilah bisa berupa kata tunggal seperti misalnya apple atau kata kompon seperti misalnya chopping board. Hasil pencarian mungkin juga menunjukkan asal, kepentingan, dan pemakaian dari suatu kata. Untuk mencari suatu istilah:

 
   
     
-      
Type in the term that you want to search for next to
-      Look up.

+      
Ketikkan istilah yang ingin Anda cari di sebelah Cari.

     
     
-      
Press Return or Look up: to
-      search.

+      
Tekan Return atau Cari: untuk mencari.

     
   
 
-  
Dictionary will search your selected dictionary source and
-  show you the result from the first dictionary in the source. To view results
-  from the other dictionaries that are in the same source, select
-  View
-  Similar Words to pop up a
-  sidebar that shows all the results.

+  
Kamus akan mencari sumber kamus yang Anda pilih dan menampilkan hasil dari kamus pertama dalam sumber. Untuk melihat hasil dari kamus lain yang ada dalam sumber yang sama, pilih Tilik Kata Serupa untuk memunculkan suatu bilah sisi yang menampilkan semua hasil.

 
 
diff -Nru gnome-dictionary-3.8.0/help/id/dictionary-select.page gnome-dictionary-3.10.0/help/id/dictionary-select.page
--- gnome-dictionary-3.8.0/help/id/dictionary-select.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/dictionary-select.page	2013-10-06 16:42:35.000000000 +0000
@@ -29,35 +29,28 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Select a different dictionary
+  Pilih kamus lain
 
-  
A single dictionary source may have many
-  different dictionaries. You can search any of these
-  dictionaries.

+  
Suatu sumber kamus mungkin memiliki kamus lain. Anda dapat mencari dari sebarang kamus ini.

 
   
-    Select a dictionary
+    Pilih suatu kamus
     
-      
Select View
-      Available Databases. A sidebar
-      listing the available dictionaries for your currently selected dictionary
-      source will open.

+      
Pilih Tilikan Basis Data Yang Tersedia. Suatu bilah sisi yang menampilkan daftar kamus yang tersedia bagi sumber kamus yang kini dipilih akan terbuka.

     
     
-      
Click twice on the dictionary that you want to use.

+      
Klik dua kali pada kamus yang ingin Anda pakai.

     
   
 
-  
The next term that you look up will show
-  the result only from the selected dictionary.

+  
Istilah selanjutnya yang Anda cari akan menampilkan hasil hanya dari kamus yang dipilih.

 
   
-    
Your dictionary selection will not be remembered next time you use
-    Dictionary.

+    
Pilihan kamus Anda tak akan diingat kali berikutnya Anda memakai Kamus.

   
 
 
diff -Nru gnome-dictionary-3.8.0/help/id/find.page gnome-dictionary-3.10.0/help/id/find.page
--- gnome-dictionary-3.8.0/help/id/find.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/find.page	2013-10-06 16:42:35.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    Find text in a definition.
+    Cari teks dalam suatu definisi.
 
   
     
@@ -30,32 +30,24 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Search within a definition
+  Mencari di dalam suatu definisi
 
-  
Some dictionary entires can be very long and can contain many results, so
-  you may wish to search them to find the section that is relevant to you.

+  
Beberapa entri kamus bisa sangat panjang dan bisa memuat banyak hasil, sehingga Anda mungkin ingin mencari di dalamnya seksi yang relevan bagi Anda.

 
   
-    To find definitions:
+    Untuk mencari definisi:
     
-      
Select Edit
-      Find.

+      
Pilih Sunting Cari.

     
     
-      
The Find bar will appear at the bottom of the
-      Dictionary window. Type in your search term to search within
-      the definition that is currently displayed.

+      
Bilah Cari akan muncul di dasar jendela Kamus. Ketikkan istilah yang akan dicari dalam definisi yang sedang ditampilkan.

     
     
-      
Click Previous or
-      Next to scroll through the results. The search
-      will not wrap around: in other words, it will not go to the top of the
-      page when you are on the last result and click
-      Next.

+      
Klik Sebelumnya atau Selanjutnya untuk menelusuri hasil. Pencarian tidak akan melipat: dengan kata lain, tidak akan kembali ke puncak halaman ketika Anda berada pada hasil terakhir dan mengklik Selanjutnya.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/id.po gnome-dictionary-3.10.0/help/id/id.po
--- gnome-dictionary-3.8.0/help/id/id.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/id.po	2013-10-01 13:07:21.000000000 +0000
@@ -2,897 +2,1146 @@
 # Copyright (C) 2011 gnome-utils's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-utils package.
 # Paula , 2011
-# Andika Triwidada , 2012
+# Andika Triwidada , 2012, 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-dictionary master\n"
-"POT-Creation-Date: 2012-08-21 15:36+0000\n"
-"PO-Revision-Date: 2012-09-15 22:03+0700\n"
+"POT-Creation-Date: 2013-09-10 15:35+0000\n"
+"PO-Revision-Date: 2013-09-18 09:39+0700\n"
 "Last-Translator: Andika Triwidada \n"
 "Language-Team: Indonesian \n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.3\n"
+"X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Put one translator per line, in the form NAME , YEAR1, YEAR2
-#| msgid "translator-credits"
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Paula , 2011.\n"
-"Andika Triwidada , 2012"
+"Andika Triwidada , 2012, 2013"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:150(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-application.png'; "
-#| "md5=fb48a9e5863bfb2b3811df2e28489eb7"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-application.png' "
-"md5='fb48a9e5863bfb2b3811df2e28489eb7'"
-msgstr ""
-"external ref='figures/gnome-dictionary-application.png' "
-"md5='fb48a9e5863bfb2b3811df2e28489eb7'"
-
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:179(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-lookup.png'; "
-#| "md5=c41c96af4de54f457a2081aad009a8d0"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-lookup.png' "
-"md5='c41c96af4de54f457a2081aad009a8d0'"
-msgstr ""
-"external ref='figures/gnome-dictionary-lookup.png' "
-"md5='c41c96af4de54f457a2081aad009a8d0'"
-
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:221(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-find.png'; "
-#| "md5=d8bf0677084e2d9998a7942faaab5379"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-find.png' "
-"md5='d8bf0677084e2d9998a7942faaab5379'"
-msgstr ""
-"external ref='figures/gnome-dictionary-find.png' "
-"md5='d8bf0677084e2d9998a7942faaab5379'"
-
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:262(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-preferences-source.png'; "
-#| "md5=5470b15e64e66924477f150c4f47e96d"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-preferences-source.png' "
-"md5='5470b15e64e66924477f150c4f47e96d'"
-msgstr ""
-"external ref='figures/gnome-dictionary-preferences-source.png' "
-"md5='5470b15e64e66924477f150c4f47e96d'"
-
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:282(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-add-source.png'; "
-#| "md5=d059507fee77bb176fce53373951756b"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-add-source.png' "
-"md5='d059507fee77bb176fce53373951756b'"
-msgstr ""
-"external ref='figures/gnome-dictionary-add-source.png' "
-"md5='d059507fee77bb176fce53373951756b'"
+#. (itstool) path: info/title
+#: C/index.page:8
+msgctxt "text"
+msgid "Dictionary"
+msgstr "Kamus"
+
+#. (itstool) path: credit/name
+#: C/index.page:11 C/definition.page:11 C/dictionary-select.page:11
+#: C/find.page:10 C/introduction.page:10 C/keyboard-shortcuts.page:11
+#: C/pref.page:9 C/print-font.page:11 C/print.page:12
+#: C/prob-retrieving-definition.page:11 C/save-definition.page:10
+#: C/similar-words.page:11 C/source-add-local.page:11
+#: C/sources-default.page:10 C/sources-delete.page:11 C/sources-edit.page:10
+#: C/sources.page:12 C/sources-select.page:12 C/text-copy.page:11
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#. (itstool) path: credit/years
+#: C/index.page:13 C/definition.page:13 C/definition.page:18
+#: C/dictionary-select.page:13 C/dictionary-select.page:18 C/find.page:12
+#: C/find.page:17 C/introduction.page:12 C/introduction.page:17
+#: C/keyboard-shortcuts.page:13 C/keyboard-shortcuts.page:18
+#: C/print-font.page:13 C/print-font.page:18 C/print.page:14 C/print.page:19
+#: C/prob-retrieving-definition.page:13 C/prob-retrieving-definition.page:18
+#: C/save-definition.page:12 C/save-definition.page:17 C/similar-words.page:13
+#: C/similar-words.page:18 C/source-add-local.page:13
+#: C/sources-default.page:12 C/sources-default.page:17
+#: C/sources-delete.page:13 C/sources-delete.page:18 C/sources-edit.page:12
+#: C/sources-edit.page:17 C/sources.page:14 C/sources.page:19
+#: C/sources-select.page:14 C/sources-select.page:19 C/text-copy.page:13
+#: C/text-copy.page:18
+msgid "2013"
+msgstr "2013"
+
+#. (itstool) path: info/desc
+#: C/index.page:18
+msgid "Look up word definitions in Dictionary."
+msgstr "Cari definisi kata dalam Kamus."
+
+#. (itstool) path: page/title
+#: C/index.page:21
+msgid "<_:media-1/> Dictionary Help"
+msgstr "<_:media-1/> Bantuan Kamus"
+
+#. (itstool) path: section/title
+#: C/index.page:26
+msgid "Features"
+msgstr "Fitur"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:351(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-preferences-print.png'; "
-#| "md5=12a65f07cb333db4c7ba743d1d12a00f"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-preferences-print.png' "
-"md5='12a65f07cb333db4c7ba743d1d12a00f'"
-msgstr ""
-"external ref='figures/gnome-dictionary-preferences-print.png' "
-"md5='12a65f07cb333db4c7ba743d1d12a00f'"
+#. (itstool) path: section/title
+#: C/index.page:30
+msgid "Preferences"
+msgstr "Preferensi"
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:385(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-applet.png'; "
-#| "md5=538c7fa191540f99dd964963a1079677"
-msgctxt "_"
-msgid ""
-"external ref='figures/gnome-dictionary-applet.png' "
-"md5='538c7fa191540f99dd964963a1079677'"
-msgstr ""
-"external ref='figures/gnome-dictionary-applet.png' "
-"md5='538c7fa191540f99dd964963a1079677'"
+#. (itstool) path: section/title
+#: C/index.page:34
+msgid "Common problems and solutions"
+msgstr "Masalah umum dan solusinya"
+
+#. (itstool) path: credit/name
+#: C/definition.page:16 C/dictionary-select.page:16 C/find.page:15
+#: C/introduction.page:15 C/keyboard-shortcuts.page:16 C/print-font.page:16
+#: C/print.page:17 C/prob-retrieving-definition.page:16
+#: C/save-definition.page:15 C/similar-words.page:16 C/sources-default.page:15
+#: C/sources-delete.page:16 C/sources-edit.page:15 C/sources.page:17
+#: C/sources-select.page:17 C/text-copy.page:16
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#. (itstool) path: info/desc
+#: C/definition.page:23
+msgid "Find the definition of a word or term."
+msgstr "Cari definisi dari suatu kata atau istilah."
+
+#. (itstool) path: page/title
+#: C/definition.page:27
+msgid "Look up a word or term"
+msgstr "Mencari suatu kata atau istilah"
+
+#. (itstool) path: page/p
+#: C/definition.page:29
+msgid ""
+"You can use Dictionary to look up the meaning of a term. "
+"A term can be a single word such as apple or a compound word "
+"such as chopping board. The search result may also show you "
+"the origin, importance and usage of a word. To look up a term:"
+msgstr ""
+"Anda dapat memakai Kamus untuk melihat arti dari suatu "
+"istilah. Suatu istilah bisa berupa kata tunggal seperti misalnya "
+"apple atau kata kompon seperti misalnya chopping "
+"board. Hasil pencarian mungkin juga menunjukkan asal, kepentingan, "
+"dan pemakaian dari suatu kata. Untuk mencari suatu istilah:"
+
+#. (itstool) path: item/p
+#: C/definition.page:37
+msgid ""
+"Type in the term that you want to search for next to Look up."
+msgstr "Ketikkan istilah yang ingin Anda cari di sebelah Cari."
+
+#. (itstool) path: item/p
+#: C/definition.page:41
+msgid ""
+"Press Return or Look up: to search."
+msgstr ""
+"Tekan Return atau Cari: untuk mencari."
+
+#. (itstool) path: page/p
+#: C/definition.page:46
+msgid ""
+"Dictionary will search your selected dictionary source and show "
+"you the result from the first dictionary in the source. To view results from "
+"the other dictionaries that are in the same source, select View Similar Words to pop up a sidebar that "
+"shows all the results."
+msgstr ""
+"Kamus akan mencari sumber kamus yang Anda pilih dan menampilkan "
+"hasil dari kamus pertama dalam sumber. Untuk melihat hasil dari kamus lain "
+"yang ada dalam sumber yang sama, pilih Tilik Kata "
+"Serupa untuk memunculkan suatu bilah sisi yang "
+"menampilkan semua hasil."
+
+#. (itstool) path: page/title
+#: C/dictionary-select.page:25
+msgid "Select a different dictionary"
+msgstr "Pilih kamus lain"
+
+#. (itstool) path: page/p
+#: C/dictionary-select.page:27
+msgid ""
+"A single dictionary source may have many "
+"different dictionaries. You can search any of these dictionaries."
+msgstr ""
+"Suatu sumber kamus mungkin memiliki kamus "
+"lain. Anda dapat mencari dari sebarang kamus ini."
+
+#. (itstool) path: steps/title
+#: C/dictionary-select.page:32
+msgid "Select a dictionary"
+msgstr "Pilih suatu kamus"
+
+#. (itstool) path: item/p
+#: C/dictionary-select.page:34
+msgid ""
+"Select View Available Databases. A sidebar listing the available "
+"dictionaries for your currently selected dictionary source will open."
+msgstr ""
+"Pilih Tilikan Basis Data Yang Tersedia. Suatu bilah sisi yang "
+"menampilkan daftar kamus yang tersedia bagi sumber kamus yang kini dipilih "
+"akan terbuka."
+
+#. (itstool) path: item/p
+#: C/dictionary-select.page:40
+msgid "Click twice on the dictionary that you want to use."
+msgstr "Klik dua kali pada kamus yang ingin Anda pakai."
+
+#. (itstool) path: page/p
+#: C/dictionary-select.page:44
+msgid ""
+"The next term that you look up will show "
+"the result only from the selected dictionary."
+msgstr ""
+"Istilah selanjutnya yang Anda cari akan "
+"menampilkan hasil hanya dari kamus yang dipilih."
+
+#. (itstool) path: note/p
+#: C/dictionary-select.page:48
+msgid ""
+"Your dictionary selection will not be remembered next time you use "
+"Dictionary."
+msgstr ""
+"Pilihan kamus Anda tak akan diingat kali berikutnya Anda memakai Kamus."
+
+#. (itstool) path: info/desc
+#: C/find.page:22
+msgid "Find text in a definition."
+msgstr "Cari teks dalam suatu definisi."
+
+#. (itstool) path: page/title
+#. (itstool) path: td/p
+#: C/find.page:26 C/keyboard-shortcuts.page:74
+msgid "Search within a definition"
+msgstr "Mencari di dalam suatu definisi"
+
+#. (itstool) path: page/p
+#: C/find.page:28
+msgid ""
+"Some dictionary entries can be very long and can contain many results, so "
+"you may wish to search them to find the section that is relevant to you."
+msgstr ""
+"Beberapa entri kamus bisa sangat panjang dan bisa memuat banyak hasil, "
+"sehingga Anda mungkin ingin mencari di dalamnya seksi yang relevan bagi Anda."
+
+#. (itstool) path: steps/title
+#: C/find.page:32
+msgid "To find definitions:"
+msgstr "Untuk mencari definisi:"
+
+#. (itstool) path: item/p
+#: C/find.page:34
+msgid ""
+"Select Edit Find."
+msgstr ""
+"Pilih Sunting Cari."
+
+#. (itstool) path: item/p
+#: C/find.page:38
+msgid ""
+"The Find bar will appear at the bottom of the Dictionary window. Type in your search term to search within the definition that "
+"is currently displayed."
+msgstr ""
+"Bilah Cari akan muncul di dasar jendela Kamus. "
+"Ketikkan istilah yang akan dicari dalam definisi yang sedang ditampilkan."
+
+#. (itstool) path: item/p
+#: C/find.page:43
+msgid ""
+"Click Previous or Next to scroll through the results. The search will not wrap around: in "
+"other words, it will not go to the top of the page when you are on the last "
+"result and click Next."
+msgstr ""
+"Klik Sebelumnya atau Selanjutnya untuk menelusuri hasil. Pencarian tidak akan melipat: "
+"dengan kata lain, tidak akan kembali ke puncak halaman ketika Anda berada "
+"pada hasil terakhir dan mengklik Selanjutnya."
 
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#.
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.docbook:421(imagedata)
-#| msgid ""
-#| "@@image: 'figures/gnome-dictionary-applet-window.png'; "
-#| "md5=e26ac4847d2e7b53c6bba7d8e1a519c4"
+#: C/introduction.page:38
 msgctxt "_"
 msgid ""
-"external ref='figures/gnome-dictionary-applet-window.png' "
-"md5='e26ac4847d2e7b53c6bba7d8e1a519c4'"
-msgstr ""
-"external ref='figures/gnome-dictionary-applet-window.png' "
-"md5='e26ac4847d2e7b53c6bba7d8e1a519c4'"
+"external ref='figures/gnome-dictionary.png' "
+"md5='80df283344ecd9b03b88309f8ee9912d'"
+msgstr "-"
+
+#. (itstool) path: info/desc
+#: C/introduction.page:22
+msgid "What is Dictionary?"
+msgstr "Apa itu Kamus?"
 
-#: C/index.docbook:24(articleinfo/title)
-msgid "Dictionary Manual"
-msgstr "Manual Kamus"
-
-#: C/index.docbook:27(abstract/para)
-msgid ""
-"Dictionary enables you to look up definitions and correct spellings of words."
-msgstr ""
-"Kamus memungkinkan Anda untuk mencari definisi dan ejaan kata-kata yang "
-"benar."
-
-#: C/index.docbook:33(articleinfo/copyright)
-msgid "2005 Emmanuele Bassi"
-msgstr "2005 Emmanuele Bassi"
-
-#: C/index.docbook:48(publisher/publishername)
-#: C/index.docbook:83(revdescription/para)
-msgid "GNOME Documentation Project"
-msgstr "Proyek Dokumentasi GNOME"
-
-#: C/index.docbook:2(legalnotice/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."
-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 ""
-"Hak diberikan untuk menyalin, mendistribusikan, dan/atau mengubah dokumen "
-"ini di bawah persyaratan GNU Free Documentation License (GFDL, Lisensi "
-"Dokumentasi Bebas GNU), Versi 1.1 atau sebarang versi setelahnya yang "
-"dipublikasikan oleh Free Software Foundation tanpa Invariant Section, tanpa "
-"Front-Cover Texts, dan tanpa Back-Cover Texts. Anda dapat menemukan salinan "
-"dari GFDL pada taut ini atau "
-"di dalam berkas COPYING-DOCS yang didistribusikan bersama manual ini."
-
-#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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 ""
-"Manual ini bagian dari koleksi manual GNOME yang disebarkan dibawah GFDL. "
-"Bila Anda ingin menyebarkan manual ini secara terpisah dari koleksi, Anda "
-"dapat menambahkan salinan lisensi ke manual, seperti yang dijelaskan di "
-"bagian 6 dari lisensi."
-
-#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 ""
-"Banyak nama yang dipakai oleh perusahaan-perusahaan untuk membedakan produk "
-"dan layanan mereka diklaim sebagai merek dagang. Nama-nama tersebut muncul "
-"dalam dokumentasi GNOME, dan anggota Projek Dokumentasi GNOME disadarkan "
-"atas merek dagang tersebut, maka nama-nama akan ditulis dalam huruf besar "
-"atau huruf awal huruf besar."
-
-#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/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 ""
-"DOKUMEN DISEDIAKAN DALAM BENTUK \"APA ADANYA\", TANPA JAMINAN APAPUN, YANG "
-"DINYATAKAN MAUPUN TERSIRAT, TERMASUK, TANPA PEMBATASAN, JAMINAN BAHWA "
-"DOKUMEN ATAU VERSI YANG DIMODIFIKASI DARI DOKUMEN BEBAS DARI KERUSAKAN YANG "
-"DAPAT DIPERJUALBELIKAN, COCOK UNTUK KEPERLUAN TERTENTU ATAU TAK MELANGGAR. "
-"SEMUA RESIKO ATAS KUALITAS, KETEPATAN, DAN KINERJA DOKUMEN ATAU VERSI YANG "
-"DIMODIFIKASI ADA PADA ANDA. BILA SEBARANG DOKUMEN ATAU VERSI YANG "
-"DIMODIFIKASI DARI DOKUMEN TERBUKTI RUSAK DALAM HAL APAPUN, ANDA (BUKAN "
-"PENULIS AWAL, PENGARANG, ATAU SEBARANG PENYUMBANG) MENANGGUNG BIAYA UNTUK "
-"PELAYANAN, PERBAIKAN, ATAU KOREKSI YANG DIPERLUKAN. DISKLAIMER JAMINAN INI "
-"MENJADI BAGIAN ESENSIAL DARI LISENSI INI. TIDAK ADA PEMAKAIAN SEBARANG "
-"DOKUMEN ATAU VERSI YANG DIMODIFIKASI DARI DOKUMEN YANG DIIJINKAN KECUALI DI "
-"BAWAH DISKLAIMER INI, DAN"
-
-#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/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 ""
-"TIDAK DI BAWAH KEADAAN APAPUN DAN TIDAK DI BAWAH TEORI HUKUM, APAKAH TORT "
-"(TERMASUK KETIDAKPEDULIAN), KONTRAK, ATAU APAPUN, DIMANA PENGARANG, PENULIS "
-"AWAL, SEBARANG PENYUMBANG, ATAU SEBARANG DISTRIBUTOR DOKUMEN ATAU VERSI YANG "
-"DIMODIFIKASI DARI DOKUMEN, ATAU SEBARANG SUPPLIER DARI SEBARANG PIHAK, "
-"BERTANGGUNG JAWAB ATAS SEBARANG ORANG BAGI SEBARANG KERUSAKAN LANGSUNG, TAK "
-"LANGSUNG, KHUSUS, INSIDENTAL, ATAU KONSEKUENSIAL DARI APAPUN TERMASUK, TANPA "
-"PEMBATASAN, KERUSAKAN ATAS HILANGNYA GOODWILL, BERHENTINYA PEKERJAAN, "
-"KEGAGALAN KOMPUTER, ATAU MALFUNGSI, ATAU SEBARANG DAN SEMUA KERUSAKAN LAIN "
-"ATAU KEHILANGAN YANG TIMBUL KARENA ATAU TERKAIT DENGAN PENGGUNAAN DOKUMEN "
-"DAN VERSI YANG DIMODIFIKASI DARI DOKUMEN, BAHKAN BILA PIHAK TERSEBUT "
-"MESTINYA TELAH DIBERITAHU TENTANG KEMUNGKINAN KERUSAKAN TERSEBUT."
-
-#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: "
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<_:orderedlist-1/>"
-msgstr ""
-"DOKUMEN DAN VERSI YANG DOKUMEN YANG DIMODIFIKASI DISEDIAKAN DI BAWAH "
-"PERSYARATAN LISENSI GNU FREE DOCUMENTATION DENGAN PENGERTIAN LEBIH LANJUT "
-"BAHWA: <_:orderedlist-1/>"
-
-#: C/index.docbook:54(authorgroup/author)
-msgid ""
-"Emmanuele Bassi  "
-"
ebassi@gmail.com
 "
-msgstr ""
-"Emmanuele Bassi  "
-"
ebassi@gmail.com
 "
-
-#: C/index.docbook:82(revdescription/para)
-msgid "Emmanuele Bassi"
-msgstr "Emmanuele Bassi"
-
-#: C/index.docbook:78(revhistory/revision)
-msgid ""
-"Dictionary Manual V1.0.0 January 2005 <_:"
-"revdescription-1/>"
-msgstr ""
-"Manual Kamus V1.0.0 Januari 2005 <_:"
-"revdescription-1/>"
-
-#: C/index.docbook:88(articleinfo/releaseinfo)
-msgid "This manual describes version 2.14.0 of Dictionary."
-msgstr "Manual ini menggambarkan versi 2.14.0 dari Kamus."
-
-#: C/index.docbook:90(legalnotice/title)
-msgid "Feedback"
-msgstr "Umpan Balik"
-
-#: C/index.docbook:91(legalnotice/para)
-#| msgid ""
-#| "To report a bug or make a suggestion regarding the Dictionary application "
-#| "or this manual, follow the directions in the GNOME Feedback Page."
-msgid ""
-"To report a bug or make a suggestion regarding the Dictionary application or "
-"this manual, follow the directions in the GNOME Feedback Page."
-msgstr ""
-"Untuk melaporkan sebuah kutu atau memberikan saran tentang aplikasi Kamus "
-"atau manual ini, ikuti petunjuk di Halaman Umpan Balik GNOME."
-
-#: C/index.docbook:100(article/indexterm)
-msgid "Dictionary"
-msgstr "Kamus"
-
-#: C/index.docbook:107(sect1/title)
+#. (itstool) path: page/title
+#: C/introduction.page:26
 msgid "Introduction"
 msgstr "Pengantar"
 
-#: C/index.docbook:109(sect1/para)
-msgid ""
-"The Dictionary application enables you to search "
-"words and terms on a dictionary source."
-msgstr ""
-"Aplikasi Dictionary memungkinkan Anda untuk "
-"mencari kata-kata dan istilah-istilah dari sumber kamus."
-
-#: C/index.docbook:116(sect1/title)
-msgid "Getting Started"
-msgstr "Untuk Memulai"
-
-#: C/index.docbook:120(sect2/title)
-msgid "To Start Dictionary"
-msgstr "Untuk Memulai Kamus"
-
-#: C/index.docbook:122(sect2/para)
+#. (itstool) path: page/p
+#: C/introduction.page:28
 msgid ""
-"You can start Dictionary in the following ways:"
-msgstr ""
-"Anda bisa memulai Dictionary dengan cara-cara "
+"Dictionary is an application for looking up term definitions. It "
+"searches for definitions using an online DICT server. The default "
+"DICT server is at http://dict.org."
+msgstr ""
+"Kamus adalah suatu aplikasi untuk mencari definisi istilah. Ini "
+"mencari definisi memakai server DICT daring. Server DICT bawaan adalah di http://dict.org."
+
+#. (itstool) path: page/p
+#: C/introduction.page:33
+msgid ""
+"Start using Dictionary by looking up a "
+"definition!"
+msgstr ""
+"Mulailah memakai Kamus dengan mencari "
+"suatu definisi!"
+
+#. (itstool) path: figure/title
+#: C/introduction.page:37
+msgid "Dictionary"
+msgstr "Kamus"
+
+#. (itstool) path: media/p
+#: C/introduction.page:39
+msgid "Screenshot showing the Dictionary main window."
+msgstr "Cuplikan layar yang menampilkan jendela utama Kamus."
+
+#. (itstool) path: info/desc
+#: C/keyboard-shortcuts.page:23
+msgid ""
+"You can use keyboard shortcuts to navigate around Dictionary more "
+"efficiently."
+msgstr ""
+"Anda dapat memakai pintasan papan tik untuk menavigasi Kamus "
+"secara lebih efisien."
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:27
+msgid "Keyboard shortcuts"
+msgstr "Pintasan papan tik"
+
+#. (itstool) path: page/p
+#: C/keyboard-shortcuts.page:29
+msgid ""
+"Keyboard shortcuts are combinations of keys that you can use instead of "
+"navigating through the menu. The following shortcuts are available:"
+msgstr ""
+"Pintasan papan tik adalah kombinasi tombol yang dapat Anda pakai sebagai "
+"pengganti dari navigasi melalui menu. Pintasan papan tik berikut tersedia:"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:33
+msgid "Navigate around Dictionary"
+msgstr "Menavigasi Kamus"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:36 C/keyboard-shortcuts.page:68
+#: C/keyboard-shortcuts.page:92 C/keyboard-shortcuts.page:120
+msgid "Action"
+msgstr "Aksi"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:37 C/keyboard-shortcuts.page:69
+#: C/keyboard-shortcuts.page:93 C/keyboard-shortcuts.page:121
+msgid "Shortcut"
+msgstr "Pintasan"
+
+#. (itstool) path: td/p
+#. (itstool) path: section/title
+#: C/keyboard-shortcuts.page:42 C/print.page:36
+msgid "Print preview"
+msgstr "Pratinjau cetak"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:43
+msgid "ShiftCtrlP"
+msgstr "ShiftCtrlP"
+
+#. (itstool) path: td/p
+#. (itstool) path: section/title
+#: C/keyboard-shortcuts.page:46 C/print.page:67
+msgid "Print"
+msgstr "Cetak"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:47
+msgid "CtrlP"
+msgstr "CtrlP"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:50
+msgid "View sidebar"
+msgstr "Lihat bilah sisi"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:51
+msgid "F9"
+msgstr "F9"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:54
+msgid "Open a new Dictionary window"
+msgstr "Membuka jendela Kamus baru"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:55
+msgid "CtrlN"
+msgstr "CtrlN"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:58
+msgid "Close current Dictionary window"
+msgstr "Tutup jendela Kamus saat ini"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:59
+msgid "CtrlW"
+msgstr "CtrlW"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:65
+msgid "Search shortcuts"
+msgstr "Pintasan pencarian"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:75
+msgid "/ or CtrlF"
+msgstr "/ atau CtrlF"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:78
+msgid "Find next"
+msgstr "Cari selanjutnya"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:79
+msgid "CtrlG"
+msgstr "CtrlG"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:82
+msgid "Find previous"
+msgstr "Cari sebelumnya"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:83
+msgid "ShiftCtrlG"
+msgstr "ShiftCtrlG"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:89
+msgid "Navigate within a definition"
+msgstr "Menavigasi dalam suatu definisi"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:98
+msgid "Previous definition"
+msgstr "Definisi sebelumnya"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:99
+msgid "CtrlPage Up"
+msgstr "CtrlPage Up"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:102
+msgid "Next definition"
+msgstr "Definisi selanjutnya"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:103
+msgid "CtrlPage Down"
+msgstr "CtrlPage Down"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:106
+msgid "First definition"
+msgstr "Definisi pertama"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:107
+msgid "CtrlHome"
+msgstr "CtrlHome"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:110
+msgid "Last definition"
+msgstr "Definisi terakhir"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:111
+msgid "CtrlEnd"
+msgstr "CtrlEnd"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:117
+msgid "Dictionary definitions shortcuts:"
+msgstr "Pintasan definisi Kamus:"
+
+#. (itstool) path: td/p
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:126 C/similar-words.page:27
+msgid "Similar words"
+msgstr "Kata serupa"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:127
+msgid "CtrlT"
+msgstr "CtrlT"
+
+#. (itstool) path: td/p
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:130 C/sources.page:28
+msgid "Dictionary sources"
+msgstr "Sumber-Sumber kamus"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:131
+msgid "CtrlD"
+msgstr "CtrlD"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:134
+msgid "Available databases"
+msgstr "Basis data yang tersedia"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:135
+msgid "CtrlB"
+msgstr "CtrlB"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Available strategies"
+msgstr "Strategi yang tersedia"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:139
+msgid "CtrlR"
+msgstr "CtrlR"
+
+#. (itstool) path: p/link
+#: C/legal.xml:3
+msgid "http://creativecommons.org/licenses/by-sa/3.0/"
+msgstr "http://creativecommons.org/licenses/by-sa/3.0/"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid ""
+"This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 "
+"Unported License. To view a copy of this license, visit <_:link-1/> or send "
+"a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, "
+"California, 94041, USA."
+msgstr ""
+"Karya ini dilisensikan di bawah Creative Commons Attribution-ShareAlike 3.0 "
+"Unported License. Untuk melihat suatu salinan dari lisensi ini, kunjungi <_:"
+"link-1/> atau kirimlah surat ke Creative Commons, 444 Castro Street, Suite "
+"900, Mountain View, California, 94041, USA."
+
+#. (itstool) path: info/desc
+#: C/pref.page:15
+msgid "Manage your preferences."
+msgstr "Kelola preferensi Anda."
+
+#. (itstool) path: page/title
+#: C/pref.page:18
+msgid "Dictionary preferences"
+msgstr "Preferensi Kamus"
+
+#. (itstool) path: info/desc
+#: C/print-font.page:23
+msgid "Select the font for printing definitions."
+msgstr "Pilih fonta untuk mencetak definisi."
+
+#. (itstool) path: page/title
+#: C/print-font.page:27
+msgid "Print font"
+msgstr "Fonta cetak"
+
+#. (itstool) path: page/p
+#: C/print-font.page:29
+msgid ""
+"You can change the default font face and size that are used for printing the "
+"definitions."
+msgstr ""
+"Anda dapat mengubah muka dan ukuran fonta baku yang dipakai ketika mencetak "
+"definisi."
+
+#. (itstool) path: steps/title
+#: C/print-font.page:33
+msgid "Change the font"
+msgstr "Mengubah fonta"
+
+#. (itstool) path: item/p
+#: C/print-font.page:35
+msgid ""
+"Select Dictionary Preferences Print."
+msgstr ""
+"Pilih Kamus Preferensi Cetak."
+
+#. (itstool) path: item/p
+#: C/print-font.page:40
+msgid "Click font selector button."
+msgstr "Klik tombol pemilih fonta."
+
+#. (itstool) path: item/p
+#: C/print-font.page:43
+msgid "Select the font that you wish to use."
+msgstr "Pilih fonta yang ingin Anda pakai."
+
+#. (itstool) path: item/p
+#: C/print-font.page:46
+msgid ""
+"Drag the slider to the right to increase the font size or left to decrease "
+"it. Alternatively, you can type in the font size in the text box, or use the "
+"- and + buttons to decrease and increase the font size."
+msgstr ""
+"Seret penggeser ke kanan untuk memperbesar ukuran fonta atau ke kiri untuk "
+"memperkecilnya. Sebagai alternatif, Anda dapat mengetikkan ukuran fonta "
+"dalam kotak teks, atau memakai tombol - dan + untuk "
+"mengurangi dan meningkatkan ukuran fonta."
+
+#. (itstool) path: item/p
+#: C/print-font.page:52
+msgid "Click Select to save your font settings."
+msgstr ""
+"Klik Pilih untuk menyimpan pengaturan fonta Anda."
+
+#. (itstool) path: page/p
+#: C/print-font.page:56
+msgid ""
+"The definition is not reflowed for printing, so if you choose a large font "
+"size, some of the text may be cut off."
+msgstr ""
+"Definisi tak ditata ulang untuk pencetakan, sehingga bila Anda memilih suatu "
+"ukuran fonta yang besar, sebagian teks mungkin terpotong."
+
+#. (itstool) path: info/desc
+#: C/print.page:24
+msgid "Print preview and print definitions."
+msgstr "Pratinjau cetak dan cetak definisi."
+
+#. (itstool) path: page/title
+#: C/print.page:28
+msgid "Print a definition"
+msgstr "Mencetak suatu definisi"
+
+#. (itstool) path: page/p
+#: C/print.page:30
+msgid ""
+"You can print a definition to paper or a file. Before printing, you should "
+"preview the definition as it would be printed to check that the text fits "
+"onto the page, especially if you have changed the print font size."
+msgstr ""
+"Anda dapat mencetak suatu definisi ke kertas atau suatu berkas. Sebelum "
+"mencetak, Anda mesti mempratinjau definisi bagaimana akan dicetak untuk "
+"memeriksa bahwa teks cukup termuat pada halaman, khususnya bila Anda telah "
+"mengubah ukuran fonta cetak."
+
+#. (itstool) path: item/p
+#: C/print.page:40
+msgid ""
+"Select File Preview."
+msgstr ""
+"Pilih Berkas Pratinjau."
+
+#. (itstool) path: item/p
+#: C/print.page:44
+msgid ""
+"A print preview window will open which will show you the definition exactly "
+"as it will be printed."
+msgstr ""
+"Suatu jendela pratinjau cetak akan terbuka yang menunjukkan definisi akan "
+"dicetak tepat seperti apa."
+
+#. (itstool) path: item/p
+#: C/print.page:48
+msgid "Use the toolbar to browse pages, adjust zoom level and page width."
+msgstr ""
+"Gunakan bilah alat untuk meramban halaman, menyesuaikan tingkat zum, dan "
+"lebar halaman."
+
+#. (itstool) path: item/p
+#: C/print.page:52
+msgid ""
+"Click the Print this document to print the "
+"definition or close the window to end the preview."
+msgstr ""
+"Klik Cetak dokumen ini untuk mencetak definisi "
+"atau tutup jendela untuk mengakhiri pratinjau."
+
+#. (itstool) path: note/p
+#: C/print.page:58
+msgid ""
+"The print button in the toolbar may not always work. If it does not work for "
+"you, close the window and select File Print."
+msgstr ""
+"Tombol cetak dalam bilah alat mungkin tak selalu bekerja. Bila itu tak "
+"bekerja bagi Anda, tutup jendela dan pilih Berkas Cetak."
+
+#. (itstool) path: section/p
+#: C/print.page:69
+msgid ""
+"You need to have a printer set up to be able to print to paper."
+msgstr ""
+"Anda perlu pencetak yang telah "
+"disiapkan untuk bisa mencetak ke kertas."
+
+#. (itstool) path: item/p
+#: C/print.page:74
+msgid ""
+"Select File Print General."
+msgstr ""
+"Pilih Berkas Cetak Umum."
+
+#. (itstool) path: item/p
+#: C/print.page:79
+msgid ""
+"Select the printer that you want to use from the list of printers or select "
+"Print to File."
+msgstr ""
+"Pilih pencetak yang ingin Anda pakai dari daftar pencetak atau pilih Cetak ke Berkas."
+
+#. (itstool) path: item/p
+#: C/print.page:84
+msgid ""
+"Chose your printing settings."
+msgstr ""
+"Pilih pengaturan pencetak Anda."
+
+#. (itstool) path: item/p
+#: C/print.page:88
+msgid "Press Print to print the definition."
+msgstr "Tekan Cetak untuk mencetak definisi."
+
+#. (itstool) path: info/desc
+#: C/prob-retrieving-definition.page:23
+msgid "Error while retrieving definitions."
+msgstr "Galat ketika mengambil definisi."
+
+#. (itstool) path: page/title
+#: C/prob-retrieving-definition.page:27
+msgid "Cannot find definitions"
+msgstr "Tak bisa temukan definisi"
+
+#. (itstool) path: page/p
+#: C/prob-retrieving-definition.page:29
+msgid ""
+"If you see the error message Error while retrieving definition "
+"when looking up a definition from any of the selected dictionaries, the problem is more likely one of the "
+"following:"
+msgstr ""
+"Bila Anda menemui pesan kesalahan Galat ketika mengambil definisi "
+"ketika mencari suatu definisi dari sebarang kamus yang dipilih, masalahnya sangat mungkin satu dari yang "
 "berikut:"
 
-#: C/index.docbook:127(varlistentry/term)
-msgid "Applications menu"
-msgstr "Menu Aplikasi"
-
-#: C/index.docbook:129(listitem/para)
-#| msgid ""
-#| "Choose AccessoriesDictionary."
+#. (itstool) path: item/p
+#: C/prob-retrieving-definition.page:36
 msgid ""
-"Choose Accessories "
-"Dictionary."
+"One or more of the selected DICT servers that are used to look up "
+"definitions may not be working. You can try waiting a while before looking up the definition again."
 msgstr ""
-"Pilih AksesoriKamus."
-
-#: C/index.docbook:135(varlistentry/term)
-msgid "Command line"
-msgstr "Baris Perintah"
-
-#: C/index.docbook:137(listitem/para)
-msgid "Execute the following command: gnome-dictionary"
-msgstr "Laksanakan langkah berikut: gnome-dictionary"
-
-#: C/index.docbook:142(sect2/para)
-msgid ""
-"Once started, the Dictionary window is displayed:"
-msgstr "Ketika dimulai, jendela Kamus ditampilkan:"
-
-#: C/index.docbook:146(figure/title) C/index.docbook:175(figure/title)
-#: C/index.docbook:217(figure/title) C/index.docbook:258(figure/title)
-#: C/index.docbook:278(figure/title) C/index.docbook:347(figure/title)
-msgid "Dictionary Window"
-msgstr "Jendela Kamus"
+"Satu atau lebih server DICT yang dipilih yang dipakai untuk "
+"mencari definisi mungkin tak bekerja. Anda dapat mencoba menunggu sebentar "
+"sebelum mencari definisi lagi."
 
-#: C/index.docbook:148(screenshot/mediaobject)
+#. (itstool) path: item/p
+#: C/prob-retrieving-definition.page:42
 msgid ""
-"   Shows Dictionary main "
-"window."
+"You may not have a working Internet connection. For Dictionary to "
+"look up terms, your computer must be able "
+"to connect to dict.org."
 msgstr ""
-"   Menampilkna jendela "
-"utama Kamus."
+"Anda mungkin tak memiliki koneksi Internet. Agar Kamus mencari "
+"istilah Anda, komputer Anda harus bisa "
+"menyambung ke dict.org."
 
-#: C/index.docbook:163(sect1/title)
-msgid "Usage"
-msgstr "Pengunaan"
+#. (itstool) path: info/desc
+#: C/save-definition.page:22
+msgid "Save a copy of a definition to a text file."
+msgstr "Simpan suatu salinan definisi ke suatu berkas teks."
 
-#: C/index.docbook:166(sect2/title)
-msgid "Looking up a word"
-msgstr "Mencari suatu kata."
+#. (itstool) path: page/title
+#: C/save-definition.page:26
+msgid "Save a definition"
+msgstr "Simpan suatu definisi"
 
-#: C/index.docbook:168(sect2/para)
+#. (itstool) path: page/p
+#: C/save-definition.page:28
 msgid ""
-"To look up a word, type it into the entry field and "
-"press Enter."
+"You can save a definition to a text file. This may be useful if you want to "
+"use it outside of Dictionary."
 msgstr ""
-"Untuk mencari suatu kata, ketik kata tersebut kedalam ruas entri dan tekan Enter."
+"Anda dapat menyimpan suatu definisi ke suatu berkas teks. Ini mungkin "
+"berguna bila Anda ingin memakainya di luar Kamus."
 
-#: C/index.docbook:171(sect2/para)
-msgid ""
-"If some definition for the word is found, it will appear inside the main "
-"window area:"
-msgstr ""
-"Bila suatu definisi untuk kata ditemukan, definisi tersebut akan muncul di "
-"dalam area jendela utama:"
+#. (itstool) path: steps/title
+#: C/save-definition.page:32
+msgid "To save a definition:"
+msgstr "Untuk menyimpan definisi:"
 
-#: C/index.docbook:177(screenshot/mediaobject)
+#. (itstool) path: item/p
+#: C/save-definition.page:34
 msgid ""
-"   Shows a definition "
-"inside the Dictionary main window."
+"Select File Save a "
+"Copy…."
 msgstr ""
-"   Menampilkan suatu "
-"definisi di dalam jendela utama Kamus."
+"Pilih Berkas Simpan suatu Salinan…."
 
-#: C/index.docbook:186(sect2/para)
+#. (itstool) path: item/p
+#: C/save-definition.page:38
 msgid ""
-"Otherwise, an error dialog will appear, with a message explaining the nature "
-"of the error."
+"Chose where you want to save the definition to and a name for the file. You "
+"may want to add a .txt file extension to the end of the file "
+"name."
 msgstr ""
-"Jika tidak, sebuah dialog kesalahan akan muncul, dengan pesan yang "
-"menjelaskan kesalahan tersebut."
+"Pilih tempat dimana Anda ingin menyimpan definisi dan suatu nama bagi "
+"berkas. Anda mungkin ingin menambahkan ekstensi berkas .txt di "
+"akhir nama berkas."
 
-#: C/index.docbook:192(sect2/title)
-msgid "Save look up results"
-msgstr "Simpan hasil pencarian"
+#. (itstool) path: item/p
+#: C/save-definition.page:43
+msgid "Press Save to save the definition."
+msgstr "Tekan Simpan untuk menyimpan definisi."
 
-#: C/index.docbook:194(sect2/para)
-msgid ""
-"To save the results of a look up, choose FileSave a Copy. Enter a name "
-"for the file in the Save a Copy dialog, then click "
-"Save."
-msgstr ""
-"Untuk menyimpan hasil pencarian, pilih BerkasSimpan Salinan. Masukkan "
-"nama untuk berkas di dialog Simpan Salinan lalu klik "
-"Simpan."
-
-#: C/index.docbook:199(sect2/title)
-msgid "Print look up results"
-msgstr "Cetak hasil pencarian"
+#. (itstool) path: info/desc
+#: C/similar-words.page:23
+msgid "View related results in other dictionaries."
+msgstr "Lihat hasil terkait di kamus lain."
 
-#: C/index.docbook:201(sect2/para)
+#. (itstool) path: page/p
+#: C/similar-words.page:29
 msgid ""
-"To print the results of a look up, choose FilePrint."
+"Dictionary will only display the definition from one of your "
+"dictionaries. To check if there are search results in other dictionaries:"
 msgstr ""
-"Untuk mencetak hasil pencarian, pilih BerkasCetak."
+"Kamus hanya akan menampilkan definisi dari salah satu kamus Anda. "
+"Untuk memeriksa apakah ada hasil pencarian di kamus lain:"
 
-#: C/index.docbook:203(sect2/para)
+#. (itstool) path: item/p
+#: C/similar-words.page:34
+msgid "Look up the desired term."
+msgstr "Cari butir yang diinginkan."
+
+#. (itstool) path: item/p
+#: C/similar-words.page:37
 msgid ""
-"Inside the Print dialog you can select the printer to "
-"use, the paper format, the number of copies."
+"If the sidebar is not already visible, select View Similar Words."
 msgstr ""
-"Didalam dialog Cetak, Anda bisa memilih pencetak yang "
-"dipakai, format kertas dan jumlah salinan."
+"Bila bilah sisi belum nampak, pilih Tilikan Kata Serupa."
 
-#: C/index.docbook:206(sect2/para)
+#. (itstool) path: item/p
+#: C/similar-words.page:42
 msgid ""
-"To see a preview of what will be printed, click Preview."
+"The Similar Words sidebar will show search results from other "
+"dictionaries in your selected dictionary source. To view the similar word, "
+"double click on the entry."
 msgstr ""
-"Untuk melihat pratilik dari apa yang akan dicetak, klik Pratilik."
+"Bilah sisi Kata Serupa akan menampilkan hasil pencarian dari "
+"kamus lain dalam sumber kamus yang dipilih. Untuk melihat kata yang serupa, "
+"klik ganda pada entri."
 
-#: C/index.docbook:209(sect2/para)
-msgid "To print, click Print."
-msgstr "Untuk mencetak, klik Cetak"
+#. (itstool) path: page/title
+#: C/source-add-local.page:20
+msgid "Add local dictionary sources"
+msgstr "Menambah sumber kamus lokal"
 
-#: C/index.docbook:214(sect2/title)
-msgid "Find Text"
-msgstr "Cari Teks"
+#. (itstool) path: page/title
+#: C/sources-default.page:24
+msgid "Set a default dictionary source"
+msgstr "Menata sumber kamus baku"
 
-#: C/index.docbook:219(screenshot/mediaobject)
+#. (itstool) path: page/p
+#: C/sources-default.page:26
 msgid ""
-"   Shows the Dictionary "
-"Find pane inside the main window."
+"When you first use Dictionary, it should have some pre-installed "
+"dictionaries that you can use. You can change the default dictionary source to one that you would prefer to use "
+"instead."
 msgstr ""
-"   Menampilkan panel Cari "
-"Kamus di dalam jendela utama."
+"Ketika Anda pertama memakai Kamus, dia mesti memiliki beberapa "
+"kamus terprapasang yang dapat Anda pakai. Anda dapat mengubah sumber kamus yang baku ke lainnya yang lebih Anda sukai."
 
-#: C/index.docbook:229(sect2/para)
-msgid ""
-"To find text inside the results of a look up, perform the following steps:"
-msgstr ""
-"Untuk mencari teks didalam hasil dari pencarian, lakukan langkah-langkah "
-"berikut:"
+#. (itstool) path: steps/title
+#: C/sources-default.page:32
+msgid "Change the default dictionary source:"
+msgstr "Mengubah sumber kamus baku:"
 
-#: C/index.docbook:233(listitem/para)
-#| msgid ""
-#| "Choose EditFind to display the Find pane."
+#. (itstool) path: item/p
+#: C/sources-default.page:34
 msgid ""
-"Choose  Edit Find "
-" to display the Find pane."
+"Select Dictionary Preferences Source."
 msgstr ""
-"Pilih  Sunting Cari  untuk menampilkan panel Cari."
+"Pilih Kamus Preferensi Sumber."
 
-#: C/index.docbook:235(listitem/para)
-msgid ""
-"Type the text you want to find inside the Search entry."
-msgstr ""
-"Ketik teks yang Anda ingin cari di dalam entri Cari."
+#. (itstool) path: item/p
+#: C/sources-default.page:39
+msgid "Select the dictionary source that you want to set as the default."
+msgstr "Pilih sumber kamus yang ingin Anda tata sebagai baku."
 
-#: C/index.docbook:237(listitem/para)
-msgid ""
-"To find the next occurrence of the text, click Next. "
-"To find the previous occurrence of the text, click Previous."
-msgstr ""
-"Untuk mencari kejadian berikut dari teks, klik Selanjutnya. Untuk mencari kejadian sebelumnya dari teks, klik "
-"Sebelumnya."
+#. (itstool) path: item/p
+#: C/sources-default.page:42
+msgid "Your change will be saved automatically."
+msgstr "Perubahan Anda akan disimpan secara otomatis."
 
-#: C/index.docbook:248(sect1/title) C/index.docbook:438(sect2/title)
-msgid "Preferences"
-msgstr "Preferensi"
+#. (itstool) path: page/title
+#: C/sources-delete.page:25
+msgid "Delete a dictionary source"
+msgstr "Menghapus suatu sumber kamus"
 
-#: C/index.docbook:250(sect1/para)
+#. (itstool) path: page/p
+#: C/sources-delete.page:27
 msgid ""
-"To change the Dictionary application preferences, "
-"choose EditPreferences."
+"If you no longer need a specific dictionary source or if one stops working for you, you may want to delete it."
 msgstr ""
-"Untuk mengganti preferensi applikasi Kamus, pilih "
-"SuntingPreferensi."
+"Bila Anda tak memerlukan lagi suatu sumber kamus atau bila ada yang tak berkerja lagi, Anda mungkin ingin menghapusnya."
 
-#: C/index.docbook:255(sect2/title)
-msgid "Dictionary Sources"
-msgstr "Sumber-Sumber Kamus"
+#. (itstool) path: steps/title
+#: C/sources-delete.page:32
+msgid "Delete a dictionary source:"
+msgstr "Menghapus suatu sumber kamus:"
 
-#: C/index.docbook:260(screenshot/mediaobject)
+#. (itstool) path: item/p
+#: C/sources-delete.page:34
 msgid ""
-"   Shows the "
-"Source tab of the Preferences dialog."
+"Select Dictionary Preferences Source."
 msgstr ""
-"   Menampilkan "
-"tab Sumber dari dialog Preferensi."
+"Pilih Kamus Preferensi Sumber."
 
-#: C/index.docbook:269(sect2/para)
-msgid ""
-"To change the dictionary source used to look up words, select the desired "
-"source from the list."
-msgstr ""
-"Untuk mengganti sumber kamus yang dipakai untuk mencari kata-kata, pilih "
-"sumber yang diinginkan dari daftar."
+#. (itstool) path: item/p
+#: C/sources-delete.page:39
+msgid "Select the dictionary source that you want to delete."
+msgstr "Pilih sumber kamus yang Anda ingin hapus."
 
-#: C/index.docbook:275(sect2/title)
-msgid "Adding a new source"
-msgstr "Menambahkan suatu sumber"
+#. (itstool) path: item/p
+#: C/sources-delete.page:42
+msgid "Press Remove."
+msgstr "Tekan Hapus."
 
-#: C/index.docbook:280(screenshot/mediaobject)
+#. (itstool) path: item/p
+#: C/sources-delete.page:45
 msgid ""
-"   Shows the Add Source "
-"dialog."
+"A dialog will pop up asking you to confirm that you wish to permanently "
+"delete the selected source. Once you confirm, the source will be deleted."
 msgstr ""
-"   Menampilkan dialog "
-"Tambah Sumber."
-
-#: C/index.docbook:289(sect2/para)
-msgid "To add a new dictionary source, perform the following steps:"
-msgstr "Untuk menambahkan sumber kamus baru, lakukan langkah-langkah berikut:"
+"Suatu dialog akan muncul meminta konfirmasi bahwa Anda ingin menghapus "
+"secara permanen sumber yang dipilih. Setelah Anda mengkonfirmasi, sumber "
+"akan dihapus."
 
-#: C/index.docbook:292(listitem/para)
-msgid "Click on the Add button"
-msgstr "Klik pada tombol Tambah"
+#. (itstool) path: page/title
+#: C/sources-edit.page:24
+msgid "Edit a dictionary source"
+msgstr "Menyunting suatu sumber kamus"
 
-#: C/index.docbook:293(listitem/para)
+#. (itstool) path: page/p
+#: C/sources-edit.page:26
 msgid ""
-"Edit the name of the new source inside the Description "
-"entry"
-msgstr "Edit nama sumber baru didalam entri Deskripsi"
-
-#: C/index.docbook:294(listitem/para)
-msgid ""
-"Change the transport type of the new source using the Transport combo box"
+"You can customize a dictionary source to "
+"update details such as its description or remote address."
 msgstr ""
-"Ganti tipe transpor dari sumber baru menggunakan kotak combo "
-"Transport"
-
-#: C/index.docbook:295(listitem/para)
-msgid "Edit the attributes of the new source"
-msgstr "Edit atribut-atribut dari sumber baru"
+"Anda dapat menggubah suatu sumber kamus untuk "
+"memutakhirkan rincian seperti keterangannya atau alamatnya."
 
-#: C/index.docbook:296(listitem/para)
-msgid "Click Add"
-msgstr "Klik Tambah"
+#. (itstool) path: steps/title
+#: C/sources-edit.page:30
+msgid "To edit a dictionary source:"
+msgstr "Untuk menyunting suatu sumber kamus:"
 
-#: C/index.docbook:299(sect2/para)
+#. (itstool) path: item/p
+#: C/sources-edit.page:32
 msgid ""
-"Different source transport types uses different attributes. This is the list "
-"of available attributes per transport type:"
+"Select Dictionary Preferences Source."
 msgstr ""
-"Jenis sumber transpor yang berbeda menggunakan atribut-atribut yang berbeda. "
-"Ini adalah daftar atribut yang tersedia untuk setiap tipe transpor:"
-
-#: C/index.docbook:306(entry/para)
-msgid "Transport"
-msgstr "Transpor"
-
-#: C/index.docbook:307(entry/para)
-msgid "Attributes"
-msgstr "Atibut"
-
-#: C/index.docbook:312(entry/para)
-msgid "Dictionary Server"
-msgstr "Server Kamus"
-
-#: C/index.docbook:314(entry/para)
-msgid "Hostname: the hostname of the dictionary server"
-msgstr "Nama host: nama host dari server kamus"
+"Pilih Kamus Preferensi Sumber."
 
-#: C/index.docbook:315(entry/para)
-msgid "Port: the port of the dictionary server"
-msgstr "Pangkalan: pangkalan dari server kamus"
+#. (itstool) path: item/p
+#: C/sources-edit.page:37
+msgid "Double click on the dictionary source you want to edit."
+msgstr "Klik ganda pada sumber kamus yang ingin Anda sunting."
 
-#: C/index.docbook:326(sect2/title)
-msgid "Removing a source"
-msgstr "Menghapus sumber"
+#. (itstool) path: item/p
+#: C/sources-edit.page:40
+msgid "You can edit the following fields:"
+msgstr "Anda dapat menyunting ruas berikut:"
 
-#: C/index.docbook:328(sect2/para)
-msgid "To remove a dictionary source, perform the following steps:"
-msgstr "Untuk menhapus suatu sumber kamus, lakukan langkah-langkah berikut:"
-
-#: C/index.docbook:331(listitem/para)
-msgid "Select the source you wish to remove"
-msgstr "Pilih sumber yang Anda ingin hapus"
-
-#: C/index.docbook:332(listitem/para)
-msgid "Click the Remove button"
-msgstr "Klik tombol Hapus "
-
-#: C/index.docbook:335(warning/para)
+#. (itstool) path: item/p
+#: C/sources-edit.page:43
 msgid ""
-"If you remove a dictionary source it will be permanently deleted from the "
-"list of available sources. Also, as some sources might be defined system-"
-"wide you may actually not be able to remove them unless you have the right "
-"ownership privileges."
+"Description is the name of the source as it will be displayed to "
+"you."
 msgstr ""
-"Bila Anda menghapus sumber kamus, sumber kamus tersebut akan terhapus secara "
-"permanen dari daftar sumber yang tersedia. Juga, karena beberapa sumber "
-"mungkin didefinisikan dan tersebar seluruh sistem, Anda mungkin tidak bisa "
-"menghapusnya kecuali Anda mempunyai hak istimewa kepimilikan."
+"Deskripsi adalah nama sumber sebagaimana akan ditampilkan ke Anda."
 
-#: C/index.docbook:344(sect2/title)
-msgid "Print Options"
-msgstr "Opsi Cetak"
+#. (itstool) path: item/p
+#: C/sources-edit.page:47
+msgid "Transport is the type of server."
+msgstr "Transport adalah tipe server."
 
-#: C/index.docbook:349(screenshot/mediaobject)
-msgid ""
-"   Shows the "
-"Print tab inside the Preferences dialog."
-msgstr ""
-"   Menampilkan "
-"tab Cetak di dalam dialog Preferensi."
+#. (itstool) path: item/p
+#: C/sources-edit.page:50
+msgid "Hostname is the location of the dictionary source."
+msgstr "Nama host adalah lokasi dari sumber kamus."
 
-#: C/index.docbook:358(sect2/para)
+#. (itstool) path: item/p
+#: C/sources-edit.page:55
+msgid "Port."
+msgstr "Port."
+
+#. (itstool) path: item/p
+#: C/sources-edit.page:60
 msgid ""
-"If you want to change the font name and size used when printing, perform the "
-"following steps:"
+"View the dictionaries that are available in the dictionary source by "
+"selecting the Dictionaries tab."
 msgstr ""
-"Bila Anda ingin mengganti nama huruf dan ukuran huruf yang dipakai ketika "
-"mencetak, lakukan langkah-langkah berikut:"
-
-#: C/index.docbook:362(listitem/para)
-msgid "Click on the Print Font button"
-msgstr "Klik tombol Fonta Cetak"
+"Lihat kamus yang tersedia dalam sumber kamus dengan memilih tab Kamus."
 
-#: C/index.docbook:363(listitem/para)
-msgid "Select the font and size you wish to use"
-msgstr "Pilih huruf dan ukuran yang Anda inginkan"
+#. (itstool) path: item/p
+#: C/sources-edit.page:64
+msgid "Press Close to save the settings."
+msgstr "Tekan Tutup untuk menyimpan pengaturan."
 
-#: C/index.docbook:364(listitem/para)
-msgid "Click Ok"
-msgstr "Klik Ok"
+#. (itstool) path: info/desc
+#: C/sources.page:24
+msgid "Manage various dictionary sources."
+msgstr "Mengelola berbagai sumber kamus."
 
-#: C/index.docbook:373(sect1/title)
-msgid "The Dictionary Applet"
-msgstr "Aplet Kamus"
-
-#: C/index.docbook:375(sect1/para)
+#. (itstool) path: page/p
+#: C/sources.page:30
 msgid ""
-"The Dictionary application comes with a panel "
-"applet, the Dictionary Applet. You can add the "
-"Dictionary Applet applet to a panel and look up "
-"words in dictionaries."
+"Dictionary uses dictionary sources to look up words that "
+"you search for. Dictionary sources are collections of one or more dictionary "
+"databases which are usually online, but can be installed on your machine as "
+"well."
 msgstr ""
-"Aplikasi Kamus application datang dengan aplet "
-"panel, Aplet Kamus. Anda bisa menambahkan aplet "
-"Aplet Kamus ke suatu panel dan mencari kata-kata "
-"di kamus-kamus."
+"Kamus memakai sumber kamus untuk menemukan kata yang "
+"Anda cari. Sumber kamus adalah koleksi dari satu atau lebih basis data kamus "
+"yang biasanya daring, tapi dapat juga dipasang pada mesin Anda."
+
+#. (itstool) path: section/title
+#: C/sources.page:36
+msgid "Manage your dictionary sources"
+msgstr "Mengelola sumber-sumber kamus Anda"
 
-#: C/index.docbook:381(figure/title) C/index.docbook:417(figure/title)
-msgid "Dictionary Applet Window"
-msgstr "Jendela Aplet Kamus"
+#. (itstool) path: page/title
+#: C/sources-select.page:26
+msgid "Select a dictionary source"
+msgstr "Pilih suatu sumber kamus"
 
-#: C/index.docbook:383(screenshot/mediaobject)
+#. (itstool) path: page/p
+#: C/sources-select.page:28
 msgid ""
-"   Shows Dictionary Applet."
-""
+"You can change the dictionary source that you "
+"are currently using without changing your default preferences."
 msgstr ""
-"   Menampilkan Aplet Kamus."
-""
+"Anda dapat mengubah sumber kamus yang sedang "
+"Anda pakai tanpa mengubah preferensi baku Anda."
 
-#: C/index.docbook:395(sect2/title)
-msgid "To Start Dictionary Applet"
-msgstr "Untuk Memulai Aplet Kamus"
+#. (itstool) path: steps/title
+#: C/sources-select.page:32
+msgid "Temporarily change the dictionary source:"
+msgstr "Mengubah sementara sumber kamus:"
 
-#: C/index.docbook:397(sect2/para)
+#. (itstool) path: item/p
+#: C/sources-select.page:34
 msgid ""
-"To add Dictionary Applet to a panel, right-click "
-"on the panel, then choose Add to Panel. Select "
-"Dictionary Applet in the Add to the panel dialog, "
-"then click OK."
+"Select View Dictionary Sources."
 msgstr ""
-"Untuk menambahkan Aplet Kamus ke suatu panel, "
-"klik kanan pada panel, lalu pilih Tambahkan ke Panel. Pilih Aplet Kamus di dialog Tambahkan ke panel, lalu klik OK."
+"Pilih Tilikan Sumber Kamus."
 
-#: C/index.docbook:406(sect2/title)
-msgid "Using the Dictionary Applet"
-msgstr "Menggunakan Aplet Kamus"
+#. (itstool) path: item/p
+#: C/sources-select.page:38
+msgid "Double click on the dictionary source that you want to use."
+msgstr "Klik ganda pada sumber kamus yang ingin Anda pakai."
 
-#: C/index.docbook:408(sect2/para)
-msgid ""
-"To look up a word, type it into the entry field, and "
-"press Enter or right-click on the dictionary icon and then "
-"choose Look up."
-msgstr ""
-"Untuk mencari suatu kata, ketiklah kata tersebut di ruas entri, dan tekan Enter atau klik kanan pada objek kamus "
-"lalu pilih Lihat."
+#. (itstool) path: info/desc
+#: C/text-copy.page:23
+msgid "Select and copy a definition to another application."
+msgstr "Pilih dan salin suatu definisi ke aplikasi lain."
 
-#: C/index.docbook:413(sect2/para)
-msgid ""
-"If some definition for the word was found, a window will appear, with the "
-"text of the definitions:"
-msgstr ""
-"Bila suatu definisi untuk kata tersebut ditemukan, jendela baru akan muncul, "
-"dengan teks definisi tersebut:"
+#. (itstool) path: page/title
+#: C/text-copy.page:27
+msgid "Copy definition"
+msgstr "Salin definisi"
 
-#: C/index.docbook:419(screenshot/mediaobject)
+#. (itstool) path: page/p
+#: C/text-copy.page:29
 msgid ""
-"   Shows Dictionary "
-"Applet main window."
+"You can copy and paste definitions from Dictionary to another "
+"application."
 msgstr ""
-"   Menampilkan jendela "
-"utama Aplet Kamus."
+"Anda dapat menyalin dan menempel definisi dari Kamus ke aplikasi "
+"lain."
 
-#: C/index.docbook:428(sect2/para)
-msgid ""
-"Click Save to save the definitions to a text file. "
-"Click Print to print the definitions. Click "
-"Clear to clear the definitions."
-msgstr ""
-"Klik Simpan untuk menyimpan definisi ke dalam berkas "
-"teks. Klik Cetak untuk mencetak definisi. Klik "
-"Bersih untuk menghapus definisi."
+#. (itstool) path: steps/title
+#: C/text-copy.page:33
+msgid "Copy a definition"
+msgstr "Menyalin suatu definisi"
 
-#: C/index.docbook:432(sect2/para)
+#. (itstool) path: item/p
+#: C/text-copy.page:35
 msgid ""
-"You can make the window disappear by left-clicking on the dictionary icon or "
-"by pressing Esc."
+"Select the text that you want to copy in Dictionary. "
+"Alternatively, you can select the whole definition using Edit Select All."
 msgstr ""
-"Anda bisa membuat jendela hilang dengan menklik kiri pada tombol kamus atau "
-"dengan menekan Esc."
+"Pilih teks yang ingin Anda salin dalam Kamus. Sebagai alternatif, "
+"Anda dapat memilih seluruh definisi memakai Sunting Pilih Semua."
 
-#: C/index.docbook:440(sect2/para)
+#. (itstool) path: item/p
+#: C/text-copy.page:41
 msgid ""
-"To configure the Dictionary Applet, right-click "
-"on the dictionary icon, then choose Preferences."
+"Select Edit Copy."
 msgstr ""
-"Untuk mengkonfigurasi Aplet Kamus, klik kanan "
-"pada tombol kamus, lalu pilih Preferensi."
+"Pilih Sunting Salin."
 
-#: C/index.docbook:443(sect2/para)
+#. (itstool) path: item/p
+#: C/text-copy.page:45
 msgid ""
-"The Preferences dialog is the same used by the "
-"Dictionary application, so refer to "
+"Paste the text into another application. This can usually be done using the "
+"CtrlP keyboard shortcut or through "
+"one of the menus."
 msgstr ""
-"Dialog Preferensi adalah yang sama dipakai oleh "
-"aplikasi Kamus, lihat "
-
-#: C/legal.xml:9(para/ulink)
-msgid "link"
-msgstr "taut"
+"Tempelkan teks ke dalam aplikasi lain. Ini biasanya dapat dilakukan memakai "
+"pintasan papan tikCtrlP atau melalui "
+"satu dari menu."
 
-#: C/legal.xml:2(legalnotice/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."
-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 <_:ulink-1/> or in the file COPYING-DOCS distributed "
-"with this manual."
-msgstr ""
-"Hak diberikan untuk menyalin, mendistribusikan, dan/atau mengubah dokumen "
-"ini di bawah persyaratan GNU Free Documentation License (GFDL, Lisensi "
-"Dokumentasi Bebas GNU), Versi 1.1 atau sebarang versi setelahnya yang "
-"dipublikasikan oleh Free Software Foundation tanpa Invariant Section, tanpa "
-"Front-Cover Texts, dan tanpa Back-Cover Texts. Anda dapat menemukan salinan "
-"dari GFDL pada <_:ulink-1/> ini atau di dalam berkas COPYING-DOCS yang "
-"didistribusikan bersama panduan ini."
diff -Nru gnome-dictionary-3.8.0/help/id/index.page gnome-dictionary-3.10.0/help/id/index.page
--- gnome-dictionary-3.8.0/help/id/index.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/index.page	2013-10-06 16:42:35.000000000 +0000
@@ -3,7 +3,7 @@
 
   
     
-    Dictionary
+    Kamus
 
     
       Sindhu S
@@ -13,7 +13,7 @@
 
     
 
-    Look up word definitions in Dictionary.
+    Cari definisi kata dalam Kamus.
   
     
       Paula
@@ -24,16 +24,14 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  
-    <media type="image" mime="image/png" its:translate="no" src="figures/gnome-dictionary-icon.png"/> Dictionary Help
-  
+  <media type="image" mime="image/png" its:translate="no" src="figures/gnome-dictionary-icon.png"/> Bantuan Kamus
 
   

-    Features
+    Fitur
   

 
  

@@ -41,6 +39,6 @@
   

 
  

-    Common problems and solutions
+    Masalah umum dan solusinya
   

 
diff -Nru gnome-dictionary-3.8.0/help/id/introduction.page gnome-dictionary-3.10.0/help/id/introduction.page
--- gnome-dictionary-3.8.0/help/id/introduction.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/introduction.page	2013-10-06 16:42:35.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    What is Dictionary?
+    Apa itu Kamus?
 
   
     
@@ -30,24 +30,20 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
   Pengantar
 
-  
Dictionary is an application for looking up term definitions.
-  It searches for definitions using an online DICT server. The
-  default DICT server is at
-  http://dict.org.

+  
Kamus adalah suatu aplikasi untuk mencari definisi istilah. Ini mencari definisi memakai server DICT daring. Server DICT bawaan adalah di http://dict.org.

 
-  
Start using Dictionary by
-  looking up a definition!

+  
Mulailah memakai Kamus dengan mencari suatu definisi!

 
   

-    Dictionary
+    Kamus
     
-      
Screenshot showing the Dictionary main window.

+      
Cuplikan layar yang menampilkan jendela utama Kamus.

     
   

 
diff -Nru gnome-dictionary-3.8.0/help/id/keyboard-shortcuts.page gnome-dictionary-3.10.0/help/id/keyboard-shortcuts.page
--- gnome-dictionary-3.8.0/help/id/keyboard-shortcuts.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/keyboard-shortcuts.page	2013-10-06 16:42:35.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    You can use keyboard shortcuts to navigate around Dictionary more efficiently.
+    Anda dapat memakai pintasan papan tik untuk menavigasi Kamus secara lebih efisien.
 
   
     
@@ -30,122 +30,121 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Keyboard shortcuts
+  Pintasan papan tik
 
-  
Keyboard shortcuts are combinations of keys that you can use instead of
-  navigating through the menu. The following shortcuts are available:

+  
Pintasan papan tik adalah kombinasi tombol yang dapat Anda pakai sebagai pengganti dari navigasi melalui menu. Pintasan papan tik berikut tersedia:

 
   

     
       

         
Action
Shortcut
Raccourci

       

     
     
       
Similar words
Mots similaires

         
CtrlT

       

       
Dictionary sources
Sources de dictionnaires

         
CtrlD

       

       
Available databases
Bases de données disponibles

         
CtrlB

       

       
Available strategies
Stratégies disponibles

         
CtrlR

       

     

-    Navigate around <app>Dictionary</app>
+    Menavigasi <app>Kamus</app>
-        
-        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        
-        
+        

     
       
Action
Shortcut
Aksi
Pintasan

       

     
     
       
Print preview
Pratinjau cetak

         
ShiftCtrlP

       

       
Print
Cetak

         
CtrlP

       

       
View sidebar
Lihat bilah sisi

         
F9

       

       
Open a new Dictionary window
Membuka jendela Kamus baru

         
CtrlN

       

       
Close current Dictionary window
Tutup jendela Kamus saat ini

         
CtrlW

       

     
   

 
   
-    Search shortcuts
+    Pintasan pencarian
-        
-        
+        
+        
-        
-        
+        
+        
-        
+        
-        
+        

     
       
Action
Shortcut
Aksi
Pintasan

       

     
     
       
Search within a definition
/ or CtrlF
Mencari di dalam suatu definisi
/ atau CtrlF

       

       
Find next
Cari selanjutnya

         
CtrlG

       

       
Find previous
Cari sebelumnya

         
ShiftCtrlG

       

     
   

 
   
-    Navigate within a definition
+    Menavigasi dalam suatu definisi
-        
-        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        

     
       
Action
Shortcut
Aksi
Pintasan

       

     
     
       
Previous definition
Definisi sebelumnya

         
CtrlPage Up

       

       
Next definition
Definisi selanjutnya

         
CtrlPage Down

       

       
First definition
Definisi pertama

         
CtrlHome

       

       
Last definition
Definisi terakhir

         
CtrlEnd

       

     
   

 
   
-    <app>Dictionary</app> definitions shortcuts:
+    Pintasan definisi <app>Kamus</app>:
-        
-        
+        
+        
-        
+        
-        
+        
-        
+        
-        
+        
diff -Nru gnome-dictionary-3.8.0/help/id/legal.xml gnome-dictionary-3.10.0/help/id/legal.xml
--- gnome-dictionary-3.8.0/help/id/legal.xml	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/legal.xml	2013-10-06 16:42:35.000000000 +0000
@@ -1,5 +1,5 @@
 
 
-
This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.

+
Karya ini dilisensikan di bawah Creative Commons Attribution-ShareAlike 3.0 Unported License. Untuk melihat suatu salinan dari lisensi ini, kunjungi http://creativecommons.org/licenses/by-sa/3.0/ atau kirimlah surat ke Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.

 
diff -Nru gnome-dictionary-3.8.0/help/id/pref.page gnome-dictionary-3.10.0/help/id/pref.page
--- gnome-dictionary-3.8.0/help/id/pref.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/pref.page	2013-10-06 16:42:35.000000000 +0000
@@ -11,7 +11,7 @@
 
     
 
-    Manage your preferences.
+    Kelola preferensi Anda.
   
     
       Paula
@@ -22,10 +22,10 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  <app>Dictionary</app> preferences
+  Preferensi <app>Kamus</app>
 
 
diff -Nru gnome-dictionary-3.8.0/help/id/print-font.page gnome-dictionary-3.10.0/help/id/print-font.page
--- gnome-dictionary-3.8.0/help/id/print-font.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/print-font.page	2013-10-06 16:42:36.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Select the font for printing definitions.
+    Pilih fonta untuk mencetak definisi.
 
   
     
@@ -31,40 +31,33 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Print font
+  Fonta cetak
 
-  
You can change the default font face and size that are used for printing
-  the definitions.

+  
Anda dapat mengubah muka dan ukuran fonta baku yang dipakai ketika mencetak definisi.

 
   
-    Change the font
+    Mengubah fonta
     
-      
Select Dictionary
-      Preferences
-      Print.

+      
Pilih Kamus Preferensi Cetak.

     
     
-      
Click font selector button.

+      
Klik tombol pemilih fonta.

     
     
-      
Select the font that you wish to use.

+      
Pilih fonta yang ingin Anda pakai.

     
     
-      
Drag the slider to the right to increase the font size or left to
-      decrease it. Alternatively, you can type in the font size in the text box,
-      or use the - and + buttons to decrease and increase
-      the font size.

+      
Seret penggeser ke kanan untuk memperbesar ukuran fonta atau ke kiri untuk memperkecilnya. Sebagai alternatif, Anda dapat mengetikkan ukuran fonta dalam kotak teks, atau memakai tombol - dan + untuk mengurangi dan meningkatkan ukuran fonta.

     
     
-      
Click Select to save your font settings.

+      
Klik Pilih untuk menyimpan pengaturan fonta Anda.

     
   
 
-  
The definition is not reflowed for printing, so if you choose a large font
-  size, some of the text may be cut off.

+  
Definisi tak ditata ulang untuk pencetakan, sehingga bila Anda memilih suatu ukuran fonta yang besar, sebagian teks mungkin terpotong.

 
 
diff -Nru gnome-dictionary-3.8.0/help/id/print.page gnome-dictionary-3.10.0/help/id/print.page
--- gnome-dictionary-3.8.0/help/id/print.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/print.page	2013-10-06 16:42:36.000000000 +0000
@@ -20,7 +20,7 @@
 
     
 
-    Print preview and print definitions.
+    Pratinjau cetak dan cetak definisi.
 
   
     
@@ -32,71 +32,55 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Print a definition
+  Mencetak suatu definisi
 
-  
You can print a definition to paper or a file. Before printing, you
-  should preview the definition as it would be printed to check that the text
-  fits onto the page, especially if you have changed the
-  print font size.

+  
Anda dapat mencetak suatu definisi ke kertas atau suatu berkas. Sebelum mencetak, Anda mesti mempratinjau definisi bagaimana akan dicetak untuk memeriksa bahwa teks cukup termuat pada halaman, khususnya bila Anda telah mengubah ukuran fonta cetak.

 
   

-    Print preview
+    Pratinjau cetak
 
     
       
-        
Select File
-        Preview.

+        
Pilih Berkas Pratinjau.

       
       
-        
A print preview window will open which will show you the definition
-        exactly as it will be printed.

+        
Suatu jendela pratinjau cetak akan terbuka yang menunjukkan definisi akan dicetak tepat seperti apa.

       
       
-	
Use the toolbar to browse pages, adjust zoom level and page
-	width.

+	
Gunakan bilah alat untuk meramban halaman, menyesuaikan tingkat zum, dan lebar halaman.

       
       
-        
Click the Print this document to print
-        the definition or close the window to end the preview.

+        
Klik Cetak dokumen ini untuk mencetak definisi atau tutup jendela untuk mengakhiri pratinjau.

       
     
 
     
-      
The print button in the toolbar may not always work. If it does not
-      work for you, close the window and select
-      File
-      Print.

+      
Tombol cetak dalam bilah alat mungkin tak selalu bekerja. Bila itu tak bekerja bagi Anda, tutup jendela dan pilih Berkas Cetak.

     
 
   

 
   

-    Print
+    Cetak
 
-    
You need to have a printer set
-    up to be able to print to paper.

+    
Anda perlu pencetak yang telah disiapkan untuk bisa mencetak ke kertas.

 
     
       
-        
Select File
-        Print
-        General.

+        
Pilih Berkas Cetak Umum.

       
       
-        
Select the printer that you want to use from the list of printers
-        or select
-        Print to File.

+        
Pilih pencetak yang ingin Anda pakai dari daftar pencetak atau pilih Cetak ke Berkas.

       
       
-        
Chose your printing
-        settings.

+        
Pilih pengaturan pencetak Anda.

       
       
-        
Press Print to print the definition.

+        
Tekan Cetak untuk mencetak definisi.

       
     
 
diff -Nru gnome-dictionary-3.8.0/help/id/prob-retrieving-definition.page gnome-dictionary-3.10.0/help/id/prob-retrieving-definition.page
--- gnome-dictionary-3.8.0/help/id/prob-retrieving-definition.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/prob-retrieving-definition.page	2013-10-06 16:42:36.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    Error while retrieving definitions.
+    Galat ketika mengambil definisi.
 
   
     
@@ -31,29 +31,20 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Cannot find definitions
+  Tak bisa temukan definisi
 
-  
If you see the error message
-  Error while retrieving definition when looking up a definition
-  from any of the selected dictionaries,
-  the problem is more likely one of the following:

+  
Bila Anda menemui pesan kesalahan Galat ketika mengambil definisi ketika mencari suatu definisi dari sebarang kamus yang dipilih, masalahnya sangat mungkin satu dari yang berikut:

 
   
     
-      
One or more of the selected DICT servers that are used to
-      look up definitions may not be working. You can try waiting a while
-      before looking up the definition
-      again.

+      
Satu atau lebih server DICT yang dipilih yang dipakai untuk mencari definisi mungkin tak bekerja. Anda dapat mencoba menunggu sebentar sebelum mencari definisi lagi.

     
     
-      
You may not have a working Internet connection. For
-      Dictionary to look up terms, your computer
-      must be able to connect to
-      dict.org.

+      
Anda mungkin tak memiliki koneksi Internet. Agar Kamus mencari istilah Anda, komputer Anda harus bisa menyambung ke dict.org.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/save-definition.page gnome-dictionary-3.10.0/help/id/save-definition.page
--- gnome-dictionary-3.8.0/help/id/save-definition.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/save-definition.page	2013-10-06 16:42:36.000000000 +0000
@@ -18,7 +18,7 @@
 
     
 
-    Save a copy of a definition to a text file.
+    Simpan suatu salinan definisi ke suatu berkas teks.
 
   
     
@@ -30,28 +30,24 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Save a definition
+  Simpan suatu definisi
 
-  
You can save a definition to a text file. This may be useful if you want
-  to use it outside of Dictionary.

+  
Anda dapat menyimpan suatu definisi ke suatu berkas teks. Ini mungkin berguna bila Anda ingin memakainya di luar Kamus.

 
   
-    To save a definition:
+    Untuk menyimpan definisi:
     
-      
Select File
-      Save a Copy….

+      
Pilih Berkas Simpan suatu Salinan….

     
     
-      
Chose where you want to save the definition to and a name for the
-      file. You may want to add a .txt file extension to the end
-      of the file name.

+      
Pilih tempat dimana Anda ingin menyimpan definisi dan suatu nama bagi berkas. Anda mungkin ingin menambahkan ekstensi berkas .txt di akhir nama berkas.

     
     
-      
Press Save to save the definition.

+      
Tekan Simpan untuk menyimpan definisi.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/similar-words.page gnome-dictionary-3.10.0/help/id/similar-words.page
--- gnome-dictionary-3.8.0/help/id/similar-words.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/similar-words.page	2013-10-06 16:42:36.000000000 +0000
@@ -19,7 +19,7 @@
 
     
 
-    View related results in other dictionaries.
+    Lihat hasil terkait di kamus lain.
 
   
     
@@ -31,28 +31,23 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Similar words
+  Kata serupa
 
-  
Dictionary will only display the definition from one your
-  dictionaries. To check if there are search results in other dictionaries:

+  
Kamus hanya akan menampilkan definisi dari salah satu kamus Anda. Untuk memeriksa apakah ada hasil pencarian di kamus lain:

 
   
     
-      
Look up the desired term.

+      
Cari butir yang diinginkan.

     
     
-      
If the sidebar is not already visible, select
-      View
-      Similar Words.

+      
Bila bilah sisi belum nampak, pilih Tilikan Kata Serupa.

     
     
-      
The Similar Words sidebar will show search results from
-      other dictionaries in your selected dictionary source. To view the
-      similar word, double click on the entry.

+      
Bilah sisi Kata Serupa akan menampilkan hasil pencarian dari kamus lain dalam sumber kamus yang dipilih. Untuk melihat kata yang serupa, klik ganda pada entri.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/source-add-local.page gnome-dictionary-3.10.0/help/id/source-add-local.page
--- gnome-dictionary-3.8.0/help/id/source-add-local.page	2013-07-21 16:33:33.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/source-add-local.page	2013-10-06 16:42:36.000000000 +0000
@@ -24,11 +24,11 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Add local dictionary sources
+  Menambah sumber kamus lokal
 
 
 
diff -Nru gnome-dictionary-3.8.0/help/id/sources-default.page gnome-dictionary-3.10.0/help/id/sources-default.page
--- gnome-dictionary-3.8.0/help/id/sources-default.page	2013-07-21 16:33:34.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/sources-default.page	2013-10-06 16:42:36.000000000 +0000
@@ -28,29 +28,24 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Set a default dictionary source
+  Menata sumber kamus baku
 
-  
When you first use Dictionary, it should have some
-  pre-installed dictionaries that you can use. You can change the default
-  dictionary source to one that you would
-  prefer to use instead.

+  
Ketika Anda pertama memakai Kamus, dia mesti memiliki beberapa kamus terprapasang yang dapat Anda pakai. Anda dapat mengubah sumber kamus yang baku ke lainnya yang lebih Anda sukai.

 
   
-    Change the default dictionary source:
+    Mengubah sumber kamus baku:
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Pilih Kamus Preferensi Sumber.

     
     
-      
Select the dictionary source that you want to set as the default.

+      
Pilih sumber kamus yang ingin Anda tata sebagai baku.

     
     
-      
Your change will be saved automatically.

+      
Perubahan Anda akan disimpan secara otomatis.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/sources-delete.page gnome-dictionary-3.10.0/help/id/sources-delete.page
--- gnome-dictionary-3.8.0/help/id/sources-delete.page	2013-07-21 16:33:34.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/sources-delete.page	2013-10-06 16:42:36.000000000 +0000
@@ -29,33 +29,27 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Delete a dictionary source
+  Menghapus suatu sumber kamus
 
-  
If you no longer need a specific
-  dictionary source or if one stops
-  working for you, you may want to delete it.

+  
Bila Anda tak memerlukan lagi suatu sumber kamus atau bila ada yang tak berkerja lagi, Anda mungkin ingin menghapusnya.

 
   
-    Delete a dictionary source:
+    Menghapus suatu sumber kamus:
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Pilih Kamus Preferensi Sumber.

     
     
-      
Select the dictionary source that you want to delete.

+      
Pilih sumber kamus yang Anda ingin hapus.

     
     
-      
Press Remove.

+      
Tekan Hapus.

     
     
-      
A dialog will pop up asking you to confirm that you wish to
-      permanently delete the selected source. Once you confirm, the source will
-      be deleted.

+      
Suatu dialog akan muncul meminta konfirmasi bahwa Anda ingin menghapus secara permanen sumber yang dipilih. Setelah Anda mengkonfirmasi, sumber akan dihapus.

     
   
 
diff -Nru gnome-dictionary-3.8.0/help/id/sources-edit.page gnome-dictionary-3.10.0/help/id/sources-edit.page
--- gnome-dictionary-3.8.0/help/id/sources-edit.page	2013-07-21 16:33:34.000000000 +0000
+++ gnome-dictionary-3.10.0/help/id/sources-edit.page	2013-10-06 16:42:36.000000000 +0000
@@ -28,37 +28,33 @@
     
       Andika Triwidada
       andika@gmail.com
-      2012
+      2012, 2013
     
   
 
-  Edit a dictionary source
+  Menyunting suatu sumber kamus
 
-  
You can customize a dictionary source to
-  update details such as its description or remote address.

+  
Anda dapat menggubah suatu sumber kamus untuk memutakhirkan rincian seperti keterangannya atau alamatnya.

 
   
-    To edit a dictionary source:
+    Untuk menyunting suatu sumber kamus:
     
-      
Select Dictionary
-      Preferences
-      Source.

+      
Pilih Kamus Preferensi Sumber.

     
     
-      
Double click on the dictionary source you want to edit.

+      
Klik ganda pada sumber kamus yang ingin Anda sunting.

     
     
-      
You can edit the following fields:

+      
Anda dapat menyunting ruas berikut:

       
         
-          
Description is the name of the source as it will be
-          displayed to you.

+          
Deskripsi adalah nama sumber sebagaimana akan ditampilkan ke Anda.

         
         
-          
Transport is the type of server.

+          
Transport adalah tipe server.

         
         
-          
Hostname is the location of the dictionary source.

+          
Nama host adalah lokasi dari sumber kamus.

         
         
            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([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_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
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff -Nru gnome-dictionary-3.8.0/m4/gtk-doc.m4 gnome-dictionary-3.10.0/m4/gtk-doc.m4
--- gnome-dictionary-3.8.0/m4/gtk-doc.m4	2013-07-21 16:32:43.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/gtk-doc.m4	2013-10-06 16:41:58.000000000 +0000
@@ -11,7 +11,12 @@
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
   dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
 
diff -Nru gnome-dictionary-3.8.0/m4/iconv.m4 gnome-dictionary-3.10.0/m4/iconv.m4
--- gnome-dictionary-3.8.0/m4/iconv.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/iconv.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-# iconv.m4 serial AM6 (gettext-0.17)
-dnl Copyright (C) 2000-2002, 2007 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 and HP-UX 11.11.
-      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;
-      }
-  }
-#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)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include 
-#include 
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
diff -Nru gnome-dictionary-3.8.0/m4/intlmacosx.m4 gnome-dictionary-3.10.0/m4/intlmacosx.m4
--- gnome-dictionary-3.8.0/m4/intlmacosx.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/intlmacosx.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-# intlmacosx.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2004-2007 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])
-])
diff -Nru gnome-dictionary-3.8.0/m4/lib-ld.m4 gnome-dictionary-3.10.0/m4/lib-ld.m4
--- gnome-dictionary-3.8.0/m4/lib-ld.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/lib-ld.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 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
-])
diff -Nru gnome-dictionary-3.8.0/m4/lib-link.m4 gnome-dictionary-3.10.0/m4/lib-link.m4
--- gnome-dictionary-3.8.0/m4/lib-link.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/lib-link.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,709 +0,0 @@
-# lib-link.m4 serial 13 (gettext-0.17)
-dnl Copyright (C) 2001-2007 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])
-  define([Name],[translit([$1],[./-], [___])])
-  define([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
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-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. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl 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])
-  define([Name],[translit([$1],[./-], [___])])
-  define([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"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    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 $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])
-  undefine([Name])
-  undefine([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_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])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
-  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]N_A_M_E[-prefix],
-[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib]N_A_M_E[-prefix     don't search for lib$1 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
-])
-  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=
-  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"; 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/"'*$,,'`
-                LIB[]NAME[]_PREFIX="$basedir"
-                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"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; 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
-])
-
-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"; 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"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
diff -Nru gnome-dictionary-3.8.0/m4/lib-prefix.m4 gnome-dictionary-3.10.0/m4/lib-prefix.m4
--- gnome-dictionary-3.8.0/m4/lib-prefix.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/lib-prefix.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-# lib-prefix.m4 serial 5 (gettext-0.15)
-dnl Copyright (C) 2001-2005 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 a variable acl_libdirstem, containing
-dnl the basename of the libdir, either "lib" or "lib64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib and lib64. The current
-  dnl practice is that on a system supporting 32-bit and 64-bit instruction
-  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
-  dnl libraries go under $prefix/lib. We determine the compiler's default
-  dnl mode by looking at the compiler's library search path. If at least
-  dnl of its elements ends in /lib64 or points to a directory whose absolute
-  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
-  dnl default, namely "lib".
-  acl_libdirstem=lib
-  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 ;;
-          *) searchdir=`cd "$searchdir" && pwd`
-             case "$searchdir" in
-               */lib64 ) acl_libdirstem=lib64 ;;
-             esac ;;
-        esac
-      fi
-    done
-    IFS="$acl_save_IFS"
-  fi
-])
diff -Nru gnome-dictionary-3.8.0/m4/nls.m4 gnome-dictionary-3.10.0/m4/nls.m4
--- gnome-dictionary-3.8.0/m4/nls.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/nls.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 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)
-
-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)
-])
diff -Nru gnome-dictionary-3.8.0/m4/po.m4 gnome-dictionary-3.10.0/m4/po.m4
--- gnome-dictionary-3.8.0/m4/po.m4	2013-07-21 16:32:42.000000000 +0000
+++ gnome-dictionary-3.10.0/m4/po.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,449 +0,0 @@
-# po.m4 serial 15 (gettext-0.17)
-dnl Copyright (C) 1995-2007 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.17])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          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
-      echo_func () {
-        cat < "$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.
-
-AC_PREREQ(2.50)
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  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
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
diff -Nru gnome-dictionary-3.8.0/po/LINGUAS gnome-dictionary-3.10.0/po/LINGUAS
--- gnome-dictionary-3.8.0/po/LINGUAS	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/LINGUAS	2013-10-01 13:07:21.000000000 +0000
@@ -32,6 +32,7 @@
 fa
 fi
 fr
+fur
 ga
 gl
 gu
diff -Nru gnome-dictionary-3.8.0/po/be.po gnome-dictionary-3.10.0/po/be.po
--- gnome-dictionary-3.8.0/po/be.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/be.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,13 +1,13 @@
 # Vital Khilko , 2003.
 # Ales Nyakhaychyk , 2003, 2004.
-# Ihar Hrachyshka , 2011.
+# Ihar Hrachyshka , 2011, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
 "PO-Revision-Date: 2012-05-10 20:18+0300\n"
 "Last-Translator: Ihar Hrachyshka \n"
 "Language-Team: Belarusian \n"
@@ -120,8 +120,8 @@
 msgstr "Крыніцы слоўнікаў"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Наяўныя _базы даных"
+msgid "Available _Dictionaries"
+msgstr "Наяўныя _слоўнікі"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -820,3 +820,4 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Крыніцы слоўнікаў"
+
diff -Nru gnome-dictionary-3.8.0/po/br.po gnome-dictionary-3.10.0/po/br.po
--- gnome-dictionary-3.8.0/po/br.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/br.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,94 +1,164 @@
 # Breton translation for gnome-utils
 # Copyright (c) 2009-2010 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the gnome-utils package.
-# Denis , 2009.
+# Denis , 2009-2013.
 # Alan Monfort , 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-06 14:35-0400\n"
-"PO-Revision-Date: 2010-07-11 09:06+0000\n"
-"Last-Translator: Alan \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"dictionary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-14 18:34+0000\n"
+"PO-Revision-Date: 2013-07-03 17:29+0100\n"
+"Last-Translator: Denis Arnaud \n"
 "Language-Team: Brenux \n"
-"Language: \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: Poedit 1.5.4\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
 msgstr "Dafariad dre ziouer ar geriadur"
 
-#: ../data/spanish.desktop.in.h:1
-msgid "Spanish Dictionaries"
-msgstr "Geriadurioù spagnolek"
-
-#: ../data/thai.desktop.in.h:1
-msgid "Longdo Thai-English Dictionaries"
-msgstr "Geriadurioù longdo taieg-Saozneg"
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
+msgid "Dictionary"
+msgstr "Geriadur"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:1
+#: ../data/gnome-dictionary.desktop.in.in.h:2
 msgid "Check word definitions and spellings in an online dictionary"
 msgstr "Gwiriañ termenadurioù ha skritur gerioù dre ur geriadur enlinenn"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:2 ../src/gdict-about.c:62
-#: ../src/gdict-app.c:233 ../src/gdict-window.c:601 ../src/gdict-window.c:1894
-msgid "Dictionary"
-msgstr "Geriadur"
+#: ../data/gnome-dictionary.desktop.in.in.h:3
+msgid "word;synonym;definition;spelling;"
+msgstr "Ger;heñvelster;termenadur;reizhadur;"
+
+#: ../data/gnome-dictionary-menus.ui.h:1
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "Gwellvezioù"
+
+#: ../data/gnome-dictionary-menus.ui.h:2
+#| msgid "_Help"
+msgid "Help"
+msgstr "Skoazell"
+
+#: ../data/gnome-dictionary-menus.ui.h:3
+#| msgid "Dictionary"
+msgid "About Dictionary"
+msgstr "A-zivout ar Geriadur"
+
+#: ../data/gnome-dictionary-menus.ui.h:4
+msgid "Quit"
+msgstr "Kuitaat"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
-msgid "The default database to use"
-msgstr "Ar stlennvon dre ziouer da arverañ"
+#: ../data/gnome-dictionary-menus.ui.h:5
+msgid "_File"
+msgstr "_Restr"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
-msgid "The default search strategy to use"
-msgstr "An doare klask da arverañ dre ziouer"
+#: ../data/gnome-dictionary-menus.ui.h:6
+msgid "_New"
+msgstr "_Nevez"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
-msgid "The font to be used when printing"
-msgstr "An nodrezh da arverañ pa vez moullet"
+#: ../data/gnome-dictionary-menus.ui.h:7
+msgid "_Save a Copy..."
+msgstr "_Enrollañ un eilad..."
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
-msgid "The font to be used when printing a definition."
-msgstr "An nodrezh da arverañ pa vez moullet un termenadur."
+#: ../data/gnome-dictionary-menus.ui.h:8
+#| msgid "P_review..."
+msgid "P_review"
+msgstr "A_lberz"
+
+#: ../data/gnome-dictionary-menus.ui.h:9
+#| msgid "Print"
+msgid "_Print"
+msgstr "_Moullañ"
+
+#: ../data/gnome-dictionary-menus.ui.h:10
+msgid "_Close"
+msgstr "_Serriñ"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
-msgid ""
-"The name of the default individual database or meta-database to use on a "
-"dictionary source. An exclamation mark (\"!\") means that all the databases "
-"present in a dictionary source should be searched"
-msgstr ""
-"Anv ar stlennvon hiniennel dre ziouer pe meta-stlennvon da arverañ war tarzh "
-"ur geriadur. Ar poent estlamm (\"!\") a dalv e tlefe klasket an holl "
-"stlennvonioù a zo e tarzh ur geriadur"
+#: ../data/gnome-dictionary-menus.ui.h:11
+msgid "_Edit"
+msgstr "_Embann"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
-msgid ""
-"The name of the default search strategy to use on a dictionary source, if "
-"available. The default strategy is 'exact', that is match exact words."
-msgstr ""
-"Anv an doare klask da arverañ dre ziouer gant tarzh ur geriadur, mar bez "
-"hegerz. 'Rik' eo an doare klask dre ziouer mar klot gant ar gerioù gant un "
-"doare peurvat."
+#: ../data/gnome-dictionary-menus.ui.h:12
+msgid "_Copy"
+msgstr "_Eilañ"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
-msgid "The name of the dictionary source used"
-msgstr "Anv tarzh ar geriadur arveret"
+#: ../data/gnome-dictionary-menus.ui.h:13
+msgid "Select _All"
+msgstr "Diuz pep tr_a"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
-msgid ""
-"The name of the dictionary source used to retrieve the definitions of words."
-msgstr "Anv tarzh ar geriadur arveret a-benn adkavout termenadur ar gerioù."
+#: ../data/gnome-dictionary-menus.ui.h:14
+msgid "_Find"
+msgstr "_Klask"
+
+#: ../data/gnome-dictionary-menus.ui.h:15
+msgid "Find Ne_xt"
+msgstr "Klask an hini _war-lerc'h"
+
+#: ../data/gnome-dictionary-menus.ui.h:16
+msgid "Find Pre_vious"
+msgstr "Klask an hini _kent"
+
+#: ../data/gnome-dictionary-menus.ui.h:17
+msgid "_View"
+msgstr "G_welout"
+
+#: ../data/gnome-dictionary-menus.ui.h:18
+msgid "_Sidebar"
+msgstr "_Barrenn gostez"
+
+#: ../data/gnome-dictionary-menus.ui.h:19
+msgid "S_tatusbar"
+msgstr "Barrenn s_tad"
+
+#: ../data/gnome-dictionary-menus.ui.h:20
+msgid "Similar _Words"
+msgstr "Gerioù _damheñvel"
+
+#: ../data/gnome-dictionary-menus.ui.h:21
+msgid "Dictionary Sources"
+msgstr "Tarzhioù ar geriadur"
+
+#: ../data/gnome-dictionary-menus.ui.h:22
+msgid "Available _Databases"
+msgstr "Stlennvonioù hegerz"
+
+#: ../data/gnome-dictionary-menus.ui.h:23
+msgid "Available St_rategies"
+msgstr "Doare _klask hegerz"
+
+#: ../data/gnome-dictionary-menus.ui.h:24
+msgid "_Go"
+msgstr "_Mont"
+
+#: ../data/gnome-dictionary-menus.ui.h:25
+msgid "_Previous Definition"
+msgstr "_Termenadur kent"
+
+#: ../data/gnome-dictionary-menus.ui.h:26
+msgid "_Next Definition"
+msgstr "Te_rmenadur a zeu"
+
+#: ../data/gnome-dictionary-menus.ui.h:27
+msgid "_First Definition"
+msgstr "Termenadur _kentañ"
+
+#: ../data/gnome-dictionary-menus.ui.h:28
+msgid "_Last Definition"
+msgstr "Termenadur _diwezhañ"
 
 #: ../data/gnome-dictionary-preferences.ui.h:1
-msgid "Print"
-msgstr "Moullañ"
+msgid "_Select a dictionary source for looking up words:"
+msgstr "_Diuzañ ur tarzh geriadur a-benn teurel ur sell war ar gerioù :"
 
 #: ../data/gnome-dictionary-preferences.ui.h:2
-#: ../data/gnome-dictionary-source.ui.h:3
+#: ../data/gnome-dictionary-source.ui.h:6
 msgid "Source"
 msgstr "Tarzh"
 
@@ -97,92 +167,144 @@
 msgstr "Nodrezh ar _moullañ :"
 
 #: ../data/gnome-dictionary-preferences.ui.h:4
-msgid "_Select a dictionary source for looking up words:"
-msgstr "_Diuzañ ur tarzh geriadur a-benn teurel ur sell war ar gerioù :"
+msgid "Print"
+msgstr "Moullañ"
 
 #: ../data/gnome-dictionary-source.ui.h:1
-msgid "Dictionaries"
-msgstr "Geriadurioù"
+msgid "_Description:"
+msgstr "_Deskrivadur :"
 
 #: ../data/gnome-dictionary-source.ui.h:2
+msgid "_Transport:"
+msgstr "_Treuzdougen :"
+
+#: ../data/gnome-dictionary-source.ui.h:3
 msgid "H_ostname:"
 msgstr "Anv_ostiz :"
 
 #: ../data/gnome-dictionary-source.ui.h:4
+msgid "_Port:"
+msgstr "_Porzh :"
+
+#: ../data/gnome-dictionary-source.ui.h:5
 msgid "Source Name"
 msgstr "Anv an tarzh"
 
-#: ../data/gnome-dictionary-source.ui.h:5
+#: ../data/gnome-dictionary-source.ui.h:7
+msgid "Dictionaries"
+msgstr "Geriadurioù"
+
+#: ../data/gnome-dictionary-source.ui.h:8
 msgid "Strategies"
 msgstr "Doareoù klask"
 
-#: ../data/gnome-dictionary-source.ui.h:6
-msgid "_Description:"
-msgstr "_Deskrivadur :"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
+msgid "The default database to use"
+msgstr "Ar stlennvon dre ziouer da arverañ"
 
-#: ../data/gnome-dictionary-source.ui.h:7
-msgid "_Port:"
-msgstr "_Porzh :"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
+msgid ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
+msgstr ""
+"Anv ar stlennvon hiniennel dre ziouer pe meta-stlennvon da arverañ war tarzh "
+"ur geriadur. Ar poent estlamm (\"!\") a dalv e tlefe klasket an holl "
+"stlennvonioù a zo e tarzh ur geriadur"
 
-#: ../data/gnome-dictionary-source.ui.h:8
-msgid "_Transport:"
-msgstr "_Treuzdougen :"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
+msgid "The default search strategy to use"
+msgstr "An doare klask da arverañ dre ziouer"
 
-#: ../libgdict/gdict-client-context.c:283
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
+msgid ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
+msgstr ""
+"Anv an doare klask da arverañ dre ziouer gant tarzh ur geriadur, mar bez "
+"hegerz. 'Rik' eo an doare klask dre ziouer mar klot gant ar gerioù gant un "
+"doare peurvat."
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
+msgid "The font to be used when printing"
+msgstr "An nodrezh da arverañ pa vez moullet"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
+msgid "The font to be used when printing a definition."
+msgstr "An nodrezh da arverañ pa vez moullet un termenadur."
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
+msgid "The name of the dictionary source used"
+msgstr "Anv tarzh ar geriadur arveret"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
+msgid ""
+"The name of the dictionary source used to retrieve the definitions of words."
+msgstr "Anv tarzh ar geriadur arveret a-benn adkavout termenadur ar gerioù."
+
+#: ../data/spanish.desktop.in.h:1
+msgid "Spanish Dictionaries"
+msgstr "Geriadurioù spagnolek"
+
+#: ../data/thai.desktop.in.h:1
+msgid "Longdo Thai-English Dictionaries"
+msgstr "Geriadurioù longdo taieg-Saozneg"
+
+#: ../libgdict/gdict-client-context.c:282
 msgid "Client Name"
 msgstr "Anv an arval"
 
-#: ../libgdict/gdict-client-context.c:284
+#: ../libgdict/gdict-client-context.c:283
 msgid "The name of the client of the context object"
 msgstr "Anv an arval eus an ergorenn kemparzhel"
 
-#: ../libgdict/gdict-client-context.c:297
+#: ../libgdict/gdict-client-context.c:296
 msgid "Hostname"
 msgstr "Anv-ostiz"
 
-#: ../libgdict/gdict-client-context.c:298
+#: ../libgdict/gdict-client-context.c:297
 msgid "The hostname of the dictionary server to connect to"
 msgstr "Anv ostiz dafariad ar geriadur da gennaskañ outañ"
 
-#: ../libgdict/gdict-client-context.c:311
+#: ../libgdict/gdict-client-context.c:310
 msgid "Port"
 msgstr "Porzh"
 
-#: ../libgdict/gdict-client-context.c:312
+#: ../libgdict/gdict-client-context.c:311
 msgid "The port of the dictionary server to connect to"
 msgstr "Porzh dafariad ar geriadur da gennaskañ outañ"
 
-#: ../libgdict/gdict-client-context.c:327
+#: ../libgdict/gdict-client-context.c:326
 msgid "Status"
 msgstr "Stad"
 
-#: ../libgdict/gdict-client-context.c:328
+#: ../libgdict/gdict-client-context.c:327
 msgid "The status code as returned by the dictionary server"
 msgstr "Boneg ar stad kaset gant dafariad ar geriadur"
 
-#: ../libgdict/gdict-client-context.c:777
+#: ../libgdict/gdict-client-context.c:776
 #, c-format
 msgid "No connection to the dictionary server at '%s:%d'"
 msgstr "Kennask ebet ouzh dafariad ar geriadur da '%s : %d'"
 
-#: ../libgdict/gdict-client-context.c:1060
+#: ../libgdict/gdict-client-context.c:1059
 #, c-format
 msgid "Lookup failed for hostname '%s': no suitable resources found"
 msgstr ""
 "C'hwitadenn war klask anv an ostiz '%s' : loazioù dereat n'int ket bet kavet"
 
-#: ../libgdict/gdict-client-context.c:1091
+#: ../libgdict/gdict-client-context.c:1090
 #, c-format
 msgid "Lookup failed for host '%s': %s"
 msgstr "C'hwitadenn war ar c'hlask evit an ostiz '%s' : %s"
 
-#: ../libgdict/gdict-client-context.c:1125
+#: ../libgdict/gdict-client-context.c:1124
 #, c-format
 msgid "Lookup failed for host '%s': host not found"
 msgstr ""
 "C'hwitadenn war ar c'hlask evit an ostiz '%s' : n'eo ket bet kavet an ozstiz"
 
-#: ../libgdict/gdict-client-context.c:1177
+#: ../libgdict/gdict-client-context.c:1176
 #, c-format
 msgid ""
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
@@ -191,7 +313,7 @@
 "N'eo ket gouest da gennaskañ ouzh dafariad ar geriadur da '%s : %d'. Gant ar "
 "voneg %d en deus respontet an dafariad (dafariad sac'het)"
 
-#: ../libgdict/gdict-client-context.c:1196
+#: ../libgdict/gdict-client-context.c:1195
 #, c-format
 msgid ""
 "Unable to parse the dictionary server reply\n"
@@ -200,47 +322,47 @@
 "N'eo ket goust da zielfennañ respont dafariad ar geriadur\n"
 ": '%s'"
 
-#: ../libgdict/gdict-client-context.c:1225
+#: ../libgdict/gdict-client-context.c:1224
 #, c-format
 msgid "No definitions found for '%s'"
 msgstr "Termenadur ebet bet kavet evit '%s'"
 
-#: ../libgdict/gdict-client-context.c:1240
+#: ../libgdict/gdict-client-context.c:1239
 #, c-format
 msgid "Invalid database '%s'"
 msgstr "Stlennvon didalvoudek '%s'"
 
-#: ../libgdict/gdict-client-context.c:1255
+#: ../libgdict/gdict-client-context.c:1254
 #, c-format
 msgid "Invalid strategy '%s'"
 msgstr "Doare klask '%s' didalvoudek"
 
-#: ../libgdict/gdict-client-context.c:1270
+#: ../libgdict/gdict-client-context.c:1269
 #, c-format
 msgid "Bad command '%s'"
 msgstr "Arc'had fall '%s'"
 
-#: ../libgdict/gdict-client-context.c:1285
+#: ../libgdict/gdict-client-context.c:1284
 #, c-format
 msgid "Bad parameters for command '%s'"
 msgstr "Arventennoù fall evit an arc'had '%s'"
 
-#: ../libgdict/gdict-client-context.c:1300
+#: ../libgdict/gdict-client-context.c:1299
 #, c-format
 msgid "No databases found on dictionary server at '%s'"
 msgstr "N'eus ket bet kavet stlennvonioù war dafariad ar geriadur e '%s'"
 
-#: ../libgdict/gdict-client-context.c:1315
+#: ../libgdict/gdict-client-context.c:1314
 #, c-format
 msgid "No strategies found on dictionary server at '%s'"
 msgstr "N'eus ket bet kavet doareoù klask war dafariad ar geriadur e '%s'"
 
-#: ../libgdict/gdict-client-context.c:1748
+#: ../libgdict/gdict-client-context.c:1747
 #, c-format
 msgid "Connection failed to the dictionary server at %s:%d"
 msgstr "C'hwitadenn war kennaskañ ouzh dafariad ar geriadur da %s : %d"
 
-#: ../libgdict/gdict-client-context.c:1787
+#: ../libgdict/gdict-client-context.c:1786
 #, c-format
 msgid ""
 "Error while reading reply from server:\n"
@@ -249,37 +371,37 @@
 "Fazi e-pad ma oa o lenn ar respont a-berzh an dafaraid :\n"
 "%s"
 
-#: ../libgdict/gdict-client-context.c:1860
+#: ../libgdict/gdict-client-context.c:1859
 #, c-format
 msgid "Connection timeout for the dictionary server at '%s:%d'"
 msgstr "Re hir eo bet ar c'hennask ouzh dafariad ar geriadur da '%s : %d'"
 
-#: ../libgdict/gdict-client-context.c:1894
+#: ../libgdict/gdict-client-context.c:1893
 #, c-format
 msgid "No hostname defined for the dictionary server"
 msgstr "Anv ostiz ebet bet erspizet evit dafariad ar geriadur"
 
-#: ../libgdict/gdict-client-context.c:1930
-#: ../libgdict/gdict-client-context.c:1945
+#: ../libgdict/gdict-client-context.c:1929
+#: ../libgdict/gdict-client-context.c:1944
 #, c-format
 msgid "Unable to create socket"
 msgstr "N'eo ket gouest da grouiñ ur giez"
 
-#: ../libgdict/gdict-client-context.c:1971
+#: ../libgdict/gdict-client-context.c:1970
 #, c-format
 msgid "Unable to set the channel as non-blocking: %s"
 msgstr "N'eo ket gouest da arventennañ ar sanell evel unan ankaelus : %s"
 
-#: ../libgdict/gdict-client-context.c:1986
+#: ../libgdict/gdict-client-context.c:1985
 #, c-format
 msgid "Unable to connect to the dictionary server at '%s:%d'"
 msgstr "N'eo ket gouest da gennaskañ ouzh dafariad ar geriadur da '%s' : %d"
 
-#: ../libgdict/gdict-context.c:218
+#: ../libgdict/gdict-context.c:217
 msgid "Local Only"
 msgstr "Lec'hel nemetken"
 
-#: ../libgdict/gdict-context.c:219
+#: ../libgdict/gdict-context.c:218
 msgid "Whether the context uses only local dictionaries or not"
 msgstr ""
 "Menegiñ a ra hag-eñ e vo arveret geriadurioù lec'hel pe get gant ar "
@@ -293,122 +415,119 @@
 msgid "Clear the list of available databases"
 msgstr "Skarzhañ roll ar stlennvonioù hegerz"
 
-#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:778
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
 msgstr "Fazi e-pad ma oa o klask ur genglotadenn"
 
-#: ../libgdict/gdict-defbox.c:1127 ../libgdict/gdict-defbox.c:1221
-#: ../libgdict/gdict-defbox.c:1255
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1254
 msgid "Not found"
 msgstr "N'eo ket bet kavet"
 
-#: ../libgdict/gdict-defbox.c:1316
+#: ../libgdict/gdict-defbox.c:1315
 msgid "F_ind:"
 msgstr "K_avout :"
 
-#: ../libgdict/gdict-defbox.c:1329
+#: ../libgdict/gdict-defbox.c:1328
 msgid "_Previous"
 msgstr "_Kent"
 
-#: ../libgdict/gdict-defbox.c:1337
+#: ../libgdict/gdict-defbox.c:1336
 msgid "_Next"
 msgstr "_War-lerc'h"
 
-#: ../libgdict/gdict-defbox.c:2512
+#: ../libgdict/gdict-defbox.c:2513
 msgid "Error while looking up definition"
 msgstr "Fazi e-pad ma oa o klask an termenadur"
 
-#: ../libgdict/gdict-defbox.c:2554 ../libgdict/gdict-speller.c:736
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
 msgstr "Emañ ur c'hlask all o vont en-dro"
 
-#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:737
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
 msgstr "Mar plij, gortozit ma 'z echuo ar c'hlask bremanel."
 
-#: ../libgdict/gdict-defbox.c:2594
+#: ../libgdict/gdict-defbox.c:2595
 msgid "Error while retrieving the definition"
 msgstr "Fazi e-pad ma oa oc'h atoriñ an termenadur"
 
-#: ../libgdict/gdict-source.c:232
+#: ../libgdict/gdict-source.c:231
 msgid "Filename"
 msgstr "Anv restr"
 
-#: ../libgdict/gdict-source.c:233
+#: ../libgdict/gdict-source.c:232
 msgid "The filename used by this dictionary source"
 msgstr "An anv restr arveret gant tarzh ar geriadur-mañ"
 
-#: ../libgdict/gdict-source.c:246
+#: ../libgdict/gdict-source.c:245
 msgid "Name"
 msgstr "Anv"
 
-#: ../libgdict/gdict-source.c:247
-#, fuzzy
+#: ../libgdict/gdict-source.c:246
 msgid "The display name of this dictionary source"
-msgstr "Anv ar skrammañ eus tarzh ar geriadur-mañ"
+msgstr "Anv skrammet eus ar geriadur-tarzh-mañ"
 
-#: ../libgdict/gdict-source.c:260
+#: ../libgdict/gdict-source.c:259
 msgid "Description"
 msgstr "Deskrivadur"
 
-#: ../libgdict/gdict-source.c:261
+#: ../libgdict/gdict-source.c:260
 msgid "The description of this dictionary source"
 msgstr "Deskrivadur tarzh ar geriadur-mañ"
 
-#: ../libgdict/gdict-source.c:274 ../libgdict/gdict-speller.c:383
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
 msgstr "Stlennvon"
 
-#: ../libgdict/gdict-source.c:275
-#, fuzzy
+#: ../libgdict/gdict-source.c:274
 msgid "The default database of this dictionary source"
-msgstr "Stlennvon dre ziouer tarzh ar geriadur-mañ"
+msgstr "Stlennvon dre ziouer ar geriadur-tarzh-mañ"
 
-#: ../libgdict/gdict-source.c:288 ../libgdict/gdict-speller.c:390
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
 msgstr "Doare klask"
 
-#: ../libgdict/gdict-source.c:289
-#, fuzzy
+#: ../libgdict/gdict-source.c:288
 msgid "The default strategy of this dictionary source"
-msgstr "An doare klask dre ziouer e tarzh ar geriadur"
+msgstr "An doare klask dre ziouer er geriadur-tarzh"
 
-#: ../libgdict/gdict-source.c:302
+#: ../libgdict/gdict-source.c:301
 msgid "Transport"
 msgstr "Treuzdougen"
 
-#: ../libgdict/gdict-source.c:303
+#: ../libgdict/gdict-source.c:302
 msgid "The transport mechanism used by this dictionary source"
 msgstr "An ijinenn dreuzdougen arveret gant tarzh ar geriadur"
 
-#: ../libgdict/gdict-source.c:317 ../libgdict/gdict-speller.c:376
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
 msgstr "Kendestenn"
 
-#: ../libgdict/gdict-source.c:318
+#: ../libgdict/gdict-source.c:317
 msgid "The GdictContext bound to this source"
 msgstr "GdictContext liammet gant an tarzh-mañ"
 
-#: ../libgdict/gdict-source.c:413
+#: ../libgdict/gdict-source.c:412
 #, c-format
 msgid "Invalid transport type '%d'"
 msgstr "Rizh treuzdougen didalvoudek '%d'"
 
-#: ../libgdict/gdict-source.c:441
+#: ../libgdict/gdict-source.c:440
 #, c-format
 msgid "No '%s' group found inside the dictionary source definition"
 msgstr "Strollad '%s' kavet ebet e-barzh termenadur tarzh ar geriadur"
 
-#: ../libgdict/gdict-source.c:457 ../libgdict/gdict-source.c:481
-#: ../libgdict/gdict-source.c:505 ../libgdict/gdict-source.c:530
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
 msgstr ""
 "N'eo ket gouest da gaout an alc'hwez '%s' e-barzh termenadur tarzh ar "
 "geriadur : %s"
 
-#: ../libgdict/gdict-source.c:555
+#: ../libgdict/gdict-source.c:554
 #, c-format
 msgid ""
 "Unable to get the '%s' key inside the dictionary source definition file: %s"
@@ -416,49 +535,49 @@
 "N'eo ket gouest da gaout an alc'hwez '%s' e-barzh restr termenadur tarzh ar "
 "geriadur : %s"
 
-#: ../libgdict/gdict-source.c:741
+#: ../libgdict/gdict-source.c:740
 #, c-format
 msgid "Dictionary source does not have name"
 msgstr "N'eus anv ebet gant tarzh ar geriadur"
 
-#: ../libgdict/gdict-source.c:750
+#: ../libgdict/gdict-source.c:749
 #, c-format
 msgid "Dictionary source '%s' has invalid transport '%s'"
 msgstr "Tarzh ar geriadur '%s' en deus treuzdougen didalvoudek '%s'"
 
-#: ../libgdict/gdict-source-chooser.c:295
+#: ../libgdict/gdict-source-chooser.c:294
 msgid "Reload the list of available sources"
 msgstr "Adkargañ roll an tarzhioù hegerz"
 
-#: ../libgdict/gdict-source-loader.c:171
+#: ../libgdict/gdict-source-loader.c:170
 msgid "Paths"
 msgstr "Treugoù"
 
-#: ../libgdict/gdict-source-loader.c:172
+#: ../libgdict/gdict-source-loader.c:171
 msgid "Search paths used by this object"
 msgstr "Klask an treugoù arveret gant an ergorenn-mañ"
 
-#: ../libgdict/gdict-source-loader.c:184
+#: ../libgdict/gdict-source-loader.c:183
 msgid "Sources"
 msgstr "Tarzhioù"
 
-#: ../libgdict/gdict-source-loader.c:185
+#: ../libgdict/gdict-source-loader.c:184
 msgid "Dictionary sources found"
 msgstr "Kavet eo bet tarzhioù ar geriadur"
 
-#: ../libgdict/gdict-speller.c:353
+#: ../libgdict/gdict-speller.c:352
 msgid "Clear the list of similar words"
 msgstr "Skarzhañ roll ar gerioù damheñvel"
 
-#: ../libgdict/gdict-speller.c:377
+#: ../libgdict/gdict-speller.c:376
 msgid "The GdictContext object used to get the word definition"
 msgstr "Ergorenn GdictContext arveret a-benn kaout termenadur ar ger"
 
-#: ../libgdict/gdict-speller.c:384
+#: ../libgdict/gdict-speller.c:383
 msgid "The database used to query the GdictContext"
 msgstr "Ar stlennvon arveret a-benn kerc'hat GdictContext"
 
-#: ../libgdict/gdict-speller.c:391
+#: ../libgdict/gdict-speller.c:390
 msgid "The strategy used to query the GdictContext"
 msgstr "An doare klask arveret a-benn kerc'hat GdictContext"
 
@@ -470,27 +589,27 @@
 msgid "Clear the list of available strategies"
 msgstr "Skarzhañ ar roll eus an doareoù klask hegerz"
 
-#: ../libgdict/gdict-utils.c:97
+#: ../libgdict/gdict-utils.c:96
 msgid "GDict debugging flags to set"
 msgstr "Bannieloù diveugañ GDict da arventennañ"
 
-#: ../libgdict/gdict-utils.c:97 ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
 msgstr "BANNIELOÙ"
 
-#: ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:98
 msgid "GDict debugging flags to unset"
 msgstr "Bannieloù diveugañ GDict da ziarventennañ"
 
-#: ../libgdict/gdict-utils.c:157
+#: ../libgdict/gdict-utils.c:156
 msgid "GDict Options"
 msgstr "Dibarzhioù GDict"
 
-#: ../libgdict/gdict-utils.c:158
+#: ../libgdict/gdict-utils.c:157
 msgid "Show GDict Options"
 msgstr "Diskouez dibarzhioù GDict"
 
-#: ../src/gdict-about.c:55
+#: ../src/gdict-about.c:53
 msgid "translator-credits"
 msgstr ""
 "Denis\n"
@@ -500,354 +619,249 @@
 "  Denis https://launchpad.net/~bibar\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#: ../src/gdict-about.c:57
+#: ../src/gdict-about.c:55
 msgid "Look up words in dictionaries"
 msgstr "Klask gerioù war ar geriadurioù"
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:91
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
 msgstr "Gerioù da glask"
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:68
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
-msgstr ""
+msgstr "Ger"
 
-#: ../src/gdict-app.c:68
+#: ../src/gdict-app.c:66
 msgid "Words to match"
 msgstr "Grioù da lakaat da glotañ"
 
-#: ../src/gdict-app.c:74
+#: ../src/gdict-app.c:72
 msgid "Dictionary source to use"
 msgstr "Tarzh ar geriadur da arverañ"
 
-#: ../src/gdict-app.c:74 ../src/gdict-app.c:80 ../src/gdict-app.c:86
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
-msgstr ""
+msgstr "ANV"
 
-#: ../src/gdict-app.c:80
+#: ../src/gdict-app.c:78
 msgid "Database to use"
 msgstr "Stlennvon da arverañ"
 
-#: ../src/gdict-app.c:86
+#: ../src/gdict-app.c:84
 msgid "Strategy to use"
 msgstr "Doare klask da arverañ"
 
-#: ../src/gdict-app.c:91
+#: ../src/gdict-app.c:89
 msgid "WORDS"
-msgstr ""
+msgstr "GERIOÙ"
+
+#: ../src/gdict-app.c:106
+msgid "Dictionary Preferences"
+msgstr "Gwellvezioù ar geriadur"
+
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-source-dialog.c:475
+#, c-format
+msgid "There was an error while displaying help"
+msgstr "Ur fazi ez eus bet e-pad ma oa o skrammañ ar skoazell"
 
 #. create the new option context
-#: ../src/gdict-app.c:143
+#: ../src/gdict-app.c:217
 msgid " - Look up words in dictionaries"
 msgstr " - Klask gerioù war ar geriadurioù"
 
-#: ../src/gdict-pref-dialog.c:241 ../src/gdict-pref-dialog.c:430
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
 msgstr "Embann tarzh ar geriadur"
 
-#: ../src/gdict-pref-dialog.c:305
+#: ../src/gdict-pref-dialog.c:303
 msgid "Add Dictionary Source"
 msgstr "Ouzhpennañ tarzh ar geriadur"
 
-#: ../src/gdict-pref-dialog.c:350
+#: ../src/gdict-pref-dialog.c:348
 #, c-format
 msgid "Remove \"%s\"?"
 msgstr "Lemel \"%s\"?"
 
-#: ../src/gdict-pref-dialog.c:352
+#: ../src/gdict-pref-dialog.c:350
 msgid "This will permanently remove the dictionary source from the list."
 msgstr "Dilamet e vo tarzh ar geriadur diwar ar roll da vat gant an dra-mañ."
 
-#: ../src/gdict-pref-dialog.c:382
+#: ../src/gdict-pref-dialog.c:380
 #, c-format
 msgid "Unable to remove source '%s'"
 msgstr "N'eo ket gouest da zilemel an tarzh '%s'"
 
-#: ../src/gdict-pref-dialog.c:496 ../src/gdict-source-dialog.c:479
-#: ../src/gdict-window.c:1245
-#, c-format
-msgid "There was an error while displaying help"
-msgstr "Ur fazi ez eus bet e-pad ma oa o skrammañ ar skoazell"
-
-#: ../src/gdict-pref-dialog.c:643
+#: ../src/gdict-pref-dialog.c:641
 msgid "Add a new dictionary source"
 msgstr "Ouzhpennañ un tarzh geriadur nevez"
 
-#: ../src/gdict-pref-dialog.c:649
+#: ../src/gdict-pref-dialog.c:647
 msgid "Remove the currently selected dictionary source"
 msgstr "Dilemel tarzh ar geriadur diuzet bremañ"
 
-#: ../src/gdict-pref-dialog.c:655
-#, fuzzy
+#: ../src/gdict-pref-dialog.c:653
 msgid "Edit the currently selected dictionary source"
-msgstr "Dilemel tarzh ar geriadur diuzet bremañ"
+msgstr "Daskemmañ ar geriadur tarzh diuzet oberiat"
 
-#: ../src/gdict-pref-dialog.c:663
+#: ../src/gdict-pref-dialog.c:661
 msgid "Set the font used for printing the definitions"
 msgstr "Arventennañ an nodrezh arveret evit diskouez an termenadurioù"
 
-#: ../src/gdict-print.c:241 ../src/gdict-print.c:305
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
 msgstr "N'eo ket gouest da skrammañ an alberz : %s"
 
-#: ../src/gdict-source-dialog.c:341 ../src/gdict-source-dialog.c:434
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
 msgstr "N'eo ket gouest da grouiñ ur restr tarzh"
 
-#: ../src/gdict-source-dialog.c:359 ../src/gdict-source-dialog.c:452
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
 msgstr "N'eo ket gouest da enrollañ ar restr tarzh"
 
-#: ../src/gdict-window.c:311
+#: ../src/gdict-window.c:253
 #, c-format
 msgid "Searching for '%s'..."
 msgstr "O klask '%s'..."
 
-#: ../src/gdict-window.c:343 ../src/gdict-window.c:400
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
 msgstr "Termenadur ebet bet kavet"
 
-#: ../src/gdict-window.c:345
+#: ../src/gdict-window.c:287
 #, c-format
 msgid "A definition found"
 msgid_plural "%d definitions found"
 msgstr[0] "Un termenadur bet kavet"
 msgstr[1] "%d a dermenadurioù bet kavet"
 
-#: ../src/gdict-window.c:516
+#: ../src/gdict-window.c:458
 #, c-format
 msgid "No dictionary source available with name '%s'"
 msgstr "N'eus tarzh geriadur ebet hegerz gant an anv '%s'"
 
-#: ../src/gdict-window.c:520
+#: ../src/gdict-window.c:462
 msgid "Unable to find dictionary source"
 msgstr "N'eo ket gouest da gavout tarzh ar geriadur"
 
-#: ../src/gdict-window.c:536
+#: ../src/gdict-window.c:478
 #, c-format
 msgid "No context available for source '%s'"
 msgstr "Kendestenn ebet hegerz evit an tarzh '%s'"
 
-#: ../src/gdict-window.c:540
+#: ../src/gdict-window.c:482
 msgid "Unable to create a context"
 msgstr "N'eo ket gouest da grouiiñ ur gendestenn"
 
-#: ../src/gdict-window.c:599
+#: ../src/gdict-window.c:541
 #, c-format
 msgid "%s - Dictionary"
 msgstr "%s - Geriadur"
 
-#: ../src/gdict-window.c:962
+#: ../src/gdict-window.c:910
 msgid "Save a Copy"
 msgstr "Enrollañ un eilad"
 
-#: ../src/gdict-window.c:972
+#: ../src/gdict-window.c:920
 msgid "Untitled document"
 msgstr "Teul dianv"
 
-#: ../src/gdict-window.c:993
+#: ../src/gdict-window.c:941
 #, c-format
 msgid "Error while writing to '%s'"
 msgstr "Fazi e-pad ma oa o skrivañ e '%s'"
 
-#: ../src/gdict-window.c:1098
-msgid "Dictionary Preferences"
-msgstr "Gwellvezioù ar geriadur"
-
-#: ../src/gdict-window.c:1280
-msgid "_File"
-msgstr "_Restr"
-
-#: ../src/gdict-window.c:1281
-msgid "_Edit"
-msgstr "_Embann"
-
-#: ../src/gdict-window.c:1282
-msgid "_View"
-msgstr "G_welout"
-
-#: ../src/gdict-window.c:1283
-msgid "_Go"
-msgstr "_Mont"
-
-#: ../src/gdict-window.c:1284
-msgid "_Help"
-msgstr "_Skoazell"
-
-#. File menu
-#: ../src/gdict-window.c:1287
-msgid "_New"
-msgstr "_Nevez"
-
-#: ../src/gdict-window.c:1288
-msgid "New look up"
-msgstr "Klask nevez"
-
-#: ../src/gdict-window.c:1289
-msgid "_Save a Copy..."
-msgstr "_Enrollañ un eilad..."
-
-#: ../src/gdict-window.c:1291
-msgid "P_review..."
-msgstr "Albe_rz..."
-
-#: ../src/gdict-window.c:1292
-msgid "Preview this document"
-msgstr "Alberz an teul-mañ"
-
-#: ../src/gdict-window.c:1293
-msgid "_Print..."
-msgstr "_Moullañ..."
-
-#: ../src/gdict-window.c:1294
-msgid "Print this document"
-msgstr "Moullañ an teuliad-mañ"
-
-#: ../src/gdict-window.c:1301
-msgid "Select _All"
-msgstr "Diuz pep tr_a"
-
-#: ../src/gdict-window.c:1304
-msgid "Find a word or phrase in the document"
-msgstr "Kavout ur ger pe ur frazenn en teul-mañ"
-
-#: ../src/gdict-window.c:1306
-msgid "Find Ne_xt"
-msgstr "Klask an hini _war-lerc'h"
-
-#: ../src/gdict-window.c:1308
-msgid "Find Pre_vious"
-msgstr "Klask an hini _kent"
-
-#: ../src/gdict-window.c:1310
-msgid "_Preferences"
-msgstr "_Gwellvezioù"
-
-#. Go menu
-#: ../src/gdict-window.c:1314
-msgid "_Previous Definition"
-msgstr "_Termenadur kent"
-
-#: ../src/gdict-window.c:1315
-msgid "Go to the previous definition"
-msgstr "Mont d'an termenadur kent"
-
-#: ../src/gdict-window.c:1316
-msgid "_Next Definition"
-msgstr "Te_rmenadur a zeu"
-
-#: ../src/gdict-window.c:1317
-msgid "Go to the next definition"
-msgstr "Mont d'an termenadur a zeu"
-
-#: ../src/gdict-window.c:1318
-msgid "_First Definition"
-msgstr "Termenadur _kentañ"
-
-#: ../src/gdict-window.c:1319
-msgid "Go to the first definition"
-msgstr "Mont d'an termenadur kentañ"
-
-#: ../src/gdict-window.c:1320
-msgid "_Last Definition"
-msgstr "Termenadur _diwezhañ"
-
-#: ../src/gdict-window.c:1321
-msgid "Go to the last definition"
-msgstr "Mont d'an termenadur diwezhañ"
-
-#. View menu
-#: ../src/gdict-window.c:1324
-msgid "Similar _Words"
-msgstr "Gerioù _damheñvel"
-
-#: ../src/gdict-window.c:1326
-msgid "Dictionary Sources"
-msgstr "Tarzhioù ar geriadur"
-
-#: ../src/gdict-window.c:1328
-msgid "Available _Databases"
-msgstr "Stlennvonioù hegerz"
-
-#: ../src/gdict-window.c:1330
-msgid "Available St_rategies"
-msgstr "Doare _klask hegerz"
-
-#. Help menu
-#: ../src/gdict-window.c:1334
-msgid "_Contents"
-msgstr "Endal_c'hadoù"
-
-#: ../src/gdict-window.c:1336
-msgid "_About"
-msgstr "_Diwar-benn"
-
-#. View menu
-#: ../src/gdict-window.c:1347
-msgid "_Sidebar"
-msgstr "_Barrenn gostez"
-
-#: ../src/gdict-window.c:1349
-msgid "S_tatusbar"
-msgstr "Barrenn s_tad"
-
-#: ../src/gdict-window.c:1414
+#: ../src/gdict-window.c:1359
 #, c-format
 msgid "Dictionary source `%s' selected"
 msgstr "Tarzh ar geriadur '%s' diuzet"
 
-#: ../src/gdict-window.c:1435
+#: ../src/gdict-window.c:1380
 #, c-format
 msgid "Strategy `%s' selected"
 msgstr "Doare klask '%s' diuzet"
 
-#: ../src/gdict-window.c:1455
+#: ../src/gdict-window.c:1400
 #, c-format
 msgid "Database `%s' selected"
 msgstr "Stlennvon '%s' diuzet"
 
-#: ../src/gdict-window.c:1475
+#: ../src/gdict-window.c:1420
 #, c-format
 msgid "Word `%s' selected"
 msgstr "Ger '%s' diuzet"
 
 #. speller
-#: ../src/gdict-window.c:1500
+#: ../src/gdict-window.c:1445
 msgid "Double-click on the word to look up"
 msgstr "Daouglikañ war ar ger da glask"
 
 #. strat-chooser
-#: ../src/gdict-window.c:1506
+#: ../src/gdict-window.c:1451
 msgid "Double-click on the matching strategy to use"
 msgstr "Daouglikañ war an doare klask o klotañ ganti da arverañ"
 
 #. source-chooser
-#: ../src/gdict-window.c:1511
+#: ../src/gdict-window.c:1456
 msgid "Double-click on the source to use"
 msgstr "Daouglikañ war an tarzh da arverañ"
 
 #. db-chooser
-#: ../src/gdict-window.c:1520
+#: ../src/gdict-window.c:1465
 msgid "Double-click on the database to use"
 msgstr "Daouglikañ war ar stlennvon da arverañ"
 
-#: ../src/gdict-window.c:1700
+#: ../src/gdict-window.c:1615
 msgid "Look _up:"
 msgstr "Kl_ask :"
 
-#: ../src/gdict-window.c:1775
+#: ../src/gdict-window.c:1690
 msgid "Similar words"
 msgstr "Gerioù damheñvel"
 
-#: ../src/gdict-window.c:1788
+#: ../src/gdict-window.c:1703
 msgid "Available dictionaries"
 msgstr "Geriadurioù hegerz"
 
-#: ../src/gdict-window.c:1806
+#: ../src/gdict-window.c:1721
 msgid "Available strategies"
 msgstr "Doareoù klask hegerz"
 
-#: ../src/gdict-window.c:1822
+#: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Tarzhioù ar geriadur"
+
+#~ msgid "New look up"
+#~ msgstr "Klask nevez"
+
+#~ msgid "Preview this document"
+#~ msgstr "Alberz an teul-mañ"
+
+#~ msgid "_Print..."
+#~ msgstr "_Moullañ..."
+
+#~ msgid "Print this document"
+#~ msgstr "Moullañ an teuliad-mañ"
+
+#~ msgid "Find a word or phrase in the document"
+#~ msgstr "Kavout ur ger pe ur frazenn en teul-mañ"
+
+#~ msgid "Go to the previous definition"
+#~ msgstr "Mont d'an termenadur kent"
+
+#~ msgid "Go to the next definition"
+#~ msgstr "Mont d'an termenadur a zeu"
+
+#~ msgid "Go to the first definition"
+#~ msgstr "Mont d'an termenadur kentañ"
+
+#~ msgid "Go to the last definition"
+#~ msgstr "Mont d'an termenadur diwezhañ"
+
+#~ msgid "_Contents"
+#~ msgstr "Endal_c'hadoù"
+
+#~ msgid "_About"
+#~ msgstr "_Diwar-benn"
diff -Nru gnome-dictionary-3.8.0/po/da.po gnome-dictionary-3.10.0/po/da.po
--- gnome-dictionary-3.8.0/po/da.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/da.po	2013-10-01 13:07:21.000000000 +0000
@@ -22,8 +22,8 @@
 msgstr ""
 "Project-Id-Version: gnome-utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-12 23:36+0100\n"
-"PO-Revision-Date: 2013-03-12 22:38+0100\n"
+"POT-Creation-Date: 2013-09-16 00:41+0200\n"
+"PO-Revision-Date: 2013-09-14 15:43+0200\n"
 "Last-Translator: Kenneth Nielsen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
@@ -134,8 +134,8 @@
 msgstr "Ordbogskilder"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Tilgængelige _databaser"
+msgid "Available _Dictionaries"
+msgstr "Tilgængelige ord_bøger"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -843,6 +843,9 @@
 msgid "Dictionary sources"
 msgstr "Ordbogskilder"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Tilgængelige _databaser"
+
 #~ msgid "New look up"
 #~ msgstr "Nyt opslag"
 
diff -Nru gnome-dictionary-3.8.0/po/et.po gnome-dictionary-3.10.0/po/et.po
--- gnome-dictionary-3.8.0/po/et.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/et.po	2013-10-01 13:07:21.000000000 +0000
@@ -10,15 +10,15 @@
 # Tõivo Leedjärv , 2002.
 # Ivar Smolin , 2005–2011.
 # Priit Laes , 2005.
-# Mattias Põldaru , 2012.
+# Mattias Põldaru , 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-26 21:54+0000\n"
-"PO-Revision-Date: 2012-11-17 01:16+0300\n"
+"POT-Creation-Date: 2013-09-11 19:16+0000\n"
+"PO-Revision-Date: 2013-09-11 23:03+0300\n"
 "Last-Translator: Mattias Põldaru \n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -26,6 +26,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "Default Dictionary Server"
 msgstr "Vaikimisi sõnaraamatuserver"
@@ -102,8 +103,8 @@
 msgid "Dictionary Sources"
 msgstr "Sõnaraamatuallikad"
 
-msgid "Available _Databases"
-msgstr "Saadaolevad _andmebaasid"
+msgid "Available _Dictionaries"
+msgstr "Saadaolevad _sõnastikud"
 
 msgid "Available St_rategies"
 msgstr "Saadaolevad st_rateegiad"
@@ -641,6 +642,9 @@
 msgid "Dictionary sources"
 msgstr "Sõnaraamatuallikad"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Saadaolevad _andmebaasid"
+
 #~ msgid "New look up"
 #~ msgstr "Uus otsing"
 
diff -Nru gnome-dictionary-3.8.0/po/eu.po gnome-dictionary-3.10.0/po/eu.po
--- gnome-dictionary-3.8.0/po/eu.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/eu.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,18 +1,20 @@
 # translation of eu.po to Basque
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the baobab package.
+#
 # Mikel Olasagasti , 2005.
 # Iñaki Larrañaga Murgoitio , 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 # Iñaki Larrañaga Murgoitio , 2012, 2013.
 # Julen Ruiz Aizpuru , 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-02 12:20+0100\n"
-"PO-Revision-Date: 2013-01-06 23:11+0100\n"
+"POT-Creation-Date: 2013-09-16 21:50+0200\n"
+"PO-Revision-Date: 2013-09-16 21:51+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio \n"
-"Language-Team: Basque \n"
+"Language-Team: Basque \n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,10 +128,9 @@
 msgid "Dictionary Sources"
 msgstr "Hiztegiaren iturburuak"
 
-#
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "_Datu-base erabilgarriak"
+msgid "Available _Dictionaries"
+msgstr "_Hiztegi erabilgarriak"
 
 #
 #: ../data/gnome-dictionary-menus.ui.h:23
@@ -878,6 +879,10 @@
 msgid "Dictionary sources"
 msgstr "Hiztegiaren iturburuak"
 
+#
+#~ msgid "Available _Databases"
+#~ msgstr "_Datu-base erabilgarriak"
+
 #~ msgid "New look up"
 #~ msgstr "Bilaketa berria"
 
diff -Nru gnome-dictionary-3.8.0/po/fi.po gnome-dictionary-3.10.0/po/fi.po
--- gnome-dictionary-3.8.0/po/fi.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/fi.po	2013-10-01 13:07:21.000000000 +0000
@@ -14,23 +14,24 @@
 # Ilkka Tuohela , 2005-2009.
 # Timo Jyrinki , 2008.
 # Tommi Vainikainen , 2009-2011.
-# Jiri Grönroos , 2012, 2013.
+# Jiri Grönroos , 2012, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-07 18:52+0000\n"
-"PO-Revision-Date: 2013-03-26 20:13+0200\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-09-02 23:09+0300\n"
 "Last-Translator: Jiri Grönroos \n"
-"Language-Team: Finnish \n"
+"Language-Team: suomi \n"
 "Language: fi\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-POT-Import-Date: 2012-02-19 15:16:04+0000\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
@@ -136,8 +137,9 @@
 msgstr "Sanakirjalähteet"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Saatavilla olevat tieto_kannat"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "_Käytettävissä olevat sanakirjat"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -840,6 +842,9 @@
 msgid "Dictionary sources"
 msgstr "Sanakirjalähteet"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Saatavilla olevat tieto_kannat"
+
 #~ msgid "New look up"
 #~ msgstr "Uusi haku"
 
diff -Nru gnome-dictionary-3.8.0/po/fr.po gnome-dictionary-3.10.0/po/fr.po
--- gnome-dictionary-3.8.0/po/fr.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/fr.po	2013-10-01 13:07:21.000000000 +0000
@@ -22,8 +22,8 @@
 "Project-Id-Version: gnome-utils HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-01-23 12:18+0100\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-08-24 17:12+0200\n"
 "Last-Translator: Bruno Brouard \n"
 "Language-Team: GNOME French Team \n"
 "Language: \n"
@@ -136,8 +136,8 @@
 msgstr "Sources de Dictionnaire"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "_Bases de données disponibles"
+msgid "Available _Dictionaries"
+msgstr "_Dictionnaires disponibles"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -847,3 +847,6 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Sources de Dictionnaire"
+
+#~ msgid "Available _Databases"
+#~ msgstr "_Bases de données disponibles"
diff -Nru gnome-dictionary-3.8.0/po/fur.po gnome-dictionary-3.10.0/po/fur.po
--- gnome-dictionary-3.8.0/po/fur.po	1970-01-01 00:00:00.000000000 +0000
+++ gnome-dictionary-3.10.0/po/fur.po	2013-10-01 13:07:21.000000000 +0000
@@ -0,0 +1,823 @@
+# Friulian translation for gnome-dictionary.
+# Copyright (C) 2013 gnome-dictionary's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-dictionary package.
+# Fabio Tomat , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-dictionary master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"dictionary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-08-22 13:13+0000\n"
+"PO-Revision-Date: 2013-08-25 10:31+0100\n"
+"Last-Translator: Fabio Tomat \n"
+"Language-Team: Friulian \n"
+"Language: fur\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: Poedit 1.5.4\n"
+
+#: ../data/default.desktop.in.h:1
+msgid "Default Dictionary Server"
+msgstr "Server di dizionari predefinît"
+
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
+msgid "Dictionary"
+msgstr "Dizionari"
+
+#: ../data/gnome-dictionary.desktop.in.in.h:2
+msgid "Check word definitions and spellings in an online dictionary"
+msgstr "Controle definizions e ortografie di peraulis suntun dizionari in rêt"
+
+#: ../data/gnome-dictionary.desktop.in.in.h:3
+msgid "word;synonym;definition;spelling;"
+msgstr "peraule;peraulis;sinonims;definizion;definizions;ortografie;"
+
+#: ../data/gnome-dictionary-menus.ui.h:1
+msgid "Preferences"
+msgstr "Preferencis"
+
+#: ../data/gnome-dictionary-menus.ui.h:2
+msgid "Help"
+msgstr "Jutori"
+
+#: ../data/gnome-dictionary-menus.ui.h:3
+msgid "About Dictionary"
+msgstr "Informazions su Dizionari"
+
+#: ../data/gnome-dictionary-menus.ui.h:4
+msgid "Quit"
+msgstr "Jes"
+
+#: ../data/gnome-dictionary-menus.ui.h:5
+msgid "_File"
+msgstr "_File"
+
+#: ../data/gnome-dictionary-menus.ui.h:6
+msgid "_New"
+msgstr "_Gnûf"
+
+#: ../data/gnome-dictionary-menus.ui.h:7
+msgid "_Save a Copy..."
+msgstr "_Salve une copie..."
+
+#: ../data/gnome-dictionary-menus.ui.h:8
+msgid "P_review"
+msgstr "Antepri_me"
+
+#: ../data/gnome-dictionary-menus.ui.h:9
+msgid "_Print"
+msgstr "Stam_pe"
+
+#: ../data/gnome-dictionary-menus.ui.h:10
+msgid "_Close"
+msgstr "Sie_re"
+
+#: ../data/gnome-dictionary-menus.ui.h:11
+msgid "_Edit"
+msgstr "_Modifiche"
+
+#: ../data/gnome-dictionary-menus.ui.h:12
+msgid "_Copy"
+msgstr "_Copie"
+
+#: ../data/gnome-dictionary-menus.ui.h:13
+msgid "Select _All"
+msgstr "_Selezione dut"
+
+#: ../data/gnome-dictionary-menus.ui.h:14
+msgid "_Find"
+msgstr "Cja_te"
+
+#: ../data/gnome-dictionary-menus.ui.h:15
+msgid "Find Ne_xt"
+msgstr "Cjate _prossim"
+
+#: ../data/gnome-dictionary-menus.ui.h:16
+msgid "Find Pre_vious"
+msgstr "Cjate prece_dent"
+
+#: ../data/gnome-dictionary-menus.ui.h:17
+msgid "_View"
+msgstr "M_ostre"
+
+#: ../data/gnome-dictionary-menus.ui.h:18
+#, fuzzy
+msgid "_Sidebar"
+msgstr "Striche _laterâl"
+
+#: ../data/gnome-dictionary-menus.ui.h:19
+msgid "S_tatusbar"
+msgstr "Striche di s_tât"
+
+#: ../data/gnome-dictionary-menus.ui.h:20
+msgid "Similar _Words"
+msgstr "_Peraulis similis"
+
+#: ../data/gnome-dictionary-menus.ui.h:21
+msgid "Dictionary Sources"
+msgstr "Sorzints dizionari"
+
+#: ../data/gnome-dictionary-menus.ui.h:22
+msgid "Available _Dictionaries"
+msgstr "Dizionaris a _disposizion"
+
+#: ../data/gnome-dictionary-menus.ui.h:23
+msgid "Available St_rategies"
+msgstr "St_rategjiis disponibii"
+
+#: ../data/gnome-dictionary-menus.ui.h:24
+msgid "_Go"
+msgstr "_Va"
+
+#: ../data/gnome-dictionary-menus.ui.h:25
+msgid "_Previous Definition"
+msgstr "Definizion pr_ecedent"
+
+#: ../data/gnome-dictionary-menus.ui.h:26
+msgid "_Next Definition"
+msgstr "prossime defini_zion"
+
+#: ../data/gnome-dictionary-menus.ui.h:27
+msgid "_First Definition"
+msgstr "Prime de_finizion"
+
+#: ../data/gnome-dictionary-menus.ui.h:28
+msgid "_Last Definition"
+msgstr "U_ltime definizion"
+
+#: ../data/gnome-dictionary-preferences.ui.h:1
+msgid "_Select a dictionary source for looking up words:"
+msgstr "_Selezione une sorzint dizionari par cirî peraulis:"
+
+#: ../data/gnome-dictionary-preferences.ui.h:2
+#: ../data/gnome-dictionary-source.ui.h:6
+msgid "Source"
+msgstr "Sorzint"
+
+#: ../data/gnome-dictionary-preferences.ui.h:3
+msgid "_Print font:"
+msgstr "Caratar par _stampâ:"
+
+#: ../data/gnome-dictionary-preferences.ui.h:4
+msgid "Print"
+msgstr "Stampe"
+
+#: ../data/gnome-dictionary-source.ui.h:1
+msgid "_Description:"
+msgstr "_Descrizion:"
+
+#: ../data/gnome-dictionary-source.ui.h:2
+msgid "_Transport:"
+msgstr "_Traspuart:"
+
+#: ../data/gnome-dictionary-source.ui.h:3
+msgid "H_ostname:"
+msgstr "Non h_ost:"
+
+#: ../data/gnome-dictionary-source.ui.h:4
+msgid "_Port:"
+msgstr "_Puarte:"
+
+#: ../data/gnome-dictionary-source.ui.h:5
+msgid "Source Name"
+msgstr "Non sorzint"
+
+#: ../data/gnome-dictionary-source.ui.h:7
+msgid "Dictionaries"
+msgstr "Dizionaris"
+
+#: ../data/gnome-dictionary-source.ui.h:8
+msgid "Strategies"
+msgstr "Strategjiis"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
+msgid "The default database to use"
+msgstr "Database predefinît di doprâ"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
+msgid ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
+msgstr ""
+"Non dal database individuâl predefinît o meta-database di doprâ suntune "
+"sorzint dal dizionari. Un pont esclamatîf (\"!\") al specifiche che a àn di "
+"sedi cirûts ducj i database presints intune sorzint di dizionari"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
+msgid "The default search strategy to use"
+msgstr "Mût di cirî predefinît di doprâ"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
+msgid ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
+msgstr ""
+"Non dal mût di cirî predefinît di doprâ intune sorzint dizionari, se "
+"disponibil. La strategjie predefinide a je «exact», che a cjate lis peraulis "
+"compagnis identichis."
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
+msgid "The font to be used when printing"
+msgstr "Caratar di doprâ pe stampe"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
+msgid "The font to be used when printing a definition."
+msgstr "Caratar di doprâ cuant che a si stampe une definizion."
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
+msgid "The name of the dictionary source used"
+msgstr "Non de sorzint dizionari doprade"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
+msgid ""
+"The name of the dictionary source used to retrieve the definitions of words."
+msgstr ""
+"Non de sorzint di dizionari doprade par vê lis definizions des peraulis."
+
+#: ../data/spanish.desktop.in.h:1
+msgid "Spanish Dictionaries"
+msgstr "Dizionaris spagnui"
+
+#: ../data/thai.desktop.in.h:1
+msgid "Longdo Thai-English Dictionaries"
+msgstr "Dizionaris Longdo Thai-Inglês"
+
+#: ../libgdict/gdict-client-context.c:282
+msgid "Client Name"
+msgstr "Non client"
+
+#: ../libgdict/gdict-client-context.c:283
+msgid "The name of the client of the context object"
+msgstr "Non dal client dal ogjet contest"
+
+#: ../libgdict/gdict-client-context.c:296
+msgid "Hostname"
+msgstr "Non host"
+
+#: ../libgdict/gdict-client-context.c:297
+msgid "The hostname of the dictionary server to connect to"
+msgstr "Non host dal server di dizionari dulà tacasi"
+
+#: ../libgdict/gdict-client-context.c:310
+msgid "Port"
+msgstr "Puarte"
+
+#: ../libgdict/gdict-client-context.c:311
+msgid "The port of the dictionary server to connect to"
+msgstr "Puarte dal server di dizionari dulà tacasi"
+
+#: ../libgdict/gdict-client-context.c:326
+msgid "Status"
+msgstr "Stât"
+
+#: ../libgdict/gdict-client-context.c:327
+msgid "The status code as returned by the dictionary server"
+msgstr "Codiç di stât come tornât dal server di dizionari"
+
+#: ../libgdict/gdict-client-context.c:776
+#, c-format
+msgid "No connection to the dictionary server at '%s:%d'"
+msgstr "Nissune conession al server di dizionari a «%s:%d»"
+
+#: ../libgdict/gdict-client-context.c:1059
+#, c-format
+msgid "Lookup failed for hostname '%s': no suitable resources found"
+msgstr "Ricercje falide pal non host «%s»: nissune risorse adeguade cjatade"
+
+#: ../libgdict/gdict-client-context.c:1090
+#, c-format
+msgid "Lookup failed for host '%s': %s"
+msgstr "Ricercje falide pal host «%s»: %s"
+
+#: ../libgdict/gdict-client-context.c:1124
+#, c-format
+msgid "Lookup failed for host '%s': host not found"
+msgstr "Ricercje falide par il non host «%s»: host no cjatât"
+
+#: ../libgdict/gdict-client-context.c:1176
+#, c-format
+msgid ""
+"Unable to connect to the dictionary server at '%s:%d'. The server replied "
+"with code %d (server down)"
+msgstr ""
+"Impussibil tacasi al server di dizionari a «%s:%d». Il server al à "
+"rispuindût cun codiç %d (server no atîf)"
+
+#: ../libgdict/gdict-client-context.c:1195
+#, c-format
+msgid ""
+"Unable to parse the dictionary server reply\n"
+": '%s'"
+msgstr ""
+"Impussibil analizâ la rispueste dal server dal dizionari\n"
+": «%s»"
+
+#: ../libgdict/gdict-client-context.c:1224
+#, c-format
+msgid "No definitions found for '%s'"
+msgstr "Nissune definizion cjatade par «%s»"
+
+#: ../libgdict/gdict-client-context.c:1239
+#, c-format
+msgid "Invalid database '%s'"
+msgstr "Database «%s» no valit"
+
+#: ../libgdict/gdict-client-context.c:1254
+#, c-format
+msgid "Invalid strategy '%s'"
+msgstr "Strategje «%s» no valide"
+
+#: ../libgdict/gdict-client-context.c:1269
+#, c-format
+msgid "Bad command '%s'"
+msgstr "Comant «%s» no bon"
+
+#: ../libgdict/gdict-client-context.c:1284
+#, c-format
+msgid "Bad parameters for command '%s'"
+msgstr "Parametris no juscj par il comant «%s» "
+
+#: ../libgdict/gdict-client-context.c:1299
+#, c-format
+msgid "No databases found on dictionary server at '%s'"
+msgstr "Nissun database cjatât tal server di dizionari a «%s»"
+
+#: ../libgdict/gdict-client-context.c:1314
+#, c-format
+msgid "No strategies found on dictionary server at '%s'"
+msgstr "Nissune strategjie cjatade tal server di dizionari a «%s»"
+
+#: ../libgdict/gdict-client-context.c:1747
+#, c-format
+msgid "Connection failed to the dictionary server at %s:%d"
+msgstr "Conession falide al server di dizionari a «%s:%d»"
+
+#: ../libgdict/gdict-client-context.c:1786
+#, c-format
+msgid ""
+"Error while reading reply from server:\n"
+"%s"
+msgstr ""
+"Erôr intant che a si leieve le rispueste dal server:\n"
+"%s"
+
+#: ../libgdict/gdict-client-context.c:1859
+#, c-format
+msgid "Connection timeout for the dictionary server at '%s:%d'"
+msgstr "Conession scjadude al server di dizionari a «%s:%d»"
+
+#: ../libgdict/gdict-client-context.c:1893
+#, c-format
+msgid "No hostname defined for the dictionary server"
+msgstr "Nissun non host definît pal server di dizionari"
+
+#: ../libgdict/gdict-client-context.c:1929
+#: ../libgdict/gdict-client-context.c:1944
+#, c-format
+msgid "Unable to create socket"
+msgstr "Impussibil creâ il socket"
+
+#: ../libgdict/gdict-client-context.c:1970
+#, c-format
+msgid "Unable to set the channel as non-blocking: %s"
+msgstr "Impussibil disponi il canâl come no-blocant: %s"
+
+#: ../libgdict/gdict-client-context.c:1985
+#, c-format
+msgid "Unable to connect to the dictionary server at '%s:%d'"
+msgstr "Impussibil conetisi al server di dizionari a «%s:%d»"
+
+#: ../libgdict/gdict-context.c:217
+msgid "Local Only"
+msgstr "Dome locâl"
+
+#: ../libgdict/gdict-context.c:218
+msgid "Whether the context uses only local dictionaries or not"
+msgstr "Dîs se il contest al dopre dome dizionaris locâi o no"
+
+#: ../libgdict/gdict-database-chooser.c:378
+msgid "Reload the list of available databases"
+msgstr "Cjarie di gnûf la liste dai database disponibii"
+
+#: ../libgdict/gdict-database-chooser.c:390
+msgid "Clear the list of available databases"
+msgstr "Nete la liste dai database disponibii"
+
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
+#: ../libgdict/gdict-strategy-chooser.c:785
+msgid "Error while matching"
+msgstr "Erôr intant che a si cirive"
+
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1254
+msgid "Not found"
+msgstr "No cjatât"
+
+#: ../libgdict/gdict-defbox.c:1315
+msgid "F_ind:"
+msgstr "_Cîr:"
+
+#: ../libgdict/gdict-defbox.c:1328
+msgid "_Previous"
+msgstr "Pr_ecedent"
+
+#: ../libgdict/gdict-defbox.c:1336
+msgid "_Next"
+msgstr "_Prossim"
+
+#: ../libgdict/gdict-defbox.c:2513
+msgid "Error while looking up definition"
+msgstr "Erôr intant che a si cirive la definizion"
+
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
+msgid "Another search is in progress"
+msgstr "Une altre ricercje a je in côrs"
+
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
+msgid "Please wait until the current search ends."
+msgstr "Spietâ fintremai che la ricercje atuâl no je finide."
+
+#: ../libgdict/gdict-defbox.c:2595
+msgid "Error while retrieving the definition"
+msgstr "Erôr intant che a si otignive la definizion"
+
+#: ../libgdict/gdict-source.c:231
+msgid "Filename"
+msgstr "Non file"
+
+#: ../libgdict/gdict-source.c:232
+msgid "The filename used by this dictionary source"
+msgstr "Non file doprât di cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:245
+msgid "Name"
+msgstr "Non"
+
+#: ../libgdict/gdict-source.c:246
+msgid "The display name of this dictionary source"
+msgstr "Non mostrât di cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:259
+msgid "Description"
+msgstr "Descrizion"
+
+#: ../libgdict/gdict-source.c:260
+msgid "The description of this dictionary source"
+msgstr "Descrizion di cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
+msgid "Database"
+msgstr "Database"
+
+#: ../libgdict/gdict-source.c:274
+msgid "The default database of this dictionary source"
+msgstr "Database predefinît di cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
+msgid "Strategy"
+msgstr "Strategjie"
+
+#: ../libgdict/gdict-source.c:288
+msgid "The default strategy of this dictionary source"
+msgstr "Strategjie predefinide par cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:301
+msgid "Transport"
+msgstr "Traspuart"
+
+#: ../libgdict/gdict-source.c:302
+msgid "The transport mechanism used by this dictionary source"
+msgstr "Mecanisim di traspuart doprât di cheste sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
+msgid "Context"
+msgstr "Contest"
+
+#: ../libgdict/gdict-source.c:317
+msgid "The GdictContext bound to this source"
+msgstr "GdictContext associât a cheste sorzint"
+
+#: ../libgdict/gdict-source.c:412
+#, c-format
+msgid "Invalid transport type '%d'"
+msgstr "Tipo di traspuart no valit «%d»"
+
+#: ../libgdict/gdict-source.c:440
+#, c-format
+msgid "No '%s' group found inside the dictionary source definition"
+msgstr "Nissun grup «%s» cjatât te definizion de sorzint dizionari"
+
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
+#, c-format
+msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
+msgstr ""
+"Impussibil otignî la clâf «%s» di dentri de definizion de sorzint di "
+"dizionari : %s"
+
+#: ../libgdict/gdict-source.c:554
+#, c-format
+msgid ""
+"Unable to get the '%s' key inside the dictionary source definition file: %s"
+msgstr ""
+"Impussibil otignî la clâf «%s» di dentri dal file di definizion de sorzint "
+"di dizionari: %s"
+
+#: ../libgdict/gdict-source.c:740
+#, c-format
+msgid "Dictionary source does not have name"
+msgstr "La sorzint dizionari no à un non"
+
+#: ../libgdict/gdict-source.c:749
+#, c-format
+msgid "Dictionary source '%s' has invalid transport '%s'"
+msgstr "La sorzint dizionari «%s» a à traspuart «%s» no valit"
+
+#: ../libgdict/gdict-source-chooser.c:294
+msgid "Reload the list of available sources"
+msgstr "Torne a cjariâ la liste das sorzints disponibii"
+
+#: ../libgdict/gdict-source-loader.c:170
+msgid "Paths"
+msgstr "Percors"
+
+#: ../libgdict/gdict-source-loader.c:171
+msgid "Search paths used by this object"
+msgstr "Percors di ricercje doprâts da chest ogjet"
+
+#: ../libgdict/gdict-source-loader.c:183
+msgid "Sources"
+msgstr "Sorzints"
+
+#: ../libgdict/gdict-source-loader.c:184
+msgid "Dictionary sources found"
+msgstr "Sorzints dizionari cjatadis"
+
+#: ../libgdict/gdict-speller.c:352
+msgid "Clear the list of similar words"
+msgstr "Nete la liste das peraulis simii"
+
+#: ../libgdict/gdict-speller.c:376
+msgid "The GdictContext object used to get the word definition"
+msgstr "Ogjet GdictContext doprât par vê la definizion de peraule"
+
+#: ../libgdict/gdict-speller.c:383
+msgid "The database used to query the GdictContext"
+msgstr "Database doprât par interogâ il GdictContext"
+
+#: ../libgdict/gdict-speller.c:390
+msgid "The strategy used to query the GdictContext"
+msgstr "La strategjie doprade par interogâ il GdictContext"
+
+#: ../libgdict/gdict-strategy-chooser.c:361
+msgid "Reload the list of available strategies"
+msgstr "Torne a cjamâ la liste das strategjiis disponibii"
+
+#: ../libgdict/gdict-strategy-chooser.c:373
+msgid "Clear the list of available strategies"
+msgstr "Nete la liste das strategjiis disponibii"
+
+#: ../libgdict/gdict-utils.c:96
+msgid "GDict debugging flags to set"
+msgstr "Opzions di debug di GDict di configurâ"
+
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
+msgid "FLAGS"
+msgstr "OPZIONS"
+
+#: ../libgdict/gdict-utils.c:98
+msgid "GDict debugging flags to unset"
+msgstr "Opzions di debug di GDict di no configurâ"
+
+#: ../libgdict/gdict-utils.c:156
+msgid "GDict Options"
+msgstr "Opzions di GDict"
+
+#: ../libgdict/gdict-utils.c:157
+msgid "Show GDict Options"
+msgstr "Mostre opzions GDict"
+
+#: ../src/gdict-about.c:53
+msgid "translator-credits"
+msgstr ""
+"Traduzion mantignude da:\n"
+"  Fabio Tomat "
+
+#: ../src/gdict-about.c:55
+msgid "Look up words in dictionaries"
+msgstr "Cîr peraulis sui dizionaris"
+
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
+msgid "Words to look up"
+msgstr "Peraulis di cirî"
+
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
+msgid "WORD"
+msgstr "PERAULE"
+
+#: ../src/gdict-app.c:66
+msgid "Words to match"
+msgstr "Peraulis di cirî"
+
+#: ../src/gdict-app.c:72
+msgid "Dictionary source to use"
+msgstr "Sorzint dizionari di doprâ"
+
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
+msgid "NAME"
+msgstr "Non"
+
+#: ../src/gdict-app.c:78
+msgid "Database to use"
+msgstr "Database di doprâ"
+
+#: ../src/gdict-app.c:84
+msgid "Strategy to use"
+msgstr "Strategjie di doprâ"
+
+#: ../src/gdict-app.c:89
+msgid "WORDS"
+msgstr "PERAULIS"
+
+#: ../src/gdict-app.c:106
+msgid "Dictionary Preferences"
+msgstr "Preferencis di Dizionari"
+
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-source-dialog.c:475
+#, c-format
+msgid "There was an error while displaying help"
+msgstr "Al è saltât fûr un erôr tal mostrâ la guide."
+
+#. create the new option context
+#: ../src/gdict-app.c:217
+msgid " - Look up words in dictionaries"
+msgstr "- Cîr peraulis sui dizionaris"
+
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
+msgid "Edit Dictionary Source"
+msgstr "Modifiche sorzint dizionari"
+
+#: ../src/gdict-pref-dialog.c:303
+msgid "Add Dictionary Source"
+msgstr "Zonte sorzint dizionari"
+
+#: ../src/gdict-pref-dialog.c:348
+#, c-format
+msgid "Remove \"%s\"?"
+msgstr "Gjavâ «%s»?"
+
+#: ../src/gdict-pref-dialog.c:350
+msgid "This will permanently remove the dictionary source from the list."
+msgstr "Chest al gjavarà par simpri la sorzint dizionari de liste."
+
+#: ../src/gdict-pref-dialog.c:380
+#, c-format
+msgid "Unable to remove source '%s'"
+msgstr "Impussibil gjavâ la sorzint «%s»"
+
+#: ../src/gdict-pref-dialog.c:641
+msgid "Add a new dictionary source"
+msgstr "Zonte une gnove sorzint dizionari"
+
+#: ../src/gdict-pref-dialog.c:647
+msgid "Remove the currently selected dictionary source"
+msgstr "Gjave la sorzint dizionari cumò selezionade"
+
+#: ../src/gdict-pref-dialog.c:653
+msgid "Edit the currently selected dictionary source"
+msgstr "Modifiche la sorzint dizionari cumò selezionade"
+
+#: ../src/gdict-pref-dialog.c:661
+msgid "Set the font used for printing the definitions"
+msgstr "Impuestâ  il tipo di caratar doprât pe stampe das definizions"
+
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
+#, c-format
+msgid "Unable to display the preview: %s"
+msgstr "Impussibil mostrâ le anteprime: %s"
+
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
+msgid "Unable to create a source file"
+msgstr "Impussibil creâ un file sorzint"
+
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
+msgid "Unable to save source file"
+msgstr "Impussibil salvâ il file sorzint"
+
+#: ../src/gdict-window.c:253
+#, c-format
+msgid "Searching for '%s'..."
+msgstr "O stoi cirint «%s»..."
+
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
+msgid "No definitions found"
+msgstr "Nissune definizion cjatade"
+
+#: ../src/gdict-window.c:287
+#, c-format
+msgid "A definition found"
+msgid_plural "%d definitions found"
+msgstr[0] "Une definizion cjatade"
+msgstr[1] "%d definizions cjatadis"
+
+#: ../src/gdict-window.c:458
+#, c-format
+msgid "No dictionary source available with name '%s'"
+msgstr "Nissune sorzint dizionari disponibil cun non «%s»"
+
+#: ../src/gdict-window.c:462
+msgid "Unable to find dictionary source"
+msgstr "Impussibil cjatâ la sorzint dizionari"
+
+#: ../src/gdict-window.c:478
+#, c-format
+msgid "No context available for source '%s'"
+msgstr "Nissun contest disponibil pe sorzint «%s»"
+
+#: ../src/gdict-window.c:482
+msgid "Unable to create a context"
+msgstr "Impussibil creâ un contest"
+
+#: ../src/gdict-window.c:541
+#, c-format
+msgid "%s - Dictionary"
+msgstr "%s - Dizionari"
+
+#: ../src/gdict-window.c:910
+msgid "Save a Copy"
+msgstr "Salve une copie"
+
+#: ../src/gdict-window.c:920
+msgid "Untitled document"
+msgstr "Document cence titul"
+
+#: ../src/gdict-window.c:941
+#, c-format
+msgid "Error while writing to '%s'"
+msgstr "Erôr intant che a si scriveve «%s»"
+
+#: ../src/gdict-window.c:1359
+#, c-format
+msgid "Dictionary source `%s' selected"
+msgstr "Selezionade sorzint dizionari «%s»"
+
+#: ../src/gdict-window.c:1380
+#, c-format
+msgid "Strategy `%s' selected"
+msgstr "Selezionade strategjie «%s»"
+
+#: ../src/gdict-window.c:1400
+#, c-format
+msgid "Database `%s' selected"
+msgstr "Selezionât database «%s»"
+
+#: ../src/gdict-window.c:1420
+#, c-format
+msgid "Word `%s' selected"
+msgstr "Selezionade peraule «%s»"
+
+#. speller
+#: ../src/gdict-window.c:1445
+msgid "Double-click on the word to look up"
+msgstr "Fâ dopli clic su le peraule di cirî"
+
+#. strat-chooser
+#: ../src/gdict-window.c:1451
+msgid "Double-click on the matching strategy to use"
+msgstr "Fâ dopli clic su le strategjie di confront di doprâ"
+
+#. source-chooser
+#: ../src/gdict-window.c:1456
+msgid "Double-click on the source to use"
+msgstr "Fâ dopli clic su la sorzint di doprâ"
+
+#. db-chooser
+#: ../src/gdict-window.c:1465
+msgid "Double-click on the database to use"
+msgstr "Fâ dopli clic sul database di doprâ"
+
+#: ../src/gdict-window.c:1615
+msgid "Look _up:"
+msgstr "_Cîr:"
+
+#: ../src/gdict-window.c:1690
+msgid "Similar words"
+msgstr "Peraulis simii"
+
+#: ../src/gdict-window.c:1703
+msgid "Available dictionaries"
+msgstr "Dizionaris disponibii"
+
+#: ../src/gdict-window.c:1721
+msgid "Available strategies"
+msgstr "Strategjiis disponibii"
+
+#: ../src/gdict-window.c:1737
+msgid "Dictionary sources"
+msgstr "Sorzints dizionari"
diff -Nru gnome-dictionary-3.8.0/po/ga.po gnome-dictionary-3.10.0/po/ga.po
--- gnome-dictionary-3.8.0/po/ga.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/ga.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,91 +1,161 @@
-# Irish translations for gnome-utils package.
-# Copyright (C) 1999-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-utils package.
+# Irish translations for gnome-dictionary package.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-dictionary package.
 # Seán O'Ceallaigh , 1999.
 # Paul Duffy , 2003
 # Alastair McKinstry , 2004.
-# Seán de Búrca , 2007-2009.
+# Seán de Búrca , 2007-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-utils.master\n"
+"Project-Id-Version: gnome-dictionary.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-06 14:35-0400\n"
-"PO-Revision-Date: 2009-08-12 15:49-0600\n"
+"POT-Creation-Date: 2013-09-03 21:22-0600\n"
+"PO-Revision-Date: 2013-09-03 21:35-0600\n"
 "Last-Translator: Seán de Búrca \n"
 "Language-Team: Irish \n"
 "Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
-"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4;\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
 msgstr "Freastalaí Foclóra Réamhshocraithe"
 
-#: ../data/spanish.desktop.in.h:1
-msgid "Spanish Dictionaries"
-msgstr "Foclóirí Spáinnise"
-
-#: ../data/thai.desktop.in.h:1
-msgid "Longdo Thai-English Dictionaries"
-msgstr ""
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
+msgid "Dictionary"
+msgstr "Foclóir"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:1
+#: ../data/gnome-dictionary.desktop.in.in.h:2
 msgid "Check word definitions and spellings in an online dictionary"
-msgstr ""
+msgstr "Lorg shainmhíniú agus litriú focal i bhfoclóir ar líne"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:2 ../src/gdict-about.c:62
-#: ../src/gdict-app.c:233 ../src/gdict-window.c:601 ../src/gdict-window.c:1894
-msgid "Dictionary"
-msgstr "Foclóir"
+#: ../data/gnome-dictionary.desktop.in.in.h:3
+msgid "word;synonym;definition;spelling;"
+msgstr "focal;comhchiallach;sainmhíniú;litriú;"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
-msgid "The default database to use"
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:1
+msgid "Preferences"
+msgstr "Sainroghanna"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
-msgid "The default search strategy to use"
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:2
+msgid "Help"
+msgstr "Cabhair"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
-msgid "The font to be used when printing"
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:3
+msgid "About Dictionary"
+msgstr "Maidir le Foclóir"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
-msgid "The font to be used when printing a definition."
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:4
+msgid "Quit"
+msgstr "Scoir"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
-msgid ""
-"The name of the default individual database or meta-database to use on a "
-"dictionary source. An exclamation mark (\"!\") means that all the databases "
-"present in a dictionary source should be searched"
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:5
+msgid "_File"
+msgstr "_Comhad"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
-msgid ""
-"The name of the default search strategy to use on a dictionary source, if "
-"available. The default strategy is 'exact', that is match exact words."
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:6
+msgid "_New"
+msgstr "_Nua"
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
-msgid "The name of the dictionary source used"
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:7
+msgid "_Save a Copy..."
+msgstr "_Sábháil Cóip..."
 
-#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
-msgid ""
-"The name of the dictionary source used to retrieve the definitions of words."
-msgstr ""
+#: ../data/gnome-dictionary-menus.ui.h:8
+msgid "P_review"
+msgstr "_Réamhamharc"
+
+#: ../data/gnome-dictionary-menus.ui.h:9
+msgid "_Print"
+msgstr "_Priontáil"
+
+#: ../data/gnome-dictionary-menus.ui.h:10
+msgid "_Close"
+msgstr "Dún"
+
+#: ../data/gnome-dictionary-menus.ui.h:11
+msgid "_Edit"
+msgstr "_Eagar"
+
+#: ../data/gnome-dictionary-menus.ui.h:12
+msgid "_Copy"
+msgstr "_Cóipeáil"
+
+#: ../data/gnome-dictionary-menus.ui.h:13
+msgid "Select _All"
+msgstr "Roghnaigh _Uile"
+
+#: ../data/gnome-dictionary-menus.ui.h:14
+msgid "_Find"
+msgstr "_Aimsigh"
+
+#: ../data/gnome-dictionary-menus.ui.h:15
+msgid "Find Ne_xt"
+msgstr "Aimsigh an Chéad Cheann _Eile"
+
+#: ../data/gnome-dictionary-menus.ui.h:16
+msgid "Find Pre_vious"
+msgstr "Aimsigh an Ceann _Roimhe Seo"
+
+#: ../data/gnome-dictionary-menus.ui.h:17
+msgid "_View"
+msgstr "_Amharc"
+
+#: ../data/gnome-dictionary-menus.ui.h:18
+msgid "_Sidebar"
+msgstr "Barra _Taoibh"
+
+#: ../data/gnome-dictionary-menus.ui.h:19
+msgid "S_tatusbar"
+msgstr "Barra _Stádais"
+
+#: ../data/gnome-dictionary-menus.ui.h:20
+msgid "Similar _Words"
+msgstr "Focail _Chosúla"
+
+#: ../data/gnome-dictionary-menus.ui.h:21
+msgid "Dictionary Sources"
+msgstr "Foinsí Foclóra"
+
+#: ../data/gnome-dictionary-menus.ui.h:22
+msgid "Available _Dictionaries"
+msgstr "_Foclóirí le Fáil"
+
+#: ../data/gnome-dictionary-menus.ui.h:23
+msgid "Available St_rategies"
+msgstr "_Straitéisí le Fáil"
+
+#: ../data/gnome-dictionary-menus.ui.h:24
+msgid "_Go"
+msgstr "_Téigh"
+
+#: ../data/gnome-dictionary-menus.ui.h:25
+msgid "_Previous Definition"
+msgstr "Sainmhíniú _Roimhe Seo"
+
+#: ../data/gnome-dictionary-menus.ui.h:26
+msgid "_Next Definition"
+msgstr "An Chéad Sainmhíniú _Eile"
+
+#: ../data/gnome-dictionary-menus.ui.h:27
+msgid "_First Definition"
+msgstr "An _Chéad Sainmhíniú"
+
+#: ../data/gnome-dictionary-menus.ui.h:28
+msgid "_Last Definition"
+msgstr "An Sainmhíniú _Deireanach"
 
 #: ../data/gnome-dictionary-preferences.ui.h:1
-msgid "Print"
-msgstr "Priontáil"
+msgid "_Select a dictionary source for looking up words:"
+msgstr "_Roghnaigh foinse foclóra chun lorg focal:"
 
 #: ../data/gnome-dictionary-preferences.ui.h:2
-#: ../data/gnome-dictionary-source.ui.h:3
+#: ../data/gnome-dictionary-source.ui.h:6
 msgid "Source"
 msgstr "Foinse"
 
@@ -94,97 +164,143 @@
 msgstr "Cló _priontála:"
 
 #: ../data/gnome-dictionary-preferences.ui.h:4
-msgid "_Select a dictionary source for looking up words:"
-msgstr ""
+msgid "Print"
+msgstr "Priontáil"
 
 #: ../data/gnome-dictionary-source.ui.h:1
-msgid "Dictionaries"
-msgstr "Foclóirí"
+msgid "_Description:"
+msgstr "_Cur síos:"
 
 #: ../data/gnome-dictionary-source.ui.h:2
+msgid "_Transport:"
+msgstr "_Iompar:"
+
+#: ../data/gnome-dictionary-source.ui.h:3
 msgid "H_ostname:"
 msgstr "Ós_tainm:"
 
 #: ../data/gnome-dictionary-source.ui.h:4
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../data/gnome-dictionary-source.ui.h:5
 msgid "Source Name"
 msgstr "Ainm Foinse"
 
-#: ../data/gnome-dictionary-source.ui.h:5
+#: ../data/gnome-dictionary-source.ui.h:7
+msgid "Dictionaries"
+msgstr "Foclóirí"
+
+#: ../data/gnome-dictionary-source.ui.h:8
 msgid "Strategies"
+msgstr "Straitéisí"
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
+msgid "The default database to use"
 msgstr ""
 
-#: ../data/gnome-dictionary-source.ui.h:6
-msgid "_Description:"
-msgstr "_Tuarascail:"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
+msgid ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
+msgstr ""
 
-#: ../data/gnome-dictionary-source.ui.h:7
-msgid "_Port:"
-msgstr "_Port:"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
+msgid "The default search strategy to use"
+msgstr ""
 
-#: ../data/gnome-dictionary-source.ui.h:8
-msgid "_Transport:"
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
+msgid ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:283
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
+msgid "The font to be used when printing"
+msgstr ""
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
+msgid "The font to be used when printing a definition."
+msgstr ""
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
+msgid "The name of the dictionary source used"
+msgstr ""
+
+#: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
+msgid ""
+"The name of the dictionary source used to retrieve the definitions of words."
+msgstr ""
+
+#: ../data/spanish.desktop.in.h:1
+msgid "Spanish Dictionaries"
+msgstr "Foclóirí Spáinnise"
+
+#: ../data/thai.desktop.in.h:1
+msgid "Longdo Thai-English Dictionaries"
+msgstr "Foclóirí Téalainnis-Béarla Longdo"
+
+#: ../libgdict/gdict-client-context.c:282
 msgid "Client Name"
 msgstr "Ainm Cliaint"
 
-#: ../libgdict/gdict-client-context.c:284
+#: ../libgdict/gdict-client-context.c:283
 msgid "The name of the client of the context object"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:297
+#: ../libgdict/gdict-client-context.c:296
 msgid "Hostname"
 msgstr "Óstainm"
 
-#: ../libgdict/gdict-client-context.c:298
+#: ../libgdict/gdict-client-context.c:297
 msgid "The hostname of the dictionary server to connect to"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:311
+#: ../libgdict/gdict-client-context.c:310
 msgid "Port"
 msgstr "Port"
 
-#: ../libgdict/gdict-client-context.c:312
+#: ../libgdict/gdict-client-context.c:311
 msgid "The port of the dictionary server to connect to"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:327
+#: ../libgdict/gdict-client-context.c:326
 msgid "Status"
 msgstr "Stádas"
 
-#: ../libgdict/gdict-client-context.c:328
+#: ../libgdict/gdict-client-context.c:327
 msgid "The status code as returned by the dictionary server"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:777
+#: ../libgdict/gdict-client-context.c:776
 #, c-format
 msgid "No connection to the dictionary server at '%s:%d'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1060
+#: ../libgdict/gdict-client-context.c:1059
 #, c-format
 msgid "Lookup failed for hostname '%s': no suitable resources found"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1091
+#: ../libgdict/gdict-client-context.c:1090
 #, c-format
 msgid "Lookup failed for host '%s': %s"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1125
+#: ../libgdict/gdict-client-context.c:1124
 #, c-format
 msgid "Lookup failed for host '%s': host not found"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1177
+#: ../libgdict/gdict-client-context.c:1176
 #, c-format
 msgid ""
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1196
+#: ../libgdict/gdict-client-context.c:1195
 #, c-format
 msgid ""
 "Unable to parse the dictionary server reply\n"
@@ -193,84 +309,84 @@
 "Ní féidir freagra an fhreastalaí foclóra a pharsáil\n"
 ": '%s'"
 
-#: ../libgdict/gdict-client-context.c:1225
+#: ../libgdict/gdict-client-context.c:1224
 #, c-format
 msgid "No definitions found for '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1240
+#: ../libgdict/gdict-client-context.c:1239
 #, c-format
 msgid "Invalid database '%s'"
 msgstr "Bunachar sonraí neamhbhailí '%s'"
 
-#: ../libgdict/gdict-client-context.c:1255
+#: ../libgdict/gdict-client-context.c:1254
 #, c-format
 msgid "Invalid strategy '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1270
+#: ../libgdict/gdict-client-context.c:1269
 #, c-format
 msgid "Bad command '%s'"
 msgstr "Drochordú '%s'"
 
-#: ../libgdict/gdict-client-context.c:1285
+#: ../libgdict/gdict-client-context.c:1284
 #, c-format
 msgid "Bad parameters for command '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1300
+#: ../libgdict/gdict-client-context.c:1299
 #, c-format
 msgid "No databases found on dictionary server at '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1315
+#: ../libgdict/gdict-client-context.c:1314
 #, c-format
 msgid "No strategies found on dictionary server at '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1748
+#: ../libgdict/gdict-client-context.c:1747
 #, c-format
 msgid "Connection failed to the dictionary server at %s:%d"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1787
+#: ../libgdict/gdict-client-context.c:1786
 #, c-format
 msgid ""
 "Error while reading reply from server:\n"
 "%s"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1860
+#: ../libgdict/gdict-client-context.c:1859
 #, c-format
 msgid "Connection timeout for the dictionary server at '%s:%d'"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1894
+#: ../libgdict/gdict-client-context.c:1893
 #, c-format
 msgid "No hostname defined for the dictionary server"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1930
-#: ../libgdict/gdict-client-context.c:1945
+#: ../libgdict/gdict-client-context.c:1929
+#: ../libgdict/gdict-client-context.c:1944
 #, c-format
 msgid "Unable to create socket"
 msgstr "Ní féidir soicéad a chruthú"
 
-#: ../libgdict/gdict-client-context.c:1971
+#: ../libgdict/gdict-client-context.c:1970
 #, c-format
 msgid "Unable to set the channel as non-blocking: %s"
 msgstr ""
 
-#: ../libgdict/gdict-client-context.c:1986
+#: ../libgdict/gdict-client-context.c:1985
 #, c-format
 msgid "Unable to connect to the dictionary server at '%s:%d'"
 msgstr ""
 
-#: ../libgdict/gdict-context.c:218
+#: ../libgdict/gdict-context.c:217
 msgid "Local Only"
 msgstr "Logánta Amháin"
 
-#: ../libgdict/gdict-context.c:219
+#: ../libgdict/gdict-context.c:218
 msgid "Whether the context uses only local dictionaries or not"
 msgstr ""
 
@@ -282,168 +398,168 @@
 msgid "Clear the list of available databases"
 msgstr ""
 
-#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:778
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
 msgstr ""
 
-#: ../libgdict/gdict-defbox.c:1127 ../libgdict/gdict-defbox.c:1221
-#: ../libgdict/gdict-defbox.c:1255
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1254
 msgid "Not found"
 msgstr "Gan aimsiú"
 
-#: ../libgdict/gdict-defbox.c:1316
+#: ../libgdict/gdict-defbox.c:1315
 msgid "F_ind:"
 msgstr "A_imsigh:"
 
-#: ../libgdict/gdict-defbox.c:1329
+#: ../libgdict/gdict-defbox.c:1328
 msgid "_Previous"
 msgstr "Ar A_is"
 
-#: ../libgdict/gdict-defbox.c:1337
+#: ../libgdict/gdict-defbox.c:1336
 msgid "_Next"
 msgstr "Ar A_ghaidh"
 
-#: ../libgdict/gdict-defbox.c:2512
+#: ../libgdict/gdict-defbox.c:2513
 msgid "Error while looking up definition"
 msgstr ""
 
-#: ../libgdict/gdict-defbox.c:2554 ../libgdict/gdict-speller.c:736
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
 msgstr ""
 
-#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:737
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
 msgstr ""
 
-#: ../libgdict/gdict-defbox.c:2594
+#: ../libgdict/gdict-defbox.c:2595
 msgid "Error while retrieving the definition"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:232
+#: ../libgdict/gdict-source.c:231
 msgid "Filename"
 msgstr "Ainm Comhaid"
 
-#: ../libgdict/gdict-source.c:233
+#: ../libgdict/gdict-source.c:232
 msgid "The filename used by this dictionary source"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:246
+#: ../libgdict/gdict-source.c:245
 msgid "Name"
 msgstr "Ainm"
 
-#: ../libgdict/gdict-source.c:247
+#: ../libgdict/gdict-source.c:246
 #, fuzzy
 msgid "The display name of this dictionary source"
 msgstr "Cuir foinse fhoclóra nua leis"
 
-#: ../libgdict/gdict-source.c:260
+#: ../libgdict/gdict-source.c:259
 msgid "Description"
 msgstr "Cur Síos"
 
-#: ../libgdict/gdict-source.c:261
+#: ../libgdict/gdict-source.c:260
 msgid "The description of this dictionary source"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:274 ../libgdict/gdict-speller.c:383
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
 msgstr "Bunachar Sonraí"
 
-#: ../libgdict/gdict-source.c:275
+#: ../libgdict/gdict-source.c:274
 #, fuzzy
 msgid "The default database of this dictionary source"
 msgstr "Cuir foinse fhoclóra nua leis"
 
-#: ../libgdict/gdict-source.c:288 ../libgdict/gdict-speller.c:390
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
-msgstr ""
+msgstr "Straitéis"
 
-#: ../libgdict/gdict-source.c:289
+#: ../libgdict/gdict-source.c:288
 #, fuzzy
 msgid "The default strategy of this dictionary source"
 msgstr "Cuir foinse fhoclóra nua leis"
 
-#: ../libgdict/gdict-source.c:302
+#: ../libgdict/gdict-source.c:301
 msgid "Transport"
-msgstr ""
+msgstr "Iompar"
 
-#: ../libgdict/gdict-source.c:303
+#: ../libgdict/gdict-source.c:302
 msgid "The transport mechanism used by this dictionary source"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:317 ../libgdict/gdict-speller.c:376
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
 msgstr "Comhthéacs"
 
-#: ../libgdict/gdict-source.c:318
+#: ../libgdict/gdict-source.c:317
 msgid "The GdictContext bound to this source"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:413
+#: ../libgdict/gdict-source.c:412
 #, c-format
 msgid "Invalid transport type '%d'"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:441
+#: ../libgdict/gdict-source.c:440
 #, c-format
 msgid "No '%s' group found inside the dictionary source definition"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:457 ../libgdict/gdict-source.c:481
-#: ../libgdict/gdict-source.c:505 ../libgdict/gdict-source.c:530
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:555
+#: ../libgdict/gdict-source.c:554
 #, c-format
 msgid ""
 "Unable to get the '%s' key inside the dictionary source definition file: %s"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:741
+#: ../libgdict/gdict-source.c:740
 #, c-format
 msgid "Dictionary source does not have name"
 msgstr ""
 
-#: ../libgdict/gdict-source.c:750
+#: ../libgdict/gdict-source.c:749
 #, c-format
 msgid "Dictionary source '%s' has invalid transport '%s'"
 msgstr ""
 
-#: ../libgdict/gdict-source-chooser.c:295
+#: ../libgdict/gdict-source-chooser.c:294
 msgid "Reload the list of available sources"
 msgstr ""
 
-#: ../libgdict/gdict-source-loader.c:171
+#: ../libgdict/gdict-source-loader.c:170
 msgid "Paths"
-msgstr ""
+msgstr "Conairí"
 
-#: ../libgdict/gdict-source-loader.c:172
+#: ../libgdict/gdict-source-loader.c:171
 msgid "Search paths used by this object"
 msgstr ""
 
-#: ../libgdict/gdict-source-loader.c:184
+#: ../libgdict/gdict-source-loader.c:183
 msgid "Sources"
 msgstr "Foinsí"
 
-#: ../libgdict/gdict-source-loader.c:185
+#: ../libgdict/gdict-source-loader.c:184
 msgid "Dictionary sources found"
 msgstr "Aimsíodh foinsí foclóra"
 
-#: ../libgdict/gdict-speller.c:353
+#: ../libgdict/gdict-speller.c:352
 msgid "Clear the list of similar words"
 msgstr ""
 
-#: ../libgdict/gdict-speller.c:377
+#: ../libgdict/gdict-speller.c:376
 msgid "The GdictContext object used to get the word definition"
 msgstr ""
 
-#: ../libgdict/gdict-speller.c:384
+#: ../libgdict/gdict-speller.c:383
 msgid "The database used to query the GdictContext"
 msgstr ""
 
-#: ../libgdict/gdict-speller.c:391
+#: ../libgdict/gdict-speller.c:390
 msgid "The strategy used to query the GdictContext"
 msgstr ""
 
@@ -455,27 +571,27 @@
 msgid "Clear the list of available strategies"
 msgstr ""
 
-#: ../libgdict/gdict-utils.c:97
+#: ../libgdict/gdict-utils.c:96
 msgid "GDict debugging flags to set"
 msgstr ""
 
-#: ../libgdict/gdict-utils.c:97 ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
-msgstr ""
+msgstr "BRATACHA"
 
-#: ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:98
 msgid "GDict debugging flags to unset"
 msgstr ""
 
-#: ../libgdict/gdict-utils.c:157
+#: ../libgdict/gdict-utils.c:156
 msgid "GDict Options"
 msgstr "Roghanna GDict"
 
-#: ../libgdict/gdict-utils.c:158
+#: ../libgdict/gdict-utils.c:157
 msgid "Show GDict Options"
 msgstr "Taispeáin Roghanna GDict"
 
-#: ../src/gdict-about.c:55
+#: ../src/gdict-about.c:53
 msgid "translator-credits"
 msgstr ""
 "Seán Ó Ceallaigh \n"
@@ -483,354 +599,216 @@
 "Alastair McKinstry \n"
 "Seán de Búrca "
 
-#: ../src/gdict-about.c:57
+#: ../src/gdict-about.c:55
 msgid "Look up words in dictionaries"
 msgstr "Cuardaigh focail i bhfoclóirí"
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:91
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
 msgstr ""
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:68
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
-msgstr ""
+msgstr "FOCAL"
 
-#: ../src/gdict-app.c:68
+#: ../src/gdict-app.c:66
 msgid "Words to match"
 msgstr ""
 
-#: ../src/gdict-app.c:74
+#: ../src/gdict-app.c:72
 msgid "Dictionary source to use"
 msgstr "Foinse fhoclóra le húsáid"
 
-#: ../src/gdict-app.c:74 ../src/gdict-app.c:80 ../src/gdict-app.c:86
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
-msgstr ""
+msgstr "AINM"
 
-#: ../src/gdict-app.c:80
+#: ../src/gdict-app.c:78
 msgid "Database to use"
 msgstr "Bunachar sonraí le húsáid"
 
-#: ../src/gdict-app.c:86
+#: ../src/gdict-app.c:84
 msgid "Strategy to use"
 msgstr ""
 
-#: ../src/gdict-app.c:91
+#: ../src/gdict-app.c:89
 msgid "WORDS"
+msgstr "FOCAIL"
+
+#: ../src/gdict-app.c:106
+msgid "Dictionary Preferences"
+msgstr "Sainroghanna Foclóra"
+
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-source-dialog.c:475
+#, c-format
+msgid "There was an error while displaying help"
 msgstr ""
 
 #. create the new option context
-#: ../src/gdict-app.c:143
+#: ../src/gdict-app.c:217
 msgid " - Look up words in dictionaries"
 msgstr " - Cuardaigh focail i bhfoclóirí"
 
-#: ../src/gdict-pref-dialog.c:241 ../src/gdict-pref-dialog.c:430
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
 msgstr "Cuir Foinse Fhoclóra in Eagar"
 
-#: ../src/gdict-pref-dialog.c:305
+#: ../src/gdict-pref-dialog.c:303
 msgid "Add Dictionary Source"
 msgstr "Cuir Foinse Fhoclóra Leis"
 
-#: ../src/gdict-pref-dialog.c:350
+#: ../src/gdict-pref-dialog.c:348
 #, c-format
 msgid "Remove \"%s\"?"
 msgstr "Bain \"%s\"?"
 
-#: ../src/gdict-pref-dialog.c:352
+#: ../src/gdict-pref-dialog.c:350
 msgid "This will permanently remove the dictionary source from the list."
 msgstr ""
 
-#: ../src/gdict-pref-dialog.c:382
+#: ../src/gdict-pref-dialog.c:380
 #, c-format
 msgid "Unable to remove source '%s'"
 msgstr "Ní féidir foinse '%s' a bhaint"
 
-#: ../src/gdict-pref-dialog.c:496 ../src/gdict-source-dialog.c:479
-#: ../src/gdict-window.c:1245
-#, c-format
-msgid "There was an error while displaying help"
-msgstr ""
-
-#: ../src/gdict-pref-dialog.c:643
+#: ../src/gdict-pref-dialog.c:641
 msgid "Add a new dictionary source"
 msgstr "Cuir foinse fhoclóra nua leis"
 
-#: ../src/gdict-pref-dialog.c:649
+#: ../src/gdict-pref-dialog.c:647
 msgid "Remove the currently selected dictionary source"
 msgstr ""
 
-#: ../src/gdict-pref-dialog.c:655
-#, fuzzy
+#: ../src/gdict-pref-dialog.c:653
 msgid "Edit the currently selected dictionary source"
-msgstr "Cuir foinse fhoclóra nua leis"
+msgstr "Cuir an fhoinse fhoclóra atá roghnaithe faoi láthair in eagar"
 
-#: ../src/gdict-pref-dialog.c:663
+#: ../src/gdict-pref-dialog.c:661
 msgid "Set the font used for printing the definitions"
 msgstr ""
 
-#: ../src/gdict-print.c:241 ../src/gdict-print.c:305
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
 msgstr "Ní féidir an réamhamharc a thaispeáint: %s"
 
-#: ../src/gdict-source-dialog.c:341 ../src/gdict-source-dialog.c:434
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
 msgstr "Ní féidir comhad foinseach a chruthú"
 
-#: ../src/gdict-source-dialog.c:359 ../src/gdict-source-dialog.c:452
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
 msgstr ""
 
-#: ../src/gdict-window.c:311
+#: ../src/gdict-window.c:253
 #, c-format
 msgid "Searching for '%s'..."
 msgstr "Á Chuardach ar '%s'..."
 
-#: ../src/gdict-window.c:343 ../src/gdict-window.c:400
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
 msgstr ""
 
-#: ../src/gdict-window.c:345
+#: ../src/gdict-window.c:287
 #, c-format
 msgid "A definition found"
 msgid_plural "%d definitions found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/gdict-window.c:516
+#: ../src/gdict-window.c:458
 #, c-format
 msgid "No dictionary source available with name '%s'"
 msgstr ""
 
-#: ../src/gdict-window.c:520
+#: ../src/gdict-window.c:462
 msgid "Unable to find dictionary source"
 msgstr ""
 
-#: ../src/gdict-window.c:536
+#: ../src/gdict-window.c:478
 #, c-format
 msgid "No context available for source '%s'"
 msgstr ""
 
-#: ../src/gdict-window.c:540
+#: ../src/gdict-window.c:482
 msgid "Unable to create a context"
 msgstr "Ní féidir comhthéacs a chruthú"
 
-#: ../src/gdict-window.c:599
+#: ../src/gdict-window.c:541
 #, c-format
 msgid "%s - Dictionary"
 msgstr "%s - Foclóir"
 
-#: ../src/gdict-window.c:962
+#: ../src/gdict-window.c:910
 msgid "Save a Copy"
 msgstr "Sábháil Cóip"
 
-#: ../src/gdict-window.c:972
+#: ../src/gdict-window.c:920
 msgid "Untitled document"
 msgstr "Cáipéis gan teideal"
 
-#: ../src/gdict-window.c:993
+#: ../src/gdict-window.c:941
 #, c-format
 msgid "Error while writing to '%s'"
 msgstr ""
 
-#: ../src/gdict-window.c:1098
-msgid "Dictionary Preferences"
-msgstr "Sainroghanna Foclóra"
-
-#: ../src/gdict-window.c:1280
-msgid "_File"
-msgstr "_Comhad"
-
-#: ../src/gdict-window.c:1281
-msgid "_Edit"
-msgstr "_Eagar"
-
-#: ../src/gdict-window.c:1282
-msgid "_View"
-msgstr "_Amharc"
-
-#: ../src/gdict-window.c:1283
-msgid "_Go"
-msgstr "_Téigh"
-
-#: ../src/gdict-window.c:1284
-msgid "_Help"
-msgstr "Cab_hair"
-
-#. File menu
-#: ../src/gdict-window.c:1287
-msgid "_New"
-msgstr "_Nua"
-
-#: ../src/gdict-window.c:1288
-msgid "New look up"
-msgstr ""
-
-#: ../src/gdict-window.c:1289
-msgid "_Save a Copy..."
-msgstr "_Sábháil Cóip..."
-
-#: ../src/gdict-window.c:1291
-msgid "P_review..."
-msgstr "_Réamhamharc..."
-
-#: ../src/gdict-window.c:1292
-msgid "Preview this document"
-msgstr ""
-
-#: ../src/gdict-window.c:1293
-msgid "_Print..."
-msgstr "_Priontáil..."
-
-#: ../src/gdict-window.c:1294
-msgid "Print this document"
-msgstr ""
-
-#: ../src/gdict-window.c:1301
-msgid "Select _All"
-msgstr "Roghnaigh _Gach Rud"
-
-#: ../src/gdict-window.c:1304
-msgid "Find a word or phrase in the document"
-msgstr ""
-
-#: ../src/gdict-window.c:1306
-msgid "Find Ne_xt"
-msgstr "Aimsigh an Chéad Cheann _Eile"
-
-#: ../src/gdict-window.c:1308
-msgid "Find Pre_vious"
-msgstr "Aimsigh an Ceann _Roimhe Seo"
-
-#: ../src/gdict-window.c:1310
-msgid "_Preferences"
-msgstr "_Sainroghanna"
-
-#. Go menu
-#: ../src/gdict-window.c:1314
-msgid "_Previous Definition"
-msgstr "Sainmhíniú _Roimhe Seo"
-
-#: ../src/gdict-window.c:1315
-msgid "Go to the previous definition"
-msgstr ""
-
-#: ../src/gdict-window.c:1316
-msgid "_Next Definition"
-msgstr "An Chéad Sainmhíniú _Eile"
-
-#: ../src/gdict-window.c:1317
-msgid "Go to the next definition"
-msgstr ""
-
-#: ../src/gdict-window.c:1318
-msgid "_First Definition"
-msgstr "An _Chéad Sainmhíniú"
-
-#: ../src/gdict-window.c:1319
-msgid "Go to the first definition"
-msgstr ""
-
-#: ../src/gdict-window.c:1320
-msgid "_Last Definition"
-msgstr "An Sainmhíniú _Deireanach"
-
-#: ../src/gdict-window.c:1321
-msgid "Go to the last definition"
-msgstr ""
-
-#. View menu
-#: ../src/gdict-window.c:1324
-msgid "Similar _Words"
-msgstr ""
-
-#: ../src/gdict-window.c:1326
-msgid "Dictionary Sources"
-msgstr "Foinsí Foclóra"
-
-#: ../src/gdict-window.c:1328
-msgid "Available _Databases"
-msgstr "_Bunachair Sonraí ar Fáil:"
-
-#: ../src/gdict-window.c:1330
-msgid "Available St_rategies"
-msgstr ""
-
-#. Help menu
-#: ../src/gdict-window.c:1334
-msgid "_Contents"
-msgstr "_Inneachar"
-
-#: ../src/gdict-window.c:1336
-msgid "_About"
-msgstr "_Maidir Leis Seo"
-
-#. View menu
-#: ../src/gdict-window.c:1347
-msgid "_Sidebar"
-msgstr "Barra _Taoibh"
-
-#: ../src/gdict-window.c:1349
-msgid "S_tatusbar"
-msgstr "Barra _Stádais"
-
-#: ../src/gdict-window.c:1414
+#: ../src/gdict-window.c:1359
 #, c-format
 msgid "Dictionary source `%s' selected"
 msgstr "Roghnaíodh foinse fhoclóra `%s'"
 
-#: ../src/gdict-window.c:1435
+#: ../src/gdict-window.c:1380
 #, c-format
 msgid "Strategy `%s' selected"
 msgstr ""
 
-#: ../src/gdict-window.c:1455
+#: ../src/gdict-window.c:1400
 #, c-format
 msgid "Database `%s' selected"
 msgstr ""
 
-#: ../src/gdict-window.c:1475
+#: ../src/gdict-window.c:1420
 #, c-format
 msgid "Word `%s' selected"
 msgstr ""
 
 #. speller
-#: ../src/gdict-window.c:1500
+#: ../src/gdict-window.c:1445
 msgid "Double-click on the word to look up"
 msgstr ""
 
 #. strat-chooser
-#: ../src/gdict-window.c:1506
+#: ../src/gdict-window.c:1451
 msgid "Double-click on the matching strategy to use"
 msgstr ""
 
 #. source-chooser
-#: ../src/gdict-window.c:1511
+#: ../src/gdict-window.c:1456
 msgid "Double-click on the source to use"
 msgstr ""
 
 #. db-chooser
-#: ../src/gdict-window.c:1520
+#: ../src/gdict-window.c:1465
 msgid "Double-click on the database to use"
 msgstr ""
 
-#: ../src/gdict-window.c:1700
+#: ../src/gdict-window.c:1615
 msgid "Look _up:"
-msgstr "C_uardaigh:"
+msgstr "_Lorg:"
 
-#: ../src/gdict-window.c:1775
+#: ../src/gdict-window.c:1690
 msgid "Similar words"
-msgstr ""
+msgstr "Focail chosúla"
 
-#: ../src/gdict-window.c:1788
+#: ../src/gdict-window.c:1703
 msgid "Available dictionaries"
-msgstr ""
+msgstr "Foclóirí le fáil"
 
-#: ../src/gdict-window.c:1806
+#: ../src/gdict-window.c:1721
 msgid "Available strategies"
-msgstr ""
+msgstr "Straitéisí le fáil"
 
-#: ../src/gdict-window.c:1822
+#: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Foinsí foclóra"
diff -Nru gnome-dictionary-3.8.0/po/gl.po gnome-dictionary-3.10.0/po/gl.po
--- gnome-dictionary-3.8.0/po/gl.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/gl.po	2013-10-01 13:07:21.000000000 +0000
@@ -13,13 +13,13 @@
 # Antón Méixome , 2009.
 # Fran Diéguez , 2009, 2010, 2011, 2012.
 # Leandro Regueiro , 2012.
-# Fran Dieguez , 2012.
+# Fran Dieguez , 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils-master-po-gl-14799\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-16 18:34+0100\n"
-"PO-Revision-Date: 2012-11-16 18:35+0200\n"
+"POT-Creation-Date: 2013-08-02 12:35+0200\n"
+"PO-Revision-Date: 2013-08-02 12:35+0200\n"
 "Last-Translator: Fran Dieguez \n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -132,8 +132,8 @@
 msgstr "Orixes de dicionarios"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "_Bases de datos dispoñíbeis"
+msgid "Available _Dictionaries"
+msgstr "Dicionarios _dispoñíbeis"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -847,6 +847,9 @@
 msgid "Dictionary sources"
 msgstr "orixes de dicionarios"
 
+#~ msgid "Available _Databases"
+#~ msgstr "_Bases de datos dispoñíbeis"
+
 #~ msgid "New look up"
 #~ msgstr "Nova busca"
 
diff -Nru gnome-dictionary-3.8.0/po/gu.po gnome-dictionary-3.10.0/po/gu.po
--- gnome-dictionary-3.8.0/po/gu.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/gu.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,16 +1,16 @@
 # translation of gnome-utils.master.gu.po to Gujarati
 # Ankit Patel , 2005, 2006.
 # Ankit Patel , 2005, 2007, 2009.
-# Sweta Kothari , 2009, 2012.
+# Sweta Kothari , 2009, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils.master.gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2012-11-22 14:07+0530\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-07-26 13:07+0530\n"
 "Last-Translator: \n"
-"Language-Team: gu_IN \n"
+"Language-Team: American English \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -148,8 +148,9 @@
 msgstr "શબ્દકોષ સ્રોતો"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "ઉપલબ્ધ ડેટાબેઝો (_D)"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "ઉપલબ્ધ શબ્દકોષો (_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -837,6 +838,9 @@
 msgid "Dictionary sources"
 msgstr "શબ્દકોષ સ્રોતો"
 
+#~ msgid "Available _Databases"
+#~ msgstr "ઉપલબ્ધ ડેટાબેઝો (_D)"
+
 #~ msgid "New look up"
 #~ msgstr "નવો દેખાવ"
 
diff -Nru gnome-dictionary-3.8.0/po/he.po gnome-dictionary-3.10.0/po/he.po
--- gnome-dictionary-3.8.0/po/he.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/he.po	2013-10-01 13:07:21.000000000 +0000
@@ -17,27 +17,23 @@
 msgstr ""
 "Project-Id-Version: gnome-utils.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 23:51+0200\n"
-"PO-Revision-Date: 2012-11-26 23:52+0200\n"
+"POT-Creation-Date: 2013-07-31 09:22+0300\n"
+"PO-Revision-Date: 2013-07-31 09:22+0200\n"
 "Last-Translator: Yaron Shahrabani \n"
 "Language-Team: Hebrew \n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Hebrew\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
 msgstr "שרת מילון בררת המחדל"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:1
-#: ../src/gdict-about.c:60
-#: ../src/gdict-app.c:347
-#: ../src/gdict-window.c:543
-#: ../src/gdict-window.c:1805
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
 msgid "Dictionary"
 msgstr "מילון"
 
@@ -134,8 +130,8 @@
 msgstr "מקורות מילון"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "מסדי נתונים _זמינים"
+msgid "Available _Dictionaries"
+msgstr "מילונים _זמינים"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -211,16 +207,26 @@
 msgstr "The default database to use"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
-msgid "The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark (\"!\") means that all the databases present in a dictionary source should be searched"
-msgstr "The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark (\"!\") means that all the databases present in a dictionary source should be searched"
+msgid ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
+msgstr ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
 msgid "The default search strategy to use"
 msgstr "The default search strategy to use"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
-msgid "The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words."
-msgstr "The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words."
+msgid ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
+msgstr ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
 msgid "The font to be used when printing"
@@ -235,8 +241,10 @@
 msgstr "The name of the dictionary source used"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
-msgid "The name of the dictionary source used to retrieve the definitions of words."
-msgstr "The name of the dictionary source used to retrieve the definitions of words."
+msgid ""
+"The name of the dictionary source used to retrieve the definitions of words."
+msgstr ""
+"The name of the dictionary source used to retrieve the definitions of words."
 
 #: ../data/spanish.desktop.in.h:1
 msgid "Spanish Dictionaries"
@@ -300,8 +308,12 @@
 
 #: ../libgdict/gdict-client-context.c:1176
 #, c-format
-msgid "Unable to connect to the dictionary server at '%s:%d'. The server replied with code %d (server down)"
-msgstr "לא ניתן להתחבר לשרת המילון בכתובת '‎%s:%d'. השרת החזיר את הקוד %d (השרת אינו פעיל)"
+msgid ""
+"Unable to connect to the dictionary server at '%s:%d'. The server replied "
+"with code %d (server down)"
+msgstr ""
+"לא ניתן להתחבר לשרת המילון בכתובת '‎%s:%d'. השרת החזיר את הקוד %d (השרת אינו "
+"פעיל)"
 
 #: ../libgdict/gdict-client-context.c:1195
 #, c-format
@@ -403,14 +415,12 @@
 msgid "Clear the list of available databases"
 msgstr "ניקוי רשימת מסדי הנתונים הזמינים"
 
-#: ../libgdict/gdict-database-chooser.c:837
-#: ../libgdict/gdict-speller.c:777
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
 msgstr "שגיאה בזמן ההתאמה."
 
-#: ../libgdict/gdict-defbox.c:1126
-#: ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
 #: ../libgdict/gdict-defbox.c:1254
 msgid "Not found"
 msgstr "לא נמצא"
@@ -431,13 +441,11 @@
 msgid "Error while looking up definition"
 msgstr "שגיאה בזמן חיפוש הגדרה"
 
-#: ../libgdict/gdict-defbox.c:2555
-#: ../libgdict/gdict-speller.c:735
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
 msgstr "קיים חיפוש פעיל אחר"
 
-#: ../libgdict/gdict-defbox.c:2556
-#: ../libgdict/gdict-speller.c:736
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
 msgstr "נא להמתין עד לסיום החיפוש הנוכחי."
 
@@ -469,8 +477,7 @@
 msgid "The description of this dictionary source"
 msgstr "התיאור של מקור המילון"
 
-#: ../libgdict/gdict-source.c:273
-#: ../libgdict/gdict-speller.c:382
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
 msgstr "מסד נתונים"
 
@@ -478,8 +485,7 @@
 msgid "The default database of this dictionary source"
 msgstr "מסד נתונים כבררת המחדל של מקור מילון זה"
 
-#: ../libgdict/gdict-source.c:287
-#: ../libgdict/gdict-speller.c:389
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
 msgstr "אסטרטגיה"
 
@@ -495,8 +501,7 @@
 msgid "The transport mechanism used by this dictionary source"
 msgstr "מנגנון התעבורה שנמצא בשימוש על ידי מקור מילון זה"
 
-#: ../libgdict/gdict-source.c:316
-#: ../libgdict/gdict-speller.c:375
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
 msgstr "תוכן"
 
@@ -514,17 +519,16 @@
 msgid "No '%s' group found inside the dictionary source definition"
 msgstr "לא נמצאה קבוצה '%s' בהגדרות מקור המילון"
 
-#: ../libgdict/gdict-source.c:456
-#: ../libgdict/gdict-source.c:480
-#: ../libgdict/gdict-source.c:504
-#: ../libgdict/gdict-source.c:529
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
 msgstr "אירע כשל בקבלת המפתח '%s' בהגדרות מקור המילון: %s"
 
 #: ../libgdict/gdict-source.c:554
 #, c-format
-msgid "Unable to get the '%s' key inside the dictionary source definition file: %s"
+msgid ""
+"Unable to get the '%s' key inside the dictionary source definition file: %s"
 msgstr "אירע כשל בקבלת המפתח '%s' בקובץ הגדרות מקור המילון: %s"
 
 #: ../libgdict/gdict-source.c:740
@@ -585,8 +589,7 @@
 msgid "GDict debugging flags to set"
 msgstr "ביטול הגדרת דגלוני ניפוי השגיאות של GDict"
 
-#: ../libgdict/gdict-utils.c:96
-#: ../libgdict/gdict-utils.c:98
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
 msgstr "דגלונים"
 
@@ -618,13 +621,11 @@
 msgid "Look up words in dictionaries"
 msgstr "חיפוש מילים במילונים"
 
-#: ../src/gdict-app.c:60
-#: ../src/gdict-app.c:89
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
 msgstr "Words to look up"
 
-#: ../src/gdict-app.c:60
-#: ../src/gdict-app.c:66
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
 msgstr "מילה"
 
@@ -636,9 +637,7 @@
 msgid "Dictionary source to use"
 msgstr "Dictionary source to use"
 
-#: ../src/gdict-app.c:72
-#: ../src/gdict-app.c:78
-#: ../src/gdict-app.c:84
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
 msgstr "שם"
 
@@ -658,8 +657,7 @@
 msgid "Dictionary Preferences"
 msgstr "העדפות המילון"
 
-#: ../src/gdict-app.c:128
-#: ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
 #: ../src/gdict-source-dialog.c:475
 #, c-format
 msgid "There was an error while displaying help"
@@ -670,8 +668,7 @@
 msgid " - Look up words in dictionaries"
 msgstr " - Look up words in dictionaries"
 
-#: ../src/gdict-pref-dialog.c:239
-#: ../src/gdict-pref-dialog.c:428
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
 msgstr "עריכת מקור המילון"
 
@@ -709,19 +706,16 @@
 msgid "Set the font used for printing the definitions"
 msgstr "הגדרת הגופן שישמש להדפסת ההגדרות"
 
-#: ../src/gdict-print.c:239
-#: ../src/gdict-print.c:303
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
 msgstr "לא ניתן להציג את התצוגה המקדימה: %s"
 
-#: ../src/gdict-source-dialog.c:340
-#: ../src/gdict-source-dialog.c:432
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
 msgstr "לא ניתן ליצור קובץ מקור"
 
-#: ../src/gdict-source-dialog.c:356
-#: ../src/gdict-source-dialog.c:448
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
 msgstr "לא ניתן לשמור את קובץ המקור"
 
@@ -730,8 +724,7 @@
 msgid "Searching for '%s'..."
 msgstr "בחיפוש אחר '%s'..."
 
-#: ../src/gdict-window.c:285
-#: ../src/gdict-window.c:342
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
 msgstr "לא נמצאו הגדרות"
 
@@ -838,6 +831,9 @@
 msgid "Dictionary sources"
 msgstr "מקורות מילון"
 
+#~ msgid "Available _Databases"
+#~ msgstr "מסדי נתונים _זמינים"
+
 #~ msgid "French Dictionaries from Wikipedia"
 #~ msgstr "המילונים הצרפתיים מוויקיפדיה"
 
diff -Nru gnome-dictionary-3.8.0/po/hu.po gnome-dictionary-3.10.0/po/hu.po
--- gnome-dictionary-3.8.0/po/hu.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/hu.po	2013-10-01 13:07:21.000000000 +0000
@@ -9,14 +9,14 @@
 # Laszlo Dvornik , 2004.
 # Gabor Kelemen , 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Mate ORY , 2006.
-# Balázs Úr , 2012.
+# Balázs Úr , 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2012-12-29 18:01+0100\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-08-25 20:10+0200\n"
 "Last-Translator: Balázs Úr \n"
 "Language-Team: Hungarian \n"
 "Language: hu\n"
@@ -128,8 +128,9 @@
 msgstr "Szótárforrások"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "_Elérhető adatbázisok"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "Elérhető _szótárak"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -826,6 +827,9 @@
 msgid "Dictionary sources"
 msgstr "Szótárforrások"
 
+#~ msgid "Available _Databases"
+#~ msgstr "_Elérhető adatbázisok"
+
 #~ msgid "New look up"
 #~ msgstr "Új keresés"
 
diff -Nru gnome-dictionary-3.8.0/po/ja.po gnome-dictionary-3.10.0/po/ja.po
--- gnome-dictionary-3.8.0/po/ja.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/ja.po	2013-10-01 13:07:21.000000000 +0000
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: gnome-dictionary master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-06-12 17:06+0000\n"
-"PO-Revision-Date: 2013-06-19 01:41+0900\n"
+"POT-Creation-Date: 2013-09-18 03:30+0000\n"
+"PO-Revision-Date: 2013-09-19 12:26+0900\n"
 "Last-Translator: Jiro Matsuzawa \n"
 "Language-Team: Japanese \n"
 "Language: ja\n"
@@ -129,12 +129,12 @@
 msgstr "辞書ソース"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "利用可能な辞書の一覧(_D)"
+msgid "Available _Dictionaries"
+msgstr "利用可能な辞書(_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
-msgstr "利用可能な検索ルールの一覧(_R)"
+msgstr "利用可能な検索ルール(_R)"
 
 #: ../data/gnome-dictionary-menus.ui.h:24
 msgid "_Go"
@@ -392,11 +392,11 @@
 
 #: ../libgdict/gdict-database-chooser.c:378
 msgid "Reload the list of available databases"
-msgstr "利用可能なデータベースの一覧を更新します"
+msgstr "利用可能なデータベースを更新します"
 
 #: ../libgdict/gdict-database-chooser.c:390
 msgid "Clear the list of available databases"
-msgstr "利用可能なデータベースの一覧をクリアします"
+msgstr "利用可能なデータベースをクリアします"
 
 #: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
@@ -525,7 +525,7 @@
 
 #: ../libgdict/gdict-source-chooser.c:294
 msgid "Reload the list of available sources"
-msgstr "利用可能な辞書の一覧を更新します"
+msgstr "利用可能な辞書を更新します"
 
 #: ../libgdict/gdict-source-loader.c:170
 msgid "Paths"
@@ -561,11 +561,11 @@
 
 #: ../libgdict/gdict-strategy-chooser.c:361
 msgid "Reload the list of available strategies"
-msgstr "利用可能な検索ルールの一覧を更新します"
+msgstr "利用可能な検索ルールを更新します"
 
 #: ../libgdict/gdict-strategy-chooser.c:373
 msgid "Clear the list of available strategies"
-msgstr "利用可能な検索ルールの一覧をクリアします"
+msgstr "利用可能な検索ルールをクリアします"
 
 #: ../libgdict/gdict-utils.c:96
 msgid "GDict debugging flags to set"
@@ -804,7 +804,7 @@
 
 #: ../src/gdict-window.c:1703
 msgid "Available dictionaries"
-msgstr "利用可能な辞書の一覧"
+msgstr "利用可能な辞書"
 
 #: ../src/gdict-window.c:1721
 msgid "Available strategies"
@@ -813,33 +813,3 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "辞書ソース"
-
-#~ msgid "New look up"
-#~ msgstr "新しい検索"
-
-#~ msgid "Preview this document"
-#~ msgstr "このドキュメントをプレビュー表示します"
-
-#~ msgid "_Print..."
-#~ msgstr "印刷(_P)..."
-
-#~ msgid "Print this document"
-#~ msgstr "このドキュメントを印刷します"
-
-#~ msgid "Find a word or phrase in the document"
-#~ msgstr "ドキュメントから単語または語句を検索します"
-
-#~ msgid "Go to the previous definition"
-#~ msgstr "前の意味にジャンプします"
-
-#~ msgid "Go to the next definition"
-#~ msgstr "次の意味へジャンプします"
-
-#~ msgid "Go to the first definition"
-#~ msgstr "先頭の意味へジャンプします"
-
-#~ msgid "Go to the last definition"
-#~ msgstr "最後の意味へジャンプします"
-
-#~ msgid "_Contents"
-#~ msgstr "目次(_C)"
diff -Nru gnome-dictionary-3.8.0/po/ko.po gnome-dictionary-3.10.0/po/ko.po
--- gnome-dictionary-3.8.0/po/ko.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/ko.po	2013-10-01 13:07:21.000000000 +0000
@@ -16,8 +16,8 @@
 "Project-Id-Version: gnome-utils\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-03-17 02:46+0900\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-09-14 05:24+0900\n"
 "Last-Translator: Changwoo Ryu \n"
 "Language-Team: GNOME Korea \n"
 "Language: \n"
@@ -128,8 +128,8 @@
 msgstr "사전 공급원"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "사용 가능한 데이터베이스(_D)"
+msgid "Available _Dictionaries"
+msgstr "사용 가능한 사전(_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -722,7 +722,7 @@
 #, c-format
 msgid "A definition found"
 msgid_plural "%d definitions found"
-msgstr[0] "%d개의 단어 정의를 찾았습니다"
+msgstr[0] "단어 정의 %d개를 찾았습니다"
 
 #: ../src/gdict-window.c:458
 #, c-format
diff -Nru gnome-dictionary-3.8.0/po/lv.po gnome-dictionary-3.10.0/po/lv.po
--- gnome-dictionary-3.8.0/po/lv.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/lv.po	2013-10-01 13:07:21.000000000 +0000
@@ -13,8 +13,8 @@
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-03-10 16:24+0200\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-09-11 16:04+0300\n"
 "Last-Translator: Rūdolfs Mazurs \n"
 "Language-Team: Latvian \n"
 "Language: lv\n"
@@ -23,7 +23,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
@@ -136,8 +136,9 @@
 msgstr "Vārdnīcas avoti"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Pieejamās _datubāzes"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "Pieejamās vār_dnīcas"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -876,6 +877,9 @@
 msgid "Dictionary sources"
 msgstr "Vārdnīcu avoti"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Pieejamās _datubāzes"
+
 #~ msgid "New look up"
 #~ msgstr "Jauna uzmeklēšana"
 
diff -Nru gnome-dictionary-3.8.0/po/pa.po gnome-dictionary-3.10.0/po/pa.po
--- gnome-dictionary-3.8.0/po/pa.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/pa.po	2013-10-01 13:07:21.000000000 +0000
@@ -11,8 +11,8 @@
 "Project-Id-Version: gnome-utils.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-02-22 14:57+0000\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-09-17 22:29-0500\n"
 "Last-Translator: A S Alam \n"
 "Language-Team: Punjabi/Panjabi \n"
 "Language: pa\n"
@@ -124,8 +124,9 @@
 msgstr "ਡਿਕਸ਼ਨਰੀ ਸਰੋਤ"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "ਉਪਲੱਬਧ ਡਾਟਾਬੇਸ(_D)"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "ਉਪਲੱਬਧ ਡਿਕਸ਼ਨਰੀਆਂ(_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -822,6 +823,9 @@
 msgid "Dictionary sources"
 msgstr "ਡਿਕਸ਼ਨਰੀ ਸਰੋਤ"
 
+#~ msgid "Available _Databases"
+#~ msgstr "ਉਪਲੱਬਧ ਡਾਟਾਬੇਸ(_D)"
+
 #~ msgid "New look up"
 #~ msgstr "ਨਵੀਂ ਖੋਜ"
 
diff -Nru gnome-dictionary-3.8.0/po/pt.po gnome-dictionary-3.10.0/po/pt.po
--- gnome-dictionary-3.8.0/po/pt.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/pt.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,22 +1,24 @@
-# gnome-utils's Portuguese translation
-# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 gnome-utils
-# Distributed under the same licence as the gnome-utils package
-# Nuno Ferreira , 1999.
-# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# 
+# gnome-utils's Portuguese translation
+# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 gnome-utils
+# Distributed under the same licence as the gnome-utils package
+# Nuno Ferreira , 1999.
+# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
+# António Lima , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 23:52+0000\n"
-"PO-Revision-Date: 2013-03-14 23:55+0000\n"
-"Last-Translator: Duarte Loreto \n"
+"POT-Creation-Date: 2013-09-22 23:33+0100\n"
+"PO-Revision-Date: 2013-09-22 18:48-0100\n"
+"Last-Translator: António Lima \n"
 "Language-Team: Portuguese \n"
 "Language: pt\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: Poedit 1.5.4\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
@@ -120,8 +122,8 @@
 msgstr "Origens de Dicionário"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Bases de _Dados Disponíveis"
+msgid "Available _Dictionaries"
+msgstr "Dicionários _Disponíveis"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -820,6 +822,9 @@
 msgid "Dictionary sources"
 msgstr "Origens de dicionário"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Bases de _Dados Disponíveis"
+
 #~ msgid "New look up"
 #~ msgstr "Nova procura"
 
diff -Nru gnome-dictionary-3.8.0/po/ru.po gnome-dictionary-3.10.0/po/ru.po
--- gnome-dictionary-3.8.0/po/ru.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/ru.po	2013-10-01 13:07:21.000000000 +0000
@@ -14,28 +14,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-09 12:07+0000\n"
-"PO-Revision-Date: 2012-12-30 13:37+0300\n"
-"Last-Translator: Yuri Myasoedov \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"dictionary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-07-07 00:55+0000\n"
+"PO-Revision-Date: 2013-07-07 13:26+0600\n"
+"Last-Translator: Dmitriy S. Seregin \n"
 "Language-Team: Russian \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
 msgstr "Сервер словаря по умолчанию"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:1
-#: ../src/gdict-about.c:60
-#: ../src/gdict-app.c:347
-#: ../src/gdict-window.c:543
-#: ../src/gdict-window.c:1805
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
 msgid "Dictionary"
 msgstr "Словарь"
 
@@ -132,8 +131,8 @@
 msgstr "Источники словарей"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "_Доступные базы данных"
+msgid "Available _Dictionaries"
+msgstr "Доступные с_ловари"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -209,16 +208,27 @@
 msgstr "Используемая по умолчанию база данных"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
-msgid "The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark (\"!\") means that all the databases present in a dictionary source should be searched"
-msgstr "Название индивидуальной или мета-базы данных по умолчанию, которую следует использовать в источнике словарей. Восклицательный знак («!») означает, что надо искать во всех базах данных, представленных в источнике словарей."
+msgid ""
+"The name of the default individual database or meta-database to use on a "
+"dictionary source. An exclamation mark (\"!\") means that all the databases "
+"present in a dictionary source should be searched"
+msgstr ""
+"Название индивидуальной или мета-базы данных по умолчанию, которую следует "
+"использовать в источнике словарей. Восклицательный знак («!») означает, что "
+"надо искать во всех базах данных, представленных в источнике словарей."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
 msgid "The default search strategy to use"
 msgstr "Используемая стратегия поиска по умолчанию"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
-msgid "The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words."
-msgstr "Название стратегии поиска, используемой по умолчанию в источнике словарей, если она доступна. Стратегия по умолчанию — «exact», что означает поиск в точности совпадающих слов."
+msgid ""
+"The name of the default search strategy to use on a dictionary source, if "
+"available. The default strategy is 'exact', that is match exact words."
+msgstr ""
+"Название стратегии поиска, используемой по умолчанию в источнике словарей, "
+"если она доступна. Стратегия по умолчанию — «exact», что означает поиск в "
+"точности совпадающих слов."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
 msgid "The font to be used when printing"
@@ -233,8 +243,10 @@
 msgstr "Название используемого источника словарей"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
-msgid "The name of the dictionary source used to retrieve the definitions of words."
-msgstr "Название источника словарей, используемого для получения определений слов."
+msgid ""
+"The name of the dictionary source used to retrieve the definitions of words."
+msgstr ""
+"Название источника словарей, используемого для получения определений слов."
 
 #: ../data/spanish.desktop.in.h:1
 msgid "Spanish Dictionaries"
@@ -298,8 +310,12 @@
 
 #: ../libgdict/gdict-client-context.c:1176
 #, c-format
-msgid "Unable to connect to the dictionary server at '%s:%d'. The server replied with code %d (server down)"
-msgstr "Не удалось соединиться с сервером словарей «%s:%d». Сервер ответил кодом %d (сервер недоступен)"
+msgid ""
+"Unable to connect to the dictionary server at '%s:%d'. The server replied "
+"with code %d (server down)"
+msgstr ""
+"Не удалось соединиться с сервером словарей «%s:%d». Сервер ответил кодом %d "
+"(сервер недоступен)"
 
 #: ../libgdict/gdict-client-context.c:1195
 #, c-format
@@ -401,14 +417,12 @@
 msgid "Clear the list of available databases"
 msgstr "Очистить список доступных баз данных"
 
-#: ../libgdict/gdict-database-chooser.c:837
-#: ../libgdict/gdict-speller.c:777
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
 msgstr "Произошла ошибка при поиске совпадений"
 
-#: ../libgdict/gdict-defbox.c:1126
-#: ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
 #: ../libgdict/gdict-defbox.c:1254
 msgid "Not found"
 msgstr "Совпадений не найдено"
@@ -429,13 +443,11 @@
 msgid "Error while looking up definition"
 msgstr "Произошла ошибка при поиске определения"
 
-#: ../libgdict/gdict-defbox.c:2555
-#: ../libgdict/gdict-speller.c:735
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
 msgstr "Сейчас идёт другой поиск"
 
-#: ../libgdict/gdict-defbox.c:2556
-#: ../libgdict/gdict-speller.c:736
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
 msgstr "Подождите, пока закончится текущий поиск."
 
@@ -467,8 +479,7 @@
 msgid "The description of this dictionary source"
 msgstr "Описание этого источника словарей"
 
-#: ../libgdict/gdict-source.c:273
-#: ../libgdict/gdict-speller.c:382
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
 msgstr "База данных"
 
@@ -476,8 +487,7 @@
 msgid "The default database of this dictionary source"
 msgstr "База данных по умолчанию для этого источника словарей"
 
-#: ../libgdict/gdict-source.c:287
-#: ../libgdict/gdict-speller.c:389
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
 msgstr "Стратегия"
 
@@ -493,8 +503,7 @@
 msgid "The transport mechanism used by this dictionary source"
 msgstr "Механизм транспорта, используемый этим источником словарей"
 
-#: ../libgdict/gdict-source.c:316
-#: ../libgdict/gdict-speller.c:375
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
 msgstr "Контекст"
 
@@ -512,18 +521,19 @@
 msgid "No '%s' group found inside the dictionary source definition"
 msgstr "Группа «%s» не найдена внутри определения источника словарей"
 
-#: ../libgdict/gdict-source.c:456
-#: ../libgdict/gdict-source.c:480
-#: ../libgdict/gdict-source.c:504
-#: ../libgdict/gdict-source.c:529
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
-msgstr "Не удалось получить ключ «%s» внутри определения источника словарей: %s"
+msgstr ""
+"Не удалось получить ключ «%s» внутри определения источника словарей: %s"
 
 #: ../libgdict/gdict-source.c:554
 #, c-format
-msgid "Unable to get the '%s' key inside the dictionary source definition file: %s"
-msgstr "Не удалось получить ключ «%s» внутри файла определения источника словарей: %s"
+msgid ""
+"Unable to get the '%s' key inside the dictionary source definition file: %s"
+msgstr ""
+"Не удалось получить ключ «%s» внутри файла определения источника словарей: %s"
 
 #: ../libgdict/gdict-source.c:740
 #, c-format
@@ -583,8 +593,7 @@
 msgid "GDict debugging flags to set"
 msgstr "Включить флаги отладки GDict"
 
-#: ../libgdict/gdict-utils.c:96
-#: ../libgdict/gdict-utils.c:98
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
 msgstr "ФЛАГИ"
 
@@ -614,13 +623,11 @@
 msgid "Look up words in dictionaries"
 msgstr "Поиск слова в словарях"
 
-#: ../src/gdict-app.c:60
-#: ../src/gdict-app.c:89
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
 msgstr "Слова для поиска"
 
-#: ../src/gdict-app.c:60
-#: ../src/gdict-app.c:66
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
 msgstr "СЛОВО"
 
@@ -632,9 +639,7 @@
 msgid "Dictionary source to use"
 msgstr "Используемый источник словарей"
 
-#: ../src/gdict-app.c:72
-#: ../src/gdict-app.c:78
-#: ../src/gdict-app.c:84
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
 msgstr "НАЗВАНИЕ"
 
@@ -654,8 +659,7 @@
 msgid "Dictionary Preferences"
 msgstr "Параметры словаря"
 
-#: ../src/gdict-app.c:128
-#: ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
 #: ../src/gdict-source-dialog.c:475
 #, c-format
 msgid "There was an error while displaying help"
@@ -666,8 +670,7 @@
 msgid " - Look up words in dictionaries"
 msgstr " — искать слова в словарях"
 
-#: ../src/gdict-pref-dialog.c:239
-#: ../src/gdict-pref-dialog.c:428
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
 msgstr "Изменить источник словарей"
 
@@ -705,19 +708,16 @@
 msgid "Set the font used for printing the definitions"
 msgstr "Установить шрифт для печати определений"
 
-#: ../src/gdict-print.c:239
-#: ../src/gdict-print.c:303
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
 msgstr "Не удалось задействовать предварительный просмотр: %s"
 
-#: ../src/gdict-source-dialog.c:340
-#: ../src/gdict-source-dialog.c:432
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
 msgstr "Не удалось создать файл источника"
 
-#: ../src/gdict-source-dialog.c:356
-#: ../src/gdict-source-dialog.c:448
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
 msgstr "Не удалось сохранить файл источника"
 
@@ -726,8 +726,7 @@
 msgid "Searching for '%s'..."
 msgstr "Идёт поиск «%s»..."
 
-#: ../src/gdict-window.c:285
-#: ../src/gdict-window.c:342
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
 msgstr "Определения не найдены"
 
@@ -835,6 +834,9 @@
 msgid "Dictionary sources"
 msgstr "Источники словарей"
 
+#~ msgid "Available _Databases"
+#~ msgstr "_Доступные базы данных"
+
 #~ msgid "New look up"
 #~ msgstr "Создать новый поиск"
 
diff -Nru gnome-dictionary-3.8.0/po/sk.po gnome-dictionary-3.10.0/po/sk.po
--- gnome-dictionary-3.8.0/po/sk.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/sk.po	2013-10-01 13:07:21.000000000 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: gnome-dictionary\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-07 00:43+0000\n"
-"PO-Revision-Date: 2013-06-04 11:16+0100\n"
+"POT-Creation-Date: 2013-08-06 11:46+0000\n"
+"PO-Revision-Date: 2013-08-09 10:22+0100\n"
 "Last-Translator: Pavol Klačanský \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -147,10 +147,9 @@
 msgid "Dictionary Sources"
 msgstr "Zdroje slovníkov"
 
-# menu /view
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Dostupné _databázy"
+msgid "Available _Dictionaries"
+msgstr "_Dostupné slovníky"
 
 # menu /view
 #: ../data/gnome-dictionary-menus.ui.h:23
@@ -858,15 +857,15 @@
 msgstr "Nepodarilo sa nájsť zdroj slovníka"
 
 # PM: Uff aj v anglictiene je to podla mna hovadina - contextom sa myslí dajaké rozhranie - mne to velký zmysel nedáva
+# PK: skor mi prijde podla zdrojaku ze kontext to je proste nejake nastavenie
 # * https://bugzilla.gnome.org/show_bug.cgi?id=687751
 #: ../src/gdict-window.c:478
-#, fuzzy, c-format
+#, c-format
 msgid "No context available for source '%s'"
 msgstr "Nie je dostupný žiadny kontext pre zdroj „%s“"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=687751
 #: ../src/gdict-window.c:482
-#, fuzzy
 msgid "Unable to create a context"
 msgstr "Nepodarilo sa vytvoriť kontext"
 
@@ -951,3 +950,7 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Zdroje slovníkov"
+
+# menu /view
+#~ msgid "Available _Databases"
+#~ msgstr "Dostupné _databázy"
diff -Nru gnome-dictionary-3.8.0/po/sl.po gnome-dictionary-3.10.0/po/sl.po
--- gnome-dictionary-3.8.0/po/sl.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/sl.po	2013-10-01 13:07:21.000000000 +0000
@@ -4,15 +4,15 @@
 #
 # Andraž Tori , 2000.
 # Matic Žgur , 2006.
-# Matej Urbančič , 2007 - 2011.
+# Matej Urbančič , 2007-2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:46+0000\n"
-"PO-Revision-Date: 2012-11-14 19:52+0100\n"
+"POT-Creation-Date: 2013-08-06 11:46+0000\n"
+"PO-Revision-Date: 2013-08-17 15:58+0100\n"
 "Last-Translator: Matej Urbančič \n"
 "Language-Team: Slovenian GNOME Translation Team \n"
 "Language: sl_SI\n"
@@ -126,8 +126,8 @@
 msgstr "Viri slovarja"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Razpoložljive _zbirke podatkov"
+msgid "Available _Dictionaries"
+msgstr "_Razpoložljivi slovarji"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -824,3 +824,6 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Viri slovarja"
+
+#~ msgid "Available _Databases"
+#~ msgstr "Razpoložljive _zbirke podatkov"
diff -Nru gnome-dictionary-3.8.0/po/sr.po gnome-dictionary-3.10.0/po/sr.po
--- gnome-dictionary-3.8.0/po/sr.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/sr.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,12 +1,12 @@
 # Милош Поповић , 2011.
-# Мирослав Николић , 2011, 2012.
+# Мирослав Николић , 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils-2.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2012-11-17 12:06+0200\n"
+"POT-Creation-Date: 2013-08-27 14:44+0000\n"
+"PO-Revision-Date: 2013-09-05 09:35+0200\n"
 "Last-Translator: Мирослав Николић \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -119,8 +119,9 @@
 msgstr "Извори речника"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Доступне _базе података"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "Доступни _речници"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -301,8 +302,8 @@
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
-"Не могу да се повежем на сервер речника „%s:%d“. Сервер је одговорио кодом %"
-"d (сервер је оборен)"
+"Не могу да се повежем на сервер речника „%s:%d“. Сервер је одговорио кодом "
+"%d (сервер је оборен)"
 
 #: ../libgdict/gdict-client-context.c:1195
 #, c-format
@@ -819,36 +820,3 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Извори речника"
-
-#~ msgid "New look up"
-#~ msgstr "Нова претрага"
-
-#~ msgid "Preview this document"
-#~ msgstr "Преглед документа"
-
-#~ msgid "_Print..."
-#~ msgstr "_Штампај..."
-
-#~ msgid "Print this document"
-#~ msgstr "Штампај овај документ"
-
-#~ msgid "Find a word or phrase in the document"
-#~ msgstr "Пронађи реч или фразу у документу"
-
-#~ msgid "Go to the previous definition"
-#~ msgstr "Иди на претходну дефиницију"
-
-#~ msgid "Go to the next definition"
-#~ msgstr "Иди на следећу дефиницију"
-
-#~ msgid "Go to the first definition"
-#~ msgstr "Иди на прву дефиницију"
-
-#~ msgid "Go to the last definition"
-#~ msgstr "Иди на последњу дефиницију"
-
-#~ msgid "_Contents"
-#~ msgstr "_Садржај"
-
-#~ msgid "_About"
-#~ msgstr "_О програму"
diff -Nru gnome-dictionary-3.8.0/po/sr@latin.po gnome-dictionary-3.10.0/po/sr@latin.po
--- gnome-dictionary-3.8.0/po/sr@latin.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/sr@latin.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,12 +1,12 @@
 # Miloš Popović , 2011.
-# Miroslav Nikolić , 2011, 2012.
+# Miroslav Nikolić , 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils-2.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2012-11-17 12:06+0200\n"
+"POT-Creation-Date: 2013-08-27 14:44+0000\n"
+"PO-Revision-Date: 2013-09-05 09:35+0200\n"
 "Last-Translator: Miroslav Nikolić \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -119,8 +119,9 @@
 msgstr "Izvori rečnika"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Dostupne _baze podataka"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "Dostupni _rečnici"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -301,8 +302,8 @@
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
-"Ne mogu da se povežem na server rečnika „%s:%d“. Server je odgovorio kodom %"
-"d (server je oboren)"
+"Ne mogu da se povežem na server rečnika „%s:%d“. Server je odgovorio kodom "
+"%d (server je oboren)"
 
 #: ../libgdict/gdict-client-context.c:1195
 #, c-format
@@ -819,36 +820,3 @@
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Izvori rečnika"
-
-#~ msgid "New look up"
-#~ msgstr "Nova pretraga"
-
-#~ msgid "Preview this document"
-#~ msgstr "Pregled dokumenta"
-
-#~ msgid "_Print..."
-#~ msgstr "_Štampaj..."
-
-#~ msgid "Print this document"
-#~ msgstr "Štampaj ovaj dokument"
-
-#~ msgid "Find a word or phrase in the document"
-#~ msgstr "Pronađi reč ili frazu u dokumentu"
-
-#~ msgid "Go to the previous definition"
-#~ msgstr "Idi na prethodnu definiciju"
-
-#~ msgid "Go to the next definition"
-#~ msgstr "Idi na sledeću definiciju"
-
-#~ msgid "Go to the first definition"
-#~ msgstr "Idi na prvu definiciju"
-
-#~ msgid "Go to the last definition"
-#~ msgstr "Idi na poslednju definiciju"
-
-#~ msgid "_Contents"
-#~ msgstr "_Sadržaj"
-
-#~ msgid "_About"
-#~ msgstr "_O programu"
diff -Nru gnome-dictionary-3.8.0/po/ta.po gnome-dictionary-3.10.0/po/ta.po
--- gnome-dictionary-3.8.0/po/ta.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/ta.po	2013-10-01 13:07:21.000000000 +0000
@@ -9,22 +9,23 @@
 # Dr.T.Vasudevan , 2007, 2008, 2009, 2011.
 # I. Felix , 2009.
 # Dr,T,Vasudevan , 2010, 2011.
-# Shantha kumar , 2012.
+# Shantha kumar , 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils.master.ta\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-26 21:54+0000\n"
-"PO-Revision-Date: 2012-11-28 13:39+0530\n"
+"POT-Creation-Date: 2013-07-18 11:41+0000\n"
+"PO-Revision-Date: 2013-07-24 14:51+0000\n"
 "Last-Translator: Shantha kumar \n"
 "Language-Team: American English <>\n"
-"Language: \n"
+"Language: en_US\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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -135,8 +136,9 @@
 msgstr "அகராதி வளங்கள்"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "இருக்கும் தரவுத்தளங்கள் (_D)"
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "இருக்கும் அகராதிகள் (_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -217,8 +219,10 @@
 "dictionary source. An exclamation mark (\"!\") means that all the databases "
 "present in a dictionary source should be searched"
 msgstr ""
-"அகராதி மூலத்தில் பயன்படுத்த வேண்டிய முன்னிருப்பு தரவுத்தளத்தின் அல்லது மெடா தரவுத்தளத்தின் "
-"பட்டியல். வியப்புக்குறி (\"!\") என்பது அகராதி மூலத்தில் உள்ள அனைத்து தரவுத்தளங்களையும் "
+"அகராதி மூலத்தில் பயன்படுத்த வேண்டிய முன்னிருப்பு தரவுத்தளத்தின் அல்லது மெடா "
+"தரவுத்தளத்தின் "
+"பட்டியல். வியப்புக்குறி (\"!\") என்பது அகராதி மூலத்தில் உள்ள அனைத்து "
+"தரவுத்தளங்களையும் "
 "தேட வேண்டும் எனக்குறிக்கிறது."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
@@ -230,7 +234,8 @@
 "The name of the default search strategy to use on a dictionary source, if "
 "available. The default strategy is 'exact', that is match exact words."
 msgstr ""
-"இருப்பில் இருந்தால் அகராதி மூலத்துக்கு முுன்னிருப்ப தேடல் திட்டம். ு முன்னிருப்பு'சரியான' "
+"இருப்பில் இருந்தால் அகராதி மூலத்துக்கு முுன்னிருப்ப தேடல் திட்டம். ு "
+"முன்னிருப்பு'சரியான' "
 "அதாவது  பொருத்ம் மிகச் சரியாக இருக்க வேண்டும்.."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
@@ -316,7 +321,8 @@
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
-"அகராதி சேவையகத்துடன் ('%s:%d'.  இல்) இணைக்க முடியவில்லை. சேவையகம் குறி  %d என பதில் "
+"அகராதி சேவையகத்துடன் ('%s:%d'.  இல்) இணைக்க முடியவில்லை. சேவையகம் குறி  %d என "
+"பதில் "
 "தந்தது. (சேவயகம் செய்லில் இல்லை)"
 
 #: ../libgdict/gdict-client-context.c:1195
@@ -827,6 +833,9 @@
 msgid "Dictionary sources"
 msgstr "அகராதியை மூலங்கள் "
 
+#~ msgid "Available _Databases"
+#~ msgstr "இருக்கும் தரவுத்தளங்கள் (_D)"
+
 #~ msgid "New look up"
 #~ msgstr "புதிய தேடுதல்"
 
diff -Nru gnome-dictionary-3.8.0/po/tg.po gnome-dictionary-3.10.0/po/tg.po
--- gnome-dictionary-3.8.0/po/tg.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/tg.po	2013-10-01 13:07:21.000000000 +0000
@@ -8,20 +8,20 @@
 "Project-Id-Version: Tajik Gnome\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-09 05:49+0000\n"
-"PO-Revision-Date: 2013-01-21 15:35+0500\n"
+"POT-Creation-Date: 2013-07-23 09:30+0000\n"
+"PO-Revision-Date: 2013-07-23 14:31+0500\n"
 "Last-Translator: Victor Ibragimov \n"
 "Language-Team: \n"
 "Language: Tajik\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"
+"Plural-Forms: nplurals=2; plural=1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../data/default.desktop.in.h:1
 msgid "Default Dictionary Server"
-msgstr ""
+msgstr "Сервери луғати пешфарз"
 
 #: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
 #: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
@@ -30,11 +30,11 @@
 
 #: ../data/gnome-dictionary.desktop.in.in.h:2
 msgid "Check word definitions and spellings in an online dictionary"
-msgstr ""
+msgstr "Санҷиши таърифҳо ва талаффузҳои калимаҳо дар луғати онлайн"
 
 #: ../data/gnome-dictionary.desktop.in.in.h:3
 msgid "word;synonym;definition;spelling;"
-msgstr ""
+msgstr "калима;синоним;таъриф;талаффуз;"
 
 #: ../data/gnome-dictionary-menus.ui.h:1
 msgid "Preferences"
@@ -94,11 +94,11 @@
 
 #: ../data/gnome-dictionary-menus.ui.h:15
 msgid "Find Ne_xt"
-msgstr ""
+msgstr "Ёфтани Нав_батӣ"
 
 #: ../data/gnome-dictionary-menus.ui.h:16
 msgid "Find Pre_vious"
-msgstr ""
+msgstr "Ёфтани Қаб_лӣ"
 
 #: ../data/gnome-dictionary-menus.ui.h:17
 msgid "_View"
@@ -106,27 +106,28 @@
 
 #: ../data/gnome-dictionary-menus.ui.h:18
 msgid "_Sidebar"
-msgstr ""
+msgstr "_Навори ҷонибӣ"
 
 #: ../data/gnome-dictionary-menus.ui.h:19
 msgid "S_tatusbar"
-msgstr ""
+msgstr "Навори_вазъият"
 
 #: ../data/gnome-dictionary-menus.ui.h:20
 msgid "Similar _Words"
-msgstr ""
+msgstr "Калимаҳои _монанд "
 
 #: ../data/gnome-dictionary-menus.ui.h:21
 msgid "Dictionary Sources"
-msgstr ""
+msgstr "Манбаҳои луғат"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr ""
+#| msgid "Available dictionaries"
+msgid "Available _Dictionaries"
+msgstr "Луғатҳои _дастрас"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
-msgstr ""
+msgstr "Ст_ратегияҳои дастрас"
 
 #: ../data/gnome-dictionary-menus.ui.h:24
 msgid "_Go"
@@ -134,23 +135,23 @@
 
 #: ../data/gnome-dictionary-menus.ui.h:25
 msgid "_Previous Definition"
-msgstr ""
+msgstr "_Мазмуни қаблӣ"
 
 #: ../data/gnome-dictionary-menus.ui.h:26
 msgid "_Next Definition"
-msgstr ""
+msgstr "_Таърифи навбатӣ"
 
 #: ../data/gnome-dictionary-menus.ui.h:27
 msgid "_First Definition"
-msgstr ""
+msgstr "_Таърифи якум"
 
 #: ../data/gnome-dictionary-menus.ui.h:28
 msgid "_Last Definition"
-msgstr ""
+msgstr "_Таърифи охирин"
 
 #: ../data/gnome-dictionary-preferences.ui.h:1
 msgid "_Select a dictionary source for looking up words:"
-msgstr ""
+msgstr "_Интихоби манбаи луғат барои ҷустуҷӯи калимаҳо:"
 
 #: ../data/gnome-dictionary-preferences.ui.h:2
 #: ../data/gnome-dictionary-source.ui.h:6
@@ -159,7 +160,7 @@
 
 #: ../data/gnome-dictionary-preferences.ui.h:3
 msgid "_Print font:"
-msgstr ""
+msgstr "_Чопи шрифт:"
 
 #: ../data/gnome-dictionary-preferences.ui.h:4
 msgid "Print"
@@ -171,11 +172,11 @@
 
 #: ../data/gnome-dictionary-source.ui.h:2
 msgid "_Transport:"
-msgstr ""
+msgstr "_Интиқол:"
 
 #: ../data/gnome-dictionary-source.ui.h:3
 msgid "H_ostname:"
-msgstr ""
+msgstr "Номи_мизбон"
 
 #: ../data/gnome-dictionary-source.ui.h:4
 msgid "_Port:"
@@ -183,7 +184,7 @@
 
 #: ../data/gnome-dictionary-source.ui.h:5
 msgid "Source Name"
-msgstr ""
+msgstr "Номи манбаъ"
 
 #: ../data/gnome-dictionary-source.ui.h:7
 msgid "Dictionaries"
@@ -191,11 +192,11 @@
 
 #: ../data/gnome-dictionary-source.ui.h:8
 msgid "Strategies"
-msgstr ""
+msgstr "Стратегияҳо"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:1
 msgid "The default database to use"
-msgstr ""
+msgstr "Пойгоҳи иттилоотии пешфарз барои истифода"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:2
 msgid ""
@@ -203,57 +204,63 @@
 "dictionary source. An exclamation mark (\"!\") means that all the databases "
 "present in a dictionary source should be searched"
 msgstr ""
+"Номи пойгоҳи иттилооти шахсии пешфарз ё мета-пойгоҳи иттилоотӣ барои "
+"истифода дар манбаи луғут. Аломати хитоб (\"!\") маънои онро дорад, ки ҳамаи "
+"пойгоҳҳои иттилоотии мавҷудбуда дар манбаи луғат бояд ҷустуҷӯ шаванд"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
 msgid "The default search strategy to use"
-msgstr ""
+msgstr "Стратегияи ҷустуҷӯи пешфарз барои истифода"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:4
 msgid ""
 "The name of the default search strategy to use on a dictionary source, if "
 "available. The default strategy is 'exact', that is match exact words."
 msgstr ""
+"Номи стратегияи ҷустуҷӯи пешфарз барои истифода дар манбаи луғат, дар ҳолати "
+"дастрас будан. Стратегияи пешфарз 'дақиқ' аст, ки калимаҳои дақиқро ҷқфт "
+"менамояд."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
 msgid "The font to be used when printing"
-msgstr ""
+msgstr "Шрифте, ки бояд ҳангоми чоп кардан истифода шавад"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:6
 msgid "The font to be used when printing a definition."
-msgstr ""
+msgstr "Шрифте, ки бояд ҳангоми чоп кардани таъриф истифода шавад."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:7
 msgid "The name of the dictionary source used"
-msgstr ""
+msgstr "Номи манбаи луғати истифодашуда"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:8
 msgid ""
 "The name of the dictionary source used to retrieve the definitions of words."
-msgstr ""
+msgstr "Номи манбаи луғати истифодашуда барои ҷустуҷӯи мазмуни калимаҳо"
 
 #: ../data/spanish.desktop.in.h:1
 msgid "Spanish Dictionaries"
-msgstr ""
+msgstr "Луғатҳои испанӣ"
 
 #: ../data/thai.desktop.in.h:1
 msgid "Longdo Thai-English Dictionaries"
-msgstr ""
+msgstr "Луғатҳои Тайӣ-Англисии  Longdo"
 
 #: ../libgdict/gdict-client-context.c:282
 msgid "Client Name"
-msgstr ""
+msgstr "Номи муштарӣ"
 
 #: ../libgdict/gdict-client-context.c:283
 msgid "The name of the client of the context object"
-msgstr ""
+msgstr "Номи муштарии объекти матн"
 
 #: ../libgdict/gdict-client-context.c:296
 msgid "Hostname"
-msgstr ""
+msgstr "Номи мизбон"
 
 #: ../libgdict/gdict-client-context.c:297
 msgid "The hostname of the dictionary server to connect to"
-msgstr ""
+msgstr "Номи мизбони сервери луғат барои пайваст шудан ба"
 
 #: ../libgdict/gdict-client-context.c:310
 msgid "Port"
@@ -261,7 +268,7 @@
 
 #: ../libgdict/gdict-client-context.c:311
 msgid "The port of the dictionary server to connect to"
-msgstr ""
+msgstr "Даргоҳи сервери луғат барои пайваст шудан ба"
 
 #: ../libgdict/gdict-client-context.c:326
 msgid "Status"
@@ -269,27 +276,29 @@
 
 #: ../libgdict/gdict-client-context.c:327
 msgid "The status code as returned by the dictionary server"
-msgstr ""
+msgstr "Рамзи вазъият дар ҳолати бозгашт тавассути сервери луғат"
 
 #: ../libgdict/gdict-client-context.c:776
 #, c-format
 msgid "No connection to the dictionary server at '%s:%d'"
-msgstr ""
+msgstr "Ба сервери луғат дар '%s:%d' пайваст намешавад"
 
 #: ../libgdict/gdict-client-context.c:1059
 #, c-format
 msgid "Lookup failed for hostname '%s': no suitable resources found"
 msgstr ""
+"Ҷустуҷӯ барои номи мизбони '%s' ноком монд: ҳеҷгуна манбаҳои мувофиқ ёфт "
+"нашуданд"
 
 #: ../libgdict/gdict-client-context.c:1090
 #, c-format
 msgid "Lookup failed for host '%s': %s"
-msgstr ""
+msgstr "Ҷустуҷӯ барои мизбони '%s' ноком монд: %s"
 
 #: ../libgdict/gdict-client-context.c:1124
 #, c-format
 msgid "Lookup failed for host '%s': host not found"
-msgstr ""
+msgstr "Ҷустуҷӯ барои мизбони '%s' ноком монд: мизбон ёфт нашуд"
 
 #: ../libgdict/gdict-client-context.c:1176
 #, c-format
@@ -297,6 +306,8 @@
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
+"Ба сервери луғат дар '%s:%d' пайваст намешавад. Сервер бо рамзи %d ҷавоб дод "
+"(сервер ба поён)"
 
 #: ../libgdict/gdict-client-context.c:1195
 #, c-format
@@ -304,46 +315,48 @@
 "Unable to parse the dictionary server reply\n"
 ": '%s'"
 msgstr ""
+"Таҷзияи ҷавоби сервери луғат номумкин аст\n"
+": '%s'"
 
 #: ../libgdict/gdict-client-context.c:1224
 #, c-format
 msgid "No definitions found for '%s'"
-msgstr ""
+msgstr "Ягон таъриф барои '%s' ёфт нашуд"
 
 #: ../libgdict/gdict-client-context.c:1239
 #, c-format
 msgid "Invalid database '%s'"
-msgstr ""
+msgstr "Пойгоҳи иттилоотии беэътибори '%s'"
 
 #: ../libgdict/gdict-client-context.c:1254
 #, c-format
 msgid "Invalid strategy '%s'"
-msgstr ""
+msgstr "Стратегияи беэътибори '%s'"
 
 #: ../libgdict/gdict-client-context.c:1269
 #, c-format
 msgid "Bad command '%s'"
-msgstr ""
+msgstr "Фармони бади '%s'"
 
 #: ../libgdict/gdict-client-context.c:1284
 #, c-format
 msgid "Bad parameters for command '%s'"
-msgstr ""
+msgstr "параметрҳои бад барои фармони '%s'"
 
 #: ../libgdict/gdict-client-context.c:1299
 #, c-format
 msgid "No databases found on dictionary server at '%s'"
-msgstr ""
+msgstr "Ҳеҷгуна пойгоҳи иттилоотӣ дар сервери луғат дар '%s' ёфт нашуд"
 
 #: ../libgdict/gdict-client-context.c:1314
 #, c-format
 msgid "No strategies found on dictionary server at '%s'"
-msgstr ""
+msgstr "Ҳеҷгуна стратегия дар сервери луғат дар '%s' ёфт нашуд"
 
 #: ../libgdict/gdict-client-context.c:1747
 #, c-format
 msgid "Connection failed to the dictionary server at %s:%d"
-msgstr ""
+msgstr "Пайвастшавӣ ба сервери луғат дар %s:%d қатъ гардид"
 
 #: ../libgdict/gdict-client-context.c:1786
 #, c-format
@@ -351,53 +364,55 @@
 "Error while reading reply from server:\n"
 "%s"
 msgstr ""
+"Хато ҳангоми хондани ҷавоб аз сервер:\n"
+"%s"
 
 #: ../libgdict/gdict-client-context.c:1859
 #, c-format
 msgid "Connection timeout for the dictionary server at '%s:%d'"
-msgstr ""
+msgstr "Хотимаи вақти пайвастшавӣ барои сервери луғат дар '%s:%d'"
 
 #: ../libgdict/gdict-client-context.c:1893
 #, c-format
 msgid "No hostname defined for the dictionary server"
-msgstr ""
+msgstr "Ҳеҷгуна номи мизбон барои сервери луғат таъриф нашудааст"
 
 #: ../libgdict/gdict-client-context.c:1929
 #: ../libgdict/gdict-client-context.c:1944
 #, c-format
 msgid "Unable to create socket"
-msgstr ""
+msgstr "Бастагоҳро эҷод карда наметавонад"
 
 #: ../libgdict/gdict-client-context.c:1970
 #, c-format
 msgid "Unable to set the channel as non-blocking: %s"
-msgstr ""
+msgstr "Каналро ҳамчун манънашаванда танзим карда наметавонад: %s"
 
 #: ../libgdict/gdict-client-context.c:1985
 #, c-format
 msgid "Unable to connect to the dictionary server at '%s:%d'"
-msgstr ""
+msgstr "Сервери луғатро ба '%s:%d' пайваст карда наметавонад "
 
 #: ../libgdict/gdict-context.c:217
 msgid "Local Only"
-msgstr ""
+msgstr "Танҳо маҳаллӣ"
 
 #: ../libgdict/gdict-context.c:218
 msgid "Whether the context uses only local dictionaries or not"
-msgstr ""
+msgstr "Оё мӯҳтаво танҳо луғатҳои маҳаллиро истифода мебарад ё не"
 
 #: ../libgdict/gdict-database-chooser.c:378
 msgid "Reload the list of available databases"
-msgstr ""
+msgstr "Боргузории дубораи рӯйхати пойгоҳҳои иттилоотии дастрас"
 
 #: ../libgdict/gdict-database-chooser.c:390
 msgid "Clear the list of available databases"
-msgstr ""
+msgstr "Тоза кардани рӯйхати пойгоҳҳои иттилоотии дастрас"
 
 #: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
 #: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
-msgstr ""
+msgstr "Хато ҳангоми муқоиса"
 
 #: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
 #: ../libgdict/gdict-defbox.c:1254
@@ -406,7 +421,7 @@
 
 #: ../libgdict/gdict-defbox.c:1315
 msgid "F_ind:"
-msgstr ""
+msgstr "Ё_фтан"
 
 #: ../libgdict/gdict-defbox.c:1328
 msgid "_Previous"
@@ -418,19 +433,19 @@
 
 #: ../libgdict/gdict-defbox.c:2513
 msgid "Error while looking up definition"
-msgstr ""
+msgstr "Хато ҳангоми ҷустуҷӯи таъриф"
 
 #: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
-msgstr ""
+msgstr "Ҷустуҷӯи дигар идома дорад"
 
 #: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
-msgstr ""
+msgstr "Лутфан то хотимаи ҷустуҷӯи ҷорӣ интизор шавед."
 
 #: ../libgdict/gdict-defbox.c:2595
 msgid "Error while retrieving the definition"
-msgstr ""
+msgstr "Хато ҳангоми бозёбии таъриф"
 
 #: ../libgdict/gdict-source.c:231
 msgid "Filename"
@@ -438,7 +453,7 @@
 
 #: ../libgdict/gdict-source.c:232
 msgid "The filename used by this dictionary source"
-msgstr ""
+msgstr "Номи файли истифодашуда тавассути ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:245
 msgid "Name"
@@ -446,7 +461,7 @@
 
 #: ../libgdict/gdict-source.c:246
 msgid "The display name of this dictionary source"
-msgstr ""
+msgstr "Номи намоиши ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:259
 msgid "Description"
@@ -454,7 +469,7 @@
 
 #: ../libgdict/gdict-source.c:260
 msgid "The description of this dictionary source"
-msgstr ""
+msgstr "Таърифи ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
@@ -462,23 +477,23 @@
 
 #: ../libgdict/gdict-source.c:274
 msgid "The default database of this dictionary source"
-msgstr ""
+msgstr "Пойгоҳи иттилооти пешфарзи ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
-msgstr ""
+msgstr "Стратегия"
 
 #: ../libgdict/gdict-source.c:288
 msgid "The default strategy of this dictionary source"
-msgstr ""
+msgstr "Стратегияи пешфарзи ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:301
 msgid "Transport"
-msgstr ""
+msgstr "Интиқол"
 
 #: ../libgdict/gdict-source.c:302
 msgid "The transport mechanism used by this dictionary source"
-msgstr ""
+msgstr "Механизми интиқоли истифодашуда тавассути ин манбаи луғат"
 
 #: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
@@ -486,115 +501,118 @@
 
 #: ../libgdict/gdict-source.c:317
 msgid "The GdictContext bound to this source"
-msgstr ""
+msgstr "GdictContext ба ин манбаъ маҳдуд аст"
 
 #: ../libgdict/gdict-source.c:412
 #, c-format
 msgid "Invalid transport type '%d'"
-msgstr ""
+msgstr "Навъи интиқоли беэътибори '%d'"
 
 #: ../libgdict/gdict-source.c:440
 #, c-format
 msgid "No '%s' group found inside the dictionary source definition"
-msgstr ""
+msgstr "Ҳеҷгуна гурӯҳи '%s' дар дохили таърифи манбаи луғат ёфт нашуд"
 
 #: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
 #: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
 msgstr ""
+"Калиди '%s'-ро дар дохили таърифи манбаи луғат: %s дарёфт карда наметавонад"
 
 #: ../libgdict/gdict-source.c:554
 #, c-format
 msgid ""
 "Unable to get the '%s' key inside the dictionary source definition file: %s"
 msgstr ""
+"Калиди '%s'-ро дар дохили файли таърифи манбаи луғат: %s дарёфт карда "
+"наметавонад"
 
 #: ../libgdict/gdict-source.c:740
 #, c-format
 msgid "Dictionary source does not have name"
-msgstr ""
+msgstr "Манбаи луғат ном надорад"
 
 #: ../libgdict/gdict-source.c:749
 #, c-format
 msgid "Dictionary source '%s' has invalid transport '%s'"
-msgstr ""
+msgstr "Манбаи луғати '%s' интиқоли  '%s' нодуруст дорад"
 
 #: ../libgdict/gdict-source-chooser.c:294
 msgid "Reload the list of available sources"
-msgstr ""
+msgstr "Боргузории дубораи рӯйхати манбаҳои дастрас"
 
 #: ../libgdict/gdict-source-loader.c:170
 msgid "Paths"
-msgstr ""
+msgstr "Масирҳо"
 
 #: ../libgdict/gdict-source-loader.c:171
 msgid "Search paths used by this object"
-msgstr ""
+msgstr "Ҷустуҷӯи масирҳои истифодашуда тавассути ин объект"
 
 #: ../libgdict/gdict-source-loader.c:183
 msgid "Sources"
-msgstr ""
+msgstr "Манобеъ"
 
 #: ../libgdict/gdict-source-loader.c:184
 msgid "Dictionary sources found"
-msgstr ""
+msgstr "Манобеи луғат ёфт шуд"
 
 #: ../libgdict/gdict-speller.c:352
 msgid "Clear the list of similar words"
-msgstr ""
+msgstr "Тоза кардани рӯйхати калимаҳои монанд"
 
 #: ../libgdict/gdict-speller.c:376
 msgid "The GdictContext object used to get the word definition"
-msgstr ""
+msgstr "Объекти GdictContext барои дарёфти таърифи калима истифода мешавад"
 
 #: ../libgdict/gdict-speller.c:383
 msgid "The database used to query the GdictContext"
-msgstr ""
+msgstr "Пойгоҳи иттилоотии истифодашуда барои ковиши GdictContext"
 
 #: ../libgdict/gdict-speller.c:390
 msgid "The strategy used to query the GdictContext"
-msgstr ""
+msgstr "Стратегияи истифодашуда барои ковиши GdictContext"
 
 #: ../libgdict/gdict-strategy-chooser.c:361
 msgid "Reload the list of available strategies"
-msgstr ""
+msgstr "Боргузории дубораи рӯйхати стратегияҳои дастрас"
 
 #: ../libgdict/gdict-strategy-chooser.c:373
 msgid "Clear the list of available strategies"
-msgstr ""
+msgstr "Тоза кардани рӯйхати стратегияҳои дастрас"
 
 #: ../libgdict/gdict-utils.c:96
 msgid "GDict debugging flags to set"
-msgstr ""
+msgstr "GDict байрақҳоро барои танзим бартараф менамояд"
 
 #: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
-msgstr ""
+msgstr "БАЙРАҚҲО"
 
 #: ../libgdict/gdict-utils.c:98
 msgid "GDict debugging flags to unset"
-msgstr ""
+msgstr "GDict байрақҳоро барои бекор кардани насб бартараф менамояд"
 
 #: ../libgdict/gdict-utils.c:156
 msgid "GDict Options"
-msgstr ""
+msgstr "Имконоти GDict"
 
 #: ../libgdict/gdict-utils.c:157
 msgid "Show GDict Options"
-msgstr ""
+msgstr "Намоиш додани имконоти GDict"
 
 #: ../src/gdict-about.c:53
 msgid "translator-credits"
-msgstr ""
+msgstr "Victor Ibragimov"
 
 #: ../src/gdict-about.c:55
 msgid "Look up words in dictionaries"
-msgstr ""
+msgstr "Калимаҳоро аз луғат ҷустуҷӯ намоед"
 
 #: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
-msgstr ""
+msgstr "Калимаҳо барои ҷустуҷӯ"
 
 #: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
@@ -602,11 +620,11 @@
 
 #: ../src/gdict-app.c:66
 msgid "Words to match"
-msgstr ""
+msgstr "Калимаҳо барои муқоиса"
 
 #: ../src/gdict-app.c:72
 msgid "Dictionary source to use"
-msgstr ""
+msgstr "Манбаҳои луғат барои истифода"
 
 #: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
@@ -614,11 +632,11 @@
 
 #: ../src/gdict-app.c:78
 msgid "Database to use"
-msgstr ""
+msgstr "Пойгоҳи иттилоот барои истифода"
 
 #: ../src/gdict-app.c:84
 msgid "Strategy to use"
-msgstr ""
+msgstr "Стратегия барои истифода"
 
 #: ../src/gdict-app.c:89
 msgid "WORDS"
@@ -626,26 +644,26 @@
 
 #: ../src/gdict-app.c:106
 msgid "Dictionary Preferences"
-msgstr ""
+msgstr "Бартариҳои луғат"
 
 #: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
 #: ../src/gdict-source-dialog.c:475
 #, c-format
 msgid "There was an error while displaying help"
-msgstr ""
+msgstr "Ҳангоми намоиши кӯмак хатогӣ рух дод"
 
 #. create the new option context
 #: ../src/gdict-app.c:217
 msgid " - Look up words in dictionaries"
-msgstr ""
+msgstr " - Ҷустуҷӯи калимаҳо дар луғатҳо"
 
 #: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
-msgstr ""
+msgstr "Таҳрири манбаи луғат"
 
 #: ../src/gdict-pref-dialog.c:303
 msgid "Add Dictionary Source"
-msgstr ""
+msgstr "Илова кардани манбаи луғат"
 
 #: ../src/gdict-pref-dialog.c:348
 #, c-format
@@ -654,75 +672,75 @@
 
 #: ../src/gdict-pref-dialog.c:350
 msgid "This will permanently remove the dictionary source from the list."
-msgstr ""
+msgstr "Ин ба таври доимӣ манбаи луғатро аз рӯйхат тоза менамояд"
 
 #: ../src/gdict-pref-dialog.c:380
 #, c-format
 msgid "Unable to remove source '%s'"
-msgstr ""
+msgstr "Тоза кардани манбаи '%s' номумкин аст"
 
 #: ../src/gdict-pref-dialog.c:641
 msgid "Add a new dictionary source"
-msgstr ""
+msgstr "Илова кардани манбаи нави луғат"
 
 #: ../src/gdict-pref-dialog.c:647
 msgid "Remove the currently selected dictionary source"
-msgstr ""
+msgstr "Тоза кардани манбаи интихобшудаи ҷории луғат"
 
 #: ../src/gdict-pref-dialog.c:653
 msgid "Edit the currently selected dictionary source"
-msgstr ""
+msgstr "Таҳрири манбаи интихобшудаи ҷории луғат"
 
 #: ../src/gdict-pref-dialog.c:661
 msgid "Set the font used for printing the definitions"
-msgstr ""
+msgstr "Танзими шрифти истифодашуда барои чопи тавсифҳо"
 
 #: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
-msgstr ""
+msgstr "Пешнамоиш имконнопазир аст: %s"
 
 #: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
-msgstr ""
+msgstr "Файли манбаро эҷод карда наметавонад"
 
 #: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
-msgstr ""
+msgstr "Файли манбаъо захира карда наметавонад"
 
 #: ../src/gdict-window.c:253
 #, c-format
 msgid "Searching for '%s'..."
-msgstr ""
+msgstr "Ҷустуҷӯи '%s'..."
 
 #: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
-msgstr ""
+msgstr "Ҳеҷгуна таъриф ёфт нашуд"
 
 #: ../src/gdict-window.c:287
 #, c-format
 msgid "A definition found"
 msgid_plural "%d definitions found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Таъриф ёфт шуд"
+msgstr[1] "%d таъриф ёфт шуданд"
 
 #: ../src/gdict-window.c:458
 #, c-format
 msgid "No dictionary source available with name '%s'"
-msgstr ""
+msgstr "Ҳеҷгуна манбаи луғати дастрас бо номи '%s' нест"
 
 #: ../src/gdict-window.c:462
 msgid "Unable to find dictionary source"
-msgstr ""
+msgstr "Ёфтани манбаи луғат номумкин аст"
 
 #: ../src/gdict-window.c:478
 #, c-format
 msgid "No context available for source '%s'"
-msgstr ""
+msgstr "Контексти дастрас барои манбаи '%s' нест"
 
 #: ../src/gdict-window.c:482
 msgid "Unable to create a context"
-msgstr ""
+msgstr "Контекст эҷод карда наметавонад"
 
 #: ../src/gdict-window.c:541
 #, c-format
@@ -735,69 +753,72 @@
 
 #: ../src/gdict-window.c:920
 msgid "Untitled document"
-msgstr ""
+msgstr "Ҳуҷҷати бесарлавҳа"
 
 #: ../src/gdict-window.c:941
 #, c-format
 msgid "Error while writing to '%s'"
-msgstr ""
+msgstr "Хато ҳангоми навиштан ба '%s'"
 
 #: ../src/gdict-window.c:1359
 #, c-format
 msgid "Dictionary source `%s' selected"
-msgstr ""
+msgstr "Манбаи луғати `%s' интихоб шуд"
 
 #: ../src/gdict-window.c:1380
 #, c-format
 msgid "Strategy `%s' selected"
-msgstr ""
+msgstr "Стратегияи `%s' интихоб шуд"
 
 #: ../src/gdict-window.c:1400
 #, c-format
 msgid "Database `%s' selected"
-msgstr ""
+msgstr "Пойгоҳи иттилооти `%s' интихоб шуд"
 
 #: ../src/gdict-window.c:1420
 #, c-format
 msgid "Word `%s' selected"
-msgstr ""
+msgstr "Калимаи '%s' интихоб шуд"
 
 #. speller
 #: ../src/gdict-window.c:1445
 msgid "Double-click on the word to look up"
-msgstr ""
+msgstr "Барои ҷустуҷӯ ба рӯи калима ду бор зер кунед"
 
 #. strat-chooser
 #: ../src/gdict-window.c:1451
 msgid "Double-click on the matching strategy to use"
-msgstr ""
+msgstr "Барои истифода ба рӯи стратегияи муқоиса ду бор зер кунед"
 
 #. source-chooser
 #: ../src/gdict-window.c:1456
 msgid "Double-click on the source to use"
-msgstr ""
+msgstr "Барои истифода ба рӯи манбаъ ду бор зер кунед"
 
 #. db-chooser
 #: ../src/gdict-window.c:1465
 msgid "Double-click on the database to use"
-msgstr ""
+msgstr "Барои истифода ба рӯи пойгоҳи иттилот ду бор зер кунед"
 
 #: ../src/gdict-window.c:1615
 msgid "Look _up:"
-msgstr ""
+msgstr "Ҷусту _ҷӯ:"
 
 #: ../src/gdict-window.c:1690
 msgid "Similar words"
-msgstr ""
+msgstr "Калимаҳои монанд"
 
 #: ../src/gdict-window.c:1703
 msgid "Available dictionaries"
-msgstr ""
+msgstr "Луғатҳои дастрас"
 
 #: ../src/gdict-window.c:1721
 msgid "Available strategies"
-msgstr ""
+msgstr "Стратегияҳои дастрас"
 
 #: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
-msgstr ""
+msgstr "Манбаҳои дастрас"
+
+#~ msgid "Available _Databases"
+#~ msgstr "Пойгоҳҳои иттилотии _дастрас"
diff -Nru gnome-dictionary-3.8.0/po/uk.po gnome-dictionary-3.10.0/po/uk.po
--- gnome-dictionary-3.8.0/po/uk.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/uk.po	2013-10-01 13:07:21.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: gnome-utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-26 15:04+0200\n"
-"PO-Revision-Date: 2013-03-26 15:05+0300\n"
+"POT-Creation-Date: 2013-09-21 12:59+0300\n"
+"PO-Revision-Date: 2013-09-21 12:59+0300\n"
 "Last-Translator: Daniel Korostil \n"
 "Language-Team: linux.org.ua\n"
 "Language: uk\n"
@@ -126,8 +126,8 @@
 msgstr "Додати джерела"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Доступні _бази даних"
+msgid "Available _Dictionaries"
+msgstr "Доступні _словники"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -823,6 +823,9 @@
 msgid "Dictionary sources"
 msgstr "Джерела словників"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Доступні _бази даних"
+
 #~ msgid "New look up"
 #~ msgstr "Новий пошук"
 
diff -Nru gnome-dictionary-3.8.0/po/vi.po gnome-dictionary-3.10.0/po/vi.po
--- gnome-dictionary-3.8.0/po/vi.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/vi.po	2013-10-01 13:07:21.000000000 +0000
@@ -1,21 +1,22 @@
 # Vietnamese Translation for GNOME Utils.
-# Copyright © 2009 GNOME i18n Project for Vietnamese.
+# Copyright © 2013 GNOME i18n Project for Vietnamese.
 # Nguyễn Thái Ngọc Duy , 2002,2007,2011-2012.
 # Clytie Siddall , 2005-2009.
+# Trần Ngọc Quân , 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-utils GNOME TRUNK\n"
+"Project-Id-Version: gnome-dictionary GNOME TRUNK\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-05-10 17:07+0000\n"
-"PO-Revision-Date: 2012-07-01 10:56+0700\n"
-"Last-Translator: Nguyễn Thái Ngọc Duy \n"
-"Language-Team: Vietnamese \n"
+"POT-Creation-Date: 2013-08-27 14:44+0000\n"
+"PO-Revision-Date: 2013-09-12 11:00+0700\n"
+"Last-Translator: Trần Ngọc Quân \n"
+"Language-Team: Vietnamese \n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
@@ -23,8 +24,8 @@
 msgid "Default Dictionary Server"
 msgstr "Máy phục vụ từ điển mặc định"
 
-#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:62
-#: ../src/gdict-app.c:349 ../src/gdict-window.c:545 ../src/gdict-window.c:1807
+#: ../data/gnome-dictionary.desktop.in.in.h:1 ../src/gdict-about.c:60
+#: ../src/gdict-app.c:347 ../src/gdict-window.c:543 ../src/gdict-window.c:1805
 msgid "Dictionary"
 msgstr "Từ điển"
 
@@ -32,20 +33,23 @@
 msgid "Check word definitions and spellings in an online dictionary"
 msgstr "Tìm từ trong từ điển trực tuyến để kiểm tra chính tả và sự định nghĩa"
 
+#: ../data/gnome-dictionary.desktop.in.in.h:3
+msgid "word;synonym;definition;spelling;"
+msgstr ""
+"word;từ;tu;điển;dien;synonym;đồng;dong;definition;định;nghĩa;dinh;nghia;"
+"spelling;chính;tả;chinh;ta;"
+
 #: ../data/gnome-dictionary-menus.ui.h:1
-#| msgid "_Preferences"
 msgid "Preferences"
 msgstr "_Tuỳ thích"
 
 #: ../data/gnome-dictionary-menus.ui.h:2
-#| msgid "_Help"
 msgid "Help"
 msgstr "Trợ giúp"
 
 #: ../data/gnome-dictionary-menus.ui.h:3
-#| msgid "Dictionary"
 msgid "About Dictionary"
-msgstr "Giới thiệu Từ điển"
+msgstr "Giới thiệu về từ điển"
 
 #: ../data/gnome-dictionary-menus.ui.h:4
 msgid "Quit"
@@ -64,12 +68,10 @@
 msgstr "_Lưu bản sao..."
 
 #: ../data/gnome-dictionary-menus.ui.h:8
-#| msgid "P_review..."
 msgid "P_review"
 msgstr "_Xem thử"
 
 #: ../data/gnome-dictionary-menus.ui.h:9
-#| msgid "Print"
 msgid "_Print"
 msgstr "_In"
 
@@ -90,7 +92,6 @@
 msgstr "Chọn tất _cả"
 
 #: ../data/gnome-dictionary-menus.ui.h:14
-#| msgid "F_ind:"
 msgid "_Find"
 msgstr "_Tìm"
 
@@ -123,8 +124,8 @@
 msgstr "Nguồn từ điển"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "Cơ sở _dữ liệu hiện có"
+msgid "Available _Dictionaries"
+msgstr "Từ điển _sẵn có"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
@@ -206,7 +207,7 @@
 "present in a dictionary source should be searched"
 msgstr ""
 "Tên cơ sở dữ liệu riêng mặc định hay siêu cơ sở dữ liệu cần dùng với nguồn "
-"từ điển. Dấu « ! » có nghĩa là mọi cơ sở dữ liệu trên nguồn từ điển đó nên "
+"từ điển. Dấu “!” có nghĩa là mọi cơ sở dữ liệu trên nguồn từ điển đó nên "
 "được tìm kiếm"
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:3
@@ -219,7 +220,7 @@
 "available. The default strategy is 'exact', that is match exact words."
 msgstr ""
 "Tên của chiến lược tìm kiếm mặc định cần dùng với nguồn từ điển, nếu có. "
-"Chiến lược là « exact » (chính xác), tức là phải khớp chỉ từ một cách chính "
+"Chiến lược là “exact” (chính xác), tức là phải khớp chỉ từ một cách chính "
 "xác."
 
 #: ../data/org.gnome.dictionary.gschema.xml.in.in.h:5
@@ -247,117 +248,117 @@
 msgid "Longdo Thai-English Dictionaries"
 msgstr "Từ điển Longdo Thái-Anh"
 
-#: ../libgdict/gdict-client-context.c:283
+#: ../libgdict/gdict-client-context.c:282
 msgid "Client Name"
 msgstr "Tên khách"
 
-#: ../libgdict/gdict-client-context.c:284
+#: ../libgdict/gdict-client-context.c:283
 msgid "The name of the client of the context object"
 msgstr "Tên của bộ khách của đối tượng ngữ cảnh"
 
-#: ../libgdict/gdict-client-context.c:297
+#: ../libgdict/gdict-client-context.c:296
 msgid "Hostname"
 msgstr "Tên máy"
 
-#: ../libgdict/gdict-client-context.c:298
+#: ../libgdict/gdict-client-context.c:297
 msgid "The hostname of the dictionary server to connect to"
 msgstr "Tên máy của máy phục vụ từ điển đến mà cần kết nối"
 
-#: ../libgdict/gdict-client-context.c:311
+#: ../libgdict/gdict-client-context.c:310
 msgid "Port"
 msgstr "Cổng"
 
-#: ../libgdict/gdict-client-context.c:312
+#: ../libgdict/gdict-client-context.c:311
 msgid "The port of the dictionary server to connect to"
 msgstr "Cổng của máy phục vụ từ điển đến mà cần kết nối"
 
-#: ../libgdict/gdict-client-context.c:327
+#: ../libgdict/gdict-client-context.c:326
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../libgdict/gdict-client-context.c:328
+#: ../libgdict/gdict-client-context.c:327
 msgid "The status code as returned by the dictionary server"
 msgstr "Mã trạng thãi được trả lời bởi máy phục vụ từ điển."
 
-#: ../libgdict/gdict-client-context.c:777
+#: ../libgdict/gdict-client-context.c:776
 #, c-format
 msgid "No connection to the dictionary server at '%s:%d'"
-msgstr "Không có kết nối đến máy phục vụ từ điển tại « %s:%d »"
+msgstr "Không có kết nối đến máy phục vụ từ điển tại “%s:%d”"
 
-#: ../libgdict/gdict-client-context.c:1060
+#: ../libgdict/gdict-client-context.c:1059
 #, c-format
 msgid "Lookup failed for hostname '%s': no suitable resources found"
-msgstr "Lỗi tra tìm với tên máy « %s »: không tìm thấy tài nguyên thích hợp"
+msgstr "Lỗi tra tìm với tên máy “%s”: không tìm thấy tài nguyên thích hợp"
 
-#: ../libgdict/gdict-client-context.c:1091
+#: ../libgdict/gdict-client-context.c:1090
 #, c-format
 msgid "Lookup failed for host '%s': %s"
-msgstr "Lỗi tra tìm với tên máy « %s »: %s"
+msgstr "Lỗi tra tìm với tên máy “%s”: %s"
 
-#: ../libgdict/gdict-client-context.c:1125
+#: ../libgdict/gdict-client-context.c:1124
 #, c-format
 msgid "Lookup failed for host '%s': host not found"
-msgstr "Lỗi tra tìm với tên máy « %s »: không tìm thấy máy"
+msgstr "Lỗi tra tìm với tên máy “%s”: không tìm thấy máy"
 
-#: ../libgdict/gdict-client-context.c:1177
+#: ../libgdict/gdict-client-context.c:1176
 #, c-format
 msgid ""
 "Unable to connect to the dictionary server at '%s:%d'. The server replied "
 "with code %d (server down)"
 msgstr ""
-"Không thể kết nối đến máy phục vụ từ điển tại « %s:%d ». Máy phục vụ đã trả "
+"Không thể kết nối đến máy phục vụ từ điển tại “%s:%d”. Máy phục vụ đã trả "
 "lời mã %d (máy phục vụ không trực tuyến)"
 
-#: ../libgdict/gdict-client-context.c:1196
+#: ../libgdict/gdict-client-context.c:1195
 #, c-format
 msgid ""
 "Unable to parse the dictionary server reply\n"
 ": '%s'"
 msgstr ""
-"Không thể phân tách trả lời của máy phục vụ từ điển\n"
-": '%s'"
+"Không thể phân tích trả lời của máy phục vụ từ điển\n"
+": “%s”"
 
-#: ../libgdict/gdict-client-context.c:1225
+#: ../libgdict/gdict-client-context.c:1224
 #, c-format
 msgid "No definitions found for '%s'"
-msgstr "Không tìm thấy lời định nghĩa cho « %s »"
+msgstr "Không tìm thấy lời định nghĩa cho “%s”"
 
-#: ../libgdict/gdict-client-context.c:1240
+#: ../libgdict/gdict-client-context.c:1239
 #, c-format
 msgid "Invalid database '%s'"
-msgstr "Cơ sở dữ liệu không hợp lệ « %s »"
+msgstr "Cơ sở dữ liệu không hợp lệ “%s”"
 
-#: ../libgdict/gdict-client-context.c:1255
+#: ../libgdict/gdict-client-context.c:1254
 #, c-format
 msgid "Invalid strategy '%s'"
-msgstr "Chiến lược không hợp lệ « %s »"
+msgstr "Chiến lược không hợp lệ “%s”"
 
-#: ../libgdict/gdict-client-context.c:1270
+#: ../libgdict/gdict-client-context.c:1269
 #, c-format
 msgid "Bad command '%s'"
-msgstr "Lệnh sai « %s »"
+msgstr "Lệnh sai “%s”"
 
-#: ../libgdict/gdict-client-context.c:1285
+#: ../libgdict/gdict-client-context.c:1284
 #, c-format
 msgid "Bad parameters for command '%s'"
-msgstr "Tham số sai cho lệnh « %s »"
+msgstr "Tham số sai cho lệnh “%s”"
 
-#: ../libgdict/gdict-client-context.c:1300
+#: ../libgdict/gdict-client-context.c:1299
 #, c-format
 msgid "No databases found on dictionary server at '%s'"
-msgstr "Không tìm thấy cơ sở dữ liệu trên máy phục vụ từ điển tại « %s »"
+msgstr "Không tìm thấy cơ sở dữ liệu trên máy phục vụ từ điển tại “%s”"
 
-#: ../libgdict/gdict-client-context.c:1315
+#: ../libgdict/gdict-client-context.c:1314
 #, c-format
 msgid "No strategies found on dictionary server at '%s'"
-msgstr "Không tìm thấy chiến lược trên máy phục vụ từ điển tại « %s »"
+msgstr "Không tìm thấy chiến lược trên máy phục vụ từ điển tại “%s”"
 
-#: ../libgdict/gdict-client-context.c:1748
+#: ../libgdict/gdict-client-context.c:1747
 #, c-format
 msgid "Connection failed to the dictionary server at %s:%d"
-msgstr "Lỗi kết nối đến máy phục vụ từ điển tại « %s:%d »"
+msgstr "Lỗi kết nối đến máy phục vụ từ điển tại “%s:%d”"
 
-#: ../libgdict/gdict-client-context.c:1787
+#: ../libgdict/gdict-client-context.c:1786
 #, c-format
 msgid ""
 "Error while reading reply from server:\n"
@@ -366,455 +367,458 @@
 "Gặp lỗi khi đọc trả lời từ máy phục vụ:\n"
 "%s"
 
-#: ../libgdict/gdict-client-context.c:1860
+#: ../libgdict/gdict-client-context.c:1859
 #, c-format
 msgid "Connection timeout for the dictionary server at '%s:%d'"
-msgstr "Quá hạn kết nối đến máy phục vụ từ điển tại '%s:%d'"
+msgstr "Quá hạn kết nối đến máy phục vụ từ điển tại “%s:%d”"
 
-#: ../libgdict/gdict-client-context.c:1894
+#: ../libgdict/gdict-client-context.c:1893
 #, c-format
 msgid "No hostname defined for the dictionary server"
 msgstr "Chưa định nghĩa tên máy cho máy phục vụ từ điển"
 
-#: ../libgdict/gdict-client-context.c:1930
-#: ../libgdict/gdict-client-context.c:1945
+#: ../libgdict/gdict-client-context.c:1929
+#: ../libgdict/gdict-client-context.c:1944
 #, c-format
 msgid "Unable to create socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: ../libgdict/gdict-client-context.c:1971
+#: ../libgdict/gdict-client-context.c:1970
 #, c-format
 msgid "Unable to set the channel as non-blocking: %s"
 msgstr "Không thể lập kênh có kiểu không làm trở ngại: %s"
 
-#: ../libgdict/gdict-client-context.c:1986
+#: ../libgdict/gdict-client-context.c:1985
 #, c-format
 msgid "Unable to connect to the dictionary server at '%s:%d'"
-msgstr "Không thể kết nối đến máy phục vụ từ điển tại « %s:%d »"
+msgstr "Không thể kết nối đến máy phục vụ từ điển tại “%s:%d”"
 
-#: ../libgdict/gdict-context.c:218
+#: ../libgdict/gdict-context.c:217
 msgid "Local Only"
 msgstr "Chỉ cục bộ"
 
-#: ../libgdict/gdict-context.c:219
+#: ../libgdict/gdict-context.c:218
 msgid "Whether the context uses only local dictionaries or not"
 msgstr "Có ngữ cảnh nên dùng chỉ những từ điển cục bộ hay không"
 
-#: ../libgdict/gdict-database-chooser.c:379
+#: ../libgdict/gdict-database-chooser.c:378
 msgid "Reload the list of available databases"
 msgstr "Tải lại danh sách các cơ sở dữ liệu sẵn sàng"
 
-#: ../libgdict/gdict-database-chooser.c:391
+#: ../libgdict/gdict-database-chooser.c:390
 msgid "Clear the list of available databases"
 msgstr "Xoá danh sách các cơ sở dữ liệu sẵn sàng"
 
-#: ../libgdict/gdict-database-chooser.c:838 ../libgdict/gdict-speller.c:778
-#: ../libgdict/gdict-strategy-chooser.c:786
+#: ../libgdict/gdict-database-chooser.c:837 ../libgdict/gdict-speller.c:777
+#: ../libgdict/gdict-strategy-chooser.c:785
 msgid "Error while matching"
 msgstr "Gặp lỗi khi khớp"
 
-#: ../libgdict/gdict-defbox.c:1127 ../libgdict/gdict-defbox.c:1221
-#: ../libgdict/gdict-defbox.c:1255
+#: ../libgdict/gdict-defbox.c:1126 ../libgdict/gdict-defbox.c:1220
+#: ../libgdict/gdict-defbox.c:1254
 msgid "Not found"
 msgstr "Không tìm thấy"
 
-#: ../libgdict/gdict-defbox.c:1316
+#: ../libgdict/gdict-defbox.c:1315
 msgid "F_ind:"
 msgstr "_Tìm:"
 
-#: ../libgdict/gdict-defbox.c:1329
+#: ../libgdict/gdict-defbox.c:1328
 msgid "_Previous"
 msgstr "T_rước"
 
-#: ../libgdict/gdict-defbox.c:1337
+#: ../libgdict/gdict-defbox.c:1336
 msgid "_Next"
 msgstr "_Kế"
 
-#: ../libgdict/gdict-defbox.c:2514
+#: ../libgdict/gdict-defbox.c:2513
 msgid "Error while looking up definition"
 msgstr "Gặp lỗi khi tra tìm lời định nghĩa"
 
-#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
+#: ../libgdict/gdict-defbox.c:2555 ../libgdict/gdict-speller.c:735
 msgid "Another search is in progress"
 msgstr "Việc tìm kiếm khác đang chạy"
 
-#: ../libgdict/gdict-defbox.c:2557 ../libgdict/gdict-speller.c:737
+#: ../libgdict/gdict-defbox.c:2556 ../libgdict/gdict-speller.c:736
 msgid "Please wait until the current search ends."
 msgstr "Hãy đợi đến khi việc tìm kiếm hiện thời đã kết thúc."
 
-#: ../libgdict/gdict-defbox.c:2596
+#: ../libgdict/gdict-defbox.c:2595
 msgid "Error while retrieving the definition"
-msgstr "Gặp lỗi khi lấy lời định nghĩa"
+msgstr "Gặp lỗi khi lấy phần định nghĩa"
 
-#: ../libgdict/gdict-source.c:232
+#: ../libgdict/gdict-source.c:231
 msgid "Filename"
 msgstr "Tên tập tin"
 
-#: ../libgdict/gdict-source.c:233
+#: ../libgdict/gdict-source.c:232
 msgid "The filename used by this dictionary source"
 msgstr "Tên tập tin dùng bởi nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:246
+#: ../libgdict/gdict-source.c:245
 msgid "Name"
 msgstr "Tên"
 
-#: ../libgdict/gdict-source.c:247
+#: ../libgdict/gdict-source.c:246
 msgid "The display name of this dictionary source"
-msgstr "Hhiện tên nguồn từ điển này"
+msgstr "Hiện tên nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:260
+#: ../libgdict/gdict-source.c:259
 msgid "Description"
 msgstr "Mô tả"
 
-#: ../libgdict/gdict-source.c:261
+#: ../libgdict/gdict-source.c:260
 msgid "The description of this dictionary source"
 msgstr "Mô tả của nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:274 ../libgdict/gdict-speller.c:383
+#: ../libgdict/gdict-source.c:273 ../libgdict/gdict-speller.c:382
 msgid "Database"
 msgstr "Cơ sở dữ liệu"
 
-#: ../libgdict/gdict-source.c:275
+#: ../libgdict/gdict-source.c:274
 msgid "The default database of this dictionary source"
 msgstr "Cơ sở dữ liệu mặc định của nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:288 ../libgdict/gdict-speller.c:390
+#: ../libgdict/gdict-source.c:287 ../libgdict/gdict-speller.c:389
 msgid "Strategy"
 msgstr "Chiến lược"
 
-#: ../libgdict/gdict-source.c:289
+#: ../libgdict/gdict-source.c:288
 msgid "The default strategy of this dictionary source"
 msgstr "Chiến lược mặc định của nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:302
+#: ../libgdict/gdict-source.c:301
 msgid "Transport"
 msgstr "Chuyên chở"
 
-#: ../libgdict/gdict-source.c:303
+#: ../libgdict/gdict-source.c:302
 msgid "The transport mechanism used by this dictionary source"
 msgstr "Cơ chế chuyên chở dùng bởi nguồn từ điển này"
 
-#: ../libgdict/gdict-source.c:317 ../libgdict/gdict-speller.c:376
+#: ../libgdict/gdict-source.c:316 ../libgdict/gdict-speller.c:375
 msgid "Context"
 msgstr "Ngữ cảnh"
 
-#: ../libgdict/gdict-source.c:318
+#: ../libgdict/gdict-source.c:317
 msgid "The GdictContext bound to this source"
 msgstr "Đối tượng GdictContext được buộc với nguồn này"
 
-#: ../libgdict/gdict-source.c:413
+#: ../libgdict/gdict-source.c:412
 #, c-format
 msgid "Invalid transport type '%d'"
-msgstr "Kiểu chuyên chở không hợp lệ « %d »"
+msgstr "Kiểu chuyên chở không hợp lệ “%d”"
 
-#: ../libgdict/gdict-source.c:441
+#: ../libgdict/gdict-source.c:440
 #, c-format
 msgid "No '%s' group found inside the dictionary source definition"
-msgstr "Không tìm thấy nhóm « %s » ở trong lời định nghĩa nguồn từ điển"
+msgstr "Không tìm thấy nhóm “%s” ở trong lời định nghĩa nguồn từ điển"
 
-#: ../libgdict/gdict-source.c:457 ../libgdict/gdict-source.c:481
-#: ../libgdict/gdict-source.c:505 ../libgdict/gdict-source.c:530
+#: ../libgdict/gdict-source.c:456 ../libgdict/gdict-source.c:480
+#: ../libgdict/gdict-source.c:504 ../libgdict/gdict-source.c:529
 #, c-format
 msgid "Unable to get the '%s' key inside the dictionary source definition: %s"
-msgstr "Không thể lấy khóa « %s » ở trong lời định nghĩa nguồn từ điển: %s"
+msgstr "Không thể lấy khóa “%s” ở trong lời định nghĩa nguồn từ điển: %s"
 
-#: ../libgdict/gdict-source.c:555
+#: ../libgdict/gdict-source.c:554
 #, c-format
 msgid ""
 "Unable to get the '%s' key inside the dictionary source definition file: %s"
-msgstr "Không thể lấy khóa « %s » ở trong tập tin định nghĩa nguồn từ điển: %s"
+msgstr "Không thể lấy khóa “%s” ở trong tập tin định nghĩa nguồn từ điển: %s"
 
-#: ../libgdict/gdict-source.c:741
+#: ../libgdict/gdict-source.c:740
 #, c-format
 msgid "Dictionary source does not have name"
 msgstr "Lời định nghĩa từ điển chưa có tên"
 
-#: ../libgdict/gdict-source.c:750
+#: ../libgdict/gdict-source.c:749
 #, c-format
 msgid "Dictionary source '%s' has invalid transport '%s'"
-msgstr "Nguồn từ điển « %s » có chuyên chở không hợp lệ « %s »"
+msgstr "Nguồn từ điển “%s” có chuyên chở không hợp lệ “%s”"
 
-#: ../libgdict/gdict-source-chooser.c:295
+#: ../libgdict/gdict-source-chooser.c:294
 msgid "Reload the list of available sources"
 msgstr "Nạp lại danh sách các nguồn sẵn sàng"
 
-#: ../libgdict/gdict-source-loader.c:171
+#: ../libgdict/gdict-source-loader.c:170
 msgid "Paths"
 msgstr "Đường dẫn"
 
-#: ../libgdict/gdict-source-loader.c:172
+#: ../libgdict/gdict-source-loader.c:171
 msgid "Search paths used by this object"
 msgstr "Đường dẫn tìm kiếm dùng bởi đối tượng này"
 
-#: ../libgdict/gdict-source-loader.c:184
+#: ../libgdict/gdict-source-loader.c:183
 msgid "Sources"
 msgstr "Nguồn"
 
-#: ../libgdict/gdict-source-loader.c:185
+#: ../libgdict/gdict-source-loader.c:184
 msgid "Dictionary sources found"
 msgstr "Tìm tra nguồn từ điển"
 
-#: ../libgdict/gdict-speller.c:353
+#: ../libgdict/gdict-speller.c:352
 msgid "Clear the list of similar words"
 msgstr "Xoá danh sách các từ tương tự"
 
-#: ../libgdict/gdict-speller.c:377
+#: ../libgdict/gdict-speller.c:376
 msgid "The GdictContext object used to get the word definition"
 msgstr "Đối tượng GdictContext dùng để lấy lời định nghĩa từ"
 
-#: ../libgdict/gdict-speller.c:384
+#: ../libgdict/gdict-speller.c:383
 msgid "The database used to query the GdictContext"
 msgstr "Cơ sở dữ liệu dùng để truy vấn ngữ cảnh GdictContext"
 
-#: ../libgdict/gdict-speller.c:391
+#: ../libgdict/gdict-speller.c:390
 msgid "The strategy used to query the GdictContext"
 msgstr "Chiến lược dùng để truy vấn ngữ cảnh GdictContext"
 
-#: ../libgdict/gdict-strategy-chooser.c:362
+#: ../libgdict/gdict-strategy-chooser.c:361
 msgid "Reload the list of available strategies"
 msgstr "Tải lại danh sách các chiến lược hiện có"
 
-#: ../libgdict/gdict-strategy-chooser.c:374
+#: ../libgdict/gdict-strategy-chooser.c:373
 msgid "Clear the list of available strategies"
 msgstr "Xoá danh sách các chiến lược hiện có"
 
-#: ../libgdict/gdict-utils.c:97
+#: ../libgdict/gdict-utils.c:96
 msgid "GDict debugging flags to set"
 msgstr "Các cờ gỡ lỗi GDict cần đặt"
 
-#: ../libgdict/gdict-utils.c:97 ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:96 ../libgdict/gdict-utils.c:98
 msgid "FLAGS"
 msgstr "CỜ"
 
-#: ../libgdict/gdict-utils.c:99
+#: ../libgdict/gdict-utils.c:98
 msgid "GDict debugging flags to unset"
 msgstr "Các cờ gỡ lỗi GDict cần bỏ đặt"
 
-#: ../libgdict/gdict-utils.c:157
+#: ../libgdict/gdict-utils.c:156
 msgid "GDict Options"
 msgstr "Tùy chọn Từ điển GNOME"
 
-#: ../libgdict/gdict-utils.c:158
+#: ../libgdict/gdict-utils.c:157
 msgid "Show GDict Options"
 msgstr "Hiện các tùy chọn về Từ điển GNOME"
 
-#: ../src/gdict-about.c:55
+#: ../src/gdict-about.c:53
 msgid "translator-credits"
-msgstr "Nhóm Việt hoá GNOME (http://gnomevi.sourceforge.net)"
+msgstr "Nhóm Việt hoá GNOME "
 
-#: ../src/gdict-about.c:57
+#: ../src/gdict-about.c:55
 msgid "Look up words in dictionaries"
 msgstr "Tra tìm từ trong từ điển"
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:91
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:89
 msgid "Words to look up"
 msgstr "Từ cần tra tìm"
 
-#: ../src/gdict-app.c:62 ../src/gdict-app.c:68
+#: ../src/gdict-app.c:60 ../src/gdict-app.c:66
 msgid "WORD"
 msgstr "TỪ"
 
-#: ../src/gdict-app.c:68
+#: ../src/gdict-app.c:66
 msgid "Words to match"
 msgstr "Từ cần khớp"
 
-#: ../src/gdict-app.c:74
+#: ../src/gdict-app.c:72
 msgid "Dictionary source to use"
 msgstr "Nguồn từ điển cần dùng"
 
-#: ../src/gdict-app.c:74 ../src/gdict-app.c:80 ../src/gdict-app.c:86
+#: ../src/gdict-app.c:72 ../src/gdict-app.c:78 ../src/gdict-app.c:84
 msgid "NAME"
 msgstr "TÊN"
 
-#: ../src/gdict-app.c:80
+#: ../src/gdict-app.c:78
 msgid "Database to use"
 msgstr "Cơ sở dữ liệu cần dùng"
 
-#: ../src/gdict-app.c:86
+#: ../src/gdict-app.c:84
 msgid "Strategy to use"
 msgstr "Chiến lược cần dùng"
 
-#: ../src/gdict-app.c:91
+#: ../src/gdict-app.c:89
 msgid "WORDS"
 msgstr "TỪ"
 
-#: ../src/gdict-app.c:108
+#: ../src/gdict-app.c:106
 msgid "Dictionary Preferences"
 msgstr "Tùy thích Từ điển"
 
-#: ../src/gdict-app.c:130 ../src/gdict-pref-dialog.c:496
-#: ../src/gdict-source-dialog.c:477
+#: ../src/gdict-app.c:128 ../src/gdict-pref-dialog.c:494
+#: ../src/gdict-source-dialog.c:475
 #, c-format
 msgid "There was an error while displaying help"
 msgstr "Gặp lỗi khi hiển thị trợ giúp"
 
 #. create the new option context
-#: ../src/gdict-app.c:219
+#: ../src/gdict-app.c:217
 msgid " - Look up words in dictionaries"
 msgstr " — Tra tìm từ trong từ điển"
 
-#: ../src/gdict-pref-dialog.c:241 ../src/gdict-pref-dialog.c:430
+#: ../src/gdict-pref-dialog.c:239 ../src/gdict-pref-dialog.c:428
 msgid "Edit Dictionary Source"
 msgstr "Sửa nguồn từ điển"
 
-#: ../src/gdict-pref-dialog.c:305
+#: ../src/gdict-pref-dialog.c:303
 msgid "Add Dictionary Source"
 msgstr "Thêm nguồn từ điển"
 
-#: ../src/gdict-pref-dialog.c:350
+#: ../src/gdict-pref-dialog.c:348
 #, c-format
 msgid "Remove \"%s\"?"
-msgstr "Gỡ bỏ « %s » không?"
+msgstr "Gỡ bỏ “%s” không?"
 
-#: ../src/gdict-pref-dialog.c:352
+#: ../src/gdict-pref-dialog.c:350
 msgid "This will permanently remove the dictionary source from the list."
 msgstr "Làm như thế sẽ gỡ bỏ hoàn toàn nguồn từ điển ra danh sách."
 
-#: ../src/gdict-pref-dialog.c:382
+#: ../src/gdict-pref-dialog.c:380
 #, c-format
 msgid "Unable to remove source '%s'"
-msgstr "Không thể gỡ bỏ nguồn « %s »"
+msgstr "Không thể gỡ bỏ nguồn “%s”"
 
-#: ../src/gdict-pref-dialog.c:643
+#: ../src/gdict-pref-dialog.c:641
 msgid "Add a new dictionary source"
 msgstr "Thêm một nguồn từ điển mới"
 
-#: ../src/gdict-pref-dialog.c:649
+#: ../src/gdict-pref-dialog.c:647
 msgid "Remove the currently selected dictionary source"
 msgstr "Gỡ bỏ nguồn từ điển đã chọn hiện thời"
 
-#: ../src/gdict-pref-dialog.c:655
+#: ../src/gdict-pref-dialog.c:653
 msgid "Edit the currently selected dictionary source"
 msgstr "Sửa nguồn từ điển được chọn"
 
-#: ../src/gdict-pref-dialog.c:663
+#: ../src/gdict-pref-dialog.c:661
 msgid "Set the font used for printing the definitions"
 msgstr "Lập phông chữ dùng để in lời định nghĩa"
 
-#: ../src/gdict-print.c:241 ../src/gdict-print.c:305
+#: ../src/gdict-print.c:239 ../src/gdict-print.c:303
 #, c-format
 msgid "Unable to display the preview: %s"
 msgstr "Không thể hiển thị ô xem thử: %s"
 
-#: ../src/gdict-source-dialog.c:342 ../src/gdict-source-dialog.c:434
+#: ../src/gdict-source-dialog.c:340 ../src/gdict-source-dialog.c:432
 msgid "Unable to create a source file"
 msgstr "Không thể tạo tập tin nguồn"
 
-#: ../src/gdict-source-dialog.c:358 ../src/gdict-source-dialog.c:450
+#: ../src/gdict-source-dialog.c:356 ../src/gdict-source-dialog.c:448
 msgid "Unable to save source file"
 msgstr "Không thể lưu tập tin nguồn"
 
-#: ../src/gdict-window.c:255
+#: ../src/gdict-window.c:253
 #, c-format
 msgid "Searching for '%s'..."
-msgstr "Đang tìm kiếm « %s »..."
+msgstr "Đang tìm kiếm “%s”..."
 
-#: ../src/gdict-window.c:287 ../src/gdict-window.c:344
+#: ../src/gdict-window.c:285 ../src/gdict-window.c:342
 msgid "No definitions found"
-msgstr "Không tìm thấy lời định nghĩa"
+msgstr "Không tìm thấy phần định nghĩa"
 
-#: ../src/gdict-window.c:289
+#: ../src/gdict-window.c:287
 #, c-format
 msgid "A definition found"
 msgid_plural "%d definitions found"
-msgstr[0] "Tìm thấy %d lời định nghĩa"
+msgstr[0] "Tìm thấy %d phần định nghĩa"
 
-#: ../src/gdict-window.c:460
+#: ../src/gdict-window.c:458
 #, c-format
 msgid "No dictionary source available with name '%s'"
-msgstr "Không có nguồn từ điển với tên « %s »"
+msgstr "Không có nguồn từ điển với tên “%s”"
 
-#: ../src/gdict-window.c:464
+#: ../src/gdict-window.c:462
 msgid "Unable to find dictionary source"
 msgstr "Không tìm thấy nguồn từ điển"
 
-#: ../src/gdict-window.c:480
+#: ../src/gdict-window.c:478
 #, c-format
 msgid "No context available for source '%s'"
-msgstr "Không có ngữ cảnh cho nguồn « %s »"
+msgstr "Không có ngữ cảnh cho nguồn “%s”"
 
-#: ../src/gdict-window.c:484
+#: ../src/gdict-window.c:482
 msgid "Unable to create a context"
 msgstr "Không thể tạo ngữ cảnh"
 
-#: ../src/gdict-window.c:543
+#: ../src/gdict-window.c:541
 #, c-format
 msgid "%s - Dictionary"
 msgstr "%s — Từ điển"
 
-#: ../src/gdict-window.c:912
+#: ../src/gdict-window.c:910
 msgid "Save a Copy"
 msgstr "Lưu một bản sao"
 
-#: ../src/gdict-window.c:922
+#: ../src/gdict-window.c:920
 msgid "Untitled document"
 msgstr "Tài liệu không tên"
 
-#: ../src/gdict-window.c:943
+#: ../src/gdict-window.c:941
 #, c-format
 msgid "Error while writing to '%s'"
-msgstr "Gặp lỗi khi ghi vào « %s »"
+msgstr "Gặp lỗi khi ghi vào “%s”"
 
-#: ../src/gdict-window.c:1361
+#: ../src/gdict-window.c:1359
 #, c-format
 msgid "Dictionary source `%s' selected"
-msgstr "Nguồn từ điển « %s » đã chọn"
+msgstr "Nguồn từ điển “%s” đã chọn"
 
-#: ../src/gdict-window.c:1382
+#: ../src/gdict-window.c:1380
 #, c-format
 msgid "Strategy `%s' selected"
-msgstr "Chiến lược '%s' được chọn"
+msgstr "Chiến lược “%s” được chọn"
 
-#: ../src/gdict-window.c:1402
+#: ../src/gdict-window.c:1400
 #, c-format
 msgid "Database `%s' selected"
-msgstr "Cơ sở dữ liệu « %s » đã chọn"
+msgstr "Cơ sở dữ liệu “%s” đã chọn"
 
-#: ../src/gdict-window.c:1422
+#: ../src/gdict-window.c:1420
 #, c-format
 msgid "Word `%s' selected"
-msgstr "Từ « %s » đã chọn"
+msgstr "Từ “%s” đã chọn"
 
 #. speller
-#: ../src/gdict-window.c:1447
+#: ../src/gdict-window.c:1445
 msgid "Double-click on the word to look up"
-msgstr "Nhấn đôi vào từ cần tra tìm"
+msgstr "Nhấn đúp vào từ cần tra tìm"
 
 #. strat-chooser
-#: ../src/gdict-window.c:1453
+#: ../src/gdict-window.c:1451
 msgid "Double-click on the matching strategy to use"
 msgstr "Nhấp đúp chiến lược tìm cần dùng"
 
 #. source-chooser
-#: ../src/gdict-window.c:1458
+#: ../src/gdict-window.c:1456
 msgid "Double-click on the source to use"
-msgstr "Nhấn đôi vào nguồn cần dùng"
+msgstr "Nhấn đúp vào nguồn cần dùng"
 
 #. db-chooser
-#: ../src/gdict-window.c:1467
+#: ../src/gdict-window.c:1465
 msgid "Double-click on the database to use"
-msgstr "Nhấn đôi vào cơ sở dữ liệu cần dùng"
+msgstr "Nhấn đúp vào cơ sở dữ liệu cần dùng"
 
-#: ../src/gdict-window.c:1617
+#: ../src/gdict-window.c:1615
 msgid "Look _up:"
 msgstr "_Tra tìm:"
 
-#: ../src/gdict-window.c:1692
+#: ../src/gdict-window.c:1690
 msgid "Similar words"
 msgstr "Từ tương tự"
 
-#: ../src/gdict-window.c:1705
+#: ../src/gdict-window.c:1703
 msgid "Available dictionaries"
-msgstr "Từ điển sẵn sàng"
+msgstr "Từ điển sẵn có"
 
-#: ../src/gdict-window.c:1723
+#: ../src/gdict-window.c:1721
 msgid "Available strategies"
 msgstr "Chiến lược hiện có"
 
-#: ../src/gdict-window.c:1739
+#: ../src/gdict-window.c:1737
 msgid "Dictionary sources"
 msgstr "Nguồn từ điển"
 
+#~ msgid "Available _Databases"
+#~ msgstr "Cơ sở _dữ liệu hiện có"
+
 #~ msgid "New look up"
 #~ msgstr "Tra tìm mới"
 
diff -Nru gnome-dictionary-3.8.0/po/zh_HK.po gnome-dictionary-3.10.0/po/zh_HK.po
--- gnome-dictionary-3.8.0/po/zh_HK.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/zh_HK.po	2013-10-01 13:07:21.000000000 +0000
@@ -12,10 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils 3.1.90\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-02-27 22:46+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-06 19:46+0800\n"
+"PO-Revision-Date: 2013-08-06 19:46+0800\n"
 "Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese (Hong Kong) \n"
 "Language: zh_TW\n"
@@ -128,12 +127,12 @@
 msgstr "字典來源"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "現存資料庫(_D)"
+msgid "Available _Dictionaries"
+msgstr "可用字典(_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
-msgstr "現有搜尋方法(_R)"
+msgstr "可用搜尋方法(_R)"
 
 #: ../data/gnome-dictionary-menus.ui.h:24
 msgid "_Go"
@@ -825,6 +824,9 @@
 msgid "Dictionary sources"
 msgstr "字典來源"
 
+#~ msgid "Available _Databases"
+#~ msgstr "現存資料庫(_D)"
+
 #~ msgid "New look up"
 #~ msgstr "新增查詢"
 
diff -Nru gnome-dictionary-3.8.0/po/zh_TW.po gnome-dictionary-3.10.0/po/zh_TW.po
--- gnome-dictionary-3.8.0/po/zh_TW.po	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/po/zh_TW.po	2013-10-01 13:07:21.000000000 +0000
@@ -12,10 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils 3.1.90\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"dictionary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-14 18:34+0000\n"
-"PO-Revision-Date: 2013-02-27 21:18+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-06 19:46+0800\n"
+"PO-Revision-Date: 2013-08-06 18:39+0800\n"
 "Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -128,12 +127,12 @@
 msgstr "字典來源"
 
 #: ../data/gnome-dictionary-menus.ui.h:22
-msgid "Available _Databases"
-msgstr "現存資料庫(_D)"
+msgid "Available _Dictionaries"
+msgstr "可用字典(_D)"
 
 #: ../data/gnome-dictionary-menus.ui.h:23
 msgid "Available St_rategies"
-msgstr "現有搜尋方法(_R)"
+msgstr "可用搜尋方法(_R)"
 
 #: ../data/gnome-dictionary-menus.ui.h:24
 msgid "_Go"
@@ -829,6 +828,9 @@
 msgid "Dictionary sources"
 msgstr "字典來源"
 
+#~ msgid "Available _Databases"
+#~ msgstr "現存資料庫(_D)"
+
 #~ msgid "New look up"
 #~ msgstr "新增查詢"
 
diff -Nru gnome-dictionary-3.8.0/src/Makefile.in gnome-dictionary-3.10.0/src/Makefile.in
--- gnome-dictionary-3.8.0/src/Makefile.in	2013-07-21 16:32:49.000000000 +0000
+++ gnome-dictionary-3.10.0/src/Makefile.in	2013-10-06 16:42:09.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -84,15 +84,11 @@
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -224,16 +220,15 @@
 GDICT_MICRO_VERSION = @GDICT_MICRO_VERSION@
 GDICT_MINOR_VERSION = @GDICT_MINOR_VERSION@
 GDICT_VERSION = @GDICT_VERSION@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -245,7 +240,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
@@ -254,26 +248,20 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGDICT_LT_VERSION = @LIBGDICT_LT_VERSION@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -292,7 +280,6 @@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -301,8 +288,6 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -518,14 +503,14 @@
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -Nru gnome-dictionary-3.8.0/src/gdict-sidebar.c gnome-dictionary-3.10.0/src/gdict-sidebar.c
--- gnome-dictionary-3.8.0/src/gdict-sidebar.c	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/src/gdict-sidebar.c	2013-10-06 08:39:54.000000000 +0000
@@ -445,7 +445,8 @@
   gtk_widget_show (menu_item);
   page->menu_item = menu_item;
 
-  gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu), menu_item);
+  if (gtk_widget_get_realized (priv->menu))
+    gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu), menu_item);
   gtk_label_set_text (GTK_LABEL (priv->label), page_name);
   gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page->index);
 }
@@ -495,7 +496,9 @@
   page = priv->pages->data;
   if (page)
     {
-      gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu), page->menu_item);
+      if (gtk_widget_get_realized (priv->menu))
+        gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu),
+                                    page->menu_item);
       gtk_label_set_text (GTK_LABEL (priv->label), page->name);
       gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page->index);
     }
@@ -520,7 +523,8 @@
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page->index);
   gtk_label_set_text (GTK_LABEL (priv->label), page->name);
-  gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu), page->menu_item);
+  if (gtk_widget_get_realized (priv->menu))
+    gtk_menu_shell_select_item (GTK_MENU_SHELL (priv->menu), page->menu_item);
 }
 
 const gchar *
diff -Nru gnome-dictionary-3.8.0/src/gdict-window.c gnome-dictionary-3.10.0/src/gdict-window.c
--- gnome-dictionary-3.8.0/src/gdict-window.c	2013-07-05 12:29:50.000000000 +0000
+++ gnome-dictionary-3.10.0/src/gdict-window.c	2013-10-06 16:15:35.000000000 +0000
@@ -1008,8 +1008,11 @@
 
   g_assert (GDICT_IS_WINDOW (window));
 
-  gdict_defbox_copy_to_clipboard (GDICT_DEFBOX (window->defbox),
-		  		  gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
+  if (gtk_widget_has_focus (window->entry))
+    gtk_editable_copy_clipboard (GTK_EDITABLE (window->entry));
+  else
+    gdict_defbox_copy_to_clipboard (GDICT_DEFBOX (window->defbox),
+				    gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
 }
 
 static void
@@ -1021,7 +1024,10 @@
 
   g_assert (GDICT_IS_WINDOW (window));
 
-  gdict_defbox_select_all (GDICT_DEFBOX (window->defbox));
+  if (gtk_widget_has_focus (window->entry))
+    gtk_editable_select_region (GTK_EDITABLE (window->entry), 0, -1);
+  else
+    gdict_defbox_select_all (GDICT_DEFBOX (window->defbox));
 }
 
 static void


     
       
Action
Shortcut
Aksi
Pintasan

       

     
     
       
Similar words
Kata serupa

         
CtrlT

       

       
Dictionary sources
Sumber-Sumber kamus

         
CtrlD

       

       
Available databases
Basis data yang tersedia

         
CtrlB

       

       
Available strategies
Strategi yang tersedia

         
CtrlR