aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
pull/1506/head
Frank H. Ellenberger 3 years ago
parent 09751e20c5 2d66631fea
commit d039e65aca
10 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File

2
bindings/guile/core-utils.scm
Unescape View File

@ -111,7 +111,7 @@
(set-exception-printer! 'unbound-variable print-unbound-variable-error)
;; format.
(define %regex (make-regexp "[$][{]([[:alnum:]]+)[}]"))
(define %regex (make-regexp "[$][{]([[:alnum:]\\-]+)[}]"))
(define (gnc:format str . bindings)
(define hash (make-hash-table))
(define (substitute m)

4
bindings/guile/test/test-core-utils.scm
Unescape View File

@ -30,6 +30,10 @@
"basic test"
(gnc:format "basic ${job}" 'job "test"))
(test-equal "one substitution with hyphen"
"master chief"
(gnc:format "master ${job-title}" 'job-title "chief"))
(test-equal "two substitutions out of order"
"basic test"
(gnc:format "${difficulty} ${job}" 'job "test" 'difficulty "basic"))

19
gnucash/report/reports/standard/account-summary.scm
Unescape View File

@ -297,14 +297,17 @@
(exchange-fn (gnc:case-exchange-fn price-source report-commodity to-date)))
(gnc:html-document-set-title!
doc (string-append
company-name " " report-title " "
(if sx?
;; Translators: This is part of the report title, which is capitalzed in English, but not all other languages
(format #f (G_ "For Period Covering ~a to ~a")
(qof-print-date from-date)
(qof-print-date to-date))
(qof-print-date to-date))))
doc
(if sx?
(gnc:format (G_ "${company-name} ${report-title} For Period Covering ${start} to ${end}")
'company-name company-name
'report-title report-title
'start (qof-print-date from-date)
'end (qof-print-date to-date))
(gnc:format (G_ "${company-name} ${report-title} ${date}")
'company-name company-name
'report-title report-title
'date (qof-print-date to-date))))
(if (null? accounts)

11
gnucash/report/reports/standard/equity-statement.scm
Unescape View File

@ -283,12 +283,11 @@
(gnc:account-get-comm-balance-at-date account end-date #f))
(gnc:html-document-set-title!
doc (format #f
(string-append "~a ~a "
(G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date)))
doc (gnc:format (G_ "${company-name} ${report-title} For Period Covering ${start} to ${end}")
'company-name company-name
'report-title report-title
'start (qof-print-date start-date-printable)
'end (qof-print-date end-date)))
(if (null? accounts)

9
gnucash/report/reports/standard/income-statement.scm
Unescape View File

@ -377,10 +377,11 @@
(gnc:html-table-append-ruler! table (* 2 tree-depth)))
(gnc:html-document-set-title!
doc (format #f (string-append "~a ~a " (G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date)))
doc (gnc:format (G_ "${company-name} ${report-title} For Period Covering ${start} to ${end}")
'company-name company-name
'report-title report-title
'start (qof-print-date start-date-printable)
'end (qof-print-date end-date)))
(if (null? accounts)

20
gnucash/report/reports/standard/trial-balance.scm
Unescape View File

@ -374,15 +374,17 @@
(period-for (string-append " " (G_ "for Period"))))
(gnc:html-document-set-title!
doc (if (eq? report-variant 'current)
(format #f "~a ~a ~a"
company-name report-title
(qof-print-date end-date))
(format #f (string-append "~a ~a "
(G_ "For Period Covering ~a to ~a"))
company-name report-title
(qof-print-date start-date-printable)
(qof-print-date end-date))))
doc
(if (eq? report-variant 'current)
(gnc:format (G_ "${company-name} ${report-title} ${date}")
'company-name company-name
'report-title report-title
'date (qof-print-date end-date))
(gnc:format (G_ "${company-name} ${report-title} For Period Covering ${start} to ${end}")
'company-name company-name
'report-title report-title
'start (qof-print-date start-date-printable)
'end (qof-print-date end-date))))
(if (null? accounts)

14
po/fr.po
Unescape View File

@ -14,7 +14,7 @@
# La Boussole <yoann@laboussole.coop>, 2018.
# Christopher Lam, 2018
# K. Herbert <herbert.ka@mailo.com>, 2020.
# Christopher Lam <christopher.lck@gmail.com>, 2020, 2021.
# Christopher Lam <christopher.lck@gmail.com>, 2020, 2021, 2023.
# Laurent DÉRÉDEC <images-ld@gmx.fr>, 2021.
# Julien Humbert <julroy67@gmail.com>, 2021.
# Un Anonyme <vehrzafk1@gmail.com>, 2021.
@ -34,11 +34,11 @@
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.13-pre1\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-12-04 19:47-0800\n"
"PO-Revision-Date: 2022-10-12 11:25+0000\n"
"Last-Translator: Philippe Lamare <ph.lamare@free.fr>\n"
"PO-Revision-Date: 2023-01-19 16:49+0000\n"
"Last-Translator: Christopher Lam <christopher.lck@gmail.com>\n"
"Language-Team: French <https://hosted.weblate.org/projects/gnucash/gnucash/"
"fr/>\n"
"Language: fr\n"
@ -46,7 +46,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.15-dev\n"
"X-Generator: Weblate 4.15.1\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@ -6622,7 +6622,7 @@ msgstr "Exporter"
#. to be used as toolbar button label.
#: gnucash/gnome/gnc-plugin-page-report.c:1140
msgid "Save Config"
msgstr "Enregistrer Config"
msgstr "Enregistrer la configuration"
#. Translators: This string is meant to be a short alternative for "Save Report Configuration As..."
#. to be used as toolbar button label.

14
po/glossary/sv.po
Unescape View File

@ -3,17 +3,17 @@
# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003.
# Jonas Norling <norling@lysator.liu.se>, 2006.
# Kristoffer Grundström <swedishsailfishosuser@tutanota.com>, 2021.
# Arve Eriksson <031299870@telia.com>, 2021, 2022.
# Arve Eriksson <031299870@telia.com>, 2021, 2022, 2023.
#
# $Id$
#
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.8\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2021-12-05 20:11+0100\n"
"PO-Revision-Date: 2022-01-03 03:41+0000\n"
"PO-Revision-Date: 2023-01-18 09:51+0000\n"
"Last-Translator: Arve Eriksson <031299870@telia.com>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/gnucash/glossary/"
"sv/>\n"
@ -22,7 +22,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.10.1\n"
"X-Generator: Weblate 4.15.1-dev\n"
#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
msgid "Term (Dear translator: This file will never be visible to the user!)"
@ -791,11 +791,11 @@ msgstr "skattetyp: försäljningsskatt"
#. "'Goods and Service Tax' is one form of sales tax."
msgid "tax type: GST"
msgstr "skattetyp: GST"
msgstr "skattetyp: moms"
#. "'Value Added Tax' is the other form of sales tax."
msgid "tax type: VAT"
msgstr "skattetyp: mervärdesskatt (moms)"
msgstr "skattetyp: mervärdesskatt"
#. "If you create a new e.g. style sheet, you can start from a template."
msgid "template"

34
po/he.po
Unescape View File

@ -8,13 +8,13 @@
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.13-pre1\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-12-04 19:47-0800\n"
"PO-Revision-Date: 2023-01-10 12:51+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/"
"program-beta/he/>\n"
"PO-Revision-Date: 2023-01-18 17:04+0000\n"
"Last-Translator: Avi Markovitz <avi.markovitz@gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/gnucash/gnucash/"
"he/>\n"
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -5861,8 +5861,8 @@ msgid ""
"Add the current report's configuration to the 'Reports->Saved Report "
"Configurations' menu. The report configuration will be saved in the file %s."
msgstr ""
"הוספת תצורת־הדוח הנוכחי לתפריט 'דוחותlarr;תצורות־דוחות שמורים'. תצורת־הדוח "
"תשמר לקובץ %s."
"הוספת תצורת־הדוח הנוכחי לתפריט 'דוחות&larr;תצורות־דוחות שמורים'. תצורת־הדוח "
"תישמר לקובץ %s."
#: gnucash/gnome/gnc-plugin-page-report.c:1205
msgid "_Print Report..."
@ -8882,7 +8882,7 @@ msgstr "תחילת רבעון קודם"
#: gnucash/gnome-utils/gnc-period-select.c:75
#: libgnucash/app-utils/date-utilities.scm:930
msgid "Start of this year"
msgstr "תחילת השנה הנוכחית"
msgstr "תחילת שנה נוכחית"
#: gnucash/gnome-utils/gnc-period-select.c:76
#: libgnucash/app-utils/date-utilities.scm:944
@ -8919,7 +8919,7 @@ msgstr "סוף רבעון קודם"
#: gnucash/gnome-utils/gnc-period-select.c:91
#: libgnucash/app-utils/date-utilities.scm:937
msgid "End of this year"
msgstr "סוף השנה הנוכחית"
msgstr "סוף שנה נוכחית"
#: gnucash/gnome-utils/gnc-period-select.c:92
#: libgnucash/app-utils/date-utilities.scm:951
@ -11631,7 +11631,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:165
#: gnucash/gtkbuilder/dialog-preferences.glade:1212
msgid "In the current calendar year"
msgstr "השנה האזרחית הנוכחית"
msgstr "בשנה האזרחית הנוכחית"
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:166
#: gnucash/gschemas/org.gnucash.GnuCash.gschema.xml.in:171
@ -16473,7 +16473,7 @@ msgstr "<b>השלמת נתונים</b>"
#: gnucash/gtkbuilder/dialog-preferences.glade:1202
msgid "When a date is entered without year, it should be taken"
msgstr "כאשר תאריך מוזן ללא שנה, השנה תושלם"
msgstr "אם בעת הזנת תאריך, לא הוזנה השנה, ההזנה אמורה להתקבל"
#: gnucash/gtkbuilder/dialog-preferences.glade:1218
msgid ""
@ -28957,23 +28957,23 @@ msgstr "היום הראשון, בלוח השנה האזרחית הקודמת."
#: libgnucash/app-utils/date-utilities.scm:954
msgid "Last day of the previous calendar year."
msgstr "היום האחרון, בלוח השנה האזרחית הקודמת."
msgstr "יום אחרון, בלוח השנה האזרחית הקודמת."
#: libgnucash/app-utils/date-utilities.scm:958
msgid "Start of next year"
msgstr "תחילת השנה הבאה"
msgstr "תחילת שנה הבאה"
#: libgnucash/app-utils/date-utilities.scm:961
msgid "First day of the next calendar year."
msgstr "היום הראשון, בבלוח השנה האזרחית הבאה."
msgstr "יום ראשון, בלוח השנה האזרחית הבאה."
#: libgnucash/app-utils/date-utilities.scm:965
msgid "End of next year"
msgstr "סוף השנה הבאה"
msgstr "סוף שנה הבאה"
#: libgnucash/app-utils/date-utilities.scm:968
msgid "Last day of the next calendar year."
msgstr "היום האחרון, בלוח השנה הבאה."
msgstr "יום אחרון, בלוח השנה האזרחית הבאה."
#: libgnucash/app-utils/date-utilities.scm:972
msgid "Start of accounting period"

18
po/ru.po
Unescape View File

@ -15,14 +15,15 @@
# МАН69К <weblate@mah69k.net>, 2022.
# Nikita Samoilov <n.p.samoilov@gmail.com>, 2022.
# Vik <xasertop@gmail.com>, 2022.
# Vin <k3kelm4vw@mozmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.13-pre1\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-12-04 19:47-0800\n"
"PO-Revision-Date: 2022-08-27 13:17+0000\n"
"Last-Translator: Vik <xasertop@gmail.com>\n"
"PO-Revision-Date: 2023-01-20 19:01+0000\n"
"Last-Translator: Vin <k3kelm4vw@mozmail.com>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"ru/>\n"
"Language: ru\n"
@ -31,7 +32,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Weblate 4.14.1-dev\n"
"X-Generator: Weblate 4.15.1\n"
"X-Source-Language: C\n"
# For the translation in '../borrowed/goffice/go-charmap-sel.c' see
@ -16211,10 +16212,8 @@ msgid "All _accounts"
msgstr "Все счета"
#: gnucash/gtkbuilder/dialog-find-account.glade:165
#, fuzzy
#| msgid " Search "
msgid "Search scope"
msgstr " Поиск "
msgstr "Область поиска"
#: gnucash/gtkbuilder/dialog-find-account.glade:191
msgid "Account Full Name"
@ -25992,9 +25991,8 @@ msgid "Barchart"
msgstr "Гистограмма активов"
#: gnucash/report/reports/standard/balsheet-pnl.scm:1191
#, fuzzy
msgid " to "
msgstr "%s по %s"
msgstr " по "
#: gnucash/report/reports/standard/balsheet-pnl.scm:1254
#: gnucash/report/reports/standard/trial-balance.scm:855

Write Preview
Loading…
Cancel
Save