From fb8b749677495074008ee4ac7b735cc250d71364 Mon Sep 17 00:00:00 2001 From: Erki Ferenc Date: Fri, 27 Aug 2010 01:28:29 +0200 Subject: [PATCH 1/2] ebuild: added LINGUAS_IT support, corrected the header, and reverted space indents to tabs --- packaging/gentoo/current_stable.ebuild | 3 +- packaging/gentoo/current_testing.ebuild | 71 +++++++++++++----------- packaging/gentoo/fpdb-9999.ebuild | 73 +++++++++++++------------ 3 files changed, 79 insertions(+), 68 deletions(-) diff --git a/packaging/gentoo/current_stable.ebuild b/packaging/gentoo/current_stable.ebuild index a62b2fe0..edc70791 100644 --- a/packaging/gentoo/current_stable.ebuild +++ b/packaging/gentoo/current_stable.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# created by Steffen Schaumburg, steffen@schaumburger.info and Erki Ferenc, erkiferenc@gmail.com +# $Header: $ + EAPI="2" inherit eutils diff --git a/packaging/gentoo/current_testing.ebuild b/packaging/gentoo/current_testing.ebuild index 73bedd02..9741f2b8 100644 --- a/packaging/gentoo/current_testing.ebuild +++ b/packaging/gentoo/current_testing.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# created by Steffen Schaumburg, steffen@schaumburger.info and Erki Ferenc, erkiferenc@gmail.com +# $Header: $ + EAPI="2" inherit eutils @@ -17,49 +18,53 @@ SLOT="0" KEYWORDS="~amd64 ~x86" #note: this should work on other architectures too, please send me your experiences -IUSE="graph mysql postgres sqlite linguas_hu" +IUSE="graph mysql postgres sqlite linguas_hu linguas_it" RDEPEND=" - mysql? ( virtual/mysql - dev-python/mysql-python ) - postgres? ( dev-db/postgresql-server - dev-python/psycopg ) - sqlite? ( dev-lang/python[sqlite] - dev-python/numpy ) - >=x11-libs/gtk+-2.10 - dev-python/pygtk - graph? ( dev-python/numpy - dev-python/matplotlib[gtk] ) - dev-python/python-xlib - dev-python/pytz" + mysql? ( virtual/mysql + dev-python/mysql-python ) + postgres? ( dev-db/postgresql-server + dev-python/psycopg ) + sqlite? ( dev-lang/python[sqlite] + dev-python/numpy ) + >=x11-libs/gtk+-2.10 + dev-python/pygtk + graph? ( dev-python/numpy + dev-python/matplotlib[gtk] ) + dev-python/python-xlib + dev-python/pytz" DEPEND="${RDEPEND}" src_install() { - insinto "${GAMES_DATADIR}"/${PN} - doins -r gfx - doins -r pyfpdb + insinto "${GAMES_DATADIR}"/${PN} + doins -r gfx + doins -r pyfpdb - if use linguas_hu; then - dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo - fi + if use linguas_hu; then + dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo + fi - doins readme.txt + if use linguas_it; then + dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo + fi - exeinto "${GAMES_DATADIR}"/${PN} - doexe run_fpdb.py + doins readme.txt - dodir "${GAMES_BINDIR}" - dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} + exeinto "${GAMES_DATADIR}"/${PN} + doexe run_fpdb.py - newicon gfx/fpdb-icon.png ${PN}.png - make_desktop_entry ${PN} + dodir "${GAMES_BINDIR}" + dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} - chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw - prepgamesdirs + newicon gfx/fpdb-icon.png ${PN}.png + make_desktop_entry ${PN} + + chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw + prepgamesdirs } pkg_postinst() { - games_pkg_postinst - elog "Note that if you really want to use mysql or postgresql you will have to create" - elog "the database and user yourself and enter it into the fpdb config." - elog "You can find the instructions on the project's website." + games_pkg_postinst + elog "Note that if you really want to use mysql or postgresql you will have to create" + elog "the database and user yourself and enter it into the fpdb config." + elog "You can find the instructions on the project's website." } diff --git a/packaging/gentoo/fpdb-9999.ebuild b/packaging/gentoo/fpdb-9999.ebuild index b3bfa9dc..683b3f45 100644 --- a/packaging/gentoo/fpdb-9999.ebuild +++ b/packaging/gentoo/fpdb-9999.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# created by Steffen Schaumburg, steffen@schaumburger.info and Erki Ferenc, erkiferenc@gmail.com +# $Header: $ + EAPI="2" inherit eutils @@ -18,53 +19,57 @@ SLOT="0" KEYWORDS="" #note: this should work on other architectures too, please send me your experiences -IUSE="graph mysql postgres sqlite linguas_hu" +IUSE="graph mysql postgres sqlite linguas_hu linguas_it" RDEPEND=" - mysql? ( virtual/mysql - dev-python/mysql-python ) - postgres? ( dev-db/postgresql-server - dev-python/psycopg ) - sqlite? ( dev-lang/python[sqlite] - dev-python/numpy ) - >=x11-libs/gtk+-2.10 - dev-python/pygtk - graph? ( dev-python/numpy - dev-python/matplotlib[gtk] ) - dev-python/python-xlib - dev-python/pytz" + mysql? ( virtual/mysql + dev-python/mysql-python ) + postgres? ( dev-db/postgresql-server + dev-python/psycopg ) + sqlite? ( dev-lang/python[sqlite] + dev-python/numpy ) + >=x11-libs/gtk+-2.10 + dev-python/pygtk + graph? ( dev-python/numpy + dev-python/matplotlib[gtk] ) + dev-python/python-xlib + dev-python/pytz" DEPEND="${RDEPEND}" src_unpack() { - git_src_unpack + git_src_unpack } src_install() { - insinto "${GAMES_DATADIR}"/${PN} - doins -r gfx - doins -r pyfpdb + insinto "${GAMES_DATADIR}"/${PN} + doins -r gfx + doins -r pyfpdb - if use linguas_hu; then - dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo - fi + if use linguas_hu; then + dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo + fi - doins readme.txt + if use linguas_it; then + dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo + fi - exeinto "${GAMES_DATADIR}"/${PN} - doexe run_fpdb.py + doins readme.txt - dodir "${GAMES_BINDIR}" - dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} + exeinto "${GAMES_DATADIR}"/${PN} + doexe run_fpdb.py - newicon gfx/fpdb-icon.png ${PN}.png - make_desktop_entry ${PN} + dodir "${GAMES_BINDIR}" + dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} - chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw - prepgamesdirs + newicon gfx/fpdb-icon.png ${PN}.png + make_desktop_entry ${PN} + + chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw + prepgamesdirs } pkg_postinst() { - games_pkg_postinst - elog "Note that if you really want to use mysql or postgresql you will have to create" - elog "the database and user yourself and enter it into the fpdb config." - elog "You can find the instructions on the project's website." + games_pkg_postinst + elog "Note that if you really want to use mysql or postgresql you will have to create" + elog "the database and user yourself and enter it into the fpdb config." + elog "You can find the instructions on the project's website." } From 861edf954e9ac90560fd300aedd238f552f9cecf Mon Sep 17 00:00:00 2001 From: Erki Ferenc Date: Sat, 28 Aug 2010 12:58:17 +0200 Subject: [PATCH 2/2] l10n: updated Hungarian translation This includes 1. a fix for a missing %s in a translated string which makes HUD failing to start when Hungarian locale is active 2. another potential string formatting mistake 3. various minor fixes, mainly typos --- pyfpdb/locale/fpdb-hu_HU.po | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pyfpdb/locale/fpdb-hu_HU.po b/pyfpdb/locale/fpdb-hu_HU.po index 11a0a35d..651006ea 100644 --- a/pyfpdb/locale/fpdb-hu_HU.po +++ b/pyfpdb/locale/fpdb-hu_HU.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" "POT-Creation-Date: 2010-08-26 18:52+CEST\n" -"PO-Revision-Date: 2010-08-26 01:40+0200\n" +"PO-Revision-Date: 2010-08-28 12:32+0200\n" "Last-Translator: Ferenc Erki \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -156,7 +156,7 @@ msgstr "A %s konfigurációs fájl nem található. Alapértelmezések használa #: Configuration.py:690 msgid "Reading configuration file %s" -msgstr "%s konfigurációs fájl használata" +msgstr "%s konfigurációs fájl olvasása" #: Configuration.py:691 msgid "" @@ -164,11 +164,11 @@ msgid "" "Reading configuration file %s\n" msgstr "" "\n" -"%s konfigurációs fájl használata\n" +"%s konfigurációs fájl olvasása\n" #: Configuration.py:696 msgid "Error parsing %s. See error log file." -msgstr "Hiba a(z) %s olvasása közben. Nézz bele a naplófájlba." +msgstr "Hiba a(z) %s értelmezése közben. Nézz bele a hibanaplóba." #: Database.py:74 msgid "Not using sqlalchemy connection pool." @@ -232,11 +232,11 @@ msgstr "ERROR: a(z) %s lekérdezés eredményének nem a player_id az első oszl #: Database.py:907 msgid "getLastInsertId(): problem fetching insert_id? ret=%d" -msgstr "getLastInsertId(): probléma insert_id lekérdezése közben? ret=%d" +msgstr "getLastInsertId(): probléma az insert_id lekérdezése közben? ret=%d" #: Database.py:919 msgid "getLastInsertId(%s): problem fetching lastval? row=%d" -msgstr "getLastInsertId(%s): probléma lastval lekérdezése közben? sor=%d" +msgstr "getLastInsertId(%s): probléma a lastval lekérdezése közben? sor=%d" #: Database.py:926 msgid "getLastInsertId(): unknown backend: %d" @@ -398,7 +398,7 @@ msgstr "Hiba analyze közben:" #: Database.py:1563 msgid "Analyze took %.1f seconds" -msgstr "Analyze %1.f másodpercig tartott" +msgstr "Analyze %.1f másodpercig tartott" #: Database.py:1573 Database.py:1579 msgid "Error during vacuum:" @@ -854,8 +854,8 @@ msgid "" "GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d " "in %s seconds - %.0f/sec" msgstr "" -"GuiBulkImport kész: Tárolt: %d \tDuplikáció: %d \tRészleges: %d \tHibák: %d " -"%s másodperc alatt - %.0f/mp" +"GuiBulkImport kész: Tárolt: %d \tDuplikáció: %d \tRészleges: %d \tHibák: %d %" +"s másodperc alatt - %.0f/mp" #: GuiDatabase.py:106 GuiLogView.py:96 msgid "Refresh" @@ -1242,7 +1242,7 @@ msgstr "A naplófájl " #: HUD_main.pyw:90 msgid "HUD_main starting: using db name = %s" -msgstr "HUD_main indítás: " +msgstr "HUD_main indítás: %s adatbázis használata" #: HUD_main.pyw:95 msgid "Note: error output is being diverted to:\n" @@ -1306,15 +1306,15 @@ msgstr "\"%s\" nevű asztal már nem létezik\n" #: HUD_main.pyw:321 msgid "" -"HUD_main.read_stdin: hand read in %4.3f seconds (%4.3f,%4.3f,%4.3f,%4.3f," -"%4.3f,%4.3f)" +"HUD_main.read_stdin: hand read in %4.3f seconds (%4.3f,%4.3f,%4.3f,%4.3f,%" +"4.3f,%4.3f)" msgstr "" -"HUD_main.read_stdin: leosztás beolvasva %4.3f mp alatt (%4.3f,%4.3f,%4.3f," -"%4.3f,%4.3f,%4.3f)" +"HUD_main.read_stdin: leosztás beolvasva %4.3f mp alatt (%4.3f,%4.3f,%4.3f,%" +"4.3f,%4.3f,%4.3f)" #: HUD_run_me.py:45 msgid "HUD_main starting\n" -msgstr "HUD_main indítása\n" +msgstr "HUD_main indítás\n" #: HUD_run_me.py:51 TournamentTracker.py:317 msgid "Using db name = %s\n" @@ -1772,7 +1772,7 @@ msgstr "utcTime:" #: HandHistoryConverter.py:685 msgid "Unable to create output directory %s for HHC!" -msgstr "A %s kimeneti könyvtár nem hozható létre a feldolgozó számára'" +msgstr "A %s kimeneti könyvtár nem hozható létre a feldolgozó számára!" #: HandHistoryConverter.py:686 msgid "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY" @@ -3136,8 +3136,8 @@ msgstr "" "GPL2 vagy újabb licensszel.\n" "A Windows telepítő csomag tartalmaz MIT licensz hatálya alá eső részeket " "is.\n" -"A licenszek szövegét megtalálod az fpdb főkönyvtárában az agpl-3.0.txt, " -"gpl-2.0.txt, gpl-3.0.txt és mit.txt fájlokban." +"A licenszek szövegét megtalálod az fpdb főkönyvtárában az agpl-3.0.txt, gpl-" +"2.0.txt, gpl-3.0.txt és mit.txt fájlokban." #: fpdb.pyw:1078 msgid "Help" @@ -3265,7 +3265,7 @@ msgid "" "Error No.%s please send the hand causing this to fpdb-main@lists.sourceforge." "net so we can fix the problem." msgstr "" -"%s számú hiba. Kérlek küldd el az ezt okozo leosztást az fpdb-main@lists." +"%s számú hiba. Kérlek küldd el az ezt okozó leosztást az fpdb-main@lists." "sourceforge.net címre, hogy ki tudjuk javítani a hibát." #: fpdb_import.py:520