diff -Nru chromium-bsu-0.9.14.1/ABOUT-NLS chromium-bsu-0.9.15/ABOUT-NLS --- chromium-bsu-0.9.14.1/ABOUT-NLS 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/ABOUT-NLS 2010-12-18 03:16:13.000000000 +0000 @@ -101,8 +101,11 @@ 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. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`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'). @@ -153,8 +156,7 @@ 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://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`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. @@ -168,911 +170,1125 @@ _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +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 skill are praised more than -programming skill, here. +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 July -2006. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2010. +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 - +----------------------------------------------------+ - GNUnet | [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | [] | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | - gnuedu | | - gnulib | [] [] [] [] [] [] | - 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 | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | [] () | - gtkam | [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - 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 | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] [] | - mysecretdiary | [] [] | - nano | [] [] () [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | | - pilot-qof | [] | - psmisc | [] | - pwdutils | | - python | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - silky | | - skencil | [] () | - sketch | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - 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 - 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16 - - es et eu fa fi fr ga gl gu he hi hr hu id is it - +--------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnucash-glossary | [] [] | - gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | - 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 | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - 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 | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | - skencil | [] [] | - sketch | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] [] [] | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - 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 - 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53 - - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +--------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - 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 | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_1 | [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - 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 | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | - shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3 - - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - 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 | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] [] [] [] | - 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 | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2 + Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh + +---------------------------------------------------+ + a2ps | [] [] | + aegis | | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | + bfd | | + bibshelf | [] | + binutils | | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | + doodle | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | + gas | | + gawk | [] [] | + gcal | [] | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | + gnubiff | | + gnucash | [] | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + 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 | | + grub | [] [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] [] | + iso_639_3 | [] | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | + libextractor | | + libgnutls | | + libgpewidget | | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | + mailutils | | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | + pwdutils | | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | | + solfege-manual | | + soundtracker | | + sp | | + sysstat | | + tar | [] | + texinfo | | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + af am ar as ast az be be@latin bg bn_IN bs ca crh + 6 0 2 3 19 1 11 3 28 3 1 38 5 + + cs da de el en en_GB en_ZA eo es et eu fa fi + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | [] [] | + buzztard | [] [] [] | + cflow | [] [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | [] | + cppi | [] | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] [] | + gjay | [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] | + gnubiff | () | + gnucash | [] () () () () () | + gnuedu | [] [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] [] [] | + gpe-beam | [] [] [] [] [] | + gpe-bluetooth | [] [] [] | + 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 | [] [] | + grub | [] [] [] | + gsasl | [] [] | + gss | [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] | + gtick | [] () [] [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] [] [] | + help2man | [] [] | + hylafax | [] [] | + idutils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] [] | + iso_3166 | [] [] [] () [] [] [] () [] | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] [] | + iso_639 | [] [] [] () [] [] [] | + iso_639_3 | | + jwhois | [] [] | + kbd | [] [] [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] | + klavaro | [] [] [] [] | + latrine | [] () [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] [] | + linkdr | [] [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] [] | + mkisofs | [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] [] | + psmisc | [] [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] [] | + wget | [] [] [] [] | + wyslij-po | [] | + xchat | [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + cs da de el en en_GB en_ZA eo es et eu fa fi + 64 105 117 18 1 8 0 28 89 18 19 0 104 + + fr ga gl gu he hi hr hu hy id is it ja ka kn + +------------------------------------------------+ + a2ps | [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | | + buzztard | [] | + cflow | [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] | + freedink | [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | () | + glunarclock | [] [] [] | + gnubiff | () [] () | + gnucash | () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] [] | + gpe-bluetooth | [] [] [] | + 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 | [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] | + help2man | [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | () [] [] | + iso_3166 | () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | () [] [] [] [] | + iso_639 | () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] | + keytouch-editor | [] [] [] [] | + keytouch-keyboa... | [] [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] () | + libc | [] [] [] [] | + libexif | | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] | + linkdr | [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] | + psmisc | [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] | + xchat | [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + +------------------------------------------------+ + fr ga gl gu he hi hr hu hy id is it ja ka kn + 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4 + + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + 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 | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + 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 | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - GNUnet | [] | 2 - a2ps | [] [] [] | 19 - aegis | | 0 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 14 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 - bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 16 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 4 - clisp | | 6 - console-tools | [] [] | 5 - coreutils | [] [] | 17 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - error | [] [] [] [] | 18 - fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 - flex | [] [] | 15 - fslint | [] | 9 - gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 - gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 26 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 - gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] [] [] | 19 - gpe-clock | [] [] [] [] | 20 - gpe-conf | [] [] | 14 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 19 - gpe-filemanager | [] | 5 - gpe-go | [] [] | 14 - gpe-login | [] [] [] [] [] | 20 - gpe-ownerinfo | [] [] [] [] | 20 - gpe-package | [] | 5 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 19 - gpe-taskmanager | [] [] [] | 19 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 20 - gpe-todo | [] | 6 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 - gramadoir | [] | 7 - grep | [] [] [] [] | 33 - gretl | | 4 - gsasl | [] [] | 6 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] | 18 - gstreamer | [] [] [] | 17 - gtick | [] | 11 - gtkam | [] | 13 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 39 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] | 15 - iso_3166_1 | [] [] | 20 - iso_3166_2 | | 2 - iso_3166_3 | [] [] | 9 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | | 2 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 - libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] | 4 - libidn | [] [] | 10 - lifelines | | 4 - lilypond | | 2 - lingoteach | [] | 6 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailutils | [] | 8 - make | [] [] [] | 20 - man-db | [] | 6 - minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 15 - nano_1_0 | [] [] [] | 18 - opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 - pwdutils | [] | 3 - python | | 0 - qof | [] | 2 - radius | [] | 6 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 23 - sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 - skencil | [] | 7 - sketch | | 6 - solfege | | 2 - soundtracker | [] [] | 9 - sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 19 - texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] | 11 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 13 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 30 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () () | 9 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 22 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] [] | 25 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 6 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 13 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] | 16 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 - wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 - xchat | [] [] [] [] | 28 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60 + xkeyboard-config | [] [] [] [] | 25 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054 + 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610 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 @@ -1085,10 +1301,10 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If July 2006 seems to be old, you may fetch a more recent copy of + If May 2010 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. +`http://translationproject.org/extra/matrix.html'. 1.6 Using `gettext' in new packages =================================== @@ -1106,6 +1322,6 @@ 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 -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff -Nru chromium-bsu-0.9.14.1/aclocal.m4 chromium-bsu-0.9.15/aclocal.m4 --- chromium-bsu-0.9.14.1/aclocal.m4 2010-06-19 09:33:05.000000000 +0000 +++ chromium-bsu-0.9.15/aclocal.m4 2011-02-14 03:55:01.000000000 +0000 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. 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'.])]) @@ -406,18 +406,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -968,6 +956,7 @@ m4_include([m4/ax_lang_compiler_ms.m4]) m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) +m4_include([m4/intlmacosx.m4]) m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) diff -Nru chromium-bsu-0.9.14.1/ChangeLog chromium-bsu-0.9.15/ChangeLog --- chromium-bsu-0.9.14.1/ChangeLog 2010-06-19 09:34:27.000000000 +0000 +++ chromium-bsu-0.9.15/ChangeLog 2011-02-14 03:55:29.000000000 +0000 @@ -1,3 +1,234 @@ +2011-02-14 Paul Wise + + * NEWS: Release version 0.9.15 + +2011-02-14 Paul Wise + + * .tx/config: Add the transifex configuration file + +2011-02-14 Paul Wise + + * po/bg.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/sv.po: Pull + some translation fixes from Transifex + +2011-02-11 Evgeni Golov + + * po/de.po: Update German (Deutsch) translation + +2011-02-10 Paul Wise + + * src/MainSDL.cpp: Initialise the horizontal key movement speed + properly + +2011-02-10 Paul Wise + + * configure.ac: WIP new version + +2011-02-10 Paul Wise + + * src/Image.cpp: Remove the unused pitch variable + +2011-02-09 Paul Wise + + * po/bg.po: Updates to Български език (Bulgarian) + translation by Damyan Ivanov + +2011-02-07 Paul Wise + + * po/bg.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/sv.po, + po/zh_TW.po: Update translations to correspond to latest code. + +2011-02-03 Paul Wise + + * autogen.sh: Add an autogen.sh that is just an autoreconf wrapper. + +2011-01-04 Paul Wise + + * misc/chromium-bsu.6: Document the controls in the manual page. + +2011-01-04 Paul Wise + + * misc/chromium-bsu.6, src/Config.cpp, src/Config.h, + src/HeroAircraft.cpp, src/MainSDL.cpp, src/MainSDL.h, + src/MainSDL_Event.cpp, src/MenuGL.cpp, src/MenuGL.h: Implement + 2014451: Add support for playing on a keyboard to the SDL backend. Thanks to Doruk Fisek and Cristian Henzel for playtesting. + +2011-01-28 Paul Wise + + * configure.ac: Use AM_CONFIG_HEADER replaced by AC_CONFIG_HEADERS + in autoconf 2.54. + +2010-12-17 Andrew Harrison + + * src/ScreenItemAdd.cpp, src/ScreenItemAdd.h: Add a new fourth level + +2011-01-09 Paul Wise + + * misc/chromium-bsu.6: Fix formatting issue in the manual page + +2011-01-05 Paul Wise + + * src/MainSDL_Event.cpp: Take the pause state into account properly + when grabbing the mouse. + +2010-12-25 Paul Wise + + * src/MenuGL.cpp: Change the skill level names back to what they + have been since the beginning. Doruk Fisek pointed out that this change could be confusing to + users. + +2010-12-18 Paul Wise + + * Makefile.am: Only generate the ChangeLog file when it is + appropriate to do so. + +2010-12-18 Paul Wise + + * src/Config.cpp: Add a header to the config file for docs & + preservation + +2010-12-18 Paul Wise + + * src/MenuGL.cpp: Since the highest difficulty is clearly not + impossible, make it insane and change the insane difficulty to + hardcore. http://www.youtube.com/watch?v=KzSEUl0-3p8 + +2010-12-18 Paul Wise + + * src/main.cpp: Add path dir separator translator for Windows + +2010-12-17 Paul Wise + + * misc/chromium-bsu.6, src/Config.cpp, src/Config.h, + src/MainGLUT.cpp, src/MenuGL.cpp: Switch from screenSize + configuration options to screenWidth & screenHeight. + +2010-12-17 Paul Wise + + * src/define.h: No need to repeat screen index in comment + +2010-12-17 Paul Wise + + * src-setup/.chromium-music, src-setup/Audio.cpp, + src-setup/Audio.h, src-setup/ConfigFile.cpp, + src-setup/ConfigFile.h, src-setup/HelpPage.cpp, + src-setup/HelpPage.h, src-setup/HiScoreWidget.cpp, + src-setup/HiScoreWidget.h, src-setup/MainWidget.cpp, + src-setup/MainWidget.h, src-setup/PlayList.cpp, + src-setup/PlayList.h, src-setup/SETUP.pro, src-setup/icon.xpm, + src-setup/main.cpp, src-setup/main.h, src-setup/moc/.dummyfile, + src/define.h: Drop the configuration GUI since it uses an ancient + version of Qt. + +2010-12-17 Paul Wise + + * misc/chromium-bsu.6, po/bg.po, po/de.po, po/es.po, po/fr.po, + po/it.po, po/sv.po, po/zh_TW.po, src-setup/ConfigFile.cpp, + src/MenuGL.cpp: Fix misspelling of wimp. + +2010-11-16 Paul Wise + + * po/es.po: Fix Spanish translation of the empty score file warning + message + +2010-11-15 Paul Wise + + * po/it.po: Updates to Italiano (Italian) translation by muflone + + +2010-11-12 Paul Wise + + * po/zh_TW.po: Fix zh_TW translation of the empty score file warning + message + +2010-11-07 Paul Wise + + * configure.ac, po/Makevars, po/bg.po, po/de.po, po/es.po, + po/fr.po, po/it.po, po/sv.po, po/zh_TW.po: Do not wrap messages or + translations in PO files, update translations. + +2010-11-07 Paul Wise + + * po/LINGUAS, po/zh_TW.po: Add Traditional Chinese translation by + Emmanuel Trillaud and Wei-Lun Chao + + +2010-11-07 Paul Wise + + * po/LINGUAS: Wrap the languages file so that diffs to it are easier + to review + +2010-10-31 Paul Wise + + * src/HiScore.cpp: Fix 2714088: Change the high scores file from a + memory dump to plain text. Users with an existing high scores file in memory dump format will + have their high scores file converted to plain text on startup. + +2010-10-09 Paul Wise + + * po/LINGUAS, po/it.po: Add Italiano (Italian) translation by Valter + Mura + +2010-07-06 Dmitry Marakasov + + * src/Makefile.am: Add INTLLIBS to LDADD because gettext is a + seperate library on FreeBSD + +2010-07-06 Dmitry Marakasov + + * configure.ac: Remove some bashisms from the configure script + +2010-06-26 Paul Wise + + * src/MainGLUT.cpp: The GLUT header is available at a different path + on MacOS X, handle it. + +2010-06-26 Paul Wise + + * configure.ac, src/Image.cpp, src/MainGL.cpp: The glpng header has + a different path in Fink on MacOS X, allow for it. + +2010-06-26 Paul Wise + + * src/EnemyAircraft.h, src/EnemyAmmo.cpp, src/EnemyAmmo.h, + src/EnemyFleet.cpp, src/EnemyFleet.h, src/Explosions.cpp, + src/Explosions.h, src/Ground.h, src/GroundMetal.h, + src/GroundMetalSegment.cpp, src/GroundSea.h, + src/GroundSeaSegment.cpp, src/HeroAircraft.cpp, src/HeroAircraft.h, + src/HeroAmmo.cpp, src/HeroAmmo.h, src/Image.cpp, src/MainGL.cpp, + src/MainSDL.cpp, src/MenuGL.cpp, src/MenuGL.h, src/PowerUps.cpp, + src/PowerUps.h, src/StatusDisplay.cpp, src/StatusDisplay.h, + src/TextGLC.h, src/main.cpp, src/textGeometryBSU.cpp, + src/textGeometryChromium.cpp: AX_CHECK_GL switched from ./configure + --with-apple-opengl-framework to directly detecting which GL header + path is available, handle it. + +2010-06-26 Paul Wise + + * Makefile.am, configure.ac, src/Audio.cpp, src/Audio.h, + src/AudioOpenAL.cpp, src/AudioOpenAL.h, src/AudioSDLMixer.cpp, + src/Config.cpp, src/EnemyAircraft.cpp, src/EnemyAircraft.h, + src/EnemyAmmo.cpp, src/EnemyAmmo.h, src/EnemyFleet.cpp, + src/EnemyFleet.h, src/Explosions.cpp, src/Explosions.h, + src/Global.cpp, src/Ground.h, src/GroundMetal.cpp, + src/GroundMetal.h, src/GroundMetalSegment.cpp, src/GroundSea.cpp, + src/GroundSea.h, src/GroundSeaSegment.cpp, src/HeroAircraft.cpp, + src/HeroAircraft.h, src/HeroAmmo.cpp, src/HeroAmmo.h, + src/HiScore.cpp, src/Image.cpp, src/MainGL.cpp, src/MainGLUT.cpp, + src/MainSDL.cpp, src/MainSDL_Event.cpp, src/MenuGL.cpp, + src/MenuGL.h, src/PowerUps.cpp, src/PowerUps.h, + src/ScreenItemAdd.cpp, src/StatusDisplay.cpp, src/StatusDisplay.h, + src/Text.cpp, src/Text.h, src/TextFTGL.cpp, src/TextFTGL.h, + src/TextGLC.cpp, src/TextGLC.h, src/define.h, src/main.cpp, + src/textGeometryBSU.cpp, src/textGeometryChromium.cpp: Rename + config.h to chromium-bsu-config.h for portability. On case-insensitive filesystems src/Config.h can override config.h, + which causes an FTBFS on Fink under MacOS X. + +2010-06-20 Paul Wise + + * src/TextGLC.cpp: Fix 2987891 properly, thanks to the QuesoGLC + author for the help. + 2010-06-19 Paul Wise * NEWS, configure.ac: Release version 0.9.14.1 diff -Nru chromium-bsu-0.9.14.1/chromium-bsu-config.h.in chromium-bsu-0.9.15/chromium-bsu-config.h.in --- chromium-bsu-0.9.14.1/chromium-bsu-config.h.in 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15/chromium-bsu-config.h.in 2011-02-14 03:55:03.000000000 +0000 @@ -0,0 +1,243 @@ +/* chromium-bsu-config.h.in. Generated from configure.ac by autoheader. */ + +/* define to use OpenAL */ +#undef AUDIO_OPENAL + +/* define to use SDL Mixer */ +#undef AUDIO_SDLMIXER + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* define to enable the window icon (needs SDL_image) */ +#undef ENABLE_WINDOW_ICON + +/* Define to 1 if you have the header file. */ +#undef HAVE_ALUT_ALUT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_AL_ALC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_AL_ALUT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_AL_AL_H + +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT + +/* 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 don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `floor' function. */ +#undef HAVE_FLOOR + +/* define to use fontconfig */ +#undef HAVE_FONTCONFIG + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLPNG_GLPNG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLUT_GLUT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GLC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GLPNG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GLUT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GLU_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GL_H + +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENAL_ALC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENAL_AL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENGL_GLU_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENGL_GL_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Define to 1 if you have the header file. */ +#undef HAVE_QUESOGLC_GLC_H + +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* Define to 1 if you have the `sqrt' function. */ +#undef HAVE_SQRT + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +#undef HAVE_STAT_EMPTY_STRING_BUG + +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Use nonstandard varargs form for the GLU tesselator callback */ +#undef HAVE_VARARGS_GLU_TESSCB + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINDOWS_H + +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + +/* define to use glpng */ +#undef IMAGE_GLPNG + +/* define to use SDL_image */ +#undef IMAGE_SDL + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* define to use FTGL */ +#undef TEXT_FTGL + +/* define to use GLC */ +#undef TEXT_GLC + +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* define to use GLUT */ +#undef USE_GLUT + +/* define to use SDL */ +#undef USE_SDL + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* define to enable some special macintosh path handling */ +#undef macintosh + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc diff -Nru chromium-bsu-0.9.14.1/config.h.in chromium-bsu-0.9.15/config.h.in --- chromium-bsu-0.9.14.1/config.h.in 2010-06-19 09:33:11.000000000 +0000 +++ chromium-bsu-0.9.15/config.h.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,237 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* define to use OpenAL */ -#undef AUDIO_OPENAL - -/* define to use SDL Mixer */ -#undef AUDIO_SDLMIXER - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* define to enable the window icon (needs SDL_image) */ -#undef ENABLE_WINDOW_ICON - -/* Define to 1 if you have the header file. */ -#undef HAVE_ALUT_ALUT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_AL_ALC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_AL_ALUT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_AL_AL_H - -/* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT - -/* 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 don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `floor' function. */ -#undef HAVE_FLOOR - -/* define to use fontconfig */ -#undef HAVE_FONTCONFIG - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define to 1 if you have the header file. */ -#undef HAVE_GLUT_GLUT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLUT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLU_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GL_H - -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENAL_ALC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENAL_AL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENGL_GLU_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENGL_GL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Define to 1 if you have the header file. */ -#undef HAVE_QUESOGLC_GLC_H - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if you have the `sqrt' function. */ -#undef HAVE_SQRT - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Use nonstandard varargs form for the GLU tesselator callback */ -#undef HAVE_VARARGS_GLU_TESSCB - -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - -/* define to use glpng */ -#undef IMAGE_GLPNG - -/* define to use SDL_image */ -#undef IMAGE_SDL - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* define to use FTGL */ -#undef TEXT_FTGL - -/* define to use GLC */ -#undef TEXT_GLC - -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - -/* define to use GLUT */ -#undef USE_GLUT - -/* define to use SDL */ -#undef USE_SDL - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* define to enable some special macintosh path handling */ -#undef macintosh - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc diff -Nru chromium-bsu-0.9.14.1/config.rpath chromium-bsu-0.9.15/config.rpath --- chromium-bsu-0.9.14.1/config.rpath 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/config.rpath 2010-12-18 03:16:13.000000000 +0000 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2006 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ ;; esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -74,9 +74,15 @@ ;; newsos6) ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -100,7 +106,7 @@ osf3* | osf4* | osf5*) wl='-Wl,' ;; - sco3.2v5*) + rdos*) ;; solaris*) wl='-Wl,' @@ -108,11 +114,14 @@ sunos4*) wl='-Qoption ld ' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) wl='-Wl,' ;; sysv4*MP*) ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; unicos*) wl='-Wl,' ;; @@ -121,7 +130,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -129,7 +138,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -155,7 +164,7 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -179,7 +188,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -189,11 +198,11 @@ ld_shlibs=no fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -251,7 +260,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -261,7 +270,7 @@ # 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*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -280,7 +289,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -323,7 +332,7 @@ ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -359,7 +368,7 @@ hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -412,18 +421,22 @@ hardcode_libdir_separator=: ;; openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + 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 - 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 + ld_shlibs=no fi ;; os2*) @@ -471,7 +484,7 @@ ld_shlibs=yes fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + 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`' @@ -487,34 +500,52 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_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*) + aix[4-9]*) + 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*) + cygwin* | mingw* | pw32* | cegcc*) 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*) ;; - kfreebsd*-gnu) - ;; 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 @@ -528,10 +559,13 @@ shrext=.sl ;; esac + library_names_spec='$libname$shrext' ;; - interix3*) + interix[3-9]*) + library_names_spec='$libname$shrext' ;; irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' case "$host_os" in irix5* | nonstopux*) libsuff= shlibsuff= @@ -548,41 +582,59 @@ ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux*) + 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=/' <. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='Chromium B.S.U.' PACKAGE_TARNAME='chromium-bsu' -PACKAGE_VERSION='0.9.14.1' -PACKAGE_STRING='Chromium B.S.U. 0.9.14.1' +PACKAGE_VERSION='0.9.15' +PACKAGE_STRING='Chromium B.S.U. 0.9.15' PACKAGE_BUGREPORT='http://sf.net/projects/chromium-bsu/bugs' PACKAGE_URL='' @@ -594,6 +594,7 @@ # include #endif" +gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -645,6 +646,7 @@ build_vendor build_cpu build +XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 XGETTEXT @@ -652,6 +654,7 @@ MSGFMT_015 GMSGFMT MSGFMT +GETTEXT_MACRO_VERSION USE_NLS LIBOBJS EGREP @@ -853,8 +856,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -899,7 +903,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -925,7 +929,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1129,7 +1133,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1145,7 +1149,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1175,8 +1179,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1184,7 +1188,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1202,13 +1206,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1231,7 +1235,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1245,8 +1249,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1261,9 +1265,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1302,11 +1306,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1332,7 +1336,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 Chromium B.S.U. 0.9.14.1 to adapt to many kinds of systems. +\`configure' configures Chromium B.S.U. 0.9.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1350,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1406,7 +1410,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Chromium B.S.U. 0.9.14.1:";; + short | recursive ) echo "Configuration of Chromium B.S.U. 0.9.15:";; esac cat <<\_ACEOF @@ -1543,10 +1547,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Chromium B.S.U. configure 0.9.14.1 -generated by GNU Autoconf 2.65 +Chromium B.S.U. configure 0.9.15 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1654,7 +1658,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1720,10 +1724,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1759,7 +1763,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1782,17 +1786,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ------------------------------------------------------- ## +( $as_echo "## ------------------------------------------------------- ## ## Report this to http://sf.net/projects/chromium-bsu/bugs ## -## ------------------------------------------------------- ## -_ASBOX +## ------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1814,7 +1816,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1845,7 +1847,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1944,7 +1946,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2006,8 +2008,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Chromium B.S.U. $as_me 0.9.14.1, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by Chromium B.S.U. $as_me 0.9.15, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2117,11 +2119,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2155,11 +2155,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2172,11 +2170,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2190,11 +2186,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2249,7 +2243,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2264,7 +2263,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2285,6 +2288,7 @@ >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2340,7 +2344,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2357,16 +2361,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2482,11 +2492,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2508,7 +2518,7 @@ # 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". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2518,7 +2528,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2756,7 +2766,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2764,7 +2774,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2798,7 +2808,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2814,7 +2824,7 @@ # Define the identity of the package. PACKAGE='chromium-bsu' - VERSION='0.9.14.1' + VERSION='0.9.15' cat >>confdefs.h <<_ACEOF @@ -2856,7 +2866,7 @@ -ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers chromium-bsu-config.h" # Programs @@ -3083,9 +3093,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C++ compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C++ compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3127,8 +3136,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3185,9 +3194,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C++ compiled programs. +as_fn_error $? "cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3238,8 +3247,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3978,8 +3987,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4388,7 +4397,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4404,11 +4413,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4447,7 +4456,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4463,18 +4472,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4535,7 +4544,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4601,7 +4610,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4733,8 +4742,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4748,8 +4756,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5227,8 +5234,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -5266,6 +5272,9 @@ + GETTEXT_MACRO_VERSION=0.18 + + # Prepare PATH_SEPARATOR. @@ -5541,6 +5550,9 @@ test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" @@ -5562,7 +5574,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -5573,16 +5585,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5607,7 +5619,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -5615,7 +5627,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5671,7 +5683,7 @@ # 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%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -5705,9 +5717,9 @@ # 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" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -5725,7 +5737,7 @@ { $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 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${acl_cv_prog_gnu_ld+set}" = set; then : @@ -5762,12 +5774,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + 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; : @@ -5777,23 +5791,71 @@ - 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 ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if test "${gl_cv_solaris_64bit+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + + @@ -5838,6 +5900,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -5846,6 +5912,8 @@ LIBICONV= LTLIBICONV= INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -5879,22 +5947,52 @@ 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 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + 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 @@ -5910,21 +6008,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + 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 @@ -5935,7 +6056,9 @@ 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 + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -5948,10 +6071,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + 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 @@ -5983,7 +6106,7 @@ if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -6002,6 +6125,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -6050,9 +6183,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -6152,21 +6287,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + 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=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -6195,6 +6330,19 @@ + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then : @@ -6277,45 +6425,67 @@ 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 test "${gt_cv_func_gnugettext1_libc+set}" = set; then : +if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; 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 ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libc=yes + eval "$gt_func_gnugettext_libc=yes" else - gt_cv_func_gnugettext1_libc=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -6403,6 +6573,123 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if test "${am_cv_func_iconv_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +else + am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + 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 @@ -6424,6 +6711,10 @@ + + + + use_additional=yes acl_save_prefix="$prefix" @@ -6460,6 +6751,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -6468,6 +6763,8 @@ LIBINTL= LTLIBINTL= INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -6501,22 +6798,52 @@ 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 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + 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 @@ -6532,21 +6859,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + 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 @@ -6557,7 +6907,9 @@ 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 + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -6570,10 +6922,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + 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 @@ -6605,7 +6957,7 @@ if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -6624,6 +6976,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -6672,9 +7034,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -6774,21 +7138,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + 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=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -6800,9 +7164,14 @@ 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 test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : +if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -6812,6 +7181,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus @@ -6822,23 +7192,24 @@ main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" else - gt_cv_func_gnugettext1_libintl=no + eval "$gt_func_gnugettext_libintl=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + 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 @@ -6849,7 +7220,7 @@ main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -6857,7 +7228,7 @@ if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -6866,12 +7237,13 @@ CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } +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 test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + 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 @@ -6909,7 +7281,7 @@ { $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 test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -6924,7 +7296,7 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "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 @@ -6992,7 +7364,7 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -7010,7 +7382,7 @@ @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -7096,7 +7468,7 @@ fi done fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -7577,8 +7949,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7769,8 +8140,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8833,8 +9203,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9218,6 +9587,34 @@ fi if test "x$enable_glpng" != xno ; then + for ac_header in GL/glpng.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "GL/glpng.h" "ac_cv_header_GL_glpng_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glpng_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GL_GLPNG_H 1 +_ACEOF + HAVE_GL_GLPNG_H=yes +else + HAVE_GL_GLPNG_H=no +fi + +done + + for ac_header in glpng/glpng.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "glpng/glpng.h" "ac_cv_header_glpng_glpng_h" "$ac_includes_default" +if test "x$ac_cv_header_glpng_glpng_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GLPNG_GLPNG_H 1 +_ACEOF + HAVE_GLPNG_GLPNG_H=yes +else + HAVE_GLPNG_GLPNG_H=no +fi + +done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pngBind in -lglpng" >&5 $as_echo_n "checking for pngBind in -lglpng... " >&6; } if test "${ac_cv_lib_glpng_pngBind+set}" = set; then : @@ -9255,20 +9652,20 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glpng_pngBind" >&5 $as_echo "$ac_cv_lib_glpng_pngBind" >&6; } if test "x$ac_cv_lib_glpng_pngBind" = x""yes; then : - HAVE_GLPNG=yes + HAVE_GLPNG_LIB=yes else - HAVE_GLPNG=no + HAVE_GLPNG_LIB=no fi fi if test "x$no_gl" = xyes ; then - as_fn_error "cannot find OpenGL (drawing system)" "$LINENO" 5 + as_fn_error $? "cannot find OpenGL (drawing system)" "$LINENO" 5 fi if test "x$no_glu" = xyes ; then - as_fn_error "cannot find GLU (drawing system)" "$LINENO" 5 + as_fn_error $? "cannot find GLU (drawing system)" "$LINENO" 5 fi @@ -9296,11 +9693,11 @@ TEXT_TYPE=FTGL else - as_fn_error "cannot find GLC or FTGL >= 2.1.3 (text renderer)" "$LINENO" 5 + as_fn_error $? "cannot find GLC or FTGL >= 2.1.3 (text renderer)" "$LINENO" 5 fi if test "x$TEXT_TYPE" = xGLC -a "x$FONT_NAME" != x ; then - TEXT_CFLAGS+=" -DFONT_NAME=\"\\\"$FONT_NAME\\\"\"" + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_NAME=\"\\\"$FONT_NAME\\\"\"" FONT="$FONT_NAME" elif test "x$TEXT_TYPE" = xGLC ; then @@ -9308,7 +9705,7 @@ fi if test "x$TEXT_TYPE" = xFTGL -a "x$FONT_PATH" != x ; then - TEXT_CFLAGS+=" -DFONT_PATH=\"\\\"$FONT_PATH\\\"\"" + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_PATH=\"\\\"$FONT_PATH\\\"\"" FONT="$FONT_PATH " fi @@ -9317,11 +9714,11 @@ $as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h - TEXT_CFLAGS+=" $FONTCONFIG_CFLAGS" + TEXT_CFLAGS="$TEXT_CFLAGS $FONTCONFIG_CFLAGS" - TEXT_LIBS+=" $FONTCONFIG_LIBS" + TEXT_LIBS="$TEXT_LIBS $FONTCONFIG_LIBS" - FONT+="fontconfig (bold Gothic Uralic) " + FONT="$FONT fontconfig (bold Gothic Uralic) " fi if test "x$TEXT_TYPE" = xFTGL -a "x$HAVE_FONTCONFIG" != xyes -a "x$FONT_PATH" = x ; then @@ -9348,7 +9745,7 @@ WINDOW_TYPE=GLUT else - as_fn_error "cannot find SDL >= 1.1.6 or GLUT (window system)" "$LINENO" 5 + as_fn_error $? "cannot find SDL >= 1.1.6 or GLUT (window system)" "$LINENO" 5 fi if test "x$HAVE_OPENAL" = xyes -a "x$HAVE_FREEALUT" = xyes -a "x$enable_openal" != xno ; then @@ -9370,8 +9767,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9384,8 +9780,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -9406,10 +9801,10 @@ AUDIO_TYPE="SDL mixer" else - as_fn_error "cannot find OpenAL & ALUT or SDL Mixer (sound)" "$LINENO" 5 + as_fn_error $? "cannot find OpenAL & ALUT or SDL Mixer (sound)" "$LINENO" 5 fi -if test "x$HAVE_GLPNG" = xyes -a "x$enable_glpng" != no ; then +if test \( "x$HAVE_GL_GLPNG_H" = xyes -o "x$HAVE_GLPNG_GLPNG_H" = xyes \) -a "x$HAVE_GLPNG_LIB" = xyes -a "x$enable_glpng" != no ; then $as_echo "#define IMAGE_GLPNG 1" >>confdefs.h @@ -9419,7 +9814,7 @@ IMAGE_TYPE=glpng if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then - IMAGE_LIBS+=" -lSDL_image" + IMAGE_LIBS="$IMAGE_LIBS -lSDL_image" $as_echo "#define ENABLE_WINDOW_ICON 1" >>confdefs.h @@ -9446,7 +9841,7 @@ WINDOW_ICON=yes else - as_fn_error "cannot find glpng or SDL_image (image loader)" "$LINENO" 5 + as_fn_error $? "cannot find glpng or SDL_image (image loader)" "$LINENO" 5 fi ac_config_files="$ac_config_files Makefile data/doc/Makefile data/doc/images/Makefile data/png/Makefile data/wav/Makefile data/Makefile misc/Makefile src/Makefile m4/Makefile po/Makefile.in" @@ -9535,6 +9930,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -9558,15 +9954,15 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -9716,19 +10112,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -9924,7 +10320,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -9977,8 +10373,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Chromium B.S.U. $as_me 0.9.14.1, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by Chromium B.S.U. $as_me 0.9.15, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10043,11 +10439,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Chromium B.S.U. config.status 0.9.14.1 -configured by $0, generated by GNU Autoconf 2.65, +Chromium B.S.U. config.status 0.9.15 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10065,11 +10461,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -10091,6 +10492,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -10103,7 +10505,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -10112,7 +10514,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -10173,7 +10575,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "chromium-bsu-config.h") CONFIG_HEADERS="$CONFIG_HEADERS chromium-bsu-config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -10187,7 +10589,7 @@ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -10225,7 +10627,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10242,7 +10644,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -10256,18 +10658,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10356,20 +10758,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -10397,7 +10807,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -10482,7 +10892,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -10495,7 +10905,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10523,7 +10933,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10550,7 +10960,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10687,22 +11097,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -10713,19 +11123,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -10988,7 +11398,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -11009,7 +11419,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru chromium-bsu-0.9.14.1/configure.ac chromium-bsu-0.9.15/configure.ac --- chromium-bsu-0.9.14.1/configure.ac 2010-06-19 09:28:46.000000000 +0000 +++ chromium-bsu-0.9.15/configure.ac 2011-02-14 03:54:04.000000000 +0000 @@ -3,11 +3,11 @@ AC_PREREQ([2.58]) -AC_INIT([Chromium B.S.U.], [0.9.14.1], [http://sf.net/projects/chromium-bsu/bugs], [chromium-bsu]) +AC_INIT([Chromium B.S.U.], [0.9.15], [http://sf.net/projects/chromium-bsu/bugs], [chromium-bsu]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([src/main.cpp]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([chromium-bsu-config.h]) # Programs AC_PROG_CXX @@ -39,7 +39,7 @@ # gettext for internationalisation AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.15]) +AM_GNU_GETTEXT_VERSION([0.18]) # Need OpenGL and GLU for drawing stuff AX_CHECK_GL @@ -113,7 +113,9 @@ fi if test "x$enable_glpng" != xno ; then - AC_CHECK_LIB([glpng], [pngBind], [HAVE_GLPNG=yes], [HAVE_GLPNG=no], [$GL_LIBS]) + AC_CHECK_HEADERS([GL/glpng.h], [HAVE_GL_GLPNG_H=yes], [HAVE_GL_GLPNG_H=no]) + AC_CHECK_HEADERS([glpng/glpng.h], [HAVE_GLPNG_GLPNG_H=yes], [HAVE_GLPNG_GLPNG_H=no]) + AC_CHECK_LIB([glpng], [pngBind], [HAVE_GLPNG_LIB=yes], [HAVE_GLPNG_LIB=no], [$GL_LIBS]) fi @@ -148,7 +150,7 @@ fi if test "x$TEXT_TYPE" = xGLC -a "x$FONT_NAME" != x ; then - TEXT_CFLAGS+=" -DFONT_NAME=\"\\\"$FONT_NAME\\\"\"" + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_NAME=\"\\\"$FONT_NAME\\\"\"" AC_SUBST(TEXT_CFLAGS) FONT="$FONT_NAME" elif test "x$TEXT_TYPE" = xGLC ; then @@ -156,18 +158,18 @@ fi if test "x$TEXT_TYPE" = xFTGL -a "x$FONT_PATH" != x ; then - TEXT_CFLAGS+=" -DFONT_PATH=\"\\\"$FONT_PATH\\\"\"" + TEXT_CFLAGS="$TEXT_CFLAGS -DFONT_PATH=\"\\\"$FONT_PATH\\\"\"" AC_SUBST(TEXT_CFLAGS) FONT="$FONT_PATH " fi if test "x$TEXT_TYPE" = xFTGL -a "x$HAVE_FONTCONFIG" = xyes ; then AC_DEFINE(HAVE_FONTCONFIG, 1, [define to use fontconfig]) - TEXT_CFLAGS+=" $FONTCONFIG_CFLAGS" + TEXT_CFLAGS="$TEXT_CFLAGS $FONTCONFIG_CFLAGS" AC_SUBST(TEXT_CFLAGS) - TEXT_LIBS+=" $FONTCONFIG_LIBS" + TEXT_LIBS="$TEXT_LIBS $FONTCONFIG_LIBS" AC_SUBST(TEXT_LIBS) - FONT+="fontconfig (bold Gothic Uralic) " + FONT="$FONT fontconfig (bold Gothic Uralic) " fi if test "x$TEXT_TYPE" = xFTGL -a "x$HAVE_FONTCONFIG" != xyes -a "x$FONT_PATH" = x ; then @@ -220,7 +222,7 @@ AC_MSG_ERROR([cannot find OpenAL & ALUT or SDL Mixer (sound)]) fi -if test "x$HAVE_GLPNG" = xyes -a "x$enable_glpng" != no ; then +if test \( "x$HAVE_GL_GLPNG_H" = xyes -o "x$HAVE_GLPNG_GLPNG_H" = xyes \) -a "x$HAVE_GLPNG_LIB" = xyes -a "x$enable_glpng" != no ; then AC_DEFINE(IMAGE_GLPNG, 1, [define to use glpng]) IMAGE_CFLAGS="" AC_SUBST(IMAGE_CFLAGS) @@ -228,7 +230,7 @@ AC_SUBST(IMAGE_LIBS) IMAGE_TYPE=glpng if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then - IMAGE_LIBS+=" -lSDL_image" + IMAGE_LIBS="$IMAGE_LIBS -lSDL_image" AC_SUBST(IMAGE_LIBS) AC_DEFINE(ENABLE_WINDOW_ICON, 1, [define to enable the window icon (needs SDL_image)]) WINDOW_ICON=yes diff -Nru chromium-bsu-0.9.14.1/data/doc/images/Makefile.in chromium-bsu-0.9.15/data/doc/images/Makefile.in --- chromium-bsu-0.9.14.1/data/doc/images/Makefile.in 2010-06-19 09:33:13.000000000 +0000 +++ chromium-bsu-0.9.15/data/doc/images/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -110,6 +111,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -172,6 +174,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/data/doc/Makefile.in chromium-bsu-0.9.15/data/doc/Makefile.in --- chromium-bsu-0.9.14.1/data/doc/Makefile.in 2010-06-19 09:33:12.000000000 +0000 +++ chromium-bsu-0.9.15/data/doc/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -150,6 +151,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -212,6 +214,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/data/Makefile.in chromium-bsu-0.9.15/data/Makefile.in --- chromium-bsu-0.9.14.1/data/Makefile.in 2010-06-19 09:33:12.000000000 +0000 +++ chromium-bsu-0.9.15/data/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -42,14 +42,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -125,6 +126,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -187,6 +189,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/data/png/Makefile.in chromium-bsu-0.9.15/data/png/Makefile.in --- chromium-bsu-0.9.14.1/data/png/Makefile.in 2010-06-19 09:33:13.000000000 +0000 +++ chromium-bsu-0.9.15/data/png/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -110,6 +111,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -172,6 +174,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/data/wav/Makefile.in chromium-bsu-0.9.15/data/wav/Makefile.in --- chromium-bsu-0.9.14.1/data/wav/Makefile.in 2010-06-19 09:33:13.000000000 +0000 +++ chromium-bsu-0.9.15/data/wav/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -110,6 +111,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -172,6 +174,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/debian/changelog chromium-bsu-0.9.15/debian/changelog --- chromium-bsu-0.9.14.1/debian/changelog 2011-02-14 13:36:35.000000000 +0000 +++ chromium-bsu-0.9.15/debian/changelog 2011-02-14 04:28:39.000000000 +0000 @@ -1,9 +1,16 @@ -chromium-bsu (0.9.14.1-2ubuntu1) natty; urgency=low +chromium-bsu (0.9.15-1) unstable; urgency=low - * Merge from debian unstable (LP: #667784). Remaining changes: - - Drop obsolete transitional packages + * New upstream release + * Drop obsolete transitional package, pave the way for Google Chromium + (Closes: #612197) + * Use Breaks instead of Conflicts on old chromium since there are + not actually any file conflicts and drop the Provides. + - Now compliant with policy 3.9.1, update Standards-Version + * Switch to dpkg-source v3 + * Add a longtitle to the Debian menu file + * Fix grammar in the package description - -- Angel Abad Thu, 28 Oct 2010 15:01:22 +0200 + -- Paul Wise Mon, 14 Feb 2011 12:28:37 +0800 chromium-bsu (0.9.14.1-2) unstable; urgency=low @@ -11,12 +18,6 @@ -- Paul Wise Fri, 08 Oct 2010 12:37:29 +0800 -chromium-bsu (0.9.14.1-1ubuntu1) maverick; urgency=low - - * Drop obsolete transitional packages (LP: #475896) - - -- Paul Wise Wed, 15 Sep 2010 22:33:22 +0800 - chromium-bsu (0.9.14.1-1) unstable; urgency=low * New upstream release @@ -328,3 +329,4 @@ -- Peter Joseph Thu, 12 Jul 2001 01:58:32 +0100 + diff -Nru chromium-bsu-0.9.14.1/debian/control chromium-bsu-0.9.15/debian/control --- chromium-bsu-0.9.14.1/debian/control 2011-02-14 13:36:35.000000000 +0000 +++ chromium-bsu-0.9.15/debian/control 2011-02-14 04:25:01.000000000 +0000 @@ -1,8 +1,7 @@ Source: chromium-bsu Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Games Team +Maintainer: Debian Games Team Uploaders: Sam Hocevar , Paul Wise Build-Depends: debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1~), @@ -12,7 +11,7 @@ libalut-dev, libglu1-mesa-dev, libglc-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://chromium-bsu.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chromium-bsu/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/chromium-bsu/?op=log @@ -23,22 +22,20 @@ ${misc:Depends}, chromium-bsu-data (>= 0.9.14), ttf-uralic -Provides: chromium Replaces: chromium (<< 0.9.14) -Conflicts: chromium (<< 0.9.14) +Breaks: chromium (<< 0.9.14) Description: fast paced, arcade-style, scrolling space shooter Chromium is a top down fast paced high action scrolling space shooter. . - In this game you are the captain of the cargo ship Chromium B.S.U., and - responsible for delivering supplies to the troops on the front line. + In this game you are the captain of the cargo ship Chromium B.S.U. and + are responsible for delivering supplies to the troops on the front line. Your ship has a small fleet of robotic fighters which you control from the relative safety of the Chromium vessel. Package: chromium-bsu-data Architecture: all -Provides: chromium-data Replaces: chromium-data (<< 0.9.14) -Conflicts: chromium-data (<< 0.9.14) +Breaks: chromium-data (<< 0.9.14) Depends: ${misc:Depends} Description: data pack for the Chromium B.S.U. game This package provides all the sounds, images, translations and diff -Nru chromium-bsu-0.9.14.1/debian/menu chromium-bsu-0.9.15/debian/menu --- chromium-bsu-0.9.14.1/debian/menu 2011-02-14 13:36:35.000000000 +0000 +++ chromium-bsu-0.9.15/debian/menu 2011-02-14 04:22:39.000000000 +0000 @@ -2,5 +2,6 @@ needs="x11" \ section="Games/Action" \ title="Chromium B.S.U." \ + longtitle="Scrolling space shooter" \ command="/usr/games/chromium-bsu" \ icon="/usr/share/pixmaps/chromium-bsu.xpm" diff -Nru chromium-bsu-0.9.14.1/debian/source/format chromium-bsu-0.9.15/debian/source/format --- chromium-bsu-0.9.14.1/debian/source/format 2011-02-14 13:36:35.000000000 +0000 +++ chromium-bsu-0.9.15/debian/source/format 2011-02-14 13:36:35.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt) diff -Nru chromium-bsu-0.9.14.1/m4/gettext.m4 chromium-bsu-0.9.15/m4/gettext.m4 --- chromium-bsu-0.9.14.1/m4/gettext.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/gettext.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# gettext.m4 serial 53 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2005. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,11 +60,18 @@ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + 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, [ @@ -78,7 +85,7 @@ 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 test "$gt_cv_func_gnugettext_libc" != "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: @@ -104,16 +111,25 @@ 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, + 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) + 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 @@ -122,26 +138,35 @@ dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION + 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]; -]], [])[extern int _nl_msg_cat_cntr; +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 ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) +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 test "$gt_cv_func_gnugettext_libc" != "yes"; then + 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 @@ -152,48 +177,40 @@ dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_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 -]ifelse([$2], [need-formatstring-macros], -[[#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]; -]], [])[extern int _nl_msg_cat_cntr; +$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 ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) +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 test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#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]; -]], [])[extern int _nl_msg_cat_cntr; +$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 ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" ]) fi CPPFLAGS="$gt_save_CPPFLAGS" @@ -204,8 +221,8 @@ 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 test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + 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 @@ -252,7 +269,7 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -265,7 +282,7 @@ if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -279,16 +296,16 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "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, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -304,9 +321,9 @@ fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + 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= @@ -314,316 +331,51 @@ dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(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) + 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) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], [ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([gl_VISIBILITY])dnl - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_LANGINFO_CODESET - gt_LC_MESSAGES - - dnl Compilation on mingw and Cygwin needs special Makefile rules, because - dnl 1. when we install a shared library, we must arrange to export - dnl auxiliary pointer variables for every exported variable, - dnl 2. when we install a shared library and a static library simultaneously, - dnl the include file specifies __declspec(dllimport) and therefore we - dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in - cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no - fi - WOE32DLL=$is_woe32dll - AC_SUBST([WOE32DLL]) - - dnl Rename some macros and functions used for locking. - AH_BOTTOM([ -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -]) + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) ]) -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], [ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_TRY_LINK( - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], - [], - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, - [Define to 1 if the compiler understands __builtin_expect.])]) - - AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - - AM_ICONV - - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, - dnl and a _NL_LOCALE_NAME macro always. - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, - [AC_TRY_LINK([#include -#include ], - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], - gt_cv_nl_locale_name=yes, - gt_cv_nl_locale_name=no) - ]) - if test $gt_cv_nl_locale_name = yes; then - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, - [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) ]) diff -Nru chromium-bsu-0.9.14.1/m4/iconv.m4 chromium-bsu-0.9.15/m4/iconv.m4 --- chromium-bsu-0.9.14.1/m4/iconv.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/iconv.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# iconv.m4 serial 9 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,6 +21,7 @@ [ 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. @@ -33,7 +34,7 @@ am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + 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 @@ -41,7 +42,7 @@ [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -50,13 +51,110 @@ [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) @@ -68,8 +166,8 @@ LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) AC_DEFUN([AM_ICONV], @@ -77,7 +175,7 @@ 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_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include #include @@ -90,12 +188,12 @@ #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [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, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff -Nru chromium-bsu-0.9.14.1/m4/intlmacosx.m4 chromium-bsu-0.9.15/m4/intlmacosx.m4 --- chromium-bsu-0.9.14.1/m4/intlmacosx.m4 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15/m4/intlmacosx.m4 2010-12-18 03:16:13.000000000 +0000 @@ -0,0 +1,51 @@ +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) diff -Nru chromium-bsu-0.9.14.1/m4/lib-ld.m4 chromium-bsu-0.9.15/m4/lib-ld.m4 --- chromium-bsu-0.9.14.1/m4/lib-ld.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/lib-ld.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ 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, +[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 /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,7 +77,7 @@ else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +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 @@ -89,9 +89,9 @@ # 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" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -101,9 +101,9 @@ fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff -Nru chromium-bsu-0.9.14.1/m4/lib-link.m4 chromium-bsu-0.9.15/m4/lib-link.m4 --- chromium-bsu-0.9.14.1/m4/lib-link.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/lib-link.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,58 +1,66 @@ -# lib-link.m4 serial 8 (gettext-0.15) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.50) +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___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" ]) LIB[]NAME="$ac_cv_lib[]Name[]_libs" LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. 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 the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -66,13 +74,25 @@ 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]) + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else @@ -82,17 +102,23 @@ 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) - undefine([Name]) - undefine([NAME]) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) ]) dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. +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. @@ -101,7 +127,7 @@ 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, [ + 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 @@ -109,35 +135,66 @@ acl_cv_rpath=done ]) wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + 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, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -150,6 +207,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -158,6 +219,10 @@ LIB[]NAME= LTLIB[]NAME= INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -197,22 +262,55 @@ 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 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + 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 @@ -220,21 +318,46 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + 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 @@ -249,7 +372,9 @@ 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 + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -268,12 +393,12 @@ ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then + 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 "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + 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" @@ -304,13 +429,13 @@ if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + 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 $hardcode_runpath_var and LD_RUN_PATH + 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. @@ -337,6 +462,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -397,9 +532,11 @@ 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 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -498,18 +635,18 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; 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:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else @@ -517,7 +654,7 @@ for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done @@ -530,6 +667,11 @@ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -566,7 +708,7 @@ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) $1= if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = 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= @@ -575,7 +717,8 @@ 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 + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -584,7 +727,8 @@ -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 + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; @@ -600,16 +744,16 @@ done else dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then + 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:+$hardcode_libdir_separator}$dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="$flag" else @@ -617,7 +761,7 @@ for dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done diff -Nru chromium-bsu-0.9.14.1/m4/lib-prefix.m4 chromium-bsu-0.9.15/m4/lib-prefix.m4 --- chromium-bsu-0.9.14.1/m4/lib-prefix.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/lib-prefix.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ 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". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. 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". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - 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 ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff -Nru chromium-bsu-0.9.14.1/m4/Makefile.in chromium-bsu-0.9.15/m4/Makefile.in --- chromium-bsu-0.9.14.1/m4/Makefile.in 2010-06-19 09:33:13.000000000 +0000 +++ chromium-bsu-0.9.15/m4/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -42,14 +42,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -85,6 +86,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -147,6 +149,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/m4/nls.m4 chromium-bsu-0.9.15/m4/nls.m4 --- chromium-bsu-0.9.14.1/m4/nls.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/nls.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(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) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff -Nru chromium-bsu-0.9.14.1/m4/pkg.m4 chromium-bsu-0.9.15/m4/pkg.m4 --- chromium-bsu-0.9.14.1/m4/pkg.m4 2010-06-19 09:32:53.000000000 +0000 +++ chromium-bsu-0.9.15/m4/pkg.m4 2010-12-18 03:16:17.000000000 +0000 @@ -135,7 +135,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -146,7 +146,7 @@ _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff -Nru chromium-bsu-0.9.14.1/m4/po.m4 chromium-bsu-0.9.15/m4/po.m4 --- chromium-bsu-0.9.14.1/m4/po.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/po.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# po.m4 serial 13 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -27,6 +27,10 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake AC_REQUIRE([AM_NLS])dnl + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -37,7 +41,7 @@ [$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) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl @@ -84,6 +88,10 @@ 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...]]" @@ -426,3 +434,16 @@ fi mv "$ac_file.tmp" "$ac_file" ]) + +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. +AC_DEFUN([AM_XGETTEXT_OPTION_INIT], +[ + XGETTEXT_EXTRA_OPTIONS= +]) + +dnl Registers an option to be passed to xgettext in the po subdirectory. +AC_DEFUN([AM_XGETTEXT_OPTION], +[ + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" +]) diff -Nru chromium-bsu-0.9.14.1/m4/progtest.m4 chromium-bsu-0.9.15/m4/progtest.m4 --- chromium-bsu-0.9.14.1/m4/progtest.m4 2010-06-19 09:32:40.000000000 +0000 +++ chromium-bsu-0.9.15/m4/progtest.m4 2010-12-18 03:16:13.000000000 +0000 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl Authors: dnl Ulrich Drepper , 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ # 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, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff -Nru chromium-bsu-0.9.14.1/Makefile.am chromium-bsu-0.9.15/Makefile.am --- chromium-bsu-0.9.14.1/Makefile.am 2009-03-30 08:40:17.000000000 +0000 +++ chromium-bsu-0.9.15/Makefile.am 2011-02-14 03:26:04.000000000 +0000 @@ -3,6 +3,8 @@ Makefile.in \ config.h.in \ config.h.in~ \ + chromium-bsu-config.h.in \ + chromium-bsu-config.h.in~ \ config.sub \ config.guess \ aclocal.m4 \ @@ -77,4 +79,6 @@ data dist-hook: - LC_ALL=C git log --pretty --numstat --summary $(VERSION) | git2cl > $(distdir)/ChangeLog + if test -d .git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \ + LC_ALL=C git log --pretty --numstat --summary $(VERSION) | git2cl > $(distdir)/ChangeLog ; \ + fi diff -Nru chromium-bsu-0.9.14.1/Makefile.in chromium-bsu-0.9.15/Makefile.in --- chromium-bsu-0.9.14.1/Makefile.in 2010-06-19 09:33:14.000000000 +0000 +++ chromium-bsu-0.9.15/Makefile.in 2011-02-14 03:55:05.000000000 +0000 @@ -35,9 +35,9 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING NEWS \ - config.guess config.rpath config.sub depcomp install-sh \ + $(srcdir)/Makefile.in $(srcdir)/chromium-bsu-config.h.in \ + $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ + NEWS config.guess config.rpath config.sub depcomp install-sh \ missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ @@ -46,16 +46,17 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h +CONFIG_HEADER = chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -141,6 +142,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -203,6 +205,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -265,6 +268,8 @@ Makefile.in \ config.h.in \ config.h.in~ \ + chromium-bsu-config.h.in \ + chromium-bsu-config.h.in~ \ config.sub \ config.guess \ aclocal.m4 \ @@ -337,7 +342,7 @@ m4 \ data -all: config.h +all: chromium-bsu-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -376,22 +381,22 @@ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -config.h: stamp-h1 +chromium-bsu-config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/chromium-bsu-config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) + cd $(top_builddir) && $(SHELL) ./config.status chromium-bsu-config.h +$(srcdir)/chromium-bsu-config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: - -rm -f config.h stamp-h1 + -rm -f chromium-bsu-config.h stamp-h1 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -473,7 +478,7 @@ mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) chromium-bsu-config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ @@ -490,7 +495,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) chromium-bsu-config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -508,9 +513,9 @@ fi; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) chromium-bsu-config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) chromium-bsu-config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -708,7 +713,7 @@ exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile config.h +all-am: Makefile chromium-bsu-config.h installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -827,7 +832,9 @@ dist-hook: - LC_ALL=C git log --pretty --numstat --summary $(VERSION) | git2cl > $(distdir)/ChangeLog + if test -d .git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \ + LC_ALL=C git log --pretty --numstat --summary $(VERSION) | git2cl > $(distdir)/ChangeLog ; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru chromium-bsu-0.9.14.1/misc/chromium-bsu.6 chromium-bsu-0.9.15/misc/chromium-bsu.6 --- chromium-bsu-0.9.14.1/misc/chromium-bsu.6 2009-03-29 06:10:28.000000000 +0000 +++ chromium-bsu-0.9.15/misc/chromium-bsu.6 2011-02-07 03:59:50.000000000 +0000 @@ -21,6 +21,18 @@ Strategic suicide is a powerful tactic! .TP Self-destruct to preserve your ammunition! +.SH CONTROLS +The input devices supported depend on the compile options used to build. +.TP +You can control the ship with your mouse, keyboard (arrow keys) or joystick. +.TP +To fire your weapons, hold the left mouse button, joystick buttons or the space bar. +.TP +To pause the game, press pause or p on the keyboard. +.TP +To blow up your ship, press enter/return or 0 twice or double right click. +.TP +To switch to the next track in your music playlist, press n on the keyboard. .SH OPTIONS When run with arguments that are not understood, usage information is shown. .TP @@ -69,7 +81,7 @@ .TP .B CHROMIUM_BSU_FONT When using the GLC backend, this specifies the font name to be used in the menu and the game if available. -.TP +.IP When using the FTGL backend, this specifies the path to the TTF font file used in the menu and the game. .SH FILES The following files are used. @@ -125,8 +137,17 @@ Print the frames per second at the top right when in a game. Defaults to enabled. .TP +.B screenWidth +The number of pixels wide to set the screen or window size. +.TP +.B screenHigh +The number of pixels high to set the screen or window size. +.TP .B screenSize Selects the screen or window size. Defaults to 800x600. +.TP +This option is only exists for backwards compatibility purposes. +It is replaced by the screenWidth and screenHeight options. .br 0 = 512 x 384 .br @@ -152,7 +173,7 @@ .br 0.2 = fish in a barrel .br -0.3 = whimp +0.3 = wimp .br 0.4 = easy .br @@ -166,8 +187,8 @@ .br 0.9 = impossible .TP -.B mouseSpeed -Speed that the mouse moves the ship around. The value shown in the menu is +.B movementSpeed +Speed that the ship moves around. The value shown in the menu is 1000 times the value in the configuration. Defaults to 0.03. .TP .B maxLevel diff -Nru chromium-bsu-0.9.14.1/misc/Makefile.in chromium-bsu-0.9.15/misc/Makefile.in --- chromium-bsu-0.9.14.1/misc/Makefile.in 2010-06-19 09:33:13.000000000 +0000 +++ chromium-bsu-0.9.15/misc/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -114,6 +115,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -176,6 +178,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff -Nru chromium-bsu-0.9.14.1/NEWS chromium-bsu-0.9.15/NEWS --- chromium-bsu-0.9.14.1/NEWS 2010-06-19 09:28:23.000000000 +0000 +++ chromium-bsu-0.9.15/NEWS 2011-02-14 03:54:04.000000000 +0000 @@ -1,3 +1,12 @@ +Chromium B.S.U. 0.9.15 + - Fix some MacOS X portability issues + - Fix mouse grabbing and pause issue + - Change high scores to a text file + - Add Italian, Traditional Chinese translations + - Add support for playing on a keyboard + - Add new fourth level + - Translation updates + Chromium B.S.U. 0.9.14.1 - Add new Swedish translation - Add SDL_image texture loading backend Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/bg.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/bg.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/bg.po chromium-bsu-0.9.15/po/bg.po --- chromium-bsu-0.9.14.1/po/bg.po 2010-06-19 09:34:23.000000000 +0000 +++ chromium-bsu-0.9.15/po/bg.po 2011-02-14 03:55:27.000000000 +0000 @@ -1,19 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. +# Damyan Ivanov , 2009, 2011. # -# Damyan Ivanov , 2009. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" -"PO-Revision-Date: 2009-03-30 09:42+0300\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" +"PO-Revision-Date: 2011-02-07 15:20+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/Audio.cpp:110 msgid "audio" @@ -61,8 +63,7 @@ " use_cdrom enabled. Set to '0' in the configuration file to disable.\n" msgstr "" "\n" -" use_cdrom е разрешено. Задайте стойност „0“ в конфигурационния фаил за да " -"го забраните.\n" +" use_cdrom е разрешено. Задайте стойност „0“ в конфигурационния фаил за да го забраните.\n" #: src/Audio.cpp:155 #, c-format @@ -70,8 +71,7 @@ " Press the 'N' key to skip to next CD track during a game.\n" "\n" msgstr "" -" Използвайте клавиша „N“ за прескачане до следващата песен по време на " -"игра.\n" +" Използвайте клавиша „N“ за прескачане до следващата песен по време на игра.\n" "\n" #: src/Audio.cpp:166 @@ -82,9 +82,7 @@ #: src/Audio.cpp:209 #, c-format msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" -msgstr "" -"Грешка при работа с компактдисковото устройство в AudioOpenAL::pauseGameMusic" -"(%d)\n" +msgstr "Грешка при работа с компактдисковото устройство в AudioOpenAL::pauseGameMusic(%d)\n" #: src/Audio.cpp:210 #, c-format @@ -109,7 +107,7 @@ #: src/AudioOpenAL.cpp:162 #, c-format msgid "AudioOpenAL::Audio done\n" -msgstr "" +msgstr "AudioOpenAL::Audio приключи\n" #: src/AudioOpenAL.cpp:170 #, c-format @@ -118,7 +116,7 @@ #: src/AudioOpenAL.cpp:182 msgid "AudioOpenAL::~Audio()" -msgstr "" +msgstr "AudioOpenAL::~Audio()" #: src/AudioOpenAL.cpp:203 #, c-format @@ -141,7 +139,7 @@ #: src/AudioOpenAL.cpp:269 #, c-format msgid "AudioOpenAL::initSound() begin...\n" -msgstr "" +msgstr "начало на AudioOpenAL::initSound()...\n" #: src/AudioOpenAL.cpp:273 #, c-format @@ -151,45 +149,49 @@ "Renderer : %s\n" "Version : %s\n" msgstr "" +"-OpenAL-----------------------------------------------------\n" +"Доставчик : %s\n" +"Превръщане : %s\n" +"Версия : %s\n" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" -msgstr "" +msgstr "------------------------------------------------------------\n" #: src/AudioOpenAL.cpp:311 #, c-format msgid "Audio.cpp - init %s" -msgstr "" +msgstr "Audio.cpp - инициализиране %s" #: src/AudioOpenAL.cpp:324 #, c-format msgid "Audio.cpp - init explosion %d" -msgstr "" +msgstr "Audio.cpp - инициализиране на експолозия %d" #: src/AudioOpenAL.cpp:337 #, c-format msgid "Audio.cpp - init exploPop %d" -msgstr "" +msgstr "Audio.cpp - инициализиране на exploPop %d" #: src/AudioOpenAL.cpp:350 msgid "Audio.cpp - initSound complete." -msgstr "" +msgstr "Audio.cpp - initSound завърши." #: src/AudioOpenAL.cpp:430 #, c-format msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" -msgstr "" +msgstr "AudioOpenAL::setMusicMode(SoundType mode)\n" #: src/AudioOpenAL.cpp:465 #, c-format msgid "AudioOpenAL::setSoundVolume(%f)\n" -msgstr "" +msgstr "AudioOpenAL::setSoundVolume(%f)\n" #: src/AudioOpenAL.cpp:508 #, c-format msgid "Music volume = %f\n" -msgstr "" +msgstr "Сила на музиката = %f\n" #: src/AudioOpenAL.cpp:524 #, c-format @@ -197,26 +199,28 @@ "\n" "ERROR! - sound enumerant index %d does not have valid filename!\n" msgstr "" +"\n" +"ГРЕШКА! - звуковият елемент с номер %d няма валидно име на файл!\n" #: src/AudioOpenAL.cpp:547 #, c-format msgid "alutLoadWAVFile(\"%s\",...);\n" -msgstr "" +msgstr "alutLoadWAVFile(\"%s\",...);\n" #: src/AudioOpenAL.cpp:563 #, c-format msgid "ERROR!! <%s> alGetError() = %s\n" -msgstr "" +msgstr "ГРЕШКА!! <%s> alGetError() = %s\n" #: src/AudioOpenAL.cpp:568 #, c-format msgid "ERROR!! <%s> alcGetError() = %s\n" -msgstr "" +msgstr "ГРЕШКА!! <%s> alcGetError() = %s\n" #: src/AudioOpenAL.cpp:573 #, c-format msgid "ERROR!! <%s> alutGetError() = %s\n" -msgstr "" +msgstr "ГРЕШКА!! <%s> alutGetError() = %s\n" #: src/AudioOpenAL.cpp:732 #, c-format @@ -246,113 +250,113 @@ #: src/AudioOpenAL.cpp:781 #, c-format msgid " %2d : %s\n" -msgstr "" +msgstr " %2d : %s\n" #: src/AudioOpenAL.cpp:783 #, c-format msgid "loaded %s\n" -msgstr "" +msgstr "зареди се %s\n" #: src/AudioOpenAL.cpp:808 msgid "AudioOpenAL::setMusicIndex -- begin" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- начало" #: src/AudioOpenAL.cpp:821 msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- преди установяване на буфера-източник на 0" #: src/AudioOpenAL.cpp:824 msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- след установяване на буфера-източник на 0" #: src/AudioOpenAL.cpp:859 msgid "AudioOpenAL::setMusicIndex -- end" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- край" #: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" -msgstr "" +msgstr "ВНИМАНИЕ: не е включена поддръжка на списъци за изпълнение (AudioOpenAL.cpp): %s\n" #: src/AudioOpenAL.cpp:959 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "ГРЕШКА: Не може да се задели памет в AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:965 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:973 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "ГРЕШКА: alutLoadMP3() пропадна в AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:1005 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "ГРЕШКА: Не може да се задели памет в AudioOpenAL::loadVorbis\n" #: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadVorbis\n" #: src/AudioOpenAL.cpp:1019 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "ГРЕШКА: alutLoadVorbis() пропадна в AudioOpenAL::loadVorbis\n" #: src/AudioSDLMixer.cpp:65 #, c-format msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" -msgstr "" +msgstr "ГРЕШКА при инициализиране на звука - AudioSDLMixer::initSound()\n" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" -msgstr "" +msgstr "ВНИМАНИЕ: Config::init() веше е извикана.\n" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" msgstr "ВНИМАНИЕ: неуспех при четене на файла с настройки (%s)\n" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" -msgstr "" +msgstr "файлът с настройки (%s) е записан\n" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" -msgstr "" +msgstr "ВНИМАНИЕ: неуспех при запазване на файла с настройки (%s)\n" #: src/EnemyAircraft.cpp:111 #, c-format msgid "%d EnemyAircraft allocated\n" -msgstr "" +msgstr "заделени %d EnemyAircraft\n" #: src/EnemyAircraft_Straight.cpp:103 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" -msgstr "" +msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" #: src/EnemyFleet.cpp:243 #, c-format msgid "num enemies on screen = %d\n" -msgstr "" +msgstr "брой врагове на екрана = %d\n" #: src/Global.cpp:114 #, c-format msgid "WARNING: Global::init() has already been called.\n" -msgstr "" +msgstr "ВНИМАНИЕ: Global::init() веше е извикана.\n" #: src/Global.cpp:211 #, c-format msgid "Starting up..." -msgstr "" +msgstr "Стартиране…" #: src/Global.cpp:242 #, c-format @@ -362,67 +366,72 @@ #: src/Global.cpp:249 #, c-format msgid "Shutting down...\n" -msgstr "" +msgstr "Изключване…\n" #: src/Global.cpp:262 #, c-format msgid "...shutdown complete.\n" -msgstr "" +msgstr "...изключването завърши.\n" #: src/Global.cpp:269 #, c-format msgid "deleteTextures()\n" -msgstr "" +msgstr "deleteTextures()\n" #: src/Global.cpp:289 #, c-format msgid "Global::loadTextures()\n" -msgstr "" +msgstr "Global::loadTextures()\n" #: src/Global.cpp:352 #, c-format msgid "Generating random sequences\n" -msgstr "" +msgstr "Генериране на случайни числа\n" #: src/HeroAmmo.cpp:167 #, c-format msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" -msgstr "" +msgstr "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" #: src/HeroAmmo.cpp:190 #, c-format msgid "%p <--%p--> %p\n" -msgstr "" +msgstr "%p <--%p--> %p\n" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "никой" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" -msgstr "" +msgstr "ВНИМАНИЕ: HiScore::init() веше е извикана.\n" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" -msgstr "" +msgstr "ВНИМАНИЕ: неуспех при запазване на файла с постижения (%s)\n" + +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "ВНИМАНИЕ: празен файл с постижения (%s)\n" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" -msgstr "" +msgstr "ВНИМАНИЕ: неуспех при четене на файла с постижения (%s)\n" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" -msgstr "рекорди:\n" +msgstr "постижения:\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" -msgstr "" +msgstr "%02d/%02d/%04d %16s %d\n" #: src/main.cpp:118 #, c-format @@ -461,37 +470,37 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "!! ГРЕШКА !! — " -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "Разширения :" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" -msgstr "" +msgstr "initGL()\n" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" -msgstr "" +msgstr "грешка при зареждане на шрифт: %s\n" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" -msgstr "" +msgstr "грешка при зареждане на шрифт\n" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" -msgstr "" +msgstr "!!MainGL::drawGL() Ъ?\n" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" @@ -502,7 +511,7 @@ "\n" "%d" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -515,11 +524,11 @@ "\n" "%d" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "с л а б а к" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -536,52 +545,52 @@ "п р и к л ю ч е н о\n" " \n" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" -msgstr "" +msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" -msgstr "" +msgstr "ГРЕШКА!!! грешка в OpenGL: %s\n" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" -msgstr "" +msgstr "ключ = %d\n" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" -msgstr "" +msgstr "Неуспех при инициализиране на SDL: %s\n" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" -msgstr "" +msgstr "SDL е инициализирана.\n" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" -msgstr "" +msgstr "брой джойстици = %d\n" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" -msgstr "" +msgstr " джойстик 0 = %p\n" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" -msgstr "" +msgstr "не са открити джойстици\n" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" -msgstr "" +msgstr "Неуспех при установяване на видео-режима: %s\n" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -589,23 +598,27 @@ "Renderer : %s\n" "Version : %s\n" msgstr "" +"-OpenGL-----------------------------------------------------\n" +"Доставчик : %s\n" +"Превръщане : %s\n" +"Версия : %s\n" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" -msgstr "" +msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -msgstr "" +msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -msgstr "" +msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -627,70 +640,70 @@ " Понякога те могат да попречат на достигането на стабилна\n" " скорост на видеото.\n" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" msgstr "изход.\n" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" -msgstr "" +msgstr "ГРЕШКА!!! грешка в SDL: %s\n" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " -msgstr "" +msgstr "видео-режимът е установен" -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" -msgstr "" +msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" #: src/MainSDL_Event.cpp:40 #, c-format msgid "%-5d SDL_ACTIVEEVENT \n" -msgstr "" +msgstr "%-5d SDL_ACTIVEEVENT \n" #: src/MainSDL_Event.cpp:41 #, c-format msgid "%-5d SDL_KEYDOWN \n" -msgstr "" +msgstr "%-5d SDL_KEYDOWN \n" #: src/MainSDL_Event.cpp:42 #, c-format msgid "%-5d SDL_KEYUP \n" -msgstr "" +msgstr "%-5d SDL_KEYUP \n" #: src/MainSDL_Event.cpp:43 #, c-format msgid "%-5d SDL_MOUSEMOTION \n" -msgstr "" +msgstr "%-5d SDL_MOUSEMOTION \n" #: src/MainSDL_Event.cpp:44 #, c-format msgid "%-5d SDL_MOUSEBUTTONDOWN \n" -msgstr "" +msgstr "%-5d SDL_MOUSEBUTTONDOWN \n" #: src/MainSDL_Event.cpp:45 #, c-format msgid "%-5d SDL_MOUSEBUTTONUP \n" -msgstr "" +msgstr "%-5d SDL_MOUSEBUTTONUP \n" #: src/MainSDL_Event.cpp:46 #, c-format msgid "%-5d SDL_JOYBUTTONDOWN \n" -msgstr "" +msgstr "%-5d SDL_JOYBUTTONDOWN \n" #: src/MainSDL_Event.cpp:47 #, c-format msgid "%-5d SDL_JOYBUTTONUP \n" -msgstr "" +msgstr "%-5d SDL_JOYBUTTONUP \n" #: src/MainSDL_Event.cpp:212 #, c-format msgid "MainSDL::getEvent HUH?\n" -msgstr "" +msgstr "MainSDL::getEvent Ъ?\n" #: src/MainSDL_Event.cpp:222 #, c-format @@ -698,80 +711,61 @@ "buffer = \"%s\n" "\"" msgstr "" +"буфер = \"%s\n" +"\"" #: src/MainSDL_Event.cpp:243 #, c-format msgid "mouse active" -msgstr "" +msgstr "мишката е активна" #: src/MainSDL_Event.cpp:251 #, c-format msgid "focus\n" -msgstr "" +msgstr "фокус\n" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" -msgstr "" +msgstr "натиснат е клавиша „%s“\n" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" -msgstr "" +msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" -msgstr "" +msgstr "MainSDL::grabMouse(%d)\n" #: src/MenuGL.cpp:43 -msgid "" -" d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o " -"u !" -msgstr "" -" н е п о з в о л я в а й т е н а в р а г о в е т е д а п р е м и " -"н а т !" +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " н е п о з в о л я в а й т е н а в р а г о в е т е д а п р е м и н а т !" #: src/MenuGL.cpp:44 -msgid "" -" e v e r y e n e m y t h a t g e t s b y c o s t s y o u a " -"l i f e !" -msgstr "" -" в с е к и п р е м и н а л в р а г с т р у в а е д и н ж и в о т !" +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " в с е к и п р е м и н а л в р а г с т р у в а е д и н ж и в о т !" #: src/MenuGL.cpp:45 -msgid "" -" a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o " -"i n t s !" -msgstr "" -" п р е м и н а л и т е п о д о б р е н и я н о с я т т о ч к и !" +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " п р е м и н а л и т е п о д о б р е н и я н о с я т т о ч к и !" #: src/MenuGL.cpp:46 msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" -msgstr "" -" б л ъ с к а й т е с е в ъ в в р а г о в е т е з а д а г и у " -"н и щ о ж и т е !" +msgstr " б л ъ с к а й т е с е в ъ в в р а г о в е т е з а д а г и у н и щ о ж и т е !" #: src/MenuGL.cpp:47 msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" -msgstr "" -" д в о й н о д я с н о щ р а к в а н е з а с а м о р а з р у ш е н " -"и е !" +msgstr " д в о й н о д я с н о щ р а к в а н е з а с а м о р а з р у ш е н и е !" #: src/MenuGL.cpp:48 -msgid "" -" s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i " -"t i o n !" -msgstr "" -" с а м о р а з р у ш е н и е т о с ъ х р а н я в а м у н и ц и и т е !" +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " с а м о р а з р у ш е н и е т о с ъ х р а н я в а м у н и ц и и т е !" #: src/MenuGL.cpp:49 -msgid "" -" d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu." -"sf.net/" -msgstr "" -" и з т е г л е т е C h r o m i u m B. S. U. о т http://chromium-bsu." -"sf.net/" +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " и з т е г л е т е C h r o m i u m B. S. U. о т http://chromium-bsu.sf.net/" #: src/MenuGL.cpp:70 msgid "n e w g a m e" @@ -806,8 +800,8 @@ msgstr "с и л а н а ф о н о в а т а м у з и к а" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" -msgstr "с к о р о с т н а м и ш к а т а" +msgid "m o v e m e n t s p e e d" +msgstr "с к о р о с т н а д в и ж е н и е" #: src/MenuGL.cpp:79 msgid "q u i t" @@ -816,19 +810,19 @@ #: src/MenuGL.cpp:143 src/MenuGL.cpp:418 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" -msgstr "" +msgstr "ВНИМАНИЕ: Използва се „тънък“ текст за подобряване на скоростта…\n" #: src/MenuGL.cpp:147 #, c-format msgid "MenuGL::createLists\n" -msgstr "" +msgstr "MenuGL::createLists\n" #: src/MenuGL.cpp:162 msgid "fish in a barrel" msgstr "със затворени очи" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "за пеленачета" #: src/MenuGL.cpp:164 @@ -857,7 +851,7 @@ #: src/MenuGL.cpp:170 msgid "-" -msgstr "" +msgstr "-" #: src/MenuGL.cpp:292 src/MenuGL.cpp:321 msgid "high scores" @@ -865,24 +859,24 @@ #: src/MenuGL.cpp:350 msgid "the" -msgstr "" +msgstr "проектът" #: src/MenuGL.cpp:354 msgid "reptile" -msgstr "" +msgstr "за интегриране" #: src/MenuGL.cpp:358 msgid "labour" -msgstr "" +msgstr "на" #: src/MenuGL.cpp:362 msgid "project" -msgstr "" +msgstr "влечугите" #: src/MenuGL.cpp:423 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" -msgstr "" +msgstr "ВНИМАНИЕ: Връщане към „дебел“ текст…\n" #: src/MenuGL.cpp:474 #, c-format @@ -899,61 +893,40 @@ msgid "high" msgstr "висока" -#: src/MenuGL.cpp:483 +#: src/MenuGL.cpp:481 #, c-format -msgid "512x384" -msgstr "" - -#: src/MenuGL.cpp:484 -#, c-format -msgid "640x480" -msgstr "" +msgid "%dx%d" +msgstr "%dx%d" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "да" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "не" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" -msgstr "" +msgstr "---- грешка при установяване на режим „цял екран“ ----" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" -msgstr "" +msgstr "---- грешка при установяване на режим „прозорец“ ----" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" -msgstr "" -"---- трпбва да преминете ниво %d преди да можете да изберете ниво %d ----" +msgstr "---- трябва да преминете ниво %d преди да можете да изберете ниво %d ----" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" -msgstr "" +msgstr "---- грешка при настройване на размера на екрана ----" #: src/PowerUps.cpp:180 #, c-format @@ -963,12 +936,12 @@ #: src/PowerUps.cpp:368 #, c-format msgid "?? PowerUp::seal()" -msgstr "" +msgstr "?? PowerUp::seal()" #: src/ScreenItemAdd.cpp:107 #, c-format msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" -msgstr "" +msgstr "ScreenItemAdd::putScreenItems() Герой??? Ъ???\n" #: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 msgid "p a u s e d" @@ -976,9 +949,7 @@ #: src/StatusDisplay.cpp:675 msgid "do not let -any- ships past you! each one costs you a life!" -msgstr "" -"не позволявайте на НИКАКВИ кораби да преминат! всеки преминал кораб струва " -"един живот!" +msgstr "не позволявайте на НИКАКВИ кораби да преминат! всеки преминал кораб струва един живот!" #: src/StatusDisplay.cpp:686 msgid "let super shields pass by for an extra life!" @@ -987,11 +958,11 @@ #: src/TextFTGL.cpp:35 #, c-format msgid "FTGL: error loading font: %s\n" -msgstr "" +msgstr "FTGL: грешка при зареждане на шрифт: %s\n" #: src/TextFTGL.cpp:38 msgid "FTGL: error loading font" -msgstr "" +msgstr "FTGL: грешка при зареждане на шрифт" #. TRANSLATORS: If using the FTGL backend, this should be the font #. name of a font that contains all the Unicode characters in use in @@ -1041,4 +1012,4 @@ #: src/TextGLC.cpp:30 msgid "GLC: couldn't set context" -msgstr "" +msgstr "GLC: неуспех при установяване на контекст" diff -Nru chromium-bsu-0.9.14.1/po/chromium-bsu.pot chromium-bsu-0.9.15/po/chromium-bsu.pot --- chromium-bsu-0.9.14.1/po/chromium-bsu.pot 2010-06-19 09:33:34.000000000 +0000 +++ chromium-bsu-0.9.15/po/chromium-bsu.pot 2011-02-10 11:48:04.000000000 +0000 @@ -5,12 +5,13 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: chromium-bsu 0.9.15\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -137,7 +138,7 @@ "Version : %s\n" msgstr "" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" msgstr "" @@ -294,22 +295,22 @@ msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" msgstr "" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" msgstr "" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" msgstr "" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" msgstr "" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" msgstr "" @@ -379,32 +380,37 @@ msgid "%p <--%p--> %p\n" msgstr "" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" msgstr "" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" msgstr "" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" msgstr "" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "" @@ -430,37 +436,37 @@ "\n" msgstr "" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "" -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" msgstr "" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" msgstr "" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" msgstr "" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" msgstr "" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" @@ -468,7 +474,7 @@ "%d" msgstr "" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -477,11 +483,11 @@ "%d" msgstr "" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -492,52 +498,52 @@ " \n" msgstr "" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" msgstr "" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" msgstr "" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" msgstr "" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" msgstr "" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" msgstr "" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" msgstr "" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" msgstr "" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -546,22 +552,22 @@ "Version : %s\n" msgstr "" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -574,22 +580,22 @@ " can make it difficult to maintain a steady frame rate.\n" msgstr "" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" msgstr "" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " msgstr "" -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "" @@ -656,17 +662,17 @@ msgid "focus\n" msgstr "" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" msgstr "" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" msgstr "" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "" @@ -742,7 +748,7 @@ msgstr "" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" +msgid "m o v e m e n t s p e e d" msgstr "" #: src/MenuGL.cpp:79 @@ -764,7 +770,7 @@ msgstr "" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "" #: src/MenuGL.cpp:164 @@ -835,57 +841,37 @@ msgid "high" msgstr "" -#: src/MenuGL.cpp:483 +#: src/MenuGL.cpp:481 #, c-format -msgid "512x384" -msgstr "" - -#: src/MenuGL.cpp:484 -#, c-format -msgid "640x480" +msgid "%dx%d" msgstr "" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" msgstr "" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" msgstr "" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" msgstr "" Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/de.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/de.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/de.po chromium-bsu-0.9.15/po/de.po --- chromium-bsu-0.9.14.1/po/de.po 2010-06-19 09:34:23.000000000 +0000 +++ chromium-bsu-0.9.15/po/de.po 2011-02-14 03:55:27.000000000 +0000 @@ -1,11 +1,12 @@ msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" "PO-Revision-Date: \n" "Last-Translator: Evgeni Golov \n" "Language-Team: \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -56,8 +57,7 @@ " use_cdrom enabled. Set to '0' in the configuration file to disable.\n" msgstr "" "\n" -" CDROM Nutzung (use_cdrom) aktiviert. Setze es auf '0' in der " -"Konfigurationsdatei um es zu deaktivieren.\n" +" CDROM Nutzung (use_cdrom) aktiviert. Setze es auf '0' in der Konfigurationsdatei um es zu deaktivieren.\n" #: src/Audio.cpp:155 #, c-format @@ -126,8 +126,7 @@ "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" msgstr "" "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" -"!! ACHTUNG !! - Während des Audio-Checks wurden ein oder mehrere Fehler " -"festgestellt.\n" +"!! ACHTUNG !! - Während des Audio-Checks wurden ein oder mehrere Fehler festgestellt.\n" "!! Audio wird deaktiviert.\n" "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" @@ -149,7 +148,7 @@ "Renderer : %s\n" "Version : %s\n" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" msgstr "------------------------------------------------------------\n" @@ -271,9 +270,7 @@ #: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" -msgstr "" -"WARNUNG: Wiedergabelisten Unterstützung ist nicht einkompiliert (AudioOpenAL." -"cpp): %s\n" +msgstr "WARNUNG: Wiedergabelisten Unterstützung ist nicht einkompiliert (AudioOpenAL.cpp): %s\n" #: src/AudioOpenAL.cpp:959 #, c-format @@ -310,22 +307,22 @@ msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" msgstr "FEHLER bein Initializieren von Audio - AudioSDLMixer::initSound()\n" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" msgstr "WARNUNG: Config::init() wurde bereits ausgeführt.\n" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" msgstr "WARNUNG: Konnte Konfigurationsdatei nicht lesen (%s)\n" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" msgstr "Konfigurationsdatei geschrieben (%s)\n" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" msgstr "WARNUNG: Konnte Konfigurationsdatei nicht schreiben (%s)\n" @@ -395,32 +392,37 @@ msgid "%p <--%p--> %p\n" msgstr "%p <--%p--> %p\n" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "Niemand" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" msgstr "WARNUNG: HiScore::init() wurde bereits ausgeführt.\n" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" msgstr "WARNUNG: konnte Punktzahldatei nicht schreiben (%s)\n" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "WARNUNG: leere Punktzahldatei (%s)\n" + +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "WARNUNG: konnte Punktzahldatei nicht lesen (%s)\n" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" msgstr "Bestenliste:\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" @@ -462,37 +464,37 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "!! FEHLER !! - " -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "Erweiterungen:" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" msgstr "initGL()\n" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" msgstr "Fehler beim Laden der Schriftart: %s\n" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" msgstr "Fehler beim Laden der Schriftart\n" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" msgstr "!!MainGL::drawGL() BITTE?\n" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" @@ -503,7 +505,7 @@ "\n" "%d" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -516,11 +518,11 @@ "\n" "%d" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "V e r l i e r e r" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -537,52 +539,52 @@ "b e e n d e t\n" " \n" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "FEHLER!!! OpenGL Fehler: %s\n" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" msgstr "Taste = %d\n" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" msgstr "Konnte SDL nicht initialisieren: %s\n" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" msgstr "SDL initialisiert.\n" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" msgstr "Anzahl Joysticks = %d\n" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" msgstr " Joystick 0 = %p\n" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" msgstr "Keine Joysticks gefunden\n" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Konnte Video Modus nicht setzen: %s\n" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -595,22 +597,22 @@ "Renderer : %s\n" "Version : %s\n" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -632,22 +634,22 @@ " Programme (wie 'top', 'xosview', etc.) laufen. Solche\n" " Programme verhindern oft eine stabile Frame Rate.\n" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" msgstr "beendet.\n" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "FEHLER!!! SDL Fehler '%s'\n" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " msgstr "Video Modus gesetzt" -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" @@ -716,72 +718,48 @@ msgid "focus\n" msgstr "Fokus\n" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" msgstr "Taste '%s' gedrückt\n" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" #: src/MenuGL.cpp:43 -msgid "" -" d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o " -"u !" -msgstr "" -" e r l a u b e e s -k e i n e m- G e g n e r a n d i r v o r b e " -"i z u k o m m e n !" +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " e r l a u b e e s -k e i n e m- G e g n e r a n d i r v o r b e i z u k o m m e n !" #: src/MenuGL.cpp:44 -msgid "" -" e v e r y e n e m y t h a t g e t s b y c o s t s y o u a " -"l i f e !" -msgstr "" -" j e d e r G e g n e r d e r a n d i r v o r b e i k o m m " -"t , k o s t e t d i c h e i n L e b e n !" +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " j e d e r G e g n e r d e r a n d i r v o r b e i k o m m t , k o s t e t d i c h e i n L e b e n !" #: src/MenuGL.cpp:45 -msgid "" -" a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o " -"i n t s !" -msgstr "" -" l a s s e P o w e r - U p s v o r b e i f ü r m e h r P u n k " -"t e !" +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " l a s s e P o w e r - U p s v o r b e i f ü r m e h r P u n k t e !" #: src/MenuGL.cpp:46 msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" -msgstr "" -" s t o ß e m i t G e g n e r n z u s a m m e n , u m s i e " -"z u z e r s t ö r e n !" +msgstr " s t o ß e m i t G e g n e r n z u s a m m e n , u m s i e z u z e r s t ö r e n !" #: src/MenuGL.cpp:47 msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" -msgstr "" -" d o p p e l r e c h t s K l i c k f ü r S e l b s t z e r s t ö r " -"u n g !" +msgstr " d o p p e l r e c h t s K l i c k f ü r S e l b s t z e r s t ö r u n g !" #: src/MenuGL.cpp:48 -msgid "" -" s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i " -"t i o n !" -msgstr "" -" z e r s t ö r e d i c h s e l b s t u m d i e M u n i t i o n z " -"u s i c h e r n !" +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " z e r s t ö r e d i c h s e l b s t u m d i e M u n i t i o n z u s i c h e r n !" #: src/MenuGL.cpp:49 -msgid "" -" d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu." -"sf.net/" -msgstr "" -" L a d e d i e n e u s t e V e r s i o n v o n C h r o m i u " -"m B . S. U . a u f http://chromium-bsu.sf.net/" +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " L a d e d i e n e u s t e V e r s i o n v o n C h r o m i u m B . S. U . a u f http://chromium-bsu.sf.net/" #: src/MenuGL.cpp:70 msgid "n e w g a m e" @@ -816,8 +794,8 @@ msgstr "M u s i k L a u t s t ä r k e" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" -msgstr "M a u s G e s c h w i n d i g k e i t" +msgid "m o v e m e n t s p e e d" +msgstr "B e w e g u n g s G e s c h w i n d i g k e i t" #: src/MenuGL.cpp:79 msgid "q u i t" @@ -838,7 +816,7 @@ msgstr "Fisch im Faß" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "Feigling" #: src/MenuGL.cpp:164 @@ -909,57 +887,37 @@ msgid "high" msgstr "hoch" -#: src/MenuGL.cpp:483 +#: src/MenuGL.cpp:481 #, c-format -msgid "512x384" -msgstr "512x384" - -#: src/MenuGL.cpp:484 -#, c-format -msgid "640x480" -msgstr "640x480" +msgid "%dx%d" +msgstr "%dx%d" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "800x600" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "1024x768" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "1280x960" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "wahr" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "falsch" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- Fehler bei Nutzung des Vollbildmodus ----" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" msgstr "---- Fehler bei Nutzung des Fenstermodus ----" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- du musst Level %d fertig haben um Level %d auszuwählen ----" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" msgstr "---- Fehler beim setzen der Auflösung ----" @@ -989,8 +947,7 @@ #: src/StatusDisplay.cpp:686 msgid "let super shields pass by for an extra life!" -msgstr "" -"Lasse Super Schutzschilde an dir vorbei, um ein extra Leben zu erhalten!" +msgstr "Lasse Super Schutzschilde an dir vorbei, um ein extra Leben zu erhalten!" #: src/TextFTGL.cpp:35 #, c-format Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/es.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/es.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/es.po chromium-bsu-0.9.15/po/es.po --- chromium-bsu-0.9.14.1/po/es.po 2010-06-19 09:34:24.000000000 +0000 +++ chromium-bsu-0.9.15/po/es.po 2011-02-14 03:55:27.000000000 +0000 @@ -4,16 +4,16 @@ # Jordi Ferré Nos , 2010. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" "PO-Revision-Date: 2010-05-31 10:21+0200\n" "Last-Translator: Jordi Ferré Nos \n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.5.2\n" @@ -63,8 +63,7 @@ " use_cdrom enabled. Set to '0' in the configuration file to disable.\n" msgstr "" "\n" -" use_cdrom esta activado. Ponga '0' en el archivo de configuración para " -"desactivar.\n" +" use_cdrom esta activado. Ponga '0' en el archivo de configuración para desactivar.\n" #: src/Audio.cpp:155 #, c-format @@ -72,8 +71,7 @@ " Press the 'N' key to skip to next CD track during a game.\n" "\n" msgstr "" -" Pulse la tecla 'N' para saltar a la próxima pista de audio durante el " -"juego.\n" +" Pulse la tecla 'N' para saltar a la próxima pista de audio durante el juego.\n" "\n" #: src/Audio.cpp:166 @@ -157,7 +155,7 @@ "Renderizado : %s\n" "Versión : %s\n" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" msgstr "------------------------------------------------------------\n" @@ -279,9 +277,7 @@ #: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" -msgstr "" -"ADVERTENCIA: El soporte de la lista de reproducción no esta compilada en " -"(AudioOpenAL.cpp): %s\n" +msgstr "ADVERTENCIA: El soporte de la lista de reproducción no esta compilada en (AudioOpenAL.cpp): %s\n" #: src/AudioOpenAL.cpp:959 #, c-format @@ -318,22 +314,22 @@ msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" msgstr "ERROR inicializando el audio - AudioSDLMixer::initSound()\n" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" msgstr "ADVERTENCIA: Config::init() ya ha sido llamado.\n" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" msgstr "ADVERTENCIA: no pudo leer el archivo de configuración (%s)\n" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" msgstr "escribio archivo de configuración(%s)\n" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" msgstr "ADVERTENCIA: no pudo escribir archivo de configuración (%s)\n" @@ -403,32 +399,37 @@ msgid "%p <--%p--> %p\n" msgstr "%p <--%p--> %p\n" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "nadie" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" msgstr "ADVERTENCIA: HiScore::init() ha sido conseguido.\n" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" msgstr "ADVERTENCIA: no se pudo escribir el archivo de puntuacion(%s)\n" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "ADVERTENCIA: archivo de resultados vacío (%s)\n" + +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "ADVERTENCIA: no se pudo leer el archivo del resultado(%s)\n" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" msgstr "mejores puntuaciones:\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" @@ -470,37 +471,37 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "!! ERROR !! - " -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "Extensiones:" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" msgstr "initGL()\n" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" msgstr "error al cargar el texto: %s\n" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" msgstr "error al cargar el texto\n" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" msgstr "!!MainGL::drawGL() HUH?\n" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" @@ -511,7 +512,7 @@ "\n" "%d" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -524,11 +525,11 @@ "\n" "%d" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "has perdido" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -545,52 +546,52 @@ "c o m p l e t a d o\n" " \n" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ERROR!!! OpenGL error: %s\n" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" msgstr "key = %d\n" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" msgstr "No se puede iniciar SDL: %s\n" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" msgstr "SDL inicializadas.\n" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" msgstr "número de joysticks = %d\n" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" msgstr " joystick 0 = %p\n" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" msgstr "joysticks no encontrados\n" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "No pudo establecer el modo video: %s\n" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -603,22 +604,22 @@ "Renderizado : %s\n" "Versión : %s\n" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -634,26 +635,26 @@ "CONSEJO: El juego no puede mantenerse a 50 frames por segundo.\n" " Reduce la resolución del monitor o baja los detalles gráficos.\n" " -O BIEN-\n" -" Asegurate que no esta funcionando ningún monitoreo del sistema.\n" +" Asegúrate de que no este funcionando ningún monitoreo del sistema.\n" " herramientas (como 'top', 'xosview', etc.) Este tipo de herramientas\n" -" puden complicar que se mantenga un ratio de velocidad estable.\n" +" pueden complicar que se mantenga un ratio de velocidad estable.\n" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" msgstr "salida.\n" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ERROR!!! SDL error '%s'\n" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " msgstr "modo de video establecido" -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d profundidad=%d)\n" @@ -722,69 +723,48 @@ msgid "focus\n" msgstr "focus\n" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" msgstr "clave '%s' apret\n" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" #: src/MenuGL.cpp:43 -msgid "" -" d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o " -"u !" +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" msgstr " n o p e r m i t a s p a s a r a n i n g u n e n e m i g o " #: src/MenuGL.cpp:44 -msgid "" -" e v e r y e n e m y t h a t g e t s b y c o s t s y o u a " -"l i f e !" -msgstr "" -" c a d a e n e m i g o q u e p a s a t e c u e s t a u n a v i d a" +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " c a d a e n e m i g o q u e p a s a t e c u e s t a u n a v i d a" #: src/MenuGL.cpp:45 -msgid "" -" a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o " -"i n t s !" -msgstr "" -" p e r m i t e p a s a r l o s p o w e r u p s p a r a g a n a r m a " -"s p u n t o s " +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " p e r m i t e p a s a r l o s p o w e r u p s p a r a g a n a r m a s p u n t o s " #: src/MenuGL.cpp:46 msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" -msgstr "" -" e s t r e l l a t e c o n t r a l o s e n e m i g o s p a r a d e s t " -"r u i r l o s" +msgstr " e s t r e l l a t e c o n t r a l o s e n e m i g o s p a r a d e s t r u i r l o s" #: src/MenuGL.cpp:47 msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" -msgstr "" -" t o c a e l b o t o n d e r e c h o d e l r a t o n d o s v e c e s " -"p a r a a u t o d e s t r u i r t e" +msgstr " t o c a e l b o t o n d e r e c h o d e l r a t o n d o s v e c e s p a r a a u t o d e s t r u i r t e" #: src/MenuGL.cpp:48 -msgid "" -" s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i " -"t i o n !" -msgstr "" -" a u t o d e s t r u y e t e p a r a p r e s e r v a r l a m u n i c i " -"o n ! " +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " a u t o d e s t r u y e t e p a r a p r e s e r v a r l a m u n i c i o n ! " #: src/MenuGL.cpp:49 -msgid "" -" d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu." -"sf.net/" -msgstr "" -" d e s c a r g a d e C h r o m i u m B. S. U. a http://chromium-" -"bsu.sf.net/" +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " d e s c a r g a d e C h r o m i u m B. S. U. a http://chromium-bsu.sf.net/" #: src/MenuGL.cpp:70 msgid "n e w g a m e" @@ -819,8 +799,8 @@ msgstr "v o l u m e n d e l a m u s i c a" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" -msgstr "v e l o c i d a d d e l r a t o n" +msgid "m o v e m e n t s p e e d" +msgstr "v e l o c i d a d d e m o v i m i e n t o" #: src/MenuGL.cpp:79 msgid "q u i t" @@ -841,7 +821,7 @@ msgstr "pescados en barril" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "debiles" #: src/MenuGL.cpp:164 @@ -912,59 +892,37 @@ msgid "high" msgstr "alto" -#: src/MenuGL.cpp:483 +#: src/MenuGL.cpp:481 #, c-format -msgid "512x384" -msgstr "512x384" - -#: src/MenuGL.cpp:484 -#, c-format -msgid "640x480" -msgstr "640x480" +msgid "%dx%d" +msgstr "%dx%d" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "800x600" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "1024x768" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "1280x960" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "cierto" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "falso" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- error cambiando a pantalla completa ----" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" msgstr "---- error cambiando a modo ventana ----" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" -msgstr "" -"---- debes completar el nivel %d antes de que pueda seleccionar el nivel %d " -"----" +msgstr "---- debes completar el nivel %d antes de que pueda seleccionar el nivel %d ----" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" msgstr "---- error cambiando el tamaño de pantalla ----" Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/fr.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/fr.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/fr.po chromium-bsu-0.9.15/po/fr.po --- chromium-bsu-0.9.14.1/po/fr.po 2010-06-19 09:34:24.000000000 +0000 +++ chromium-bsu-0.9.15/po/fr.po 2011-02-14 03:55:27.000000000 +0000 @@ -5,12 +5,13 @@ # msgid "" msgstr "" -"Project-Id-Version: Chromium BSU\n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" "PO-Revision-Date: 2010-04-13 16:56+0200\n" "Last-Translator: Emmanuel Trillaud \n" "Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -62,8 +63,7 @@ " use_cdrom enabled. Set to '0' in the configuration file to disable.\n" msgstr "" "\n" -" use_cdrom activée. Initialiser à '0' dans le fichier de configuration pour " -"désactiver.\n" +" use_cdrom activée. Initialiser à '0' dans le fichier de configuration pour désactiver.\n" #: src/Audio.cpp:155 #, c-format @@ -71,8 +71,7 @@ " Press the 'N' key to skip to next CD track during a game.\n" "\n" msgstr "" -"Appuyer sur la touche « N » pour sauter la prochaine piste du CD pendant le " -"jeu.\n" +"Appuyer sur la touche « N » pour sauter la prochaine piste du CD pendant le jeu.\n" "\n" #: src/Audio.cpp:166 @@ -155,7 +154,7 @@ "Rendu : %s\n" "Version : %s\n" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" msgstr "------------------------------------------------------------\n" @@ -268,8 +267,7 @@ #: src/AudioOpenAL.cpp:824 msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" -msgstr "" -"AudioOpenAL::setMusicIndex -- après avoir initialisé le tampon source à 0" +msgstr "AudioOpenAL::setMusicIndex -- après avoir initialisé le tampon source à 0" #: src/AudioOpenAL.cpp:859 msgid "AudioOpenAL::setMusicIndex -- end" @@ -278,8 +276,7 @@ #: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" -msgstr "" -"AVERTISSEMENT : PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "AVERTISSEMENT : PlayList support not compiled in (AudioOpenAL.cpp): %s\n" #: src/AudioOpenAL.cpp:959 #, c-format @@ -299,8 +296,7 @@ #: src/AudioOpenAL.cpp:1005 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" -msgstr "" -"ERREUR: Impossible d'allouer de la mémoire dans AudioOpenAL::loadVorbis\n" +msgstr "ERREUR: Impossible d'allouer de la mémoire dans AudioOpenAL::loadVorbis\n" #: src/AudioOpenAL.cpp:1011 #, c-format @@ -315,25 +311,24 @@ #: src/AudioSDLMixer.cpp:65 #, c-format msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" -msgstr "" -"ERREUR lors de l'initialisation de l'audio - AudioSDLMixer::initSound()\n" +msgstr "ERREUR lors de l'initialisation de l'audio - AudioSDLMixer::initSound()\n" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" msgstr "AVERTISSEMENT : Config::init() a déjà été appelé.\n" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" msgstr "AVERTISSEMENT : impossible de lire le fichier de configuration (%s)\n" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" msgstr "écriture du fichier de configuration (%s)\n" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" msgstr "AVERTISSEMENT : impossible d'écrire le fichier de configuration (%s)\n" @@ -403,32 +398,37 @@ msgid "%p <--%p--> %p\n" msgstr "%p <--%p--> %p\n" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "personne" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" msgstr "AVERTISSEMENT : HiScore::init() a déjà été exécuté.\n" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" msgstr "AVERTISSEMENT : impossible d'écrire sur le fichier des scores (%s)\n" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:328 +#, fuzzy, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "AVERISSEMENT : impossible de lire de fichier des scores (%s)\n" + +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "AVERISSEMENT : impossible de lire de fichier des scores (%s)\n" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" msgstr "meilleurs scores :\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" @@ -470,37 +470,37 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "!! ERREUR !! - " -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "Extensions :" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" msgstr "initGL()\n" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" msgstr "erreur pendant le chargement des polices : %s\n" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" msgstr "erreur pendant le chargement des polices\n" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" msgstr "!!MainGL::drawGL() HEIN?\n" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" @@ -511,7 +511,7 @@ "\n" "%d" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -524,11 +524,11 @@ "\n" "%d" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "p e r d a n t" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -545,52 +545,52 @@ "c o m p l e t\n" " \n" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ERREUR!!! Erreur OpenGL : %s\n" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" msgstr "touche = %d\n" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" msgstr "Impossible d'initialiser SDL: %s\n" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" msgstr "SDL initialisé.\n" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" msgstr "nb joysticks = %d\n" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" msgstr " joystick 0 = %p\n" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" msgstr "aucun joysticks trouvé\n" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Impossible n'initialiser le mode vidéo : %s\n" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -603,22 +603,22 @@ "Rendu : %s\n" "Version : %s\n" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -639,22 +639,22 @@ " (comme 'top', 'xosview', etc.) n'est en cours d'exécution.\n" " Elles rendent difficile de maintenir un bon taux de frames.\n" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" msgstr "exit.\n" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ERREUR!!! SDL erreur '%s'\n" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " msgstr "mode vidéo initialisé " -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d profondeur=%d)\n" @@ -723,70 +723,48 @@ msgid "focus\n" msgstr "focus\n" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" msgstr "touche '%s' préssée\n" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" #: src/MenuGL.cpp:43 -msgid "" -" d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o " -"u !" +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" msgstr " n e l a i s s e z p a s s e z -a u c u n- e n n e m i !" #: src/MenuGL.cpp:44 -msgid "" -" e v e r y e n e m y t h a t g e t s b y c o s t s y o u a " -"l i f e !" -msgstr "" -" c h a q u e e n e m i q u i p a s s e v o u s c o u t e u n e " -"v i e !" +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " c h a q u e e n e m i q u i p a s s e v o u s c o u t e u n e v i e !" #: src/MenuGL.cpp:45 -msgid "" -" a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o " -"i n t s !" -msgstr "" -" l a i s s e r p a s s e r l e s p o w e r - u p p o u r f a i r " -"e l e p l e i n d e p o i n t s !" +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " l a i s s e r p a s s e r l e s p o w e r - u p p o u r f a i r e l e p l e i n d e p o i n t s !" #: src/MenuGL.cpp:46 msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" -msgstr "" -" c r a s h e r v o u s d a n s l e s e n ne m i s p o u r l e " -"s d e t r u i r e !" +msgstr " c r a s h e r v o u s d a n s l e s e n ne m i s p o u r l e s d e t r u i r e !" #: src/MenuGL.cpp:47 msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" -msgstr "" -" d o u b l e - c l i q u e z d r o i t p o u r v o u s a u t o - d " -"e t r u i r e !" +msgstr " d o u b l e - c l i q u e z d r o i t p o u r v o u s a u t o - d e t r u i r e !" #: src/MenuGL.cpp:48 -msgid "" -" s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i " -"t i o n !" -msgstr "" -" a u t o - d e t r u i s e z v o u s p o u r p r é s e r v e r v o " -"s m u n i t i o n s" +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " a u t o - d e t r u i s e z v o u s p o u r p r é s e r v e r v o s m u n i t i o n s" #: src/MenuGL.cpp:49 -msgid "" -" d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu." -"sf.net/" -msgstr "" -" t é l e c h a r g e r C h r o m i u m B. S. U. d e p u i s http://" -"chromium-bsu.sf.net/" +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " t é l e c h a r g e r C h r o m i u m B. S. U. d e p u i s http://chromium-bsu.sf.net/" #: src/MenuGL.cpp:70 msgid "n e w g a m e" @@ -821,7 +799,8 @@ msgstr "v o l u m e m u s i q u e" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" +#, fuzzy +msgid "m o v e m e n t s p e e d" msgstr "v i t e s s e s o u r i s" #: src/MenuGL.cpp:79 @@ -831,8 +810,7 @@ #: src/MenuGL.cpp:143 src/MenuGL.cpp:418 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" -msgstr "" -"ATTENTION : utilisé du texte 'thin' pour améliorer le taux de frame...\n" +msgstr "ATTENTION : utilisé du texte 'thin' pour améliorer le taux de frame...\n" #: src/MenuGL.cpp:147 #, c-format @@ -844,7 +822,7 @@ msgstr "poisson dans un bocal" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "poule mouillée" #: src/MenuGL.cpp:164 @@ -915,58 +893,37 @@ msgid "high" msgstr "haut" -#: src/MenuGL.cpp:483 +#: src/MenuGL.cpp:481 #, c-format -msgid "512x384" -msgstr "512x384" - -#: src/MenuGL.cpp:484 -#, c-format -msgid "640x480" -msgstr "640x480" +msgid "%dx%d" +msgstr "" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "800x600" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "1024x768" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "1280x960" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "vrai" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "faux" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- erreur au passage en mode plein écran ----" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" msgstr "---- erreur à l'initialisation du mode de fenêtrage ----" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" -msgstr "" -"---- vous devez finir le niveau %d avant de pouvoir sélectionner %d ----" +msgstr "---- vous devez finir le niveau %d avant de pouvoir sélectionner %d ----" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" msgstr "---- erreur à l'initialisation de la taille de l'écran ----" Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/it.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/it.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/it.po chromium-bsu-0.9.15/po/it.po --- chromium-bsu-0.9.14.1/po/it.po 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15/po/it.po 2011-02-14 03:55:27.000000000 +0000 @@ -0,0 +1,1018 @@ +# This file is put in the public domain. +# +# Valter Mura , 2010. +msgid "" +msgstr "" +"Project-Id-Version: Chromium B.S.U.\n" +"Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" +"PO-Revision-Date: 2010-10-08 17:02+0200\n" +"Last-Translator: Valter Mura \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/Audio.cpp:110 +msgid "audio" +msgstr "audio" + +#: src/Audio.cpp:111 +msgid "data" +msgstr "dati" + +#: src/Audio.cpp:113 +#, c-format +msgid "UNKNOWN(type=%d)" +msgstr "SCONOSCIUTO(tipo=%d)" + +#: src/Audio.cpp:124 +#, c-format +msgid "%d CDROM drive(s).\n" +msgstr "%d dispositivo/i CDROM.\n" + +#: src/Audio.cpp:135 +#, c-format +msgid "Tracks: %d\n" +msgstr "Tracce: %d\n" + +#: src/Audio.cpp:139 +#, c-format +msgid "track %2d: %s\n" +msgstr "traccia %2d: %s\n" + +#: src/Audio.cpp:148 +#, c-format +msgid "" +"\n" +" Data track(s) only. CD audio not available.\n" +"\n" +msgstr "" +"\n" +" Solo tracce dati. Audio CD non disponibile.\n" +"\n" + +#: src/Audio.cpp:154 +#, c-format +msgid "" +"\n" +" use_cdrom enabled. Set to '0' in the configuration file to disable.\n" +msgstr "" +"\n" +" use_cdrom abilitato. Per disabilitarlo, imposta a '0' nel file di configurazione.\n" + +#: src/Audio.cpp:155 +#, c-format +msgid "" +" Press the 'N' key to skip to next CD track during a game.\n" +"\n" +msgstr "" +"Premere il pulsante 'N' per saltare alla prossima traccia CD durante il gioco.\n" +"\n" + +#: src/Audio.cpp:166 +#, c-format +msgid "ERROR! Could not access CDROM device %d : %s\n" +msgstr "ERRORE! Non è possibile accedere al dispositivo CDROM %d : %s\n" + +#: src/Audio.cpp:209 +#, c-format +msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" +msgstr "Errore CDROM in AudioOpenAL::pauseGameMusic(%d)\n" + +#: src/Audio.cpp:210 +#, c-format +msgid "CDROM status = %d\n" +msgstr "Stato CDROM = %d\n" + +#: src/Audio.cpp:298 +#, c-format +msgid "Audio::setMusicIndex(%d)\n" +msgstr "Audio::setMusicIndex(%d)\n" + +#: src/Audio.cpp:315 +#, c-format +msgid "track %d is data - trying next track...\n" +msgstr "la traccia %d sono dati - tento la prossima traccia...\n" + +#: src/AudioOpenAL.cpp:149 +#, c-format +msgid "alAttenuationScale == 0. Kludge it.\n" +msgstr "" + +#: src/AudioOpenAL.cpp:162 +#, c-format +msgid "AudioOpenAL::Audio done\n" +msgstr "AudioOpenAL::Audio fatto\n" + +#: src/AudioOpenAL.cpp:170 +#, c-format +msgid "stopping OpenAL..." +msgstr "sto interrompendo OpenAL..." + +#: src/AudioOpenAL.cpp:182 +msgid "AudioOpenAL::~Audio()" +msgstr "AudioOpenAL::~Audio()" + +#: src/AudioOpenAL.cpp:203 +#, c-format +msgid "done.\n" +msgstr "fatto.\n" + +#: src/AudioOpenAL.cpp:249 +#, c-format +msgid "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENTION !! - one or more errors were encountered during audio check.\n" +"!! Audio will be disabled.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +msgstr "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENZIONE!! - sono stati riscontrati uno o più errori durante la verifica audio.\n" +"!! L'audio sarà disabilitato.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + +#: src/AudioOpenAL.cpp:269 +#, c-format +msgid "AudioOpenAL::initSound() begin...\n" +msgstr "AudioOpenAL::initSound() avvio...\n" + +#: src/AudioOpenAL.cpp:273 +#, c-format +msgid "" +"-OpenAL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenAL-----------------------------------------------------\n" +"Produttore : %s\n" +"Renderer : %s\n" +"Versione : %s\n" + +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 +#, c-format +msgid "------------------------------------------------------------\n" +msgstr "------------------------------------------------------------\n" + +#: src/AudioOpenAL.cpp:311 +#, c-format +msgid "Audio.cpp - init %s" +msgstr "Audio.cpp - init %s" + +#: src/AudioOpenAL.cpp:324 +#, c-format +msgid "Audio.cpp - init explosion %d" +msgstr "Audio.cpp - init explosion %d" + +#: src/AudioOpenAL.cpp:337 +#, c-format +msgid "Audio.cpp - init exploPop %d" +msgstr "Audio.cpp - init exploPop %d" + +#: src/AudioOpenAL.cpp:350 +msgid "Audio.cpp - initSound complete." +msgstr "Audio.cpp - initSound completato." + +#: src/AudioOpenAL.cpp:430 +#, c-format +msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" +msgstr "AudioOpenAL::setMusicMode(modalità SoundType)\n" + +#: src/AudioOpenAL.cpp:465 +#, c-format +msgid "AudioOpenAL::setSoundVolume(%f)\n" +msgstr "AudioOpenAL::setSoundVolume(%f)\n" + +#: src/AudioOpenAL.cpp:508 +#, c-format +msgid "Music volume = %f\n" +msgstr "Volume musica = %f\n" + +#: src/AudioOpenAL.cpp:524 +#, c-format +msgid "" +"\n" +"ERROR! - sound enumerant index %d does not have valid filename!\n" +msgstr "" +"\n" +"ERRORE! - l'enumeratore del suono con indice %d non ha un nome di file valido!\n" + +#: src/AudioOpenAL.cpp:547 +#, c-format +msgid "alutLoadWAVFile(\"%s\",...);\n" +msgstr "alutLoadWAVFile(\"%s\",...);\n" + +#: src/AudioOpenAL.cpp:563 +#, c-format +msgid "ERROR!! <%s> alGetError() = %s\n" +msgstr "ERRORE!! <%s> alGetError() = %s\n" + +#: src/AudioOpenAL.cpp:568 +#, c-format +msgid "ERROR!! <%s> alcGetError() = %s\n" +msgstr "ERRORE!! <%s> alcGetError() = %s\n" + +#: src/AudioOpenAL.cpp:573 +#, c-format +msgid "ERROR!! <%s> alutGetError() = %s\n" +msgstr "ERRORE!! <%s> alutGetError() = %s\n" + +#: src/AudioOpenAL.cpp:732 +#, c-format +msgid "ERROR: filename too long: \"%s\", line %d\n" +msgstr "ERRORE: nome del file troppo lungo: \"%s\", riga %d\n" + +#: src/AudioOpenAL.cpp:750 +#, c-format +msgid "WARNING: MP3 support not available: \"%s\", line %d\n" +msgstr "ATTENZIONE: supporto MP3 non disponibile: \"%s\", riga %d\n" + +#: src/AudioOpenAL.cpp:761 +#, c-format +msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" +msgstr "ATTENZIONE: supporto Ogg/Vorbis non disponibile: \"%s\", riga %d\n" + +#: src/AudioOpenAL.cpp:765 +#, c-format +msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" +msgstr "ATTENZIONE: tipo di file non riconosciuto: \"%s\": \"%s\", riga %d\n" + +#: src/AudioOpenAL.cpp:778 +#, c-format +msgid "music playlist:\n" +msgstr "scaletta musicale:\n" + +#: src/AudioOpenAL.cpp:781 +#, c-format +msgid " %2d : %s\n" +msgstr " %2d : %s\n" + +#: src/AudioOpenAL.cpp:783 +#, c-format +msgid "loaded %s\n" +msgstr "caricato %s\n" + +#: src/AudioOpenAL.cpp:808 +msgid "AudioOpenAL::setMusicIndex -- begin" +msgstr "AudioOpenAL::setMusicIndex -- inizio" + +#: src/AudioOpenAL.cpp:821 +msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- prima dell'impostazione del buffer di origine a 0" + +#: src/AudioOpenAL.cpp:824 +msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- dopo l'impostazione del buffer di origine a 0" + +#: src/AudioOpenAL.cpp:859 +msgid "AudioOpenAL::setMusicIndex -- end" +msgstr "AudioOpenAL::setMusicIndex -- fine" + +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#, c-format +msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "ATTENZIONE: supporto PlayList non compilato in (AudioOpenAL.cpp): %s\n" + +#: src/AudioOpenAL.cpp:959 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" +msgstr "ERRORE: impossibile allocare la memoria in AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:965 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:973 +#, c-format +msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" +msgstr "ERRORE: alutLoadMP3() in AudioOpenAL::loadMP3 non riuscito\n" + +#: src/AudioOpenAL.cpp:1005 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" +msgstr "ERRORE: impossibile allocare la memoria in AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1011 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1019 +#, c-format +msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" +msgstr "ERRORE: alutLoadVorbis() in AudioOpenAL::loadVorbis non riuscito\n" + +#: src/AudioSDLMixer.cpp:65 +#, c-format +msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" +msgstr "ERRORE inizializzando l'audio - AudioSDLMixer::initSound()\n" + +#: src/Config.cpp:114 +#, c-format +msgid "WARNING: Config::init() has already been called.\n" +msgstr "ATTENZIONE: Config::init() è già stato chiamato.\n" + +#: src/Config.cpp:243 +#, c-format +msgid "WARNING: could not read config file (%s)\n" +msgstr "ATTENZIONE: impossibile leggere il file di configurazione (%s)\n" + +#: src/Config.cpp:302 +#, c-format +msgid "wrote config file (%s)\n" +msgstr "file di configurazione scritto (%s)\n" + +#: src/Config.cpp:307 +#, c-format +msgid "WARNING: could not write config file (%s)\n" +msgstr "ATTENZIONE: impossibile scrivere il file di configurazione (%s)\n" + +#: src/EnemyAircraft.cpp:111 +#, c-format +msgid "%d EnemyAircraft allocated\n" +msgstr "%d EnemyAircraft allocati\n" + +#: src/EnemyAircraft_Straight.cpp:103 +#, fuzzy, c-format +msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" + +#: src/EnemyFleet.cpp:243 +#, c-format +msgid "num enemies on screen = %d\n" +msgstr "numero di nemici sullo schermo = %d\n" + +#: src/Global.cpp:114 +#, c-format +msgid "WARNING: Global::init() has already been called.\n" +msgstr "ATTENZIONE: Global::init() è già stato chiamato.\n" + +#: src/Global.cpp:211 +#, c-format +msgid "Starting up..." +msgstr "Avvio in corso..." + +#: src/Global.cpp:242 +#, c-format +msgid "...startup complete.\n" +msgstr "...avvio completato.\n" + +#: src/Global.cpp:249 +#, c-format +msgid "Shutting down...\n" +msgstr "Spegnimento in corso...\n" + +#: src/Global.cpp:262 +#, c-format +msgid "...shutdown complete.\n" +msgstr "...spegnimento completato.\n" + +#: src/Global.cpp:269 +#, c-format +msgid "deleteTextures()\n" +msgstr "deleteTextures()\n" + +#: src/Global.cpp:289 +#, c-format +msgid "Global::loadTextures()\n" +msgstr "Global::loadTextures()\n" + +#: src/Global.cpp:352 +#, c-format +msgid "Generating random sequences\n" +msgstr "Generazione delle sequenze casuali\n" + +#: src/HeroAmmo.cpp:167 +#, c-format +msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" +msgstr "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" + +#: src/HeroAmmo.cpp:190 +#, c-format +msgid "%p <--%p--> %p\n" +msgstr "%p <--%p--> %p\n" + +#: src/HiScore.cpp:58 +#, c-format +msgid "nobody" +msgstr "nessuno" + +#: src/HiScore.cpp:83 +#, c-format +msgid "WARNING: HiScore::init() has already been called.\n" +msgstr "ATTENZIONE: HiScore::init() è già stato chiamato.\n" + +#: src/HiScore.cpp:241 +#, c-format +msgid "WARNING: could not write score file (%s)\n" +msgstr "ATTENZIONE: impossibile scrivere il file del punteggio (%s)\n" + +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "ATTENZIONE: file del punteggio vuoto (%s)\n" + +#: src/HiScore.cpp:350 +#, c-format +msgid "WARNING: could not read score file (%s)\n" +msgstr "ATTENZIONE: impossibile leggere il file del punteggio (%s)\n" + +#: src/HiScore.cpp:442 +#, c-format +msgid "high scores:\n" +msgstr "Punteggi migliori:\n" + +#: src/HiScore.cpp:448 +#, c-format +msgid "%02d/%02d/%04d %16s %d\n" +msgstr "%02d/%02d/%04d %16s %d\n" + +#: src/main.cpp:118 +#, c-format +msgid "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. options\n" +"--------------------------------------------------\n" +" -f/--fullscreen : run in fullscreen mode\n" +" -w/--window : run in windowed mode\n" +" -v/--vidmode : mode 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : do not initialize audio\n" +" -nb/--noblend : disable blending (OpenGL)\n" +" -nt/--notexborder : do not set tex border color (OpenGL)\n" +"--------------------------------------------------\n" +"\n" +msgstr "" +"\n" +"--------------------------------------------------\n" +"Opzioni Chromium B.S.U.\n" +"--------------------------------------------------\n" +" -f/--fullscreen : avvia in modalità a tutto schermo\n" +" -w/--window : avvia in modalità finestra\n" +" -v/--vidmode : modalità 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : non inizializzare audio\n" +" -nb/--noblend : disabilita sfumatura (OpenGL)\n" +" -nt/--notexborder : non impostare trama colore bordo (OpenGL)\n" +"--------------------------------------------------\n" +"\n" + +#: src/main.cpp:230 +#, c-format +msgid "!! ERROR !! - " +msgstr "!! ERRORE !! - " + +#: src/main.cpp:254 +#, c-format +msgid "Extensions :" +msgstr "Estensioni:" + +#: src/MainGL.cpp:86 +#, c-format +msgid "initGL()\n" +msgstr "initGL()\n" + +#: src/MainGL.cpp:148 +#, c-format +msgid "error loading font: %s\n" +msgstr "errore durante il caricamento carattere: %s\n" + +#: src/MainGL.cpp:153 +#, c-format +msgid "error loading font\n" +msgstr "errore durante il caricamento carattere\n" + +#: src/MainGL.cpp:183 +#, c-format +msgid "!!MainGL::drawGL() HUH?\n" +msgstr "!!MainGL::drawGL() HUH?\n" + +#: src/MainGL.cpp:311 +#, c-format +msgid "" +"new high score!\n" +"\n" +"%d" +msgstr "" +"nuovo record!\n" +"\n" +"%d" + +#: src/MainGL.cpp:316 +#, c-format +msgid "" +"n o t b a d !\n" +"rank : %d\n" +"\n" +"%d" +msgstr "" +"n o n m a l e !\n" +"posizione: %d\n" +"\n" +"%d" + +#: src/MainGL.cpp:321 +msgid "l o s e r" +msgstr "h a i p e r s o" + +#: src/MainGL.cpp:379 +#, c-format +msgid "" +"congratulations!\n" +" \n" +"l e v e l\n" +" %d \n" +"c o m p l e t e\n" +" \n" +msgstr "" +"congratulazioni!\n" +" \n" +"l i v e l l o\n" +" %d \n" +"c o m p l e t a t o\n" +" \n" + +#: src/MainGLUT.cpp:77 +#, c-format +msgid "MainGLUT::run()\n" +msgstr "MainGLUT::run()\n" + +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#, c-format +msgid "ERROR!!! OpenGL error: %s\n" +msgstr "ERRORE!!! Errore OpenGL: %s\n" + +#: src/MainGLUT.cpp:235 +#, c-format +msgid "key = %d\n" +msgstr "chiave = %d\n" + +#: src/MainSDL.cpp:74 +#, c-format +msgid "Couldn't initialize SDL: %s\n" +msgstr "Impossibile inizializzare SDL: %s\n" + +#: src/MainSDL.cpp:77 +#, c-format +msgid "SDL initialized.\n" +msgstr "SDL inizializzato.\n" + +#: src/MainSDL.cpp:83 +#, c-format +msgid "num joysticks = %d\n" +msgstr "numero joystick = %d\n" + +#: src/MainSDL.cpp:85 +#, c-format +msgid " joystick 0 = %p\n" +msgstr " joystick 0 = %p\n" + +#: src/MainSDL.cpp:91 +#, c-format +msgid "no joysticks found\n" +msgstr "nessun joystick trovato\n" + +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#, c-format +msgid "Couldn't set video mode: %s\n" +msgstr "Impossibile impostare la modalità video: %s\n" + +#: src/MainSDL.cpp:124 +#, c-format +msgid "" +"-OpenGL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenGL-----------------------------------------------------\n" +"Produttore : %s\n" +"Renderer : %s\n" +"Versione : %s\n" + +#: src/MainSDL.cpp:217 +#, fuzzy, c-format +msgid "init----> %3.2ffps gameSpeed = %g\n" +msgstr "init----> %3.2ffps gameSpeed = %g\n" + +#: src/MainSDL.cpp:224 +#, fuzzy, c-format +msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" + +#: src/MainSDL.cpp:237 +#, fuzzy, c-format +msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" + +#: src/MainSDL.cpp:259 +#, c-format +msgid "" +"%d speed adjustments required.\n" +"NOTE: The game was not able to maintain a steady 50 frames per\n" +" second. You should consider reducing your screen resolution\n" +" or lowering the graphics detail setting.\n" +" -OR-\n" +" make sure that you aren't running any system monitoring\n" +" tools (like 'top', 'xosview', etc.) These kinds of tools\n" +" can make it difficult to maintain a steady frame rate.\n" +msgstr "" +"%d aggiustamenti della velocità richiesti.\n" +"NOTA: Il gioco non ha potuto mantenere una stabilità di 50 fotogrammi per\n" +" secondi. Considera la riduzione della risoluzione dello schermo\n" +" oppure la riduzione delle impostazioni di dettaglio grafico.\n" +" -OPPURE-\n" +" assicurati di non avere in esecuzione nessuno strumento di misurazione del sistema\n" +" (come 'top', 'xosview', etc.) Questo genere di strumenti\n" +" può rendere difficile mantenere una velocità di aggiornamento costante.\n" + +#: src/MainSDL.cpp:271 +#, c-format +msgid "exit.\n" +msgstr "uscita.\n" + +#: src/MainSDL.cpp:296 +#, c-format +msgid "ERROR!!! SDL error '%s'\n" +msgstr "ERRORE!!! Errore SDL '%s'\n" + +#: src/MainSDL.cpp:354 +#, c-format +msgid "video mode set " +msgstr "modalità video impostata" + +#: src/MainSDL.cpp:361 +#, fuzzy, c-format +msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" + +#: src/MainSDL_Event.cpp:40 +#, c-format +msgid "%-5d SDL_ACTIVEEVENT \n" +msgstr "%-5d SDL_ACTIVEEVENT \n" + +#: src/MainSDL_Event.cpp:41 +#, c-format +msgid "%-5d SDL_KEYDOWN \n" +msgstr "%-5d SDL_KEYDOWN \n" + +#: src/MainSDL_Event.cpp:42 +#, c-format +msgid "%-5d SDL_KEYUP \n" +msgstr "%-5d SDL_KEYUP \n" + +#: src/MainSDL_Event.cpp:43 +#, c-format +msgid "%-5d SDL_MOUSEMOTION \n" +msgstr "%-5d SDL_MOUSEMOTION \n" + +#: src/MainSDL_Event.cpp:44 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONDOWN \n" +msgstr "%-5d SDL_MOUSEBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:45 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONUP \n" +msgstr "%-5d SDL_MOUSEBUTTONUP \n" + +#: src/MainSDL_Event.cpp:46 +#, c-format +msgid "%-5d SDL_JOYBUTTONDOWN \n" +msgstr "%-5d SDL_JOYBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:47 +#, c-format +msgid "%-5d SDL_JOYBUTTONUP \n" +msgstr "%-5d SDL_JOYBUTTONUP \n" + +#: src/MainSDL_Event.cpp:212 +#, c-format +msgid "MainSDL::getEvent HUH?\n" +msgstr "MainSDL::getEvent HUH?\n" + +#: src/MainSDL_Event.cpp:222 +#, c-format +msgid "" +"buffer = \"%s\n" +"\"" +msgstr "" +"buffer = \"%s\n" +"\"" + +#: src/MainSDL_Event.cpp:243 +#, c-format +msgid "mouse active" +msgstr "mouse attivo" + +#: src/MainSDL_Event.cpp:251 +#, c-format +msgid "focus\n" +msgstr "fuoco\n" + +#: src/MainSDL_Event.cpp:403 +#, c-format +msgid "key '%s' pressed\n" +msgstr "tasto '%s' premuto\n" + +#: src/MainSDL_Event.cpp:404 +#, c-format +msgid "game->gameFrame = %d\n" +msgstr "game->gameFrame = %d\n" + +#: src/MainSDL_Event.cpp:534 +#, c-format +msgid "MainSDL::grabMouse(%d)\n" +msgstr "MainSDL::grabMouse(%d)\n" + +#: src/MenuGL.cpp:43 +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " n o n p e r m e t t e r e a -n e s s u n- n e m i c o d i s u p e r a r t i !" + +#: src/MenuGL.cpp:44 +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " o g n i n e m i c o c h e t i s u p e r a t i c o s t e r à u n a v i t a !" + +#: src/MenuGL.cpp:45 +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " p e r m e t t i a i p o w e r - u p d i s u p e r a r t i p e r m o l t i p u n t i !" + +#: src/MenuGL.cpp:46 +msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" +msgstr " s c o n t r a t i c o n i n e m i c i p e r d i s t r u g g e r l i !" + +#: src/MenuGL.cpp:47 +msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" +msgstr " c l i c c a i l t a s t o d e s t r o d u e v o l t e p e r l ' a u t o - d i s t r u z i o n e !" + +#: src/MenuGL.cpp:48 +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " a u t o - d i s t r u g g i t i p e r p r e s e r v a r e l e m u n i z i o n i !" + +#: src/MenuGL.cpp:49 +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " s c a r i c a C h r o m i u m B. S. U. d a http://chromium-bsu.sf.net/" + +#: src/MenuGL.cpp:70 +msgid "n e w g a m e" +msgstr "n u o v a p a r t i t a" + +#: src/MenuGL.cpp:71 +msgid "l e v e l" +msgstr "l i v e l l o" + +#: src/MenuGL.cpp:72 +msgid "s k i l l" +msgstr "a b i l i t à" + +#: src/MenuGL.cpp:73 +msgid "g f x d e t a i l" +msgstr "d e t t a g l i o g f x" + +#: src/MenuGL.cpp:74 +msgid "f u l l s c r e e n" +msgstr "a t u t t o s c h e r m o" + +#: src/MenuGL.cpp:75 +msgid "s c r e e n s i z e" +msgstr "d i m e n s i o n e s c h e r m o" + +#: src/MenuGL.cpp:76 +msgid "s o u n d f x v o l u m e" +msgstr "v o l u m e e f f e t t i s o n o r i" + +#: src/MenuGL.cpp:77 +msgid "m u s i c v o l u m e" +msgstr "v o l u m e m u s i c a" + +#: src/MenuGL.cpp:78 +#, fuzzy +msgid "m o v e m e n t s p e e d" +msgstr "v e l o c i t à m o u s e" + +#: src/MenuGL.cpp:79 +msgid "q u i t" +msgstr "e s c i" + +#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#, c-format +msgid "ATTENTION: Using 'thin' text to improve framerate...\n" +msgstr "ATTENZIONE: In uso il testo 'sottile' per migliorare la velocità di aggiornamento...\n" + +#: src/MenuGL.cpp:147 +#, c-format +msgid "MenuGL::createLists\n" +msgstr "MenuGL::createLists\n" + +#: src/MenuGL.cpp:162 +msgid "fish in a barrel" +msgstr "pesce in un barile" + +#: src/MenuGL.cpp:163 +msgid "wimp" +msgstr "gemito" + +#: src/MenuGL.cpp:164 +msgid "easy" +msgstr "facile" + +#: src/MenuGL.cpp:165 +msgid "normal" +msgstr "normale" + +#: src/MenuGL.cpp:166 +msgid "experienced" +msgstr "esperto" + +#: src/MenuGL.cpp:167 +msgid "fun" +msgstr "divertente" + +#: src/MenuGL.cpp:168 +msgid "insane" +msgstr "folle" + +#: src/MenuGL.cpp:169 +msgid "impossible" +msgstr "impossibile" + +#: src/MenuGL.cpp:170 +msgid "-" +msgstr "-" + +#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +msgid "high scores" +msgstr "classifiche" + +#: src/MenuGL.cpp:350 +msgid "the" +msgstr "il" + +#: src/MenuGL.cpp:354 +msgid "reptile" +msgstr "rettile" + +#: src/MenuGL.cpp:358 +msgid "labour" +msgstr "" + +#: src/MenuGL.cpp:362 +msgid "project" +msgstr "progetto" + +#: src/MenuGL.cpp:423 +#, c-format +msgid "ATTENTION: Reverting to 'thick' text...\n" +msgstr "ATTENZIONE: Sto riportando il testo a 'sottile'...\n" + +#: src/MenuGL.cpp:474 +#, c-format +msgid "low" +msgstr "basso" + +#: src/MenuGL.cpp:475 +#, c-format +msgid "med" +msgstr "medio" + +#: src/MenuGL.cpp:476 +#, c-format +msgid "high" +msgstr "alto" + +#: src/MenuGL.cpp:481 +#, c-format +msgid "%dx%d" +msgstr "" + +#: src/MenuGL.cpp:485 +#, fuzzy, c-format +msgid "true" +msgstr "vero" + +#: src/MenuGL.cpp:486 +#, fuzzy, c-format +msgid "false" +msgstr "falso" + +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#, c-format +msgid "---- error setting full screen mode ----" +msgstr "---- errore impostando la modalità a schermo intero ----" + +#: src/MenuGL.cpp:794 +#, c-format +msgid "---- error setting window mode ----" +msgstr "---- errore impostando la modalità finestra ----" + +#: src/MenuGL.cpp:835 +#, c-format +msgid "---- you must complete level %d before you can select level %d ----" +msgstr "---- devi completare %d livelli prima di poter scegliere il livello %d ----" + +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#, c-format +msgid "---- error setting screen size ----" +msgstr "---- errore impostando la dimensione dello schermo ----" + +#: src/PowerUps.cpp:180 +#, c-format +msgid "active power ups = %d\n" +msgstr "power up attivi = %d\n" + +#: src/PowerUps.cpp:368 +#, fuzzy, c-format +msgid "?? PowerUp::seal()" +msgstr "?? PowerUp::seal()" + +#: src/ScreenItemAdd.cpp:107 +#, fuzzy, c-format +msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" +msgstr "ScreenItemAdd::putScreenItems() Eroe??? HUH???\n" + +#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +msgid "p a u s e d" +msgstr "i n p a u s a" + +#: src/StatusDisplay.cpp:675 +msgid "do not let -any- ships past you! each one costs you a life!" +msgstr "non permettere a -NESSUNA- nave di superarti! ciascuna ti costerà una vita!" + +#: src/StatusDisplay.cpp:686 +msgid "let super shields pass by for an extra life!" +msgstr "permetti ai super scudi di superarti per ottenere una vita extra!" + +#: src/TextFTGL.cpp:35 +#, c-format +msgid "FTGL: error loading font: %s\n" +msgstr "FTGL: errore caricando il carattere: %s\n" + +#: src/TextFTGL.cpp:38 +msgid "FTGL: error loading font" +msgstr "FTGL: errore caricando il carattere" + +#. TRANSLATORS: If using the FTGL backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. +#. +#. TRANSLATORS: If using the GLC backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. The GLC renderer will fall back on other fonts +#. if some characters are not available though, so choose a font +#. that your language looks good in. +#. +#: src/TextFTGL.cpp:105 src/TextGLC.cpp:41 +msgid "Gothic Uralic" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:135 +#, fuzzy +msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothub__.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:141 +#, fuzzy +msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothu___.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:148 +#, fuzzy +msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:154 +#, fuzzy +msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" + +#: src/TextGLC.cpp:30 +msgid "GLC: couldn't set context" +msgstr "GLC: impossibile impostare il contesto" diff -Nru chromium-bsu-0.9.14.1/po/LINGUAS chromium-bsu-0.9.15/po/LINGUAS --- chromium-bsu-0.9.14.1/po/LINGUAS 2010-03-24 13:28:04.000000000 +0000 +++ chromium-bsu-0.9.15/po/LINGUAS 2011-02-07 03:59:50.000000000 +0000 @@ -1 +1,7 @@ -de bg es sv fr +bg +de +es +fr +it +sv +zh_TW diff -Nru chromium-bsu-0.9.14.1/po/Makefile.in.in chromium-bsu-0.9.15/po/Makefile.in.in --- chromium-bsu-0.9.14.1/po/Makefile.in.in 2010-06-19 09:32:41.000000000 +0000 +++ chromium-bsu-0.9.15/po/Makefile.in.in 2010-12-18 03:16:14.000000000 +0000 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,7 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.15 +# Origin: gettext-0.18 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -30,7 +31,17 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ + +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ GMSGFMT_ = @GMSGFMT@ @@ -77,19 +88,26 @@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: all-@USE_NLS@ +all: check-macro-version all-@USE_NLS@ all-yes: stamp-po all-no: +# Ensure that the gettext macros and this Makefile.in.in are in sync. +check-macro-version: + @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } + # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that @@ -120,16 +138,34 @@ # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ + fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ else \ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address="$$msgid_bugs_address" + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -157,8 +193,15 @@ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -181,7 +224,6 @@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -233,7 +275,6 @@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -359,9 +400,15 @@ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -382,9 +429,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff -Nru chromium-bsu-0.9.14.1/po/Makevars chromium-bsu-0.9.15/po/Makevars --- chromium-bsu-0.9.14.1/po/Makevars 2010-03-02 07:26:42.000000000 +0000 +++ chromium-bsu-0.9.15/po/Makevars 2011-02-07 03:59:50.000000000 +0000 @@ -2,5 +2,6 @@ subdir = po top_builddir = .. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +MSGMERGE_OPTIONS = --no-wrap COPYRIGHT_HOLDER = EXTRA_LOCALE_CATEGORIES = diff -Nru chromium-bsu-0.9.14.1/po/Rules-quot chromium-bsu-0.9.15/po/Rules-quot --- chromium-bsu-0.9.14.1/po/Rules-quot 2010-06-19 09:32:41.000000000 +0000 +++ chromium-bsu-0.9.15/po/Rules-quot 2010-12-18 03:16:14.000000000 +0000 @@ -20,7 +20,7 @@ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/sv.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/sv.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/sv.po chromium-bsu-0.9.15/po/sv.po --- chromium-bsu-0.9.14.1/po/sv.po 2010-06-19 09:34:24.000000000 +0000 +++ chromium-bsu-0.9.15/po/sv.po 2011-02-14 03:55:27.000000000 +0000 @@ -3,12 +3,13 @@ # msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2010-06-19 17:33+0800\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" "PO-Revision-Date: 2010-03-01 23:14+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,6 +59,8 @@ "\n" " use_cdrom enabled. Set to '0' in the configuration file to disable.\n" msgstr "" +"\n" +" use_cdrom aktiverat. Ställ in till \"0\" i konfigurationsfilen för att inaktivera.\n" #: src/Audio.cpp:155 #, c-format @@ -86,7 +89,7 @@ #: src/Audio.cpp:298 #, c-format msgid "Audio::setMusicIndex(%d)\n" -msgstr "" +msgstr "Audio::setMusicIndex(%d)\n" #: src/Audio.cpp:315 #, c-format @@ -101,7 +104,7 @@ #: src/AudioOpenAL.cpp:162 #, c-format msgid "AudioOpenAL::Audio done\n" -msgstr "" +msgstr "AudioOpenAL::Audio klar\n" #: src/AudioOpenAL.cpp:170 #, c-format @@ -110,7 +113,7 @@ #: src/AudioOpenAL.cpp:182 msgid "AudioOpenAL::~Audio()" -msgstr "" +msgstr "AudioOpenAL::~Audio()" #: src/AudioOpenAL.cpp:203 #, c-format @@ -125,11 +128,15 @@ "!! Audio will be disabled.\n" "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" msgstr "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! OBSERVERA !! - ett eller flera fel inträffade vid ljudkontrollen.\n" +"!! Ljud kommer att vara inaktiverat.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" #: src/AudioOpenAL.cpp:269 #, c-format msgid "AudioOpenAL::initSound() begin...\n" -msgstr "" +msgstr "AudioOpenAL::initSound() påbörjas...\n" #: src/AudioOpenAL.cpp:273 #, c-format @@ -139,40 +146,44 @@ "Renderer : %s\n" "Version : %s\n" msgstr "" +"-OpenAL-----------------------------------------------------\n" +"Tillverkare: %s\n" +"Renderare : %s\n" +"Version : %s\n" -#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:129 +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 #, c-format msgid "------------------------------------------------------------\n" -msgstr "" +msgstr "------------------------------------------------------------\n" #: src/AudioOpenAL.cpp:311 #, c-format msgid "Audio.cpp - init %s" -msgstr "" +msgstr "Audio.cpp - initiera %s" #: src/AudioOpenAL.cpp:324 #, c-format msgid "Audio.cpp - init explosion %d" -msgstr "" +msgstr "Audio.cpp - init explosion %d" #: src/AudioOpenAL.cpp:337 #, c-format msgid "Audio.cpp - init exploPop %d" -msgstr "" +msgstr "Audio.cpp - init exploPop %d" #: src/AudioOpenAL.cpp:350 msgid "Audio.cpp - initSound complete." -msgstr "" +msgstr "Audio.cpp - initSound färdig." #: src/AudioOpenAL.cpp:430 #, c-format msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" -msgstr "" +msgstr "AudioOpenAL::setMusicMode(SoundType-läge)\n" #: src/AudioOpenAL.cpp:465 #, c-format msgid "AudioOpenAL::setSoundVolume(%f)\n" -msgstr "" +msgstr "AudioOpenAL::setSoundVolume(%f)\n" #: src/AudioOpenAL.cpp:508 #, c-format @@ -189,7 +200,7 @@ #: src/AudioOpenAL.cpp:547 #, c-format msgid "alutLoadWAVFile(\"%s\",...);\n" -msgstr "" +msgstr "alutLoadWAVFile(\"%s\",...);\n" #: src/AudioOpenAL.cpp:563 #, c-format @@ -199,37 +210,37 @@ #: src/AudioOpenAL.cpp:568 #, c-format msgid "ERROR!! <%s> alcGetError() = %s\n" -msgstr "" +msgstr "FEL!! <%s> alcGetError() = %s\n" #: src/AudioOpenAL.cpp:573 #, c-format msgid "ERROR!! <%s> alutGetError() = %s\n" -msgstr "" +msgstr "FEL!! <%s> alutGetError() = %s\n" #: src/AudioOpenAL.cpp:732 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" -msgstr "" +msgstr "FEL: filnamnet är för långt: \"%s\", rad %d\n" #: src/AudioOpenAL.cpp:750 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" -msgstr "" +msgstr "VARNING: MP3-stöd inte tillgängligt: \"%s\", rad %d\n" #: src/AudioOpenAL.cpp:761 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" -msgstr "" +msgstr "VARNING: Ogg/Vorbis-stöd inte tillgängligt: \"%s\", rad %d\n" #: src/AudioOpenAL.cpp:765 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" -msgstr "" +msgstr "VARNING: filtypen känns inte igen: \"%s\": \"%s\", rad %d\n" #: src/AudioOpenAL.cpp:778 #, c-format msgid "music playlist:\n" -msgstr "" +msgstr "musikspellista:\n" #: src/AudioOpenAL.cpp:781 #, c-format @@ -243,7 +254,7 @@ #: src/AudioOpenAL.cpp:808 msgid "AudioOpenAL::setMusicIndex -- begin" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- start" #: src/AudioOpenAL.cpp:821 msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" @@ -255,64 +266,64 @@ #: src/AudioOpenAL.cpp:859 msgid "AudioOpenAL::setMusicIndex -- end" -msgstr "" +msgstr "AudioOpenAL::setMusicIndex -- slut" #: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" -msgstr "" +msgstr "VARNING: Stöd för spellista har inte kompilerats in (AudioOpenAL.cpp): %s\n" #: src/AudioOpenAL.cpp:959 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "FEL: Kunde inte allokera minne i AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:965 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:973 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" -msgstr "" +msgstr "FEL: alutLoadMP3() misslyckades i AudioOpenAL::loadMP3\n" #: src/AudioOpenAL.cpp:1005 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "FEL: Kunde inte allokera minne i AudioOpenAL::loadVorbis\n" #: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadVorbis\n" #: src/AudioOpenAL.cpp:1019 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" -msgstr "" +msgstr "FEL: alutLoadVorbis() misslyckades i AudioOpenAL::loadVorbis\n" #: src/AudioSDLMixer.cpp:65 #, c-format msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" -msgstr "" +msgstr "FEL: initierar ljud - AudioSDLMixer::initSound()\n" -#: src/Config.cpp:115 +#: src/Config.cpp:114 #, c-format msgid "WARNING: Config::init() has already been called.\n" -msgstr "" +msgstr "VARNING: Config::init() har redan anropats.\n" -#: src/Config.cpp:241 +#: src/Config.cpp:243 #, c-format msgid "WARNING: could not read config file (%s)\n" -msgstr "" +msgstr "VARNING: kunde inte läsa konfigurationsfilen (%s)\n" -#: src/Config.cpp:299 +#: src/Config.cpp:302 #, c-format msgid "wrote config file (%s)\n" msgstr "skrev konfigurationsfil (%s)\n" -#: src/Config.cpp:304 +#: src/Config.cpp:307 #, c-format msgid "WARNING: could not write config file (%s)\n" msgstr "VARNING: kunde inte skriva konfigurationsfil (%s)\n" @@ -320,42 +331,42 @@ #: src/EnemyAircraft.cpp:111 #, c-format msgid "%d EnemyAircraft allocated\n" -msgstr "" +msgstr "%d EnemyAircraft allokerat\n" #: src/EnemyAircraft_Straight.cpp:103 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" -msgstr "" +msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" #: src/EnemyFleet.cpp:243 #, c-format msgid "num enemies on screen = %d\n" -msgstr "" +msgstr "antal fiender på skärmen = %d\n" #: src/Global.cpp:114 #, c-format msgid "WARNING: Global::init() has already been called.\n" -msgstr "" +msgstr "VARNING: Global::init() har redan anropats.\n" #: src/Global.cpp:211 #, c-format msgid "Starting up..." -msgstr "" +msgstr "Startar upp..." #: src/Global.cpp:242 #, c-format msgid "...startup complete.\n" -msgstr "" +msgstr "...uppstart färdig.\n" #: src/Global.cpp:249 #, c-format msgid "Shutting down...\n" -msgstr "" +msgstr "Stänger av...\n" #: src/Global.cpp:262 #, c-format msgid "...shutdown complete.\n" -msgstr "" +msgstr "...avstängning färdig.\n" #: src/Global.cpp:269 #, c-format @@ -370,44 +381,49 @@ #: src/Global.cpp:352 #, c-format msgid "Generating random sequences\n" -msgstr "" +msgstr "Genererar slumpmässiga sekvenser\n" #: src/HeroAmmo.cpp:167 #, c-format msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" -msgstr "" +msgstr "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" #: src/HeroAmmo.cpp:190 #, c-format msgid "%p <--%p--> %p\n" msgstr "%p <--%p--> %p\n" -#: src/HiScore.cpp:51 +#: src/HiScore.cpp:58 #, c-format msgid "nobody" msgstr "ingen" -#: src/HiScore.cpp:76 +#: src/HiScore.cpp:83 #, c-format msgid "WARNING: HiScore::init() has already been called.\n" -msgstr "" +msgstr "VARNING: HiScore::init() har redan anropats.\n" -#: src/HiScore.cpp:208 +#: src/HiScore.cpp:241 #, c-format msgid "WARNING: could not write score file (%s)\n" -msgstr "" +msgstr "VARNING: kunde inte skriva poängfil (%s)\n" + +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "VARNING: tom poängfil (%s)\n" -#: src/HiScore.cpp:252 +#: src/HiScore.cpp:350 #, c-format msgid "WARNING: could not read score file (%s)\n" -msgstr "" +msgstr "VARNING: kunde inte läsa poängfil (%s)\n" -#: src/HiScore.cpp:344 +#: src/HiScore.cpp:442 #, c-format msgid "high scores:\n" msgstr "poänglista:\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:448 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" @@ -432,46 +448,65 @@ "--------------------------------------------------\n" "\n" msgstr "" +"\n" +"--------------------------------------------------\n" +"Flaggor för Chromium B.S.U.\n" +"--------------------------------------------------\n" +" -f/--fullscreen : kör i helskärmsläge\n" +" -w/--window : kör i fönsterläge\n" +" -v/--vidmode : läge 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : initiera inte ljud\n" +" -nb/--noblend : inaktivera blending (OpenGL)\n" +" -nt/--notexborder : ställ inte i texturramfärg (OpenGL)\n" +"--------------------------------------------------\n" +"\n" -#: src/main.cpp:221 +#: src/main.cpp:230 #, c-format msgid "!! ERROR !! - " msgstr "!! FEL !! - " -#: src/main.cpp:245 +#: src/main.cpp:254 #, c-format msgid "Extensions :" msgstr "Tillägg :" -#: src/MainGL.cpp:84 +#: src/MainGL.cpp:86 #, c-format msgid "initGL()\n" msgstr "initGL()\n" -#: src/MainGL.cpp:146 +#: src/MainGL.cpp:148 #, c-format msgid "error loading font: %s\n" -msgstr "" +msgstr "fel vid inläsning av typsnitt: %s\n" -#: src/MainGL.cpp:151 +#: src/MainGL.cpp:153 #, c-format msgid "error loading font\n" -msgstr "" +msgstr "fel vid inläsning av typsnitt\n" -#: src/MainGL.cpp:181 +#: src/MainGL.cpp:183 #, c-format msgid "!!MainGL::drawGL() HUH?\n" -msgstr "" +msgstr "!!MainGL::drawGL() HUH?\n" -#: src/MainGL.cpp:309 +#: src/MainGL.cpp:311 #, c-format msgid "" "new high score!\n" "\n" "%d" msgstr "" +"nytt högsta poäng!\n" +"\n" +"%d" -#: src/MainGL.cpp:314 +#: src/MainGL.cpp:316 #, c-format msgid "" "n o t b a d !\n" @@ -484,11 +519,11 @@ "\n" "%d" -#: src/MainGL.cpp:319 +#: src/MainGL.cpp:321 msgid "l o s e r" msgstr "f ö r l o r a r e" -#: src/MainGL.cpp:377 +#: src/MainGL.cpp:379 #, c-format msgid "" "congratulations!\n" @@ -498,53 +533,59 @@ "c o m p l e t e\n" " \n" msgstr "" +"gratulerar!\n" +" \n" +"n i v å\n" +" %d \n" +"a v k l a r a d\n" +" \n" -#: src/MainGLUT.cpp:73 +#: src/MainGLUT.cpp:77 #, c-format msgid "MainGLUT::run()\n" -msgstr "" +msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:89 src/MainSDL.cpp:285 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 #, c-format msgid "ERROR!!! OpenGL error: %s\n" -msgstr "" +msgstr "FEL!!! OpenGL-fel: %s\n" -#: src/MainGLUT.cpp:232 +#: src/MainGLUT.cpp:235 #, c-format msgid "key = %d\n" -msgstr "" +msgstr "tangent = %d\n" -#: src/MainSDL.cpp:73 +#: src/MainSDL.cpp:74 #, c-format msgid "Couldn't initialize SDL: %s\n" -msgstr "" +msgstr "Kunde inte initiera SDL: %s\n" -#: src/MainSDL.cpp:76 +#: src/MainSDL.cpp:77 #, c-format msgid "SDL initialized.\n" -msgstr "" +msgstr "SDL initierad.\n" -#: src/MainSDL.cpp:82 +#: src/MainSDL.cpp:83 #, c-format msgid "num joysticks = %d\n" -msgstr "" +msgstr "antal styrspakar = %d\n" -#: src/MainSDL.cpp:84 +#: src/MainSDL.cpp:85 #, c-format msgid " joystick 0 = %p\n" msgstr " styrspak 0 = %p\n" -#: src/MainSDL.cpp:90 +#: src/MainSDL.cpp:91 #, c-format msgid "no joysticks found\n" msgstr "inga styrspakar hittades\n" -#: src/MainSDL.cpp:115 src/MainSDL.cpp:346 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 #, c-format msgid "Couldn't set video mode: %s\n" -msgstr "" +msgstr "Kunde inte ställa in grafikläge: %s\n" -#: src/MainSDL.cpp:123 +#: src/MainSDL.cpp:124 #, c-format msgid "" "-OpenGL-----------------------------------------------------\n" @@ -552,23 +593,27 @@ "Renderer : %s\n" "Version : %s\n" msgstr "" +"-OpenGL-----------------------------------------------------\n" +"Tillverkare: %s\n" +"Renderare : %s\n" +"Version : %s\n" -#: src/MainSDL.cpp:214 +#: src/MainSDL.cpp:217 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" -msgstr "" +msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:221 +#: src/MainSDL.cpp:224 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -msgstr "" +msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:234 +#: src/MainSDL.cpp:237 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -msgstr "" +msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:256 +#: src/MainSDL.cpp:259 #, c-format msgid "" "%d speed adjustments required.\n" @@ -581,25 +626,25 @@ " can make it difficult to maintain a steady frame rate.\n" msgstr "" -#: src/MainSDL.cpp:268 +#: src/MainSDL.cpp:271 #, c-format msgid "exit.\n" -msgstr "" +msgstr "avsluta.\n" -#: src/MainSDL.cpp:293 +#: src/MainSDL.cpp:296 #, c-format msgid "ERROR!!! SDL error '%s'\n" -msgstr "" +msgstr "FEL!!! SDL-fel \"%s\"\n" -#: src/MainSDL.cpp:351 +#: src/MainSDL.cpp:354 #, c-format msgid "video mode set " -msgstr "" +msgstr "grafikläge inställt " -#: src/MainSDL.cpp:358 +#: src/MainSDL.cpp:361 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" -msgstr "" +msgstr "(bpp=%d RGB=%d%d%d djup=%d)\n" #: src/MainSDL_Event.cpp:40 #, c-format @@ -665,71 +710,48 @@ msgid "focus\n" msgstr "" -#: src/MainSDL_Event.cpp:377 +#: src/MainSDL_Event.cpp:403 #, c-format msgid "key '%s' pressed\n" -msgstr "" +msgstr "tangent \"%s\" nedtryckt\n" -#: src/MainSDL_Event.cpp:378 +#: src/MainSDL_Event.cpp:404 #, c-format msgid "game->gameFrame = %d\n" -msgstr "" +msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:486 +#: src/MainSDL_Event.cpp:534 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" #: src/MenuGL.cpp:43 -msgid "" -" d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o " -"u !" -msgstr "" -" l å t i n t e - n å g o n - f i e n d e k o m m a f ö r b i d i " -"g !" +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " l å t i n t e - n å g o n - f i e n d e k o m m a f ö r b i d i g !" #: src/MenuGL.cpp:44 -msgid "" -" e v e r y e n e m y t h a t g e t s b y c o s t s y o u a " -"l i f e !" -msgstr "" -" v a r j e f i e n d e s o m k o m m e r f ö r b i k o s t a r d " -"i g e t t l i v !" +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " v a r j e f i e n d e s o m k o m m e r f ö r b i k o s t a r d i g e t t l i v !" #: src/MenuGL.cpp:45 -msgid "" -" a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o " -"i n t s !" -msgstr "" -" l å t p o w e r - u p s g å f ö r b i d i g f ö r h ö g r e p " -"o ä n g !" +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " l å t p o w e r - u p s g å f ö r b i d i g f ö r h ö g r e p o ä n g !" #: src/MenuGL.cpp:46 msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" -msgstr "" -" k r a s c h a i n i f i e n d e r f ö r a t t f ö r s t ö r a " -"d e m !" +msgstr " k r a s c h a i n i f i e n d e r f ö r a t t f ö r s t ö r a d e m !" #: src/MenuGL.cpp:47 msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" -msgstr "" -" h ö g e r k l i c k a t v å g å n g e r f ö r a t t f ö r s t ö r " -"a d i g s j ä l v !" +msgstr " h ö g e r k l i c k a t v å g å n g e r f ö r a t t f ö r s t ö r a d i g s j ä l v !" #: src/MenuGL.cpp:48 -msgid "" -" s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i " -"t i o n !" -msgstr "" -" f ö r s t ö r d i g s j ä l v f ö r a t t s p a r a d i n a m " -"m u n i t i o n !" +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " f ö r s t ö r d i g s j ä l v f ö r a t t s p a r a d i n a m m u n i t i o n !" #: src/MenuGL.cpp:49 -msgid "" -" d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu." -"sf.net/" -msgstr "" -" h ä m t a C h r o m i u m B. S. U. p å http://chromium-bsu.sf.net/" +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " h ä m t a C h r o m i u m B. S. U. p å http://chromium-bsu.sf.net/" #: src/MenuGL.cpp:70 msgid "n e w g a m e" @@ -764,8 +786,8 @@ msgstr "m u s i k v o l y m" #: src/MenuGL.cpp:78 -msgid "m o u s e s p e e d" -msgstr "m u s h a s t i g h e t" +msgid "m o v e m e n t s p e e d" +msgstr "f ö r f l y t t n i n g s h a s t i g h e t" #: src/MenuGL.cpp:79 msgid "q u i t" @@ -779,14 +801,14 @@ #: src/MenuGL.cpp:147 #, c-format msgid "MenuGL::createLists\n" -msgstr "" +msgstr "MenuGL::createLists\n" #: src/MenuGL.cpp:162 msgid "fish in a barrel" msgstr "" #: src/MenuGL.cpp:163 -msgid "whimp" +msgid "wimp" msgstr "kyckling" #: src/MenuGL.cpp:164 @@ -819,7 +841,7 @@ #: src/MenuGL.cpp:292 src/MenuGL.cpp:321 msgid "high scores" -msgstr "" +msgstr "högsta poäng" #: src/MenuGL.cpp:350 msgid "the" @@ -857,60 +879,40 @@ msgid "high" msgstr "hög" -#: src/MenuGL.cpp:483 -#, c-format -msgid "512x384" -msgstr "512x384" - -#: src/MenuGL.cpp:484 +#: src/MenuGL.cpp:481 #, c-format -msgid "640x480" -msgstr "640x480" +msgid "%dx%d" +msgstr "%dx%d" #: src/MenuGL.cpp:485 #, c-format -msgid "800x600" -msgstr "800x600" - -#: src/MenuGL.cpp:486 -#, c-format -msgid "1024x768" -msgstr "1024x768" - -#: src/MenuGL.cpp:487 -#, c-format -msgid "1280x960" -msgstr "1280x960" - -#: src/MenuGL.cpp:492 -#, c-format msgid "true" msgstr "sant" -#: src/MenuGL.cpp:493 +#: src/MenuGL.cpp:486 #, c-format msgid "false" msgstr "falskt" -#: src/MenuGL.cpp:799 src/MenuGL.cpp:872 src/MenuGL.cpp:943 +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 #, c-format msgid "---- error setting full screen mode ----" -msgstr "" +msgstr "---- fel vid inställning av helskärmsläge ----" -#: src/MenuGL.cpp:801 +#: src/MenuGL.cpp:794 #, c-format msgid "---- error setting window mode ----" -msgstr "" +msgstr "---- fel vid inställning av fönsterläge ----" -#: src/MenuGL.cpp:842 +#: src/MenuGL.cpp:835 #, c-format msgid "---- you must complete level %d before you can select level %d ----" -msgstr "" +msgstr "---- du måste klara av nivå %d innan du kan välja nivå %d ----" -#: src/MenuGL.cpp:858 src/MenuGL.cpp:929 +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 #, c-format msgid "---- error setting screen size ----" -msgstr "" +msgstr "---- fel vid inställning av skärmstorlek ----" #: src/PowerUps.cpp:180 #, c-format @@ -920,12 +922,12 @@ #: src/PowerUps.cpp:368 #, c-format msgid "?? PowerUp::seal()" -msgstr "" +msgstr "?? PowerUp::seal()" #: src/ScreenItemAdd.cpp:107 #, c-format msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" -msgstr "" +msgstr "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" #: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 msgid "p a u s e d" @@ -933,20 +935,20 @@ #: src/StatusDisplay.cpp:675 msgid "do not let -any- ships past you! each one costs you a life!" -msgstr "" +msgstr "låt inte -några- skepp passera dig! varje skepp kostar dig ett liv!" #: src/StatusDisplay.cpp:686 msgid "let super shields pass by for an extra life!" -msgstr "" +msgstr "låt supersköldar passera dig för att få ett extraliv!" #: src/TextFTGL.cpp:35 #, c-format msgid "FTGL: error loading font: %s\n" -msgstr "" +msgstr "FTGL: fel vid inläsning av typsnitt: %s\n" #: src/TextFTGL.cpp:38 msgid "FTGL: error loading font" -msgstr "" +msgstr "FTGL: fel vid inläsning av typsnitt" #. TRANSLATORS: If using the FTGL backend, this should be the font #. name of a font that contains all the Unicode characters in use in @@ -996,4 +998,4 @@ #: src/TextGLC.cpp:30 msgid "GLC: couldn't set context" -msgstr "" +msgstr "GLC: kunde inte ställa in kontext" Binary files /tmp/tSXKJ9mHYm/chromium-bsu-0.9.14.1/po/zh_TW.gmo and /tmp/EZwaksCVr6/chromium-bsu-0.9.15/po/zh_TW.gmo differ diff -Nru chromium-bsu-0.9.14.1/po/zh_TW.po chromium-bsu-0.9.15/po/zh_TW.po --- chromium-bsu-0.9.14.1/po/zh_TW.po 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15/po/zh_TW.po 2011-02-14 03:55:27.000000000 +0000 @@ -0,0 +1,1016 @@ +# Traditional Chinese translation of the Chromium BSU package. +# This file is put in the public domain. +# This file is distributed under the same license as the chromium-bsu package. +# Emmanuel Trillaud , 2010. +# Wei-Lun Chao , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: chromium-bsu \n" +"Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" +"POT-Creation-Date: 2011-02-10 19:48+0800\n" +"PO-Revision-Date: 2010-11-06 23:37+0800\n" +"Last-Translator: Wei-Lun Chao \n" +"Language-Team: Chinese (traditional) \n" +"Language: zh_TW\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" + +#: src/Audio.cpp:110 +msgid "audio" +msgstr "音訊" + +#: src/Audio.cpp:111 +msgid "data" +msgstr "資料" + +#: src/Audio.cpp:113 +#, c-format +msgid "UNKNOWN(type=%d)" +msgstr "不明(型態=%d)" + +#: src/Audio.cpp:124 +#, c-format +msgid "%d CDROM drive(s).\n" +msgstr "%d 光碟機。\n" + +#: src/Audio.cpp:135 +#, c-format +msgid "Tracks: %d\n" +msgstr "軌段：%d\n" + +#: src/Audio.cpp:139 +#, c-format +msgid "track %2d: %s\n" +msgstr "軌段 %2d：%s\n" + +#: src/Audio.cpp:148 +#, c-format +msgid "" +"\n" +" Data track(s) only. CD audio not available.\n" +"\n" +msgstr "" +"\n" +"只有資料軌段。CD 音訊無法使用。\n" +"\n" + +#: src/Audio.cpp:154 +#, c-format +msgid "" +"\n" +" use_cdrom enabled. Set to '0' in the configuration file to disable.\n" +msgstr "" +"\n" +"use_cdrom 已啟用。在組態檔案中設定為「0」以停用。\n" + +#: src/Audio.cpp:155 +#, c-format +msgid "" +" Press the 'N' key to skip to next CD track during a game.\n" +"\n" +msgstr "" +" 在遊戲期間按下「N」鍵以跳到下一個 CD 軌段。\n" +"\n" + +#: src/Audio.cpp:166 +#, c-format +msgid "ERROR! Could not access CDROM device %d : %s\n" +msgstr "錯誤！無法存取 CDROM 裝置 %d：%s\n" + +#: src/Audio.cpp:209 +#, c-format +msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" +msgstr "CDROM 發生錯誤於 AudioOpenAL::pauseGameMusic(%d)\n" + +#: src/Audio.cpp:210 +#, c-format +msgid "CDROM status = %d\n" +msgstr "CDROM 狀態 = %d\n" + +#: src/Audio.cpp:298 +#, c-format +msgid "Audio::setMusicIndex(%d)\n" +msgstr "音訊::setMusicIndex(%d)\n" + +#: src/Audio.cpp:315 +#, c-format +msgid "track %d is data - trying next track...\n" +msgstr "軌段 %d 是資料 - 嘗試下一軌段…\n" + +#: src/AudioOpenAL.cpp:149 +#, c-format +msgid "alAttenuationScale == 0. Kludge it.\n" +msgstr "alAttenuationScale == 0. Kludge it。\n" + +#: src/AudioOpenAL.cpp:162 +#, c-format +msgid "AudioOpenAL::Audio done\n" +msgstr "AudioOpenAL::音訊已完成\n" + +#: src/AudioOpenAL.cpp:170 +#, c-format +msgid "stopping OpenAL..." +msgstr "停止 OpenAL…" + +#: src/AudioOpenAL.cpp:182 +msgid "AudioOpenAL::~Audio()" +msgstr "AudioOpenAL::~Audio()" + +#: src/AudioOpenAL.cpp:203 +#, c-format +msgid "done.\n" +msgstr "已完成。\n" + +#: src/AudioOpenAL.cpp:249 +#, c-format +msgid "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENTION !! - one or more errors were encountered during audio check.\n" +"!! Audio will be disabled.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +msgstr "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! 注意 !! - 在音訊檢查期間遇到一個或更多錯誤。\n" +"!! 音訊將被停用。\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + +#: src/AudioOpenAL.cpp:269 +#, c-format +msgid "AudioOpenAL::initSound() begin...\n" +msgstr "AudioOpenAL::initSound() 開始…\n" + +#: src/AudioOpenAL.cpp:273 +#, c-format +msgid "" +"-OpenAL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenAL-----------------------------------------------------\n" +"供應商 ：%s\n" +"潤算器 ：%s\n" +"版本 ：%s\n" + +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 +#, c-format +msgid "------------------------------------------------------------\n" +msgstr "------------------------------------------------------------\n" + +#: src/AudioOpenAL.cpp:311 +#, c-format +msgid "Audio.cpp - init %s" +msgstr "Audio.cpp - 初始 %s" + +#: src/AudioOpenAL.cpp:324 +#, c-format +msgid "Audio.cpp - init explosion %d" +msgstr "Audio.cpp - 初始爆炸 %d" + +#: src/AudioOpenAL.cpp:337 +#, c-format +msgid "Audio.cpp - init exploPop %d" +msgstr "Audio.cpp - init exploPop %d" + +#: src/AudioOpenAL.cpp:350 +msgid "Audio.cpp - initSound complete." +msgstr "Audio.cpp - initSound 完成。" + +#: src/AudioOpenAL.cpp:430 +#, c-format +msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" +msgstr "AudioOpenAL::setMusicMode(SoundType 模式)\n" + +#: src/AudioOpenAL.cpp:465 +#, c-format +msgid "AudioOpenAL::setSoundVolume(%f)\n" +msgstr "AudioOpenAL::setSoundVolume(%f)\n" + +#: src/AudioOpenAL.cpp:508 +#, c-format +msgid "Music volume = %f\n" +msgstr "音樂音量 = %f\n" + +#: src/AudioOpenAL.cpp:524 +#, c-format +msgid "" +"\n" +"ERROR! - sound enumerant index %d does not have valid filename!\n" +msgstr "" +"\n" +"錯誤！- 聲音無序索引 %d 沒有有效檔名！\n" + +#: src/AudioOpenAL.cpp:547 +#, c-format +msgid "alutLoadWAVFile(\"%s\",...);\n" +msgstr "alutLoadWAVFile(\"%s\",...);\n" + +#: src/AudioOpenAL.cpp:563 +#, c-format +msgid "ERROR!! <%s> alGetError() = %s\n" +msgstr "錯誤 !!<%s> alGetError() = %s\n" + +#: src/AudioOpenAL.cpp:568 +#, c-format +msgid "ERROR!! <%s> alcGetError() = %s\n" +msgstr "錯誤 !!<%s> alcGetError() = %s\n" + +#: src/AudioOpenAL.cpp:573 +#, c-format +msgid "ERROR!! <%s> alutGetError() = %s\n" +msgstr "錯誤 !!<%s> alutGetError() = %s\n" + +#: src/AudioOpenAL.cpp:732 +#, c-format +msgid "ERROR: filename too long: \"%s\", line %d\n" +msgstr "錯誤：檔名太長：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:750 +#, c-format +msgid "WARNING: MP3 support not available: \"%s\", line %d\n" +msgstr "警告：MP3 支援無法使用：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:761 +#, c-format +msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" +msgstr "警告：Ogg/Vorbis 支援無法使用：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:765 +#, c-format +msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" +msgstr "警告：檔案類型無法辨識：\"%s\":\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:778 +#, c-format +msgid "music playlist:\n" +msgstr "音樂播放清單：\n" + +#: src/AudioOpenAL.cpp:781 +#, c-format +msgid " %2d : %s\n" +msgstr " %2d：%s\n" + +#: src/AudioOpenAL.cpp:783 +#, c-format +msgid "loaded %s\n" +msgstr "已載入 %s\n" + +#: src/AudioOpenAL.cpp:808 +msgid "AudioOpenAL::setMusicIndex -- begin" +msgstr "AudioOpenAL::setMusicIndex -- 開始" + +#: src/AudioOpenAL.cpp:821 +msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- 設定來源緩衝區為 0 之前" + +#: src/AudioOpenAL.cpp:824 +msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- 設定來源緩衝區為 0 之後" + +#: src/AudioOpenAL.cpp:859 +msgid "AudioOpenAL::setMusicIndex -- end" +msgstr "AudioOpenAL::setMusicIndex -- 結束" + +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#, c-format +msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "警告：播放清單支援無法在 (AudioOpenAL.cpp) 中編譯：%s\n" + +#: src/AudioOpenAL.cpp:959 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" +msgstr "錯誤：無法在 AudioOpenAL::loadMP3 中配置記憶體\n" + +#: src/AudioOpenAL.cpp:965 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "錯誤：無法在 AudioOpenAL::loadMP3 中開啟「%s」\n" + +#: src/AudioOpenAL.cpp:973 +#, c-format +msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" +msgstr "錯誤：alutLoadMP3() 在 AudioOpenAL::loadMP3 中失敗\n" + +#: src/AudioOpenAL.cpp:1005 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" +msgstr "錯誤：無法在 AudioOpenAL::loadVorbis 中配置記憶體\n" + +#: src/AudioOpenAL.cpp:1011 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "錯誤：無法在 AudioOpenAL::loadVorbis 中開啟「%s」\n" + +#: src/AudioOpenAL.cpp:1019 +#, c-format +msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" +msgstr "錯誤：alutLoadVorbis() 在 AudioOpenAL::loadVorbis 中失敗\n" + +#: src/AudioSDLMixer.cpp:65 +#, c-format +msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" +msgstr "初始化音訊 - AudioSDLMixer::initSound() 時發生錯誤\n" + +#: src/Config.cpp:114 +#, c-format +msgid "WARNING: Config::init() has already been called.\n" +msgstr "警告：Config::init() 已呼叫。\n" + +#: src/Config.cpp:243 +#, c-format +msgid "WARNING: could not read config file (%s)\n" +msgstr "警告：無法讀取組態檔案 (%s)\n" + +#: src/Config.cpp:302 +#, c-format +msgid "wrote config file (%s)\n" +msgstr "已寫入組態檔案 (%s)\n" + +#: src/Config.cpp:307 +#, c-format +msgid "WARNING: could not write config file (%s)\n" +msgstr "警告：無法寫入組態檔案 (%s)\n" + +#: src/EnemyAircraft.cpp:111 +#, c-format +msgid "%d EnemyAircraft allocated\n" +msgstr "%d EnemyAircraft 配置\n" + +#: src/EnemyAircraft_Straight.cpp:103 +#, c-format +msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "EnemyAircraft_Straight %p…pos[1] = %g，vel[1] = %g\n" + +#: src/EnemyFleet.cpp:243 +#, c-format +msgid "num enemies on screen = %d\n" +msgstr "螢幕上敵人數量 = %d\n" + +#: src/Global.cpp:114 +#, c-format +msgid "WARNING: Global::init() has already been called.\n" +msgstr "警告：Global::init() 已呼叫。\n" + +#: src/Global.cpp:211 +#, c-format +msgid "Starting up..." +msgstr "開始啟動…" + +#: src/Global.cpp:242 +#, c-format +msgid "...startup complete.\n" +msgstr "...啟動完成。\n" + +#: src/Global.cpp:249 +#, c-format +msgid "Shutting down...\n" +msgstr "關機…\n" + +#: src/Global.cpp:262 +#, c-format +msgid "...shutdown complete.\n" +msgstr "...關機完成。\n" + +#: src/Global.cpp:269 +#, c-format +msgid "deleteTextures()\n" +msgstr "deleteTextures()\n" + +#: src/Global.cpp:289 +#, c-format +msgid "Global::loadTextures()\n" +msgstr "Global::loadTextures()\n" + +#: src/Global.cpp:352 +#, c-format +msgid "Generating random sequences\n" +msgstr "產生隨機序列\n" + +#: src/HeroAmmo.cpp:167 +#, c-format +msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" +msgstr "HeroAmmo::addAmmo(%d，<%f %f %f> )\n" + +#: src/HeroAmmo.cpp:190 +#, c-format +msgid "%p <--%p--> %p\n" +msgstr "%p <--%p--> %p\n" + +#: src/HiScore.cpp:58 +#, c-format +msgid "nobody" +msgstr "沒有任何人" + +#: src/HiScore.cpp:83 +#, c-format +msgid "WARNING: HiScore::init() has already been called.\n" +msgstr "警告：HiScore::init() 已呼叫。\n" + +#: src/HiScore.cpp:241 +#, c-format +msgid "WARNING: could not write score file (%s)\n" +msgstr "警告：無法寫入分數檔案 (%s)\n" + +#: src/HiScore.cpp:328 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "警告：空的分數檔案 (%s)\n" + +#: src/HiScore.cpp:350 +#, c-format +msgid "WARNING: could not read score file (%s)\n" +msgstr "警告：無法讀取分數檔案 (%s)\n" + +#: src/HiScore.cpp:442 +#, c-format +msgid "high scores:\n" +msgstr "高分：\n" + +#: src/HiScore.cpp:448 +#, c-format +msgid "%02d/%02d/%04d %16s %d\n" +msgstr "%02d/%02d/%04d %16s %d\n" + +#: src/main.cpp:118 +#, c-format +msgid "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. options\n" +"--------------------------------------------------\n" +" -f/--fullscreen : run in fullscreen mode\n" +" -w/--window : run in windowed mode\n" +" -v/--vidmode : mode 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : do not initialize audio\n" +" -nb/--noblend : disable blending (OpenGL)\n" +" -nt/--notexborder : do not set tex border color (OpenGL)\n" +"--------------------------------------------------\n" +"\n" +msgstr "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U.選項\n" +"--------------------------------------------------\n" +" -f/--fullscreen ：在全螢幕模式中運行\n" +" -w/--window ：在視窗模式中運行\n" +" -v/--vidmode ：模式 0 = 512 x 384\n" +" ： 1 = 640 x 480\n" +" ： 2 = 800 x 600\n" +" ： 3 = 1024 x 768\n" +" ： 4 = 1280 x 960\n" +" -na /--noaudio ：不初始化音訊\n" +" -nb /--noblend ：停用混色 (OpenGL)\n" +" -nt /--notexborder ：不設定 tex 邊框顏色 (OpenGL)\n" +"--------------------------------------------------\n" +"\n" + +#: src/main.cpp:230 +#, c-format +msgid "!! ERROR !! - " +msgstr "!! 錯誤 !! - " + +#: src/main.cpp:254 +#, c-format +msgid "Extensions :" +msgstr "延伸：" + +#: src/MainGL.cpp:86 +#, c-format +msgid "initGL()\n" +msgstr "initGL()\n" + +#: src/MainGL.cpp:148 +#, c-format +msgid "error loading font: %s\n" +msgstr "載入字型時發生錯誤：%s\n" + +#: src/MainGL.cpp:153 +#, c-format +msgid "error loading font\n" +msgstr "載入字型時發生錯誤\n" + +#: src/MainGL.cpp:183 +#, c-format +msgid "!!MainGL::drawGL() HUH?\n" +msgstr "!!MainGL::drawGL() 呃？\n" + +#: src/MainGL.cpp:311 +#, c-format +msgid "" +"new high score!\n" +"\n" +"%d" +msgstr "" +"新高分！\n" +"\n" +"%d" + +#: src/MainGL.cpp:316 +#, c-format +msgid "" +"n o t b a d !\n" +"rank : %d\n" +"\n" +"%d" +msgstr "" +"不 錯 噢！\n" +"分級：%d\n" +"\n" +"%d" + +#: src/MainGL.cpp:321 +msgid "l o s e r" +msgstr "失 敗 者" + +#: src/MainGL.cpp:379 +#, c-format +msgid "" +"congratulations!\n" +" \n" +"l e v e l\n" +" %d \n" +"c o m p l e t e\n" +" \n" +msgstr "" +"恭喜！\n" +"\n" +" 過\n" +"%d\n" +" 關\n" +"\n" + +#: src/MainGLUT.cpp:77 +#, c-format +msgid "MainGLUT::run()\n" +msgstr "MainGLUT::run()\n" + +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#, c-format +msgid "ERROR!!! OpenGL error: %s\n" +msgstr "錯誤!!! OpenGL 錯誤：%s\n" + +#: src/MainGLUT.cpp:235 +#, c-format +msgid "key = %d\n" +msgstr "鍵 = %d\n" + +#: src/MainSDL.cpp:74 +#, c-format +msgid "Couldn't initialize SDL: %s\n" +msgstr "無法初始化 SDL：%s\n" + +#: src/MainSDL.cpp:77 +#, c-format +msgid "SDL initialized.\n" +msgstr "SDL 已初始化。\n" + +#: src/MainSDL.cpp:83 +#, c-format +msgid "num joysticks = %d\n" +msgstr "搖桿數量 = %d\n" + +#: src/MainSDL.cpp:85 +#, c-format +msgid " joystick 0 = %p\n" +msgstr " 搖桿 0=%p\n" + +#: src/MainSDL.cpp:91 +#, c-format +msgid "no joysticks found\n" +msgstr "找不到任何搖桿\n" + +#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#, c-format +msgid "Couldn't set video mode: %s\n" +msgstr "無法設定視訊模式：%s\n" + +#: src/MainSDL.cpp:124 +#, c-format +msgid "" +"-OpenGL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenGL-----------------------------------------------------\n" +"供應商 ：%s\n" +"潤算器 ：%s\n" +"版本 ：%s\n" + +#: src/MainSDL.cpp:217 +#, c-format +msgid "init----> %3.2ffps gameSpeed = %g\n" +msgstr "init----> %3.2ffps 遊戲速度 = %g\n" + +#: src/MainSDL.cpp:224 +#, c-format +msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "init----> %3.2ffps targetAdj = %g，tmp = %g\n" + +#: src/MainSDL.cpp:237 +#, c-format +msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "adjust--> %3.2f targetAdj = %g -- game-> speedAdj = %g\n" + +#: src/MainSDL.cpp:259 +#, c-format +msgid "" +"%d speed adjustments required.\n" +"NOTE: The game was not able to maintain a steady 50 frames per\n" +" second. You should consider reducing your screen resolution\n" +" or lowering the graphics detail setting.\n" +" -OR-\n" +" make sure that you aren't running any system monitoring\n" +" tools (like 'top', 'xosview', etc.) These kinds of tools\n" +" can make it difficult to maintain a steady frame rate.\n" +msgstr "" +"%d 需要調整速度\n" +"註記：遊戲無法保持每秒穩定 50 訊框。\n" +" 您應該考慮減少您的螢幕解析度\n" +" 或降低圖形細節設定。\n" +" -或者-\n" +" 確定您沒有正在執行任何系統監控\n" +" 工具 (像是 'top'，'xosview'，etc.) 這類工具\n" +" 有可能讓它難以保持穩定訊框率。\n" + +#: src/MainSDL.cpp:271 +#, c-format +msgid "exit.\n" +msgstr "離開。\n" + +#: src/MainSDL.cpp:296 +#, c-format +msgid "ERROR!!! SDL error '%s'\n" +msgstr "錯誤!!! SDL 錯誤 '%s'\n" + +#: src/MainSDL.cpp:354 +#, c-format +msgid "video mode set " +msgstr "視訊模式設定 " + +#: src/MainSDL.cpp:361 +#, c-format +msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" + +#: src/MainSDL_Event.cpp:40 +#, c-format +msgid "%-5d SDL_ACTIVEEVENT \n" +msgstr "%-5d SDL_ACTIVEEVENT \n" + +#: src/MainSDL_Event.cpp:41 +#, c-format +msgid "%-5d SDL_KEYDOWN \n" +msgstr "%-5d SDL_KEYDOWN \n" + +#: src/MainSDL_Event.cpp:42 +#, c-format +msgid "%-5d SDL_KEYUP \n" +msgstr "%-5d SDL_KEYUP \n" + +#: src/MainSDL_Event.cpp:43 +#, c-format +msgid "%-5d SDL_MOUSEMOTION \n" +msgstr "%-5d SDL_MOUSEMOTION \n" + +#: src/MainSDL_Event.cpp:44 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONDOWN \n" +msgstr "%-5d SDL_MOUSEBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:45 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONUP \n" +msgstr "%-5d SDL_MOUSEBUTTONUP \n" + +#: src/MainSDL_Event.cpp:46 +#, c-format +msgid "%-5d SDL_JOYBUTTONDOWN \n" +msgstr "%-5d SDL_JOYBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:47 +#, c-format +msgid "%-5d SDL_JOYBUTTONUP \n" +msgstr "%-5d SDL_JOYBUTTONUP \n" + +#: src/MainSDL_Event.cpp:212 +#, c-format +msgid "MainSDL::getEvent HUH?\n" +msgstr "MainSDL::getEvent 呃？\n" + +#: src/MainSDL_Event.cpp:222 +#, c-format +msgid "" +"buffer = \"%s\n" +"\"" +msgstr "" +"緩衝區 =「%s\n" +"」" + +#: src/MainSDL_Event.cpp:243 +#, c-format +msgid "mouse active" +msgstr "滑鼠啟用" + +#: src/MainSDL_Event.cpp:251 +#, c-format +msgid "focus\n" +msgstr "焦點\n" + +#: src/MainSDL_Event.cpp:403 +#, c-format +msgid "key '%s' pressed\n" +msgstr "鍵「%s」已按\n" + +#: src/MainSDL_Event.cpp:404 +#, c-format +msgid "game->gameFrame = %d\n" +msgstr "game->gameFrame = %d\n" + +#: src/MainSDL_Event.cpp:534 +#, c-format +msgid "MainSDL::grabMouse(%d)\n" +msgstr "MainSDL::grabMouse(%d)\n" + +#: src/MenuGL.cpp:43 +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " 不 要 讓 -任 何- 敵 人 從 您 身 旁 經 過！" + +#: src/MenuGL.cpp:44 +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " 每 一 個 經 過 您 的 敵 人 都 會 減 少 您 的 生 命！" + +#: src/MenuGL.cpp:45 +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " 允 許 能 源 器 經 過 以 得 到 高 額 點 數！" + +#: src/MenuGL.cpp:46 +msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" +msgstr " 在 敵 人 之 中 碎 裂 以 毀 滅 它 們！" + +#: src/MenuGL.cpp:47 +msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" +msgstr " 連 按 滑 鼠 右 鍵 兩 次 啟 動 自 我 毀 滅！" + +#: src/MenuGL.cpp:48 +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " 自 我 毀 滅 以 保 護 您 的 彈 藥 庫！" + +#: src/MenuGL.cpp:49 +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " 從 http://chromium-bsu.sf.net/ 下 載 C h r o m i u m B. S. U." + +#: src/MenuGL.cpp:70 +msgid "n e w g a m e" +msgstr "新 遊 戲" + +#: src/MenuGL.cpp:71 +msgid "l e v e l" +msgstr "等 級" + +#: src/MenuGL.cpp:72 +msgid "s k i l l" +msgstr "技 巧" + +#: src/MenuGL.cpp:73 +msgid "g f x d e t a i l" +msgstr "g f x 細 節" + +#: src/MenuGL.cpp:74 +msgid "f u l l s c r e e n" +msgstr "全 螢 幕" + +#: src/MenuGL.cpp:75 +msgid "s c r e e n s i z e" +msgstr "畫 面 尺 寸" + +#: src/MenuGL.cpp:76 +msgid "s o u n d f x v o l u m e" +msgstr "音 效 音 量" + +#: src/MenuGL.cpp:77 +msgid "m u s i c v o l u m e" +msgstr "音 樂 音 量" + +#: src/MenuGL.cpp:78 +#, fuzzy +msgid "m o v e m e n t s p e e d" +msgstr "滑 鼠 速 度" + +#: src/MenuGL.cpp:79 +msgid "q u i t" +msgstr "離 開" + +#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#, c-format +msgid "ATTENTION: Using 'thin' text to improve framerate...\n" +msgstr "注意：使用「細體」文字以改善訊框速率…\n" + +#: src/MenuGL.cpp:147 +#, c-format +msgid "MenuGL::createLists\n" +msgstr "MenuGL::createLists\n" + +#: src/MenuGL.cpp:162 +msgid "fish in a barrel" +msgstr "大桶中的魚" + +#: src/MenuGL.cpp:163 +msgid "wimp" +msgstr "wimp" + +#: src/MenuGL.cpp:164 +msgid "easy" +msgstr "容易" + +#: src/MenuGL.cpp:165 +msgid "normal" +msgstr "一般" + +#: src/MenuGL.cpp:166 +msgid "experienced" +msgstr "熟練" + +#: src/MenuGL.cpp:167 +msgid "fun" +msgstr "娛樂" + +#: src/MenuGL.cpp:168 +msgid "insane" +msgstr "狂暴" + +#: src/MenuGL.cpp:169 +msgid "impossible" +msgstr "不可能" + +#: src/MenuGL.cpp:170 +msgid "-" +msgstr "-" + +#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +msgid "high scores" +msgstr "高分" + +#: src/MenuGL.cpp:350 +msgid "the" +msgstr " " + +#: src/MenuGL.cpp:354 +msgid "reptile" +msgstr "爬蟲" + +#: src/MenuGL.cpp:358 +msgid "labour" +msgstr "勞力" + +#: src/MenuGL.cpp:362 +msgid "project" +msgstr "專案" + +#: src/MenuGL.cpp:423 +#, c-format +msgid "ATTENTION: Reverting to 'thick' text...\n" +msgstr "注意：還原成「粗體」文字…\n" + +#: src/MenuGL.cpp:474 +#, c-format +msgid "low" +msgstr "低" + +#: src/MenuGL.cpp:475 +#, c-format +msgid "med" +msgstr "中" + +#: src/MenuGL.cpp:476 +#, c-format +msgid "high" +msgstr "高" + +#: src/MenuGL.cpp:481 +#, c-format +msgid "%dx%d" +msgstr "" + +#: src/MenuGL.cpp:485 +#, c-format +msgid "true" +msgstr "真" + +#: src/MenuGL.cpp:486 +#, c-format +msgid "false" +msgstr "假" + +#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#, c-format +msgid "---- error setting full screen mode ----" +msgstr "---- 設定全螢幕模式時發生錯誤 ----" + +#: src/MenuGL.cpp:794 +#, c-format +msgid "---- error setting window mode ----" +msgstr "---- 設定視窗模式時發生錯誤 ----" + +#: src/MenuGL.cpp:835 +#, c-format +msgid "---- you must complete level %d before you can select level %d ----" +msgstr "---- 在您可以選取等級 %2$d 之前，您必須完成等級 %1$d ----" + +#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#, c-format +msgid "---- error setting screen size ----" +msgstr "---- 設定螢幕大小時發生錯誤 ----" + +#: src/PowerUps.cpp:180 +#, c-format +msgid "active power ups = %d\n" +msgstr "作用中的動力提升 = %d\n" + +#: src/PowerUps.cpp:368 +#, c-format +msgid "?? PowerUp::seal()" +msgstr "?? PowerUp::seal()" + +#: src/ScreenItemAdd.cpp:107 +#, c-format +msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" +msgstr "ScreenItemAdd::putScreenItems() 英雄??? 呃???\n" + +#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +msgid "p a u s e d" +msgstr "暫 停" + +#: src/StatusDisplay.cpp:675 +msgid "do not let -any- ships past you! each one costs you a life!" +msgstr "不要讓 *任何* 的船隻從您旁邊越過！每一個都會耗損您的生命！" + +#: src/StatusDisplay.cpp:686 +msgid "let super shields pass by for an extra life!" +msgstr "讓超級防護罩從旁越過以得到額外的生命！" + +#: src/TextFTGL.cpp:35 +#, c-format +msgid "FTGL: error loading font: %s\n" +msgstr "FTGL：載入字型時發生錯誤：%s\n" + +#: src/TextFTGL.cpp:38 +msgid "FTGL: error loading font" +msgstr "FTGL：載入字型時發生錯誤" + +#. TRANSLATORS: If using the FTGL backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. +#. +#. TRANSLATORS: If using the GLC backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. The GLC renderer will fall back on other fonts +#. if some characters are not available though, so choose a font +#. that your language looks good in. +#. +#: src/TextFTGL.cpp:105 src/TextGLC.cpp:41 +msgid "Gothic Uralic" +msgstr "Gothic Uralic" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:135 +msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothub__.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:141 +msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothu___.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:148 +msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:154 +msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" + +#: src/TextGLC.cpp:30 +msgid "GLC: couldn't set context" +msgstr "GLC：無法設定狀態組合" diff -Nru chromium-bsu-0.9.14.1/src/Audio.cpp chromium-bsu-0.9.15/src/Audio.cpp --- chromium-bsu-0.9.14.1/src/Audio.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Audio.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" diff -Nru chromium-bsu-0.9.14.1/src/Audio.h chromium-bsu-0.9.15/src/Audio.h --- chromium-bsu-0.9.14.1/src/Audio.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Audio.h 2011-02-14 03:54:04.000000000 +0000 @@ -9,7 +9,7 @@ #define Audio_h #ifdef HAVE_CONFIG_H -#include +#include #endif #define NUM_EXPLO 2 diff -Nru chromium-bsu-0.9.14.1/src/AudioOpenAL.cpp chromium-bsu-0.9.15/src/AudioOpenAL.cpp --- chromium-bsu-0.9.14.1/src/AudioOpenAL.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/AudioOpenAL.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef AUDIO_OPENAL diff -Nru chromium-bsu-0.9.14.1/src/AudioOpenAL.h chromium-bsu-0.9.15/src/AudioOpenAL.h --- chromium-bsu-0.9.14.1/src/AudioOpenAL.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/AudioOpenAL.h 2011-02-07 03:59:50.000000000 +0000 @@ -9,7 +9,7 @@ #define AudioOpenAL_h #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef AUDIO_OPENAL diff -Nru chromium-bsu-0.9.14.1/src/AudioSDLMixer.cpp chromium-bsu-0.9.15/src/AudioSDLMixer.cpp --- chromium-bsu-0.9.14.1/src/AudioSDLMixer.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/AudioSDLMixer.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef AUDIO_SDLMIXER diff -Nru chromium-bsu-0.9.14.1/src/Config.cpp chromium-bsu-0.9.15/src/Config.cpp --- chromium-bsu-0.9.14.1/src/Config.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Config.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -56,7 +56,6 @@ m_screenNear = 10.0; m_screenFar = 70.0; m_full_screen = false; - m_screenSize = 2; m_screenBound[0] = 11.0; m_screenBound[1] = 9.0; m_zTrans = -56.5; @@ -79,7 +78,7 @@ m_maxLevel = 1; m_gfxLevel = 2; - m_mouseSpeed = 0.03; + m_movementSpeed = 0.03; m_gameSkillBase = 0.5; m_viewGamma = 1.1; m_volSound = 0.9; @@ -182,8 +181,11 @@ numLines = i; for(i = 0; i < numLines; i++) { - if(strncmp(configStrings[i], "screenSi", 8) == 0) { sscanf(configStrings[i], "screenSize %d\n", &m_screenSize); } - if(strncmp(configStrings[i], "mouseSpe", 8) == 0) { sscanf(configStrings[i], "mouseSpeed %f\n", &m_mouseSpeed); } + if(strncmp(configStrings[i], "screenSi", 8) == 0) { int screenSize; sscanf(configStrings[i], "screenSize %d\n", &screenSize); setScreenSize(screenSize); } + if(strncmp(configStrings[i], "screenWi", 8) == 0) { sscanf(configStrings[i], "screenWidth %d\n", &m_screenW); } + if(strncmp(configStrings[i], "screenHe", 8) == 0) { sscanf(configStrings[i], "screenHeight %d\n", &m_screenH); } + if(strncmp(configStrings[i], "mouseSpe", 8) == 0) { sscanf(configStrings[i], "mouseSpeed %f\n", &m_movementSpeed); } + if(strncmp(configStrings[i], "movement", 8) == 0) { sscanf(configStrings[i], "movementSpeed %f\n", &m_movementSpeed); } if(strncmp(configStrings[i], "gameSkil", 8) == 0) { sscanf(configStrings[i], "gameSkillBase %f\n", &m_gameSkillBase); } if(strncmp(configStrings[i], "gfxLevel", 8) == 0) { sscanf(configStrings[i], "gfxLevel %d\n", &m_gfxLevel); } if(strncmp(configStrings[i], "volSound", 8) == 0) { sscanf(configStrings[i], "volSound %f\n", &m_volSound); } @@ -243,9 +245,6 @@ } } - //-- update all screen size variables - setScreenSize(m_screenSize); - return retVal; } @@ -271,6 +270,9 @@ #ifdef HAVE_LOCALE_H char* locale = setlocale(LC_NUMERIC,"C"); #endif + fprintf(file, "# Chromium B.S.U. configuration file\n"); + fprintf(file, "# Please read the documentation for more info\n"); + fprintf(file, "# Only modifications to option values are preserved.\n"); fprintf(file, "use_playList %d\n", (int)m_use_playList); fprintf(file, "use_cdrom %d\n", (int)m_use_cdrom); fprintf(file, "debug %d\n", (int)m_debug); @@ -279,10 +281,11 @@ fprintf(file, "swap_stereo %d\n", (int)m_swap_stereo); fprintf(file, "auto_speed %d\n", (int)m_auto_speed); fprintf(file, "show_fps %d\n", (int)m_show_fps); - fprintf(file, "screenSize %d\n", m_screenSize); + fprintf(file, "screenWidth %d\n", m_screenW); + fprintf(file, "screenHeight %d\n", m_screenH); fprintf(file, "gfxLevel %d\n", m_gfxLevel); fprintf(file, "gameSkillBase %g\n", m_gameSkillBase); - fprintf(file, "mouseSpeed %g\n", m_mouseSpeed); + fprintf(file, "movementSpeed %g\n", m_movementSpeed); fprintf(file, "maxLevel %d\n", m_maxLevel); fprintf(file, "volSound %g\n", m_volSound); fprintf(file, "volMusic %g\n", m_volMusic); @@ -315,12 +318,11 @@ //---------------------------------------------------------- void Config::setScreenSize(int m) { - m_screenSize = m; - if(m_screenSize > MAX_SCREEN_SIZE) - m_screenSize = MAX_SCREEN_SIZE; - if(m_screenSize < MIN_SCREEN_SIZE) - m_screenSize = MIN_SCREEN_SIZE; - switch(m_screenSize) + if(m > MAX_SCREEN_SIZE) + m = MAX_SCREEN_SIZE; + if(m < MIN_SCREEN_SIZE) + m = MIN_SCREEN_SIZE; + switch(m) { case 0: m_screenW = 512; @@ -343,7 +345,6 @@ m_screenH = 960; break; default: - m_screenSize = 1; m_screenW = 640; m_screenH = 480; break; @@ -351,3 +352,15 @@ m_screenA = (float)m_screenW/(float)m_screenH; } +int Config::approxScreenSize() +{ + if( m_screenW >= 1280 && m_screenH >= 960 ) + return 4; + if( m_screenW >= 1024 && m_screenH >= 768 ) + return 3; + if( m_screenW >= 800 && m_screenH >= 600 ) + return 2; + if( m_screenW >= 640 && m_screenH >= 480 ) + return 1; + return 0; +} diff -Nru chromium-bsu-0.9.14.1/src/Config.h chromium-bsu-0.9.15/src/Config.h --- chromium-bsu-0.9.14.1/src/Config.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Config.h 2011-02-07 03:59:50.000000000 +0000 @@ -34,8 +34,9 @@ void setScreenSize(int m); + void setScreenSize(int w, int h); + int approxScreenSize(); - int screenSize() { return m_screenSize; } int screenW() { return m_screenW; } int screenH() { return m_screenH; } float screenA() { return m_screenA; } @@ -79,12 +80,12 @@ void setGfxLevel(int a) { m_gfxLevel = a; if(m_gfxLevel < 0) m_gfxLevel = 0; if(m_gfxLevel > 2) m_gfxLevel = 2; } void setMaxLevel(int a) { m_maxLevel = a; if(m_maxLevel > 10) m_maxLevel = 10; } - float mouseSpeed() { return m_mouseSpeed; } + float movementSpeed() { return m_movementSpeed; } float gameSkillBase() { return m_gameSkillBase; } float viewGamma() { return m_viewGamma; } float volSound() { return m_volSound; } float volMusic() { return m_volMusic; } - void setMouseSpeed(float f) { m_mouseSpeed = f; if(m_mouseSpeed < 0.01) m_mouseSpeed = 0.01; if(m_mouseSpeed > 0.1) m_mouseSpeed = 0.1; } + void setMovementSpeed(float f) { m_movementSpeed = f; if(m_movementSpeed < 0.01) m_movementSpeed = 0.01; if(m_movementSpeed > 0.1) m_movementSpeed = 0.1; } void setGameSkillBase(float f) { m_gameSkillBase = f; if(m_gameSkillBase > 0.9) m_gameSkillBase = 0.9; if(m_gameSkillBase < 0.2) m_gameSkillBase = 0.2;} void setViewGamma(float f) { m_viewGamma = f; } void setVolSound(float f) { m_volSound = f; if(m_volSound < 0.0) m_volSound = 0.0; if(m_volSound > 1.0) m_volSound = 1.0; } @@ -106,7 +107,6 @@ float m_screenNear; float m_screenFar; bool m_full_screen; - int m_screenSize; float m_screenBound[2]; float m_zTrans; @@ -126,7 +126,7 @@ int m_cdromDevice; int m_cdromCount; - float m_mouseSpeed; + float m_movementSpeed; float m_gameSkillBase; float m_viewGamma; float m_volSound; diff -Nru chromium-bsu-0.9.14.1/src/define.h chromium-bsu-0.9.15/src/define.h --- chromium-bsu-0.9.14.1/src/define.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/define.h 2011-02-14 03:54:04.000000000 +0000 @@ -9,7 +9,7 @@ #define define_h #ifdef HAVE_CONFIG_H -#include +#include #endif //#define SRAND (2.0*(0.5-(rand()/(double)RAND_MAX))) @@ -22,8 +22,8 @@ #define AMMO_REFILL 150 #define HERO_Z 25.0f -#define MIN_SCREEN_SIZE 0 // 4 == 512x384 -#define MAX_SCREEN_SIZE 4 // 4 == 1280x960 +#define MIN_SCREEN_SIZE 0 // 512x384 +#define MAX_SCREEN_SIZE 4 // 1280x960 #define NUM_ENEMY_AMMO_TYPES 5 #define NUM_HERO_AMMO_TYPES 3 @@ -46,18 +46,4 @@ #define HI_SCORE_HIST 5 -#define MAX_BUFF 256 - -#ifdef PKGBINDIR -#define CHROMIUM_EXEC PKGBINDIR"/"PACKAGE -#else -#define CHROMIUM_EXEC "./"PACKAGE -#endif //PKGBINDIR - -#ifdef PKGDATADIR -#define CHROMIUM_DATA_DIR PKGDATADIR"/data" -#else -#define CHROMIUM_DATA_DIR "../data" -#endif //PKGDATADIR - #endif // define_h diff -Nru chromium-bsu-0.9.14.1/src/EnemyAircraft.cpp chromium-bsu-0.9.15/src/EnemyAircraft.cpp --- chromium-bsu-0.9.14.1/src/EnemyAircraft.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyAircraft.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" diff -Nru chromium-bsu-0.9.14.1/src/EnemyAircraft.h chromium-bsu-0.9.15/src/EnemyAircraft.h --- chromium-bsu-0.9.14.1/src/EnemyAircraft.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyAircraft.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define EnemyAircraft_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/EnemyAmmo.cpp chromium-bsu-0.9.15/src/EnemyAmmo.cpp --- chromium-bsu-0.9.14.1/src/EnemyAmmo.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyAmmo.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "EnemyAmmo.h" @@ -18,7 +18,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/EnemyAmmo.h chromium-bsu-0.9.15/src/EnemyAmmo.h --- chromium-bsu-0.9.14.1/src/EnemyAmmo.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyAmmo.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define EnemyAmmo_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/EnemyFleet.cpp chromium-bsu-0.9.15/src/EnemyFleet.cpp --- chromium-bsu-0.9.14.1/src/EnemyFleet.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyFleet.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -11,12 +11,12 @@ #include #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/EnemyFleet.h chromium-bsu-0.9.15/src/EnemyFleet.h --- chromium-bsu-0.9.14.1/src/EnemyFleet.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/EnemyFleet.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define EnemyFleet_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/Explosions.cpp chromium-bsu-0.9.15/src/Explosions.cpp --- chromium-bsu-0.9.14.1/src/Explosions.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Explosions.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -10,12 +10,12 @@ #include #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/Explosions.h chromium-bsu-0.9.15/src/Explosions.h --- chromium-bsu-0.9.14.1/src/Explosions.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Explosions.h 2011-02-14 03:54:04.000000000 +0000 @@ -9,12 +9,12 @@ #define Explosions_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/Global.cpp chromium-bsu-0.9.15/src/Global.cpp --- chromium-bsu-0.9.14.1/src/Global.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Global.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" diff -Nru chromium-bsu-0.9.14.1/src/Ground.h chromium-bsu-0.9.15/src/Ground.h --- chromium-bsu-0.9.14.1/src/Ground.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Ground.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define Ground_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/GroundMetal.cpp chromium-bsu-0.9.15/src/GroundMetal.cpp --- chromium-bsu-0.9.14.1/src/GroundMetal.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundMetal.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "GroundMetal.h" diff -Nru chromium-bsu-0.9.14.1/src/GroundMetal.h chromium-bsu-0.9.15/src/GroundMetal.h --- chromium-bsu-0.9.14.1/src/GroundMetal.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundMetal.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define GroundMetal_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/GroundMetalSegment.cpp chromium-bsu-0.9.15/src/GroundMetalSegment.cpp --- chromium-bsu-0.9.14.1/src/GroundMetalSegment.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundMetalSegment.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "GroundMetalSegment.h" @@ -16,7 +16,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/GroundSea.cpp chromium-bsu-0.9.15/src/GroundSea.cpp --- chromium-bsu-0.9.14.1/src/GroundSea.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundSea.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "GroundSea.h" diff -Nru chromium-bsu-0.9.14.1/src/GroundSea.h chromium-bsu-0.9.15/src/GroundSea.h --- chromium-bsu-0.9.14.1/src/GroundSea.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundSea.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define GroundSea_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/GroundSeaSegment.cpp chromium-bsu-0.9.15/src/GroundSeaSegment.cpp --- chromium-bsu-0.9.14.1/src/GroundSeaSegment.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/GroundSeaSegment.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "GroundSeaSegment.h" @@ -16,7 +16,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/HeroAircraft.cpp chromium-bsu-0.9.15/src/HeroAircraft.cpp --- chromium-bsu-0.9.14.1/src/HeroAircraft.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/HeroAircraft.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "HeroAircraft.h" @@ -18,7 +18,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include @@ -295,8 +295,8 @@ Config *config = Config::instance(); if(game->gameMode != Global::HeroDead && !game->game_pause) { - pos[0] += x*config->mouseSpeed(); - pos[1] += -y*config->mouseSpeed(); + pos[0] += x*config->movementSpeed(); + pos[1] += -y*config->movementSpeed(); if (pos[0] < bound[0][0]) pos[0] = bound[0][0]; else if (pos[0] > bound[0][1]) pos[0] = bound[0][1]; if (pos[1] < bound[1][0]) pos[1] = bound[1][0]; diff -Nru chromium-bsu-0.9.14.1/src/HeroAircraft.h chromium-bsu-0.9.15/src/HeroAircraft.h --- chromium-bsu-0.9.14.1/src/HeroAircraft.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/HeroAircraft.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define HeroAircraft_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/HeroAmmo.cpp chromium-bsu-0.9.15/src/HeroAmmo.cpp --- chromium-bsu-0.9.14.1/src/HeroAmmo.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/HeroAmmo.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -19,7 +19,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/HeroAmmo.h chromium-bsu-0.9.15/src/HeroAmmo.h --- chromium-bsu-0.9.14.1/src/HeroAmmo.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/HeroAmmo.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define HeroAmmo_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/HiScore.cpp chromium-bsu-0.9.15/src/HiScore.cpp --- chromium-bsu-0.9.14.1/src/HiScore.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/HiScore.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -23,9 +23,16 @@ #include #include #include +#include + +#ifdef HAVE_LOCALE_H +#include +#endif HiScore *HiScore::instance = 0; +static const char* header = "# Chromium B.S.U. high scores file: skill rank score date time(UTC) name (do not remove this comment line)\n"; + /** * initialize variables, then read high score file */ @@ -198,10 +205,36 @@ file = fopen(getFileName(), "w"); if(file) { - fwrite(hiScore, sizeof(double), 10*HI_SCORE_HIST, file); - fwrite(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file); - fwrite(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file); +#ifdef HAVE_LOCALE_H + char* locale = setlocale(LC_NUMERIC,"C"); +#endif + struct tm* time; + int i,j; + fprintf(file, "%s", header); + for(i = 0; i < 10; i++) + { + for(j = 0; j < HI_SCORE_HIST; j++) + { + time = gmtime(&hiScoreDate[i][j]); + if( time != NULL ){ + fprintf(file, + "%d %d %lf %04d-%02d-%02d %02d:%02d:%02d %s\n", + i, j, + hiScore[i][j], + 1900+time->tm_year, + 1+time->tm_mon, + time->tm_mday, + time->tm_hour, + time->tm_min, + time->tm_sec, + hiScoreName[i][j]); + } + } + } fclose(file); +#ifdef HAVE_LOCALE_H + setlocale(LC_NUMERIC,locale); +#endif } else { @@ -226,10 +259,75 @@ file = fopen(fileName, "r"); if(file) { - fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file); - fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file); - fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file); - fclose(file); + int chr = fgetc(file); + if( EOF != chr ){ + fseek(file, 0L, SEEK_SET); + if( '#' == chr ){ + // Save and reset locale/timezone info +#ifdef HAVE_LOCALE_H + char* locale = setlocale(LC_NUMERIC,"C"); +#endif + char *tz = getenv("TZ"); + setenv("TZ", "", 1); + tzset(); + + // Discard the comment line + fscanf(file,"%*[^\n]"); + + char name[100]; + struct tm time; + int i, j; + double score; + int fields; + do{ + i = j = -1; + memset(&time,0,sizeof(time)); + fields = fscanf(file, + "%d %d %lf %d-%d-%d %d:%d:%d %99s%*[^\n]", + &i, &j, + &score, + &time.tm_year, + &time.tm_mon, + &time.tm_mday, + &time.tm_hour, + &time.tm_min, + &time.tm_sec, + name); + if( fields == 10 && i >=0 && i < 10 && j >= 0 && j < HI_SCORE_HIST ){ + hiScore[i][j] = score; + time.tm_year -= 1900; + time.tm_mon--; + hiScoreDate[i][j] = mktime(&time); + strncpy(hiScoreName[i][j], name, 99); + hiScoreName[i][j][99] = '\0'; + } + } while( fields != EOF ); + fclose(file); + + // Reset locale/timezone info +#ifdef HAVE_LOCALE_H + setlocale(LC_NUMERIC,locale); +#endif + if (tz) setenv("TZ", tz, 1); + else unsetenv("TZ"); + tzset(); + + } else { + // Nasty old memory dump format + fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file); + fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file); + fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file); + fclose(file); + // Resave the file in plain text format + saveFile(); + } + } + else + { + Config* config = Config::instance(); + if( config->debug() ) fprintf(stderr, _("WARNING: empty score file (%s)\n"), getFileName()); + retVal = false; + } } else { diff -Nru chromium-bsu-0.9.14.1/src/Image.cpp chromium-bsu-0.9.15/src/Image.cpp --- chromium-bsu-0.9.14.1/src/Image.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Image.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #if IMAGE_SDL @@ -19,11 +19,15 @@ #elif IMAGE_GLPNG -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include -#include #else #include +#endif + +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_GLPNG_GLPNG_H) +#include +#else #include #endif @@ -78,7 +82,6 @@ if( tmp ) { - Uint16 pitch = tmp->pitch; Uint8 bpp = tmp->format->BytesPerPixel; int w = tmp->w, h = tmp->w; Uint32 a; diff -Nru chromium-bsu-0.9.14.1/src/main.cpp chromium-bsu-0.9.15/src/main.cpp --- chromium-bsu-0.9.14.1/src/main.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/main.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,14 +7,14 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include @@ -171,6 +171,15 @@ walker++; } #endif +#ifdef _WIN32 + char *walker = filename; + while( *walker ) + { + if(*walker == '/' ) + *walker = '\\'; + walker++; + } +#endif return filename; } diff -Nru chromium-bsu-0.9.14.1/src/MainGL.cpp chromium-bsu-0.9.15/src/MainGL.cpp --- chromium-bsu-0.9.14.1/src/MainGL.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MainGL.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -8,7 +8,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -23,16 +23,18 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || (defined(HAVE_OPENGL_GL_H) && defined(HAVE_OPENGL_GLU_H)) #include #include -#if IMAGE_GLPNG -#include -#endif #else #include #include +#endif + #if IMAGE_GLPNG +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_GLPNG_GLPNG_H) +#include +#else #include #endif #endif diff -Nru chromium-bsu-0.9.14.1/src/MainGLUT.cpp chromium-bsu-0.9.15/src/MainGLUT.cpp --- chromium-bsu-0.9.14.1/src/MainGLUT.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MainGLUT.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -20,7 +20,11 @@ #include #include +#ifdef HAVE_GLUT_GLUT_H +#include +#else #include +#endif #include "Config.h" #include "HiScore.h" @@ -123,7 +127,6 @@ bool MainGLUT::setVideoMode() { Config *config = Config::instance(); - config->setScreenSize(config->screenSize()); // set screenW & screenH for new screenSize glutReshapeWindow(config->screenW(), config->screenH()); config->setFullScreen(false); // GLUT doesn't have a way to return resize errors diff -Nru chromium-bsu-0.9.14.1/src/MainSDL.cpp chromium-bsu-0.9.15/src/MainSDL.cpp --- chromium-bsu-0.9.14.1/src/MainSDL.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MainSDL.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -26,7 +26,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || (defined(HAVE_OPENGL_GL_H) && defined(HAVE_OPENGL_GLU_H)) #include #include #else @@ -54,6 +54,7 @@ fire = 0; xjoy = yjoy = xjNow = yjNow = 0; adjCount = 0; + key_speed_x = key_speed_y = 0; Uint32 initOpts; @@ -149,6 +150,7 @@ Uint32 start_time = 0; Uint32 now_time = 0; Uint32 last_time = 0; + key_speed_x = key_speed_y = 0.0; int done = 0; int frames; @@ -192,6 +194,7 @@ done = this->process(&event); } this->joystickMove(); + this->keyMove(); ++frames; game->frame++; diff -Nru chromium-bsu-0.9.14.1/src/MainSDL_Event.cpp chromium-bsu-0.9.15/src/MainSDL_Event.cpp --- chromium-bsu-0.9.14.1/src/MainSDL_Event.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MainSDL_Event.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -232,7 +232,7 @@ Global *game = Global::getInstance(); Config* config = Config::instance(); if( config->debug() ) fprintf(stderr, "app %s ", event->active.gain ? "gained" : "lost" ); - bool grab_mouse = game->gameMode == Global::Game && event->active.gain ? true : false; + bool grab_mouse = game->gameMode == Global::Game && !game->game_pause && event->active.gain ? true : false; if ( event->active.state & SDL_APPACTIVE ) { grabMouse( grab_mouse, grab_mouse ); @@ -289,7 +289,7 @@ { game->gameMode = Global::Game; game->audio->setMusicMode(Audio::MusicGame); - grabMouse(true); + grabMouse(!game->game_pause); } else { @@ -324,11 +324,12 @@ MainToolkit::Key key; switch(event->key.keysym.sym) { - case SDLK_UP: key = MainToolkit::KeyUp; break; - case SDLK_DOWN: key = MainToolkit::KeyDown; break; - case SDLK_LEFT: key = MainToolkit::KeyLeft; break; - case SDLK_RIGHT: key = MainToolkit::KeyRight; break; - case SDLK_RETURN: key = MainToolkit::KeyEnter; break; + case SDLK_KP9: case SDLK_KP7: case SDLK_KP8: case SDLK_UP: key = MainToolkit::KeyUp; break; + case SDLK_KP1: case SDLK_KP3: case SDLK_KP2: case SDLK_DOWN: key = MainToolkit::KeyDown; break; + case SDLK_KP4: case SDLK_LEFT: key = MainToolkit::KeyLeft; break; + case SDLK_KP6: case SDLK_RIGHT: key = MainToolkit::KeyRight; break; + case SDLK_KP_ENTER: case SDLK_RETURN: key = MainToolkit::KeyEnter; break; + case SDLK_KP5: return; default: key = MainToolkit::KeyEnter; break; } game->menu->keyHit(key); @@ -344,9 +345,14 @@ Config *config = Config::instance(); switch(event->key.keysym.sym) { -// case SDLK_RETURN: -// resetMouseMotion(); -// break; + case SDLK_KP_PLUS: + case SDLK_QUOTE: + game->hero->nextItem(); + break; + case SDLK_KP_ENTER: + case SDLK_RETURN: + game->hero->useItem(); + break; case SDLK_PAUSE: case SDLK_p: grabMouse(game->game_pause); @@ -356,17 +362,37 @@ case SDLK_n: game->audio->nextMusicIndex(); break; + case SDLK_KP7: + key_speed_x -= 5.0; + key_speed_y -= 5.0; + break; + case SDLK_KP9: + key_speed_x += 5.0; + key_speed_y -= 5.0; + break; + case SDLK_KP3: + key_speed_x += 5.0; + key_speed_y += 5.0; + break; + case SDLK_KP1: + key_speed_x -= 5.0; + key_speed_y += 5.0; + break; + case SDLK_KP4: case SDLK_LEFT: - game->hero->moveEvent(-10, 0); + key_speed_x -= 5.0; break; + case SDLK_KP6: case SDLK_RIGHT: - game->hero->moveEvent( 10, 0); + key_speed_x += 5.0; break; + case SDLK_KP8: case SDLK_UP: - game->hero->moveEvent(0, -10); + key_speed_y -= 5.0; break; + case SDLK_KP2: case SDLK_DOWN: - game->hero->moveEvent(0, 10); + key_speed_y += 5.0; break; case SDLK_SPACE: game->hero->fireGun(true); @@ -382,6 +408,28 @@ } //---------------------------------------------------------- +void MainSDL::keyMove() +{ + Global *game = Global::getInstance(); + if(game->gameMode == Global::Game){ + Uint8 *keystate = SDL_GetKeyState(NULL); + if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4; + if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4; + if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4; + if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4; + if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP9] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP3] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + //float s = (1.0-game->speedAdj)+(game->speedAdj*0.7); + float s = 0.7; + key_speed_x *= s; + key_speed_y *= s; + game->hero->moveEvent(key_speed_x,key_speed_y); + } +} + +//---------------------------------------------------------- void MainSDL::mouseMotion(SDL_Event *event) { Global *game = Global::getInstance(); diff -Nru chromium-bsu-0.9.14.1/src/MainSDL.h chromium-bsu-0.9.15/src/MainSDL.h --- chromium-bsu-0.9.14.1/src/MainSDL.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MainSDL.h 2011-02-14 03:54:04.000000000 +0000 @@ -31,6 +31,7 @@ bool process(SDL_Event *event); void joystickMove(); + void keyMove(); private: void activation(SDL_Event *event); @@ -57,6 +58,7 @@ float xjNow,yjNow; int adjCount; + float key_speed_x, key_speed_y; }; #endif // USE_SDL diff -Nru chromium-bsu-0.9.14.1/src/Makefile.am chromium-bsu-0.9.15/src/Makefile.am --- chromium-bsu-0.9.14.1/src/Makefile.am 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Makefile.am 2011-02-14 03:54:04.000000000 +0000 @@ -19,7 +19,8 @@ $(TEXT_LIBS) \ $(IMAGE_LIBS) \ $(WINDOW_LIBS) \ - $(AUDIO_LIBS) + $(AUDIO_LIBS) \ + $(INTLLIBS) chromium_bsu_SOURCES = \ Ammo.cpp \ diff -Nru chromium-bsu-0.9.14.1/src/Makefile.in chromium-bsu-0.9.15/src/Makefile.in --- chromium-bsu-0.9.14.1/src/Makefile.in 2010-06-19 09:33:14.000000000 +0000 +++ chromium-bsu-0.9.15/src/Makefile.in 2011-02-14 03:55:04.000000000 +0000 @@ -44,14 +44,15 @@ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/chromium-bsu-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" @@ -97,7 +98,7 @@ chromium_bsu_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -146,6 +147,7 @@ FREEALUT_LIBS = @FREEALUT_LIBS@ FTGL_CFLAGS = @FTGL_CFLAGS@ FTGL_LIBS = @FTGL_LIBS@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLUT_CFLAGS = @GLUT_CFLAGS@ GLUT_LIBS = @GLUT_LIBS@ GLU_CFLAGS = @GLU_CFLAGS@ @@ -208,6 +210,7 @@ WINDOW_LIBS = @WINDOW_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ @@ -283,7 +286,8 @@ $(TEXT_LIBS) \ $(IMAGE_LIBS) \ $(WINDOW_LIBS) \ - $(AUDIO_LIBS) + $(AUDIO_LIBS) \ + $(INTLLIBS) chromium_bsu_SOURCES = \ Ammo.cpp \ diff -Nru chromium-bsu-0.9.14.1/src/MenuGL.cpp chromium-bsu-0.9.15/src/MenuGL.cpp --- chromium-bsu-0.9.14.1/src/MenuGL.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MenuGL.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -20,7 +20,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include @@ -75,7 +75,7 @@ menuText[ScreenSize]= _("s c r e e n s i z e"); menuText[Sound] = _("s o u n d f x v o l u m e"); menuText[Music] = _("m u s i c v o l u m e"); - menuText[MouseSpeed]= _("m o u s e s p e e d"); + menuText[MovementSpeed]= _("m o v e m e n t s p e e d"); menuText[Quit] = _("q u i t"); loadTextures(); @@ -160,7 +160,7 @@ switch(i) { case 2: return _("fish in a barrel"); - case 3: return _("whimp"); + case 3: return _("wimp"); case 4: return _("easy"); case 5: return _("normal"); case 6: return _("experienced"); @@ -477,15 +477,8 @@ } break; case ScreenSize: - level = (float)config->screenSize()/(float)MAX_SCREEN_SIZE; - switch(config->screenSize()) - { - case 0: sprintf(buf, _("512x384")); break; - case 1: sprintf(buf, _("640x480")); break; - case 2: sprintf(buf, _("800x600")); break; - case 3: sprintf(buf, _("1024x768")); break; - case 4: sprintf(buf, _("1280x960")); break; - } + level = (float)config->approxScreenSize()/(float)MAX_SCREEN_SIZE; + sprintf(buf, _("%dx%d"), config->screenW(), config->screenH()); break; case FullScreen: level = (float)config->fullScreen(); @@ -500,8 +493,8 @@ level = config->volMusic(); sprintf(buf, "%d", (int)((level+0.05)*10.0)); break; - case MouseSpeed: - level = config->mouseSpeed()*10.0; + case MovementSpeed: + level = config->movementSpeed()*10.0; sprintf(buf, "%d", (int)((level+0.005)*100.0)); break; default: @@ -807,7 +800,7 @@ break; case Music: break; - case MouseSpeed: + case MovementSpeed: break; case Quit: game->game_quit = true; @@ -849,14 +842,14 @@ config->setGfxLevel(config->gfxLevel()+1); break; case ScreenSize: - config->setScreenSize(config->screenSize()+1); + config->setScreenSize(config->approxScreenSize()+1); game->deleteTextures(); if( !game->toolkit->setVideoMode() ) { mssgHelpOverride = true; mssgAlpha = 1.1; sprintf(mssgText, _("---- error setting screen size ----")); - config->setScreenSize(config->screenSize()-1); + config->setScreenSize(config->approxScreenSize()-1); } game->loadTextures(); break; @@ -884,8 +877,8 @@ config->setVolMusic(config->volMusic()+0.05); game->audio->setMusicVolume(config->volMusic()); break; - case MouseSpeed: - config->setMouseSpeed(config->mouseSpeed()+0.005); + case MovementSpeed: + config->setMovementSpeed(config->movementSpeed()+0.005); break; case Quit: activateItem(); @@ -920,14 +913,14 @@ config->setGfxLevel(config->gfxLevel()-1); break; case ScreenSize: - config->setScreenSize(config->screenSize()-1); + config->setScreenSize(config->approxScreenSize()-1); game->deleteTextures(); if( !game->toolkit->setVideoMode() ) { mssgHelpOverride = true; mssgAlpha = 1.1; sprintf(mssgText, _("---- error setting screen size ----")); - config->setScreenSize(config->screenSize()+1); + config->setScreenSize(config->approxScreenSize()+1); } game->loadTextures(); break; @@ -955,8 +948,8 @@ config->setVolMusic(config->volMusic()-0.05); game->audio->setMusicVolume(config->volMusic()); break; - case MouseSpeed: - config->setMouseSpeed(config->mouseSpeed()-0.005); + case MovementSpeed: + config->setMovementSpeed(config->movementSpeed()-0.005); break; case Quit: break; diff -Nru chromium-bsu-0.9.14.1/src/MenuGL.h chromium-bsu-0.9.15/src/MenuGL.h --- chromium-bsu-0.9.14.1/src/MenuGL.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/MenuGL.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define MenuGL_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include @@ -30,7 +30,7 @@ public: enum MenuSelection { NewGame, GameLevel, SkillLevel, Graphics, FullScreen, ScreenSize, Sound, - Music, MouseSpeed, Quit, + Music, MovementSpeed, Quit, NumSelections }; MenuGL(); diff -Nru chromium-bsu-0.9.14.1/src/PowerUps.cpp chromium-bsu-0.9.15/src/PowerUps.cpp --- chromium-bsu-0.9.14.1/src/PowerUps.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/PowerUps.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -20,7 +20,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/PowerUps.h chromium-bsu-0.9.15/src/PowerUps.h --- chromium-bsu-0.9.14.1/src/PowerUps.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/PowerUps.h 2011-02-14 03:54:04.000000000 +0000 @@ -9,12 +9,12 @@ #define PowerUps_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/ScreenItemAdd.cpp chromium-bsu-0.9.15/src/ScreenItemAdd.cpp --- chromium-bsu-0.9.14.1/src/ScreenItemAdd.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/ScreenItemAdd.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -148,6 +148,9 @@ case 2: loadLevel3(); break; + case 3: + loadLevel4(); + break; default: loadLevel1(); break; @@ -514,6 +517,74 @@ } //---------------------------------------------------------- +void ScreenItemAdd::loadLevel4() +{ + int i; + int numIterations = 12000; + + clearDeadPool(); + //-- Enemies + float r; + float d; + int waveDuration = 500; + i = 600; + addStraightWave(1, i, 0.4); + while(i < numIterations-1000) + { + if(i < 1500) + d = (i+250.0)/2000.0; + else + d = 1.0; + r = FRAND; + if (r < 0.15) addStraightArrowWave(i, waveDuration, d); + else if (r < 0.25) addOmniArrowWave(i, waveDuration, d); + else if (r > 0.60) addStraightWave(i, waveDuration, d); + else + { + if (r < 0.25) addGnatWave (i, waveDuration); + else if(r < 0.35) addStraightArrowWave(i, waveDuration); + else if(r < 0.50) addOmniArrowWave (i, waveDuration); + else if(r < 0.80) addOmniWave (i, waveDuration); + else addStraightWave (i, waveDuration); + } + + i += waveDuration; + waveDuration = (int)(600.0*game->gameSkill) + (int)(100*SRAND); + i += 50 + (int)(50*FRAND); + } + + EnemyWave gnatWave(EnemyGnat); + gnatWave.setInOut(3000, 5000); + gnatWave.setPos(FRAND*4.0, 10.0); + gnatWave.setFrequency(150, 140); + gnatWave.setXRand(5.0); + addWave(gnatWave); + + gnatWave.setInOut(8000, 11000); + addWave(gnatWave); + + //-- ray gun enemy starts halfway through... + EnemyWave rayWave(EnemyRayGun); + rayWave.setXRand(8.0); + rayWave.setFrequency(60, 5); + rayWave.setFrequency(2000, 1000); + rayWave.setInOut(numIterations/2, i-1000); + addWave(rayWave); + + //-- Boss + EnemyWave bossWave(EnemyBoss00); + bossWave.setInOut(i+75, i+1000); + bossWave.setPos(0.0, 15.0); + bossWave.setXRand(4.0); + bossWave.setFrequency(5000, 0); + addWave(bossWave); + + //-- Ammunition and PowerUps + addAmmunition(0, numIterations+9000); + addPowerUps(0, numIterations+9000); +} + +//---------------------------------------------------------- void ScreenItemAdd::addStraightWave(int o, int duration, float density) { float freq = 1.0/density; diff -Nru chromium-bsu-0.9.14.1/src/ScreenItemAdd.h chromium-bsu-0.9.15/src/ScreenItemAdd.h --- chromium-bsu-0.9.14.1/src/ScreenItemAdd.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/ScreenItemAdd.h 2011-02-07 03:59:50.000000000 +0000 @@ -39,6 +39,7 @@ void loadLevel1(); void loadLevel2(); void loadLevel3(); + void loadLevel4(); void addStraightWave(int o, int duration, float density = 1.0); void addOmniWave(int o, int duration, float density = 1.0); diff -Nru chromium-bsu-0.9.14.1/src/StatusDisplay.cpp chromium-bsu-0.9.15/src/StatusDisplay.cpp --- chromium-bsu-0.9.14.1/src/StatusDisplay.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/StatusDisplay.cpp 2011-02-14 03:54:04.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "gettext.h" @@ -21,7 +21,7 @@ #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/StatusDisplay.h chromium-bsu-0.9.15/src/StatusDisplay.h --- chromium-bsu-0.9.14.1/src/StatusDisplay.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/StatusDisplay.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define StatusDisplay_h #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/Text.cpp chromium-bsu-0.9.15/src/Text.cpp --- chromium-bsu-0.9.14.1/src/Text.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Text.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "Text.h" diff -Nru chromium-bsu-0.9.14.1/src/TextFTGL.cpp chromium-bsu-0.9.15/src/TextFTGL.cpp --- chromium-bsu-0.9.14.1/src/TextFTGL.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/TextFTGL.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef TEXT_FTGL diff -Nru chromium-bsu-0.9.14.1/src/TextFTGL.h chromium-bsu-0.9.15/src/TextFTGL.h --- chromium-bsu-0.9.14.1/src/TextFTGL.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/TextFTGL.h 2011-02-07 03:59:50.000000000 +0000 @@ -9,7 +9,7 @@ #define TextFTGL_h #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef TEXT_FTGL diff -Nru chromium-bsu-0.9.14.1/src/textGeometryBSU.cpp chromium-bsu-0.9.15/src/textGeometryBSU.cpp --- chromium-bsu-0.9.14.1/src/textGeometryBSU.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/textGeometryBSU.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,12 +7,12 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/textGeometryChromium.cpp chromium-bsu-0.9.15/src/textGeometryChromium.cpp --- chromium-bsu-0.9.14.1/src/textGeometryChromium.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/textGeometryChromium.cpp 2011-02-14 03:54:03.000000000 +0000 @@ -7,12 +7,12 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include "compatibility.h" -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/TextGLC.cpp chromium-bsu-0.9.15/src/TextGLC.cpp --- chromium-bsu-0.9.14.1/src/TextGLC.cpp 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/TextGLC.cpp 2011-02-07 03:59:50.000000000 +0000 @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef TEXT_GLC @@ -39,14 +39,16 @@ that your language looks good in. */ glcNewFontFromFamily(defaultFont, _("Gothic Uralic")); - glcFontFace(defaultFont, "Bold"); - glcFont(defaultFont); + if( GLC_NONE == glcGetError() ) { + glcFontFace(defaultFont, "Bold"); + glcFont(defaultFont); + } #ifdef FONT_NAME // Get distributor-specified font distroFont = glcGenFontID(); glcNewFontFromFamily(distroFont, FONT_NAME); - glcFont(distroFont); + if( GLC_NONE == glcGetError() ) glcFont(distroFont); #else distroFont = 0; #endif @@ -55,7 +57,7 @@ if( NULL != getenv("CHROMIUM_BSU_FONT") ){ userFont = glcGenFontID(); glcNewFontFromFamily(userFont, getenv("CHROMIUM_BSU_FONT")); - glcFont(userFont); + if( GLC_NONE == glcGetError() ) glcFont(userFont); } else { userFont = 0; } @@ -70,18 +72,12 @@ TextGLC::~TextGLC() { glcFont(0); - if(defaultFont) glcDeleteFont(defaultFont); - if(distroFont) glcDeleteFont(distroFont); - if(userFont) glcDeleteFont(userFont); + if(defaultFont){ glcDeleteFont(defaultFont); defaultFont = 0; } + if(distroFont){ glcDeleteFont(distroFont); distroFont = 0; } + if(userFont){ glcDeleteFont(userFont); userFont = 0; } glcContext(0); - if(context) glcDeleteContext(context); - - // WORKAROUND: 2987891 - // This function also resets the GLC error state and - // calling it prevents glcContext from inheriting any - // errors from the previous version of the GLC context - glcGetError(); + if(context){ glcDeleteContext(context); context = 0; } } void TextGLC::Render(const char* str, const int len) diff -Nru chromium-bsu-0.9.14.1/src/TextGLC.h chromium-bsu-0.9.15/src/TextGLC.h --- chromium-bsu-0.9.14.1/src/TextGLC.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/TextGLC.h 2011-02-14 03:54:03.000000000 +0000 @@ -9,12 +9,12 @@ #define TextGLC_h #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef TEXT_GLC -#ifdef HAVE_APPLE_OPENGL_FRAMEWORK +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) #include #else #include diff -Nru chromium-bsu-0.9.14.1/src/Text.h chromium-bsu-0.9.15/src/Text.h --- chromium-bsu-0.9.14.1/src/Text.h 2010-06-19 09:04:44.000000000 +0000 +++ chromium-bsu-0.9.15/src/Text.h 2011-02-07 03:59:50.000000000 +0000 @@ -9,7 +9,7 @@ #define Text_h #ifdef HAVE_CONFIG_H -#include +#include #endif /**