gnucash-htdocs beta: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sat Aug 13 08:46:27 EDT 2022
discards https://github.com/Gnucash/gnucash-htdocs/commit/9d11ddd6 (commit)
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/0489c962 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/a8d40b54 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/052140fd (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/e8712959 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/b6cdfa67 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (https://github.com/Gnucash/gnucash-htdocs/commit/9d11ddd6)
\
N -- N -- N (https://github.com/Gnucash/gnucash-htdocs/commit/0489c962)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
commit 0489c9625a366dce269dc82d92a3b1cbe6e6ee71
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Aug 8 02:40:08 2022 +0200
make hu
diff --git a/locale/hu/LC_MESSAGES/gnucash-htdocs.mo b/locale/hu/LC_MESSAGES/gnucash-htdocs.mo
index 3a0c378..cae7186 100644
Binary files a/locale/hu/LC_MESSAGES/gnucash-htdocs.mo and b/locale/hu/LC_MESSAGES/gnucash-htdocs.mo differ
commit a8d40b5439ed53d304647e5a1780b1e9c6969ab3
Author: Szia Tomi <sziatomi01 at gmail.com>
Date: Mon Aug 1 02:20:20 2022 +0200
Translation update by Szia Tomi <sziatomi01 at gmail.com> using Weblate
po/hu.po: 34.4% (139 of 403 strings; 58 fuzzy)
61 failing checks (15.1%)
Translation: GnuCash/Website (Hungarian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/hu/
Translation update by Szia Tomi <sziatomi01 at gmail.com> using Weblate
po/hu.po: 33.9% (137 of 403 strings; 60 fuzzy)
64 failing checks (15.8%)
Translation: GnuCash/Website (Hungarian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/hu/
Co-authored-by: Szia Tomi <sziatomi01 at gmail.com>
diff --git a/po/hu.po b/po/hu.po
index 8c5614d..429952b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist."
"cgi?component=Translations&product=Website&resolution=---\n"
"POT-Creation-Date: 2021-12-21 00:25+0100\n"
-"PO-Revision-Date: 2022-06-24 13:16+0000\n"
+"PO-Revision-Date: 2022-08-01 00:20+0000\n"
"Last-Translator: Szia Tomi <sziatomi01 at gmail.com>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
"website/hu/>\n"
@@ -19,23 +19,23 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: 2.6-release-tour.phtml:3
-#, fuzzy
msgid "GnuCash 2.6 release tour"
-msgstr "GnuCash %s for"
+msgstr "A GnuCash 2.6 bemutatója"
#: 2.6-release-tour.phtml:4
msgid ""
"This tour will introduce you to new major features in <span class=\"gnucash"
"\">GnuCash</span> 2.6."
msgstr ""
+"Ez a bemutató bemutatja az új <span class=\"gnucash\">GnuCash</span> 2.6 "
+"fÅbb jellemzÅit."
#: 2.6-release-tour.phtml:17
-#, fuzzy
msgid "Jqplot Reports"
-msgstr "Reports"
+msgstr "Jqplot-jelentések"
#: 2.6-release-tour.phtml:19
msgid ""
@@ -43,6 +43,10 @@ msgid ""
"reports. This gives a more professional look to all graphical reports "
"(piechart, barchart, scatterplot)."
msgstr ""
+"A <span class=\"gnucash\">GnuCash</span> mostantól JavaScript jqplotot "
+"használ a jelentések megjelenÃtéséhez. Ez professzionálisabb megjelenést "
+"biztosÃt minden grafikus jelentésnek (kördiagram, oszlopdiagram, "
+"szórásdiagram)."
#: 2.6-release-tour.phtml:26
msgid "A barchart rendered in GnuCash with jqplot."
@@ -415,8 +419,8 @@ msgid ""
"The following links are for further sites that can help with the "
"documentation and review process."
msgstr ""
-"The following links are for further sites that can help with the "
-"documentation and review process."
+"A következÅ hivatkozások további webhelyekre mutatnak, amelyek segÃthetnek "
+"dokumentációval és folyamat felülvizsgálattal."
#: develdocs.phtml:35
msgid ""
@@ -486,7 +490,7 @@ msgstr ""
#: develdocs.phtml:66
msgid "Writers"
-msgstr "szerkesztÅk"
+msgstr "SzerkesztÅk"
#: develdocs.phtml:68
msgid ""
@@ -531,13 +535,13 @@ msgid ""
"to when writing. This still has a lot of useful information in it which "
"hasn't been transferred to the new docs."
msgstr ""
-"You may also want to retain a local copy of the old documentation to refer "
-"to when writing. This still has a lot of useful information in it which "
-"hasn't been transferred to the new docs."
+"Ãrdemes megÅrizni a régi dokumentáció egy helyi példányát is, amelyre Ãrás "
+"közben hivatkozhat. Ez még sok hasznos információt tartalmaz, amelyek nem "
+"kerültek át az új dokumentumokba."
#: develdocs.phtml:80
msgid "Reviewers"
-msgstr "Reviewers"
+msgstr "Lektorok"
#: develdocs.phtml:82
msgid ""
@@ -891,9 +895,8 @@ msgid "Purpose: Donation"
msgstr "Source Code Documentation"
#: donate.phtml:36
-#, fuzzy
msgid "Account:"
-msgstr "Amount"
+msgstr "Számla:"
#: donate.phtml:37
msgid "Bank Identifier Code (BIC):"
@@ -1182,7 +1185,7 @@ msgstr "Információ"
#: externals/menu.phtml:9
msgid "Home"
-msgstr "KezdŠképernyŠ(?)"
+msgstr "KezdÅ képernyÅ"
#: externals/menu.phtml:10 news.phtml:3
msgid "News"
@@ -1226,7 +1229,7 @@ msgstr "LevelezÅlisták"
#: externals/menu.phtml:34
msgid "Bug Reports"
-msgstr "Hiba jelentések"
+msgstr "Hibajelentések"
#: externals/menu.phtml:35
msgid "IRC (Chat)"
@@ -1289,7 +1292,7 @@ msgid ""
"of all, the publisher has committed to allocate some percentage of the book "
"sales back to the GnuCash project. Have fun with this book!"
msgstr ""
-"Egyik fejlesztÅnk, Christian Stimming szerkesztÅként dolgozott ezen a "
+"Egyik fejlesztÅnk Christian Stimming, szerkesztÅként dolgozott ezen a "
"könyvön és örülünk ennek a gyümölcsözÅ együttműködésnek. EbbÅl a könyvbÅl "
"egy kis részletet olvashat itt: %s. A szerzÅ Ãgéretet tett arra, hogy a "
"könyvbÅl származó bevétel egy kis százalékát a GnuCash projektnek "
@@ -1505,14 +1508,15 @@ msgid "Small Business Accounting Features"
msgstr "Small Business Accounting Features"
#: features.phtml:131
-#, fuzzy
msgid ""
"Simplify managing a small business with <b>Customer</b> and <b>Vendor</b> "
"tracking, <b>Jobs</b>, <b>Invoicing</b> and <b>Bill</b> Payment, and <b>Tax</"
"b> and <b>Billing Terms</b>."
msgstr ""
-"Simplify managing a small business with Customer and Vendor tracking, "
-"Invoicing and Bill Payment, and Tax and Billing Terms."
+"EgyszerűsÃti a kisvállalkozás ügyvitelét az <b>Ãgyfél</b> és a <b>SzállÃtó</"
+"b> nyomon követésével, a <b>Munkák</b>, a <b>KimenŠszámlázás</b> és a "
+"<b>BejövŠszámlák</b> fizetésével, valamint az <b>Adó</b> és a <b>Számlázási "
+"feltételek</b> segÃtségével."
#: features.phtml:134
msgid ""
@@ -1718,7 +1722,7 @@ msgstr "Köszönti a GnuCash.org"
#: index.phtml:14
#, php-format
msgid "Download GnuCash %s"
-msgstr "A GnuCash letöltése %s"
+msgstr "A GnuCash %s letöltése"
#: index.phtml:18
msgid "Via distribution"
@@ -1797,7 +1801,7 @@ msgstr "KettÅs könyvelés"
#: index.phtml:72
msgid "Stock/Bond/Mutual Fund Accounts"
-msgstr "Stock/Bond/Mutual Fund Accounts"
+msgstr "Részvény-/Kötvény-/Befektetési alapszámlák"
#: index.phtml:73
msgid "Small-Business Accounting"
@@ -1805,7 +1809,7 @@ msgstr "Kisvállalkozás könyvelése"
#: index.phtml:75
msgid "QIF/OFX/HBCI Import, Transaction Matching"
-msgstr "QIF/OFX/HBCI Import, Transaction Matching"
+msgstr "QIF/OFX/HBCI Import, Tranzakcióegyeztetés"
#: index.phtml:77
msgid "Financial Calculations"
@@ -1833,9 +1837,9 @@ msgid "great new features"
msgstr "Main features"
#: new_features-4.0.phtml:4
-#, fuzzy, php-format
+#, php-format
msgid "What's New in GnuCash %s"
-msgstr "What's New in GnuCash 1.9.1?"
+msgstr "A GnuCash %s újdonságai"
#: new_features-4.0.phtml:15
#, fuzzy
@@ -2272,7 +2276,7 @@ msgstr "Author Credits"
#: sizing.phtml:319
msgid "Each cell displays the following:"
-msgstr "Minden cella következÅt mutatja:"
+msgstr "Minden cella a következÅt mutatja:"
#: sizing.phtml:323
msgid ""
commit 052140fd0515d553b5ef09fbc8ee8addfc7cd43a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Jul 30 04:19:38 2022 +0200
make de
393 übersetzte Meldungen, 10 ungenaue Ãbersetzungen.
diff --git a/locale/de/LC_MESSAGES/gnucash-htdocs.mo b/locale/de/LC_MESSAGES/gnucash-htdocs.mo
index 641e2d7..7a2e75c 100644
Binary files a/locale/de/LC_MESSAGES/gnucash-htdocs.mo and b/locale/de/LC_MESSAGES/gnucash-htdocs.mo differ
commit e8712959c20d220db59f4e482f40ed83af7f11c6
Author: Christian Wehling <christian.wehling at web.de>
Date: Fri Jul 29 17:22:00 2022 +0200
Translation update by Christian Wehling <christian.wehling at web.de> using Weblate
po/de.po: 97.5% (393 of 403 strings; 10 fuzzy)
24 failing checks (5.9%)
Translation: GnuCash/Website (German)
Translate-URL: https://hosted.weblate.org/projects/gnucash/website/de/
Co-authored-by: Christian Wehling <christian.wehling at web.de>
diff --git a/po/de.po b/po/de.po
index a1091ee..b60d440 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
# Frank H. Ellenberger <gnucash at mataram.de>, 2007.
# SebastianL <Sebastian.Lueck at gmail.com>, 2020.
# Milo Ivir <mail at milotype.de>, 2020.
-# Christian Wehling <christian.wehling at web.de>, 2020, 2021.
+# Christian Wehling <christian.wehling at web.de>, 2020, 2021, 2022.
# Marco Zietzling <marco.zietzling at gmail.com>, 2020, 2021.
# Thomas Kriegel <warrel040 at gmx.de>, 2021.
# Jan Schneider <grimpeur78 at gmail.com>, 2022.
@@ -18,8 +18,8 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/buglist."
"cgi?component=Translations&product=Website&resolution=---\n"
"POT-Creation-Date: 2021-12-21 00:25+0100\n"
-"PO-Revision-Date: 2022-05-17 20:14+0000\n"
-"Last-Translator: Jan Schneider <grimpeur78 at gmail.com>\n"
+"PO-Revision-Date: 2022-07-29 15:22+0000\n"
+"Last-Translator: Christian Wehling <christian.wehling at web.de>\n"
"Language-Team: German <https://hosted.weblate.org/projects/gnucash/website/"
"de/>\n"
"Language: de\n"
@@ -27,7 +27,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
#: 2.6-release-tour.phtml:3
msgid "GnuCash 2.6 release tour"
@@ -2066,11 +2066,11 @@ msgid ""
"by step."
msgstr ""
"<span class=\"gnucash\">GnuCash</span> ist gut dokumentiert, es gibt das "
-"<b>Manual</b> (überwiegend in englisch), und neue Benutzer haben die "
-"Möglichkeit im <b>Kurs und Konzepte</b> viele Dinge zu erfahren. Dieses "
-"Dokument gibt Hintergrundinformationen zu buchhalterischen Prinzipien und "
-"wie sie in <span class=\"gnucash\">GnuCash</span> umgesetzt werden, mit "
-"vielen praktischen Beispielen Schritt für Schritt."
+"<b>Manual</b>, und neue Benutzer haben die Möglichkeit im <b>Kurs und "
+"Konzepte</b> viele Dinge zu erfahren. Dieses Dokument gibt "
+"Hintergrundinformationen zu buchhalterischen Prinzipien und wie sie in <span "
+"class=\"gnucash\">GnuCash</span> umgesetzt werden, mit vielen praktischen "
+"Beispielen Schritt für Schritt."
#: index.phtml:10
msgid "Welcome to GnuCash.org"
commit b6cdfa679a59807ee21deb9f8599623578938ef4
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 7 15:24:16 2022 -0700
Refactor locale detection.
Parse all language strings the same regardless of source.
Use language quality factors if included.
diff --git a/lang.php b/lang.php
index f1848ac..87601f6 100644
--- a/lang.php
+++ b/lang.php
@@ -2,6 +2,27 @@
$top_dir = ".";
$locale_dir = "locale";
+# key: locale, value: lang_dir
+$supported_languages = array(
+ 'ca_ES' => 'ca',
+ 'de_DE' => 'de',
+ 'en_US' => 'en',
+ 'es_ES' => 'es',
+ 'fr_FR' => 'fr',
+ 'he_IL' => 'he',
+ 'hr_HR' => 'hr',
+ 'hu_HU' => 'hu',
+ 'id_ID' => 'id',
+ 'it_IT' => 'it',
+ 'ja_JP' => 'ja',
+ 'nb_NO' => 'nb',
+ 'nl_NL' => 'nl',
+ 'pl_PL' => 'pl',
+ 'pt_PT' => 'pt',
+ 'zh_CN' => 'zh_CN',
+ 'zh_TW' => 'zh_TW'
+);
+
if (!array_key_exists('HTTP_HOST', $_SERVER) || ($_SERVER["HTTP_HOST"] == "lists.gnucash.org"))
{
$home = "https://www.gnucash.org";
@@ -21,76 +42,53 @@ if (array_key_exists('lang_cookie', $_COOKIE)) {
}
# allow user override.
-$get_lang = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
-
-if ($get_lang) { $locale = $get_lang; }
+$languages = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
# choose a default language based on the client browser's preferred
# language list
#echo ("<!-- top_dir: $top_dir, me: ".__FILE__."-->\n");
+# Find the locale from Client Accept language
+# Get user preferred languages, and match against supported language
+if ($languages == "" and isset( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ) )
+{
+ # tolower() => remove space => '-' -> '_'
+ $accept_language = filter_input(INPUT_SERVER, 'HTTP_ACCEPT_LANGUAGE', FILTER_SANITIZE_STRING);
+ $languages = str_replace('-','_', str_replace(' ', '', strtolower($accept_language)));
+}
-# key: locale, value: lang_dir
-$supported_languages = array(
- 'ca_ES' => 'ca',
- 'de_DE' => 'de',
- 'en_US' => 'en',
- 'es_ES' => 'es',
- 'fr_FR' => 'fr',
- 'he_IL' => 'he',
- 'hr_HR' => 'hr',
- 'hu_HU' => 'hu',
- 'id_ID' => 'id',
- 'it_IT' => 'it',
- 'ja_JP' => 'ja',
- 'nb_NO' => 'nb',
- 'nl_NL' => 'nl',
- 'pl_PL' => 'pl',
- 'pt_PT' => 'pt',
- 'zh_CN' => 'zh_CN',
- 'zh_TW' => 'zh_TW'
-);
-
-# Find the full locale name for short language name.
-if (strlen($locale) == 2) {
- foreach($supported_languages as $loc_lang => $loc_dir)
+$ranked_langs = [];
+$languages = explode(",", $languages);
+if (count($languages) > 1) {
+ foreach ($languages as $item)
{
- if ( (strtolower($locale) == strtolower($loc_dir))
- || (strtolower($locale) == substr($loc_lang, 0, 2 )) )
- {
- $locale = $loc_lang;
- break;
+ $parts = explode(";", $item);
+ if (!$parts[1]) {
+ $ranked_langs[$parts[0]] = 1.0;
+ } else {
+ $ranked_langs[$parts[0]] = (float)substr($parts[1], 2);
}
}
+ arsort($ranked_langs, SORT_NUMERIC);
+} else if ($languages[0] != "") {
+ $ranked_langs[$languages[0]] = 1.0;
}
-# Find the locale from Client Accept language
-if ($locale == "") {
- # Get user preferred languages, and match against supported language
- if ( isset( $_SERVER["HTTP_ACCEPT_LANGUAGE"] ) )
+foreach (array_keys($ranked_langs) as $lang) {
+ if ($ranked_langs[$lang] == 0) {
+ break;
+ }
+ $lang_short = substr($lang, 0, 2);
+ # full match is prefer, but short match is acceptable.
+ foreach ($supported_languages as $loc_lang => $loc_dir)
{
- # tolower() => remove space => '-' -> '_'
- # "fr-ch;q=0.3, en, zh-cn;q=0.7" => "fr_ch;q=0.3,en,zh_cn;q=0.7"
- $accept_language = filter_input(INPUT_SERVER, 'HTTP_ACCEPT_LANGUAGE', FILTER_SANITZE_STRING);
- $languages = str_replace('-','_', str_replace(' ', '', strtolower($accept_language)));
- $languages = explode(",", $languages);
- foreach ($languages as $item)
- {
- # "zh_cn;q=0.7" => "zh_cn"
- $lang = substr($item, 0, strcspn($item, ';'));
- $lang_short = substr($lang, 0, 2);
- # full match is prefer, but short match is acceptable.
- foreach ($supported_languages as $loc_lang => $loc_dir)
- {
- if ($lang == strtolower($loc_lang)) { $locale = $loc_lang; break; }
- if ($lang_short == substr($loc_lang, 0, 2 )) { $locale = $loc_lang; }
- }
- if ($locale != "") { break; }
- }
+ if ($lang == strtolower($loc_lang)) { $locale = $loc_lang; break; }
+ if ($lang_short == substr($loc_lang, 0, 2 )) { $locale = $loc_lang; }
}
- # nothing matched, use default language
- if ($locale == "") { $locale = "en_US"; }
+ if ($locale != "") { break; }
}
+# nothing matched, use default language
+if ($locale == "") { $locale = "en_US"; }
$lang_dir = array_key_exists($locale, $supported_languages) ?
$supported_languages[$locale] : "en";
Summary of changes:
lang.php | 9 ++---
locale/de/LC_MESSAGES/gnucash-htdocs.mo | Bin 92138 -> 92119 bytes
locale/hu/LC_MESSAGES/gnucash-htdocs.mo | Bin 19686 -> 21130 bytes
po/de.po | 18 +++++-----
po/hu.po | 58 +++++++++++++++++---------------
5 files changed, 45 insertions(+), 40 deletions(-)
More information about the gnucash-changes
mailing list