diff --git a/.gitignore b/.gitignore index d6c752e8d6..7cb7509ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ *~ .*.sw? .autotools +.build*/ .cproject .deps .libs @@ -28,7 +29,6 @@ TAGS tags aclocal.m4 autom4te.cache -build*/ compile config.guess config.h diff --git a/data/accounts/de_DE/acctchrt_skr03.gnucash-xea b/data/accounts/de_DE/acctchrt_skr03.gnucash-xea index 7573ab9cf7..8d141faa4c 100644 --- a/data/accounts/de_DE/acctchrt_skr03.gnucash-xea +++ b/data/accounts/de_DE/acctchrt_skr03.gnucash-xea @@ -135,7 +135,7 @@ 27356188a1963c1dbf943022441d095f - 0565 Dahrlehn + 0565 Darlehen bd74fcb2d15fc7540ecc5ba8f27cbf48 ASSET diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.in index 3523214545..ae167c2505 100644 --- a/doc/tip_of_the_day.list.in +++ b/doc/tip_of_the_day.list.in @@ -1,6 +1,10 @@ N_( "The GnuCash online manual has lots of helpful information. \ You can access the manual under the Help menu.") + N_( "The GnuCash developers are easy to contact. As well \ +as several mailing lists, you can chat to them live on IRC! \ +Join them on #gnucash at irc.gnome.org") + N_( "You can easily import your existing financial data from Quicken, \ MS Money or other programs that export QIF files or OFX files. In the \ File menu, click on the sub-menu Import and click on QIF or OFX file, \ @@ -88,9 +92,13 @@ you can choose the monthly basic frequency and then set 'Every \ registers after midnight, to get the new date as default for new \ transactions. It is not necessary to restart GnuCash.") - N_( "The GnuCash developers are easy to contact. As well \ -as several mailing lists, you can chat to them live on IRC! \ -Join them on #gnucash at irc.gnome.org") + N_( "To search through all your transactions, start a search (Edit -> \ +Find...) from the main accounts hierarchy page. To limit your search \ +to a single account, start the search from that account's register.") + + N_( "To visually compare on screen the contents of 2 tabs, \ +in one of the tabs, select Window -> New Window with Page \ +from the menu to duplicate that tab in a new window.") N_( "There is a theory that if ever anyone discovers what \ the Universe is for and why it is here, it will instantly \ @@ -99,10 +107,4 @@ inexplicable.\n\ There is another theory that this has already happened.\n\n\ Douglas Adams, \"The Restaurant at the End of the Universe\"") - N_( "To search through all your transactions, start a search (Edit -> \ -Find...) from the main accounts hierarchy page. To limit your search \ -to a single account, start the search from that account's register.") - - N_( "To visually compare on screen the contents of 2 tabs, \ -in one of the tabs, select Window -> New Window with Page \ -from the menu to duplicate that tab in a new window.") +/* Douglas Adams should be the last tip. Insert new tips in front of it. */ diff --git a/gnucash/gnome-search/dialog-search.c b/gnucash/gnome-search/dialog-search.c index 12e922fcd4..517b45816b 100644 --- a/gnucash/gnome-search/dialog-search.c +++ b/gnucash/gnome-search/dialog-search.c @@ -1496,7 +1496,9 @@ gnc_search_dialog_test (void) display = get_display_list (GNC_ID_SPLIT); /* FIXME: All this does is leak. */ - gnc_search_dialog_create (NULL, GNC_ID_SPLIT, _("Find Transaction"), +/* (keep the line break below to avoid a translator comment) */ + gnc_search_dialog_create (NULL, GNC_ID_SPLIT, + _("Find Transaction"), params, display, NULL, NULL, buttons, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/gnucash/gnome-utils/gnc-period-select.c b/gnucash/gnome-utils/gnc-period-select.c index 379dbe3430..c16d5d6652 100644 --- a/gnucash/gnome-utils/gnc-period-select.c +++ b/gnucash/gnome-utils/gnc-period-select.c @@ -66,7 +66,7 @@ static GtkComboBoxClass *parent_class; const gchar *start_strings[GNC_ACCOUNTING_PERIOD_LAST] = { - /* CY Strings */ + /* CY (current year) Strings */ N_("Today"), N_("Start of this month"), N_("Start of previous month"), @@ -75,14 +75,14 @@ const gchar *start_strings[GNC_ACCOUNTING_PERIOD_LAST] = N_("Start of this year"), N_("Start of previous year"), - /* FY Strings */ + /* FY (fiscal year) Strings */ N_("Start of this accounting period"), N_("Start of previous accounting period"), }; const gchar *end_strings[GNC_ACCOUNTING_PERIOD_LAST] = { - /* CY Strings */ + /* CY (current year) Strings */ N_("Today"), N_("End of this month"), N_("End of previous month"), @@ -91,7 +91,7 @@ const gchar *end_strings[GNC_ACCOUNTING_PERIOD_LAST] = N_("End of this year"), N_("End of previous year"), - /* FY Strings */ + /* FY (fiscal year) Strings */ N_("End of this accounting period"), N_("End of previous accounting period"), }; diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade b/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade index 51ee5b776f..554c155a7f 100644 --- a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade +++ b/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade @@ -47,7 +47,7 @@ Locale - (dummy) + (dummy) diff --git a/gnucash/gnome/dialog-print-check.c b/gnucash/gnome/dialog-print-check.c index 2862ff0811..c88a128e97 100644 --- a/gnucash/gnome/dialog-print-check.c +++ b/gnucash/gnome/dialog-print-check.c @@ -1507,11 +1507,12 @@ read_one_check_directory(PrintCheckDialog *pcd, GtkListStore *store, _("There is a duplicate check format file.")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), - /* Translators: %1$s is the type of the first check - * format (user defined or application defined); %2$s - * is the filename of that format; %3$s the type of - * the other check format; and %4$s the filename of - * that other format. */ + /* Translators: + * %1$s is the type of the first check format + * (user defined or application defined); + * %2$s is the filename of that format; + * %3$s the type of the other check format; and + * %4$s the filename of that other format. */ _("The GUIDs in the %s check format file '%s' and " "the %s check format file '%s' match."), existing->group, existing->filename, diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in index 8486eab581..350cbcfb83 100644 --- a/gnucash/gnome/gnucash.appdata.xml.in +++ b/gnucash/gnome/gnucash.appdata.xml.in @@ -1,6 +1,6 @@ - gnucash.desktop + org.gnucash.Gnucash CC0 <_p> diff --git a/gnucash/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c index 4bba8691ec..4d5034caf5 100644 --- a/gnucash/html/gnc-html-webkit1.c +++ b/gnucash/html/gnc-html-webkit1.c @@ -1188,7 +1188,7 @@ impl_webkit_print( GncHtml* self, const gchar* jobname, gboolean export_pdf ) gchar *export_dirname = NULL; gchar* basename; - // Before we save the PDF file, we always as the user for the export + // Before we save the PDF file, we always ask the user for the export // file name. We will store the chosen directory in the gtk print settings // as well. dialog = gtk_file_chooser_dialog_new (_("Export to PDF File"), diff --git a/gnucash/import-export/aqb/dialog-ab-trans.c b/gnucash/import-export/aqb/dialog-ab-trans.c index c3244f2b9d..5f28d57847 100644 --- a/gnucash/import-export/aqb/dialog-ab-trans.c +++ b/gnucash/import-export/aqb/dialog-ab-trans.c @@ -362,7 +362,7 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc, * needed only in countries that have one of * aqbanking's Online Banking techniques * available. This is 'OFX DirectConnect' - * (U.S. and others), 'HBCI' (in Germany), + * (U.S. and others), 'HBCI' (Germany), * or 'YellowNet' (Switzerland). If none of * these techniques are available in your * country, you may safely ignore strings diff --git a/gnucash/import-export/aqb/gnc-plugin-aqbanking.c b/gnucash/import-export/aqb/gnc-plugin-aqbanking.c index fa0d886127..8906b1f65d 100644 --- a/gnucash/import-export/aqb/gnc-plugin-aqbanking.c +++ b/gnucash/import-export/aqb/gnc-plugin-aqbanking.c @@ -115,7 +115,9 @@ static GtkActionEntry gnc_plugin_actions [] = G_CALLBACK(gnc_plugin_ab_cmd_issue_transaction) }, { - "ABIssueSepaTransAction", NULL, N_("_Issue SEPA Transaction..."), NULL, + "ABIssueSepaTransAction", NULL, + /* Translators: https://en.wikipedia.org/wiki/Single_Euro_Payments_Area */ + N_("_Issue SEPA Transaction..."), NULL, N_("Issue a new international European (SEPA) transaction online through Online Banking"), G_CALLBACK(gnc_plugin_ab_cmd_issue_sepatransaction) }, @@ -137,7 +139,10 @@ static GtkActionEntry gnc_plugin_actions [] = /* File -> Import menu item */ { - "Mt940ImportAction", "go-previous", N_("Import _MT940"), NULL, + "Mt940ImportAction", "go-previous", + /* Translators: Message types MTxxxx are exchange formats used by the SWIFT network + https://en.wikipedia.org/wiki/Society_for_Worldwide_Interbank_Financial_Telecommunication */ + N_("Import _MT940"), NULL, N_("Import a MT940 file into GnuCash"), G_CALLBACK(gnc_plugin_ab_cmd_mt940_import) }, @@ -147,7 +152,10 @@ static GtkActionEntry gnc_plugin_actions [] = G_CALLBACK(gnc_plugin_ab_cmd_mt942_import) }, { - "DtausImportAction", "go-previous", N_("Import _DTAUS"), NULL, + "DtausImportAction", "go-previous", + /* Translators: DTAUS is a traditional german exchange format. + https://de.wikipedia.org/wiki/Datentr%C3%A4geraustauschverfahren */ + N_("Import _DTAUS"), NULL, N_("Import a DTAUS file into GnuCash"), G_CALLBACK(gnc_plugin_ab_cmd_dtaus_import) }, diff --git a/gnucash/import-export/import-account-matcher.c b/gnucash/import-export/import-account-matcher.c index 33d1904977..555ad5ef9c 100644 --- a/gnucash/import-export/import-account-matcher.c +++ b/gnucash/import-export/import-account-matcher.c @@ -443,7 +443,7 @@ AccountPickerDialog* gnc_import_account_assist_setup(GtkWidget *parent) picker->account_online_id_label = GTK_WIDGET(gtk_builder_get_object (builder, "online_id_label")); /* Add the New Account Button */ - picker->new_button = gtk_button_new_with_mnemonic ("_New Account"); + picker->new_button = gtk_button_new_with_mnemonic (_("_New Account")); h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous (GTK_BOX (h_box), TRUE); diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c index da41a04580..ae55178335 100644 --- a/gnucash/import-export/import-main-matcher.c +++ b/gnucash/import-export/import-main-matcher.c @@ -469,19 +469,27 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info, gtk_tree_view_set_model(view, GTK_TREE_MODEL(store)); g_object_unref(store); - /* Add the columns */ - add_text_column(view, _("Date"), DOWNLOADED_COL_DATE); + /* Add the columns * + * (keep the line break below to avoid a translator comment) */ + add_text_column(view, + _("Date"), DOWNLOADED_COL_DATE); column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT); gtk_tree_view_column_set_visible(column, show_account); add_text_column(view, _("Amount"), DOWNLOADED_COL_AMOUNT); add_text_column(view, _("Description"), DOWNLOADED_COL_DESCRIPTION); add_text_column(view, _("Memo"), DOWNLOADED_COL_MEMO); - add_toggle_column(view, _("A"), DOWNLOADED_COL_ACTION_ADD, + add_toggle_column(view, + /* toggle column: add new transaction */ + _("A"), DOWNLOADED_COL_ACTION_ADD, G_CALLBACK(gnc_gen_trans_add_toggled_cb), info); - column = add_toggle_column(view, _("U+R"), DOWNLOADED_COL_ACTION_UPDATE, + column = add_toggle_column(view, + /* toggle column: update existing transaction & mark it reconciled */ + _("U+R"), DOWNLOADED_COL_ACTION_UPDATE, G_CALLBACK(gnc_gen_trans_update_toggled_cb), info); gtk_tree_view_column_set_visible(column, show_update); - add_toggle_column(view, _("R"), DOWNLOADED_COL_ACTION_CLEAR, + add_toggle_column(view, + /* toggle column: mark existing transaction reconciled */ + _("R"), DOWNLOADED_COL_ACTION_CLEAR, G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info); /* The last column has multiple renderers */ diff --git a/gnucash/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c index cbfe10ad66..08d950e84f 100644 --- a/gnucash/import-export/ofx/gnc-ofx-import.c +++ b/gnucash/import-export/ofx/gnc-ofx-import.c @@ -896,6 +896,7 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data) break; case OFX_CMA : default_type = ACCT_TYPE_NONE; + /* Cash Management Account */ account_type_name = _("Unknown OFX CMA account"); break; case OFX_CREDITCARD : diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c index f011f133a4..4b5b6a8fef 100644 --- a/gnucash/register/ledger-core/split-register-model.c +++ b/gnucash/register/ledger-core/split-register-model.c @@ -241,6 +241,7 @@ gnc_split_register_get_num_label (VirtualLocation virt_loc, { case RECEIVABLE_REGISTER: case PAYABLE_REGISTER: + /* Column label for Invoice IDs in A/P & A/R accounts */ return _("Ref"); default: return _("Num"); diff --git a/gnucash/report/business-reports/balsheet-eg.scm b/gnucash/report/business-reports/balsheet-eg.scm index 5df41b66c3..81788a164c 100644 --- a/gnucash/report/business-reports/balsheet-eg.scm +++ b/gnucash/report/business-reports/balsheet-eg.scm @@ -498,9 +498,12 @@ (and opt-omit-zb-accts?) ;(> (accrec-depth accrec) 1)) ;; Reason 1: zero Imbalance a/c - (string-prefix? (_ "Imbalance") (xaccAccountGetName (accrec-account accrec))) + ;; The line break in the next expressions will suppress comments as translator comments. + (string-prefix? + (_ "Imbalance") (xaccAccountGetName (accrec-account accrec))) ;; Reason 2: zero Orphan a/c - (string-prefix? (_ "Orphan") (xaccAccountGetName (accrec-account accrec)))))) + (string-prefix? + (_ "Orphan") (xaccAccountGetName (accrec-account accrec)))))) (define (flattened-acc-depth acc) ;; Accounts deeper than required get moved to the requested depth diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm index 91243445f4..a46ef4e48d 100644 --- a/gnucash/report/business-reports/customer-summary.scm +++ b/gnucash/report/business-reports/customer-summary.scm @@ -52,11 +52,15 @@ (define opthelp-incomeaccounts (N_ "The income accounts where the sales and income was recorded.")) ;(define optname-account-ar (N_ "A/R Account")) +;; The line break in the next expressions will suppress above comment as translator comments. -(define pagename-expenseaccounts (N_ "Expense Accounts")) +(define pagename-expenseaccounts + (N_ "Expense Accounts")) (define optname-expenseaccounts (N_ "Expense Accounts")) ;(define optname-account-ap (N_ "A/P Account")) -(define opthelp-expenseaccounts (N_ "The expense accounts where the expenses are recorded which are subtracted from the sales to give the profit.")) +;; The line break in the next expressions will suppress above comment as translator comments. +(define opthelp-expenseaccounts + (N_ "The expense accounts where the expenses are recorded which are subtracted from the sales to give the profit.")) (define optname-show-column-expense (N_ "Show Expense Column")) (define opthelp-show-column-expense (N_ "Show the column with the expenses per customer.")) @@ -79,7 +83,10 @@ ;(define optname-show-txn-table (N_ "(Experimental) Show Transaction Table")) ;(define opthelp-show-txn-table (N_ "Show the table with all transactions. If false, only show the total amount per customer.")) -(define optname-show-zero-lines (N_ "Show Lines with All Zeros")) +;; The line break in the next expression will suppress above comments as translator comments. + +(define optname-show-zero-lines + (N_ "Show Lines with All Zeros")) (define opthelp-show-zero-lines (N_ "Show the table lines with customers which did not have any transactions in the reporting period, hence would show all zeros in the columns.")) (define optname-show-inactive (N_ "Show Inactive Customers")) (define opthelp-show-inactive (N_ "Include customers that have been marked inactive.")) @@ -833,8 +840,9 @@ (total-sales (gnc-numeric-zero)) (total-expense (gnc-numeric-zero)) (heading-list - ;; Translators: "Markup" is profit amount divided by sales amount - (list (_ "Customer") (_ "Profit") (_ "Markup") (_ "Sales")))) + (list (_ "Customer") (_ "Profit") + ;; Translators: "Markup" is profit amount divided by sales amount + (_ "Markup") (_ "Sales")))) ;; helper for sorting an owner list (define (owner-name" (_ "Invoice in progress...")))))) + ;; translation by not using string-expand for   + (string-append title "
" + (_ "Invoice in progress...")))))) (gnc:html-table-append-row! helper-table diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm index 3dd6563673..d4a56ceb46 100644 --- a/gnucash/report/business-reports/owner-report.scm +++ b/gnucash/report/business-reports/owner-report.scm @@ -73,20 +73,23 @@ (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (N_ "Customer")) ((eqv? owner-type GNC-OWNER-EMPLOYEE) (N_ "Employee")) ;; FALL THROUGH - (else (N_ "Company")))) + (else + (N_ "Company")))) ;; Error strings in case there is no (valid) selection (translated) (define (invalid-selection-title-string owner-type) (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "No valid customer selected.")) ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "No valid employee selected.")) ;; FALL THROUGH - (else (_ "No valid company selected.")))) + (else + (_ "No valid company selected.")))) (define (invalid-selection-string owner-type) (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "This report requires a customer to be selected.")) ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "This report requires a employee to be selected.")) ;; FALL THROUGH - (else (_ "This report requires a company to be selected.")))) + (else + (_ "This report requires a company to be selected.")))) ;; Html formatted error message documents (define (gnc:html-make-no-owner-warning @@ -111,7 +114,8 @@ (cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "Customer")) ((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "Employee")) ;; FALL THROUGH - (else (_ "Vendor")))) + (else + (_ "Vendor")))) (define-macro (addto! alist element) `(set! ,alist (cons ,element ,alist))) diff --git a/gnucash/report/report-system/report-collectors.scm b/gnucash/report/report-system/report-collectors.scm index 78c9992cf2..e156a9779c 100644 --- a/gnucash/report/report-system/report-collectors.scm +++ b/gnucash/report/report-system/report-collectors.scm @@ -154,7 +154,7 @@ (list min-date max-date datepairs))) (define (category-report-dates-accumulate dates) - (let* ((min-date (gnc:secs->timepair 0)) + (let* ((min-date (decdate (car (list-min-max dates gnc:timepair-lt)) DayDelta)) (max-date (cdr (list-min-max dates gnc:timepair-lt))) (datepairs (reverse! (cdr (fold (lambda (next acc) (let ((prev (car acc)) diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm index 81dc90f97e..ec28492b95 100644 --- a/gnucash/report/report-system/report.scm +++ b/gnucash/report/report-system/report.scm @@ -140,7 +140,9 @@ ;; FIXME: We should pass the top-level window ;; instead of the '() to gnc-error-dialog, but I ;; have no idea where to get it from. - (gnc-error-dialog '() (string-append (_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: ") report-guid)) + (gnc-error-dialog '() (string-append + (_ "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: ") + report-guid)) ))) (begin (if (gnc:report-template-name report-rec) diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm index 33cadc97d7..5ff78c0d3c 100644 --- a/gnucash/report/standard-reports/budget-barchart.scm +++ b/gnucash/report/standard-reports/budget-barchart.scm @@ -39,7 +39,8 @@ (use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot (load-from-path "html-jqplot") ;; for jqplot-escape-string -(define reportname (N_ "Budget Chart")) +(define reportname + (N_ "Budget Chart")) (define optname-accounts (N_ "Accounts")) (define optname-budget (N_ "Budget")) diff --git a/gnucash/report/standard-reports/budget-flow.scm b/gnucash/report/standard-reports/budget-flow.scm index fab3b28f0d..12ec0c55e7 100644 --- a/gnucash/report/standard-reports/budget-flow.scm +++ b/gnucash/report/standard-reports/budget-flow.scm @@ -35,7 +35,8 @@ (gnc:module-load "gnucash/report/report-system" 0) (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url -(define reportname (N_ "Budget Flow")) +(define reportname + (N_ "Budget Flow")) ;; define all option's names so that they are properly defined ;; in *one* place. diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm index e061b0ddd3..1dff3b1c67 100644 --- a/gnucash/report/standard-reports/budget.scm +++ b/gnucash/report/standard-reports/budget.scm @@ -46,7 +46,8 @@ ;;(define optname-from-date (N_ "Start Date")) ;;(define optname-to-date (N_ "End Date")) -(define optname-display-depth (N_ "Account Display Depth")) +(define optname-display-depth + (N_ "Account Display Depth")) (define optname-show-subaccounts (N_ "Always show sub-accounts")) (define optname-accounts (N_ "Account")) diff --git a/gnucash/report/standard-reports/price-scatter.scm b/gnucash/report/standard-reports/price-scatter.scm index 5df439d958..0c8fd06494 100644 --- a/gnucash/report/standard-reports/price-scatter.scm +++ b/gnucash/report/standard-reports/price-scatter.scm @@ -45,8 +45,10 @@ (define optname-invert (N_ "Invert prices")) ;; (optname-accounts (N_ "Accounts")) +;; The line break in the next expression will suppress above comment as translator comment. -(define optname-inc-exp (N_ "Show Income/Expense")) +(define optname-inc-exp + (N_ "Show Income/Expense")) (define optname-show-profit (N_ "Show Net Profit")) (define optname-sep-bars (N_ "Show Asset & Liability bars")) diff --git a/libgnucash/engine/Recurrence.c b/libgnucash/engine/Recurrence.c index c4135a6109..e0d0210c29 100644 --- a/libgnucash/engine/Recurrence.c +++ b/libgnucash/engine/Recurrence.c @@ -754,7 +754,9 @@ recurrenceListToCompactString(GList *rs) { //g_warning("nth weekday not handled"); //g_string_printf(buf, "@fixme: nth weekday not handled"); - g_string_printf(buf, "%s", _("Monthly")); + /* (keep the line break below to avoid a translator comment) */ + g_string_printf(buf, + "%s", _("Monthly")); if (multiplier > 1) { /* translators: %u is the recurrence multiplier. */ diff --git a/po/de.po b/po/de.po index 41569af26c..ab3eb079fd 100644 --- a/po/de.po +++ b/po/de.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: GnuCash 2.7.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-01-13 20:39+0100\n" -"PO-Revision-Date: 2018-01.10 12:33+0100\n" +"PO-Revision-Date: 2018-01.17 18:07+0100\n" "Last-Translator: Mechtilde \n" "Language-Team: GnuCash-de \n" "Language: de\n" @@ -691,7 +691,7 @@ msgstr "Darlehensrechner-Option: \"%s\"" #: ../gnucash/report/standard-reports/account-summary.scm:72 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:68 #: ../gnucash/report/standard-reports/cashflow-barchart.scm:356 -#: ../gnucash/report/standard-reports/category-barchart.scm:733 +#: ../gnucash/report/standard-reports/category-barchart.scm:739 #: ../gnucash/report/standard-reports/general-journal.scm:107 #: ../gnucash/report/standard-reports/general-ledger.scm:76 #: ../gnucash/report/standard-reports/general-ledger.scm:97 @@ -1655,6 +1655,7 @@ msgid "Bayesian" msgstr "" #. Description +#: ../gnucash/gnome/dialog-imap-editor.c:518 msgid "Description Field" msgstr "Beschreibungsfeld" @@ -2393,8 +2394,8 @@ msgid "" "The selected transaction doesn't have splits that can be assigned as a " "payment" msgstr "" -"Die ausgewählte Buchung hat keine Teile, die einer Zahlung zugewiesen " -"werden kann." +"Die ausgewählte Buchung hat keine Teile, die einer Zahlung zugewiesen werden " +"kann." #: ../gnucash/gnome/dialog-payment.c:1514 msgid "" @@ -3164,8 +3165,9 @@ msgstr "" #: ../gnucash/gnome/gnc-plugin-basic-commands.c:212 msgid "View and Delete Bayesian and Non Bayesian information" msgstr "" -#, fuzzy + #: ../gnucash/gnome/gnc-plugin-basic-commands.c:216 +#, fuzzy msgid "_Transaction Associations" msgstr "Buchungsinformationen" @@ -6073,7 +6075,8 @@ msgstr "" "verschwindet." #: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:17 -msgid "Time to wait for answer:" +#, fuzzy +msgid "Time to wait for answer" msgstr "Wartezeit auf eine Antwort:" #: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:18 @@ -6487,12 +6490,12 @@ msgstr "" #: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:76 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:75 -#, fuzzy +#, fuzzy msgid "" "Set book option on new files to use split \"action\" field for \"Num\" field " "on registers/reports" -msgstr "" -"Setzt die " +msgstr "Setzt die " + #: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:77 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:76 msgid "" @@ -8919,7 +8922,6 @@ msgid "Keeping the last available price for option:" msgstr "" #: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:37 - msgid "Source:" msgstr "Quelle:" @@ -15978,8 +15980,8 @@ msgid "" "matching." msgstr "" "Doppelklicken Sie auf die Zeile eines Online-Banking-Kontos, um diesem HBCI-" -"Konto ein GnuCash-Konto zuzuordnen. Klicken Sie »Weiter«, wenn alle gewünschten " -"Konten zugeordnet sind." +"Konto ein GnuCash-Konto zuzuordnen. Klicken Sie »Weiter«, wenn alle " +"gewünschten Konten zugeordnet sind." #: ../gnucash/import-export/aqb/assistant-ab-initial.glade.h:23 msgid "Match Online accounts with GnuCash accounts" @@ -17126,6 +17128,7 @@ msgstr "5. Danach" #. Translators: %s is the file name string. #: ../gnucash/import-export/csv-exp/assistant-csv-export.c:80 +#, c-format msgid "" "The account tree will be exported to the file '%s' when you click 'Apply'.\n" "\n" @@ -17140,6 +17143,7 @@ msgstr "" #. Translators: %s is the file name string and %u the number of accounts. #: ../gnucash/import-export/csv-exp/assistant-csv-export.c:85 +#, c-format msgid "" "When you click 'Apply', the transactions will be exported to the file '%s' " "and the number of accounts exported will be %u.\n" @@ -17155,6 +17159,7 @@ msgstr "" #. Translators: %s is the file name string. #: ../gnucash/import-export/csv-exp/assistant-csv-export.c:91 +#, fuzzy, c-format msgid "" "When you click 'Apply', the transactions will be exported to the file '%s.\n" "\n" @@ -17201,13 +17206,15 @@ msgstr "" "angegebenen Trennzeichen zu exportieren.\n" "\n" "Es wird mehrere Zeilen für jede Transaktion geben, und es kann weitere " -"Manipulationen erfordern, um sie in einem Format zu erhalten, das Sie verwenden können.\n" +"Manipulationen erfordern, um sie in einem Format zu erhalten, das Sie " +"verwenden können.\n" "\n" -"Jede Transaktion erscheint einmalig im Export und wird in der " -"Reihenfolge aufgelistet, in der die Konten bearbeitet wurden.\n" +"Jede Transaktion erscheint einmalig im Export und wird in der Reihenfolge " +"aufgelistet, in der die Konten bearbeitet wurden.\n" "\n" -"Wählen Sie die gewünschten Einstellungen für die Datei aus und klicken Sie dann auf 'Weiter', um " -"fortzufahren, oder auf 'Abbrechen', um den Export abzubrechen.\n" +"Wählen Sie die gewünschten Einstellungen für die Datei aus und klicken Sie " +"dann auf 'Weiter', um fortzufahren, oder auf 'Abbrechen', um den Export " +"abzubrechen.\n" #: ../gnucash/import-export/csv-exp/assistant-csv-export.c:111 msgid "" @@ -17450,7 +17457,6 @@ msgid "Export _Active Register to CSV..." msgstr "Aktives Register nach CSV exportieren ..." #: ../gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:65 - msgid "Export the Active Register to a CSV file" msgstr "Exportiert das aktive Register in eine CSV Datei" @@ -17463,6 +17469,7 @@ msgid "The position of paned window when it was last closed." msgstr "Position des gekachelt angeordneten Fensters beim letzten Schließen" #: ../gnucash/import-export/csv-imp/assistant-csv-account-import.c:70 +#, c-format msgid "" "The accounts will be imported from the file '%s' when you click 'Apply'.\n" "\n" @@ -17519,6 +17526,7 @@ msgstr "" "Folgende Fehler traten auf:" #: ../gnucash/import-export/csv-imp/assistant-csv-account-import.c:473 +#, c-format msgid "" "Import completed successfully!\n" "\n" @@ -17719,7 +17727,7 @@ msgstr "Duplizieren" #: ../gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1768 msgid " replaced." msgstr "" -#, fuzzy + #: ../gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1801 #, c-format msgid "" @@ -17729,8 +17737,8 @@ msgid "" "Error message:\n" "%s" msgstr "" -"Ein unerwarteter Fehler sit aufgetreten" -"Bitte berichtichten Sie dies als fehhler.\n" +"Ein unerwarteter Fehler sit aufgetretenBitte berichtichten Sie dies als " +"fehhler.\n" "\n" "Fehlermeldung:\n" "%s" @@ -18012,12 +18020,13 @@ msgid "" "settings name and press the Save Settings button. Note you can't save to " "built-in presets." msgstr "" -"Dieser Assistent möchte Ihnen helfen, strukturierte Textdateien mit Buchungen zu " -"importieren. Er unterstützt beides nämlich zeichenseparierte Dateien (durch Kommata " -"oder Semikola getrennte Daten) und mit daten fester Breite.\n" +"Dieser Assistent möchte Ihnen helfen, strukturierte Textdateien mit " +"Buchungen zu importieren. Er unterstützt beides nämlich zeichenseparierte " +"Dateien (durch Kommata oder Semikola getrennte Daten) und mit daten fester " +"Breite.\n" "\n" -"Für einen erfolgreichen Import müssen diese drei Spalten in der zu importierenden Datei vorhanden sein:" -"• eine Datumsspalte\n" +"Für einen erfolgreichen Import müssen diese drei Spalten in der zu " +"importierenden Datei vorhanden sein:• eine Datumsspalte\n" "• eine Beschreibungsspalte\n" "• eine Spalte Einzahlung oder Auszahlung\n" "\n" @@ -18035,6 +18044,7 @@ msgstr "" "Schließlich gibt es eine Option zur Bestimmung der ersten und letzten Zeile, " "welche benutzt werden kann, wenn sie einige Kopfzeilen oder mehrere Konten " "in einer Datei haben." + #: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.glade.h:35 #, fuzzy msgid "Multi-split" @@ -18107,12 +18117,11 @@ msgstr "" "Auf der folgenden Seite haben Sie die Möglicjkeit, jeder Buchung eine " "Kategorie zuzuordnen.\n" "\n" -"Wenn es Probleme mit den Import-Einstellungen gibt, bringt Sie der Klick auf Weiter " -"zurück zur vorherigen Seite, um dies zu prüfen und zu korrigieren." -"\n" -"Wenn dies ihr erster Import ist, müssen Sie leider alle " -"Zeilen manuell zuordnen. Bei späteren Importen wird das Import-Modul " -"versuchen, die Zuordnung basierend auf den früheren Importen vorzunehmen.\n" +"Wenn es Probleme mit den Import-Einstellungen gibt, bringt Sie der Klick auf " +"Weiter zurück zur vorherigen Seite, um dies zu prüfen und zu korrigieren.\n" +"Wenn dies ihr erster Import ist, müssen Sie leider alle Zeilen manuell " +"zuordnen. Bei späteren Importen wird das Import-Modul versuchen, die " +"Zuordnung basierend auf den früheren Importen vorzunehmen.\n" "\n" "Wenn dies Ihr erster Import in eine neue Datei ist, werden Sie zunächst " "einen Dialog zum Setzen der Buch-Eigenschaften sehen, da diese die Art und " @@ -18413,7 +18422,8 @@ msgstr "Wählen Sie eine Kontoart" msgid "" "Please select an account column or set a base account in the Account field." msgstr "" -"Bitte wählen Sie eine Kontenspalte oder setzen das Basiskonto in das Kontenfeld" +"Bitte wählen Sie eine Kontenspalte oder setzen das Basiskonto in das " +"Kontenfeld" #: ../gnucash/import-export/csv-imp/gnc-tx-import.cpp:478 msgid "Please select a description column." @@ -24234,20 +24244,20 @@ msgid "Yearly Average" msgstr "Durchschnitt pro Jahr" #: ../gnucash/report/standard-reports/account-piecharts.scm:455 -#: ../gnucash/report/standard-reports/category-barchart.scm:327 +#: ../gnucash/report/standard-reports/category-barchart.scm:336 msgid "Monthly Average" msgstr "Durchschnitt pro Monat" #: ../gnucash/report/standard-reports/account-piecharts.scm:456 -#: ../gnucash/report/standard-reports/category-barchart.scm:328 +#: ../gnucash/report/standard-reports/category-barchart.scm:337 msgid "Weekly Average" msgstr "Durchschnitt pro Woche" #: ../gnucash/report/standard-reports/account-piecharts.scm:569 #: ../gnucash/report/standard-reports/cashflow-barchart.scm:313 #: ../gnucash/report/standard-reports/cash-flow.scm:167 -#: ../gnucash/report/standard-reports/category-barchart.scm:531 -#: ../gnucash/report/standard-reports/category-barchart.scm:557 +#: ../gnucash/report/standard-reports/category-barchart.scm:537 +#: ../gnucash/report/standard-reports/category-barchart.scm:563 #: ../gnucash/report/standard-reports/daily-reports.scm:484 #: ../gnucash/report/standard-reports/equity-statement.scm:347 #: ../gnucash/report/standard-reports/income-statement.scm:475 @@ -25670,16 +25680,16 @@ msgstr "Balkendiagram mit gestapelten Balken anzeigen?" msgid "Maximum number of stacks in the chart." msgstr "Die Maximale Anzahl Balken im Diagramm." -#: ../gnucash/report/standard-reports/category-barchart.scm:329 +#: ../gnucash/report/standard-reports/category-barchart.scm:338 msgid "Daily Average" msgstr "Durchschnitt pro Tag" -#: ../gnucash/report/standard-reports/category-barchart.scm:532 -#: ../gnucash/report/standard-reports/category-barchart.scm:558 +#: ../gnucash/report/standard-reports/category-barchart.scm:538 +#: ../gnucash/report/standard-reports/category-barchart.scm:564 msgid "Balances %s to %s" msgstr "Salden %s bis %s" -#: ../gnucash/report/standard-reports/category-barchart.scm:742 +#: ../gnucash/report/standard-reports/category-barchart.scm:748 #: ../gnucash/report/standard-reports/income-gst-statement.scm:331 #: ../gnucash/report/standard-reports/income-gst-statement.scm:1170 #: ../gnucash/report/standard-reports/transaction.scm:1392 @@ -29150,17 +29160,17 @@ msgstr "Tag-Monat" msgid "m-d" msgstr "Monat-Tag" -#: ../libgnucash/engine/gnc-datetime.cpp:397 +#: ../libgnucash/engine/gnc-datetime.cpp:383 #, fuzzy msgid "Unknown date format specifier passed as argument." msgstr "Das Datumsformat aus den Systemeinstellungen übernehmen." #. regex didn't find a match -#: ../libgnucash/engine/gnc-datetime.cpp:402 +#: ../libgnucash/engine/gnc-datetime.cpp:388 msgid "Value can't be parsed into a date using the selected date format." msgstr "" -#: ../libgnucash/engine/gnc-datetime.cpp:407 +#: ../libgnucash/engine/gnc-datetime.cpp:393 msgid "Value appears to contain a year while the selected format forbids this." msgstr "" @@ -29734,8 +29744,8 @@ msgid "" msgstr "" "Wenn Sie GnuCash über Mitternacht hinaus arbeiten, sollten Sie nach " "Mitternacht die verwendeten Kontofenster einmal schließen und wieder öffnen, " -"damit das neue Datum als voreingestelltes Buchungsdatum vorhanden ist. Es ist " -"nicht notwendig, GnuCash neu zu starten." +"damit das neue Datum als voreingestelltes Buchungsdatum vorhanden ist. Es " +"ist nicht notwendig, GnuCash neu zu starten." #: ../doc/tip_of_the_day.list.in:91 msgid ""