Merge branch 'maint'

This commit is contained in:
Geert Janssens 2017-09-10 19:16:38 +02:00
commit 556f7037ad
4 changed files with 19 additions and 6 deletions

View File

@ -74,6 +74,7 @@ static GncEmployee * gncEmployeeLookupFlip(GncGUID g, QofBook *b)
GLIST_HELPER_INOUT(GncInvoiceList, SWIGTYPE_p__gncInvoice);
GLIST_HELPER_INOUT(EntryList, SWIGTYPE_p__gncEntry);
GLIST_HELPER_INOUT(GncTaxTableGetTables, SWIGTYPE_p__gncTaxTable);
GLIST_HELPER_INOUT(GncTaxTableEntryList, SWIGTYPE_p__gncTaxTableEntry);
GLIST_HELPER_INOUT(OwnerList, SWIGTYPE_p__gncOwner);

View File

@ -681,7 +681,7 @@ GncTaxTable *gncTaxTableLookupByName (QofBook *book, const char *name)
return NULL;
}
GList * gncTaxTableGetTables (QofBook *book)
GncTaxTableList * gncTaxTableGetTables (QofBook *book)
{
struct _book_info *bi;
if (!book) return NULL;

View File

@ -152,7 +152,8 @@ static inline GncTaxTable *gncTaxTableLookup (const QofBook* book, const GncGUID
GncTaxTable *gncTaxTableLookupByName (QofBook *book, const char *name);
GList * gncTaxTableGetTables (QofBook *book);
typedef GList GncTaxTableList;
GncTaxTableList * gncTaxTableGetTables (QofBook *book);
const char *gncTaxTableGetName (const GncTaxTable *table);
GncTaxTable *gncTaxTableGetParent (const GncTaxTable *table);

View File

@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: GnuCash 2.6.15\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-04 00:02+0200\n"
"PO-Revision-Date: 2017-09-04 17:10+0200\n"
"PO-Revision-Date: 2017-09-09 21:33+0200\n"
"Last-Translator: Mechtilde <ooo@mechtilde.de>\n"
"Language-Team: GnuCash-de <gnucash-de@gnucash.org>\n"
"Language: de\n"
@ -8313,6 +8313,17 @@ msgstr "Standardwährung, die bei neuen Berichten verwendet wird"
msgid "Zoom factor to use by default for reports."
msgstr "Vorgabe der Vergrößerung in Berichten."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:112
#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:179
msgid ""
"On high resolution screens reports tend to be hard to read. This option "
"allows you to scale reports up by the set factor. For example setting this "
"to 2.0 will display reports at twice their typical size."
msgstr ""
"Auf hochauflösenden Bildschirmen können Berichte schwer zu lesen sein.\n"
"Diese Option erlaubt das Skalieren der Berichte um den gewählten Faktor.\n"
"Z.B. wird ein Wert von 2 die Berichte mit dem Doppelten ihrer ursprünglichen Größe darstellen."
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:113
msgid "PDF export file name format"
msgstr "PDF-Export Dateinamen-Formatvorlage"
@ -12121,8 +12132,8 @@ msgstr ""
"GnuCash: Ihr privater Finanzmanager. Die freie Lösung zur Finanzverwaltung."
#: ../src/gnome-utils/gnc-main-window.c:4372
msgid "© 1997-2016 Contributors"
msgstr "© 1997-2016 Mitwirkende"
msgid "© 1997-2017 Contributors"
msgstr "© 1997-2017 Mitwirkende"
#. Translators: the following string will be shown in Help->About->Credits
#. * Enter your name or that of your team and an email contact for feedback.
@ -22866,7 +22877,7 @@ msgstr ""
#: ../src/report/standard-reports/advanced-portfolio.scm:97
msgid "Use last-in first-out method for basis."
msgstr ""
"Verwende die First-In First-Out-Zuordnung (zuerst erworbene werden zuerst "
"Verwende die Last-In First-Out-Zuordnung (zuletzt erworbene werden zuerst "
"verkauft) zur Ermittlung der Basis."
#: ../src/report/standard-reports/advanced-portfolio.scm:103