gnucash unstable: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Fri Feb 2 19:09:53 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/52ba07f5 (commit)
via https://github.com/Gnucash/gnucash/commit/794090d6 (commit)
via https://github.com/Gnucash/gnucash/commit/2b122d1f (commit)
from https://github.com/Gnucash/gnucash/commit/18abf4e2 (commit)
commit 52ba07f587cc13edee4d065ecd838209c1832645
Merge: 18abf4e 794090d
Author: fell <frank.h.ellenberger at gmail.com>
Date: Sat Feb 3 01:05:43 2018 +0100
Merge branch 'maint' into unstable
ignore chages in po/de.po
diff --cc gnucash/import-export/customer-import/gnc-plugin-customer-import.c
index ac7bc4f,0000000..1099490
mode 100644,000000..100644
--- a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
+++ b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
@@@ -1,115 -1,0 +1,116 @@@
+/*
+ * gnc-plugin-customer-import.c --
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, contact:
+ *
+ * Free Software Foundation Voice: +1-617-542-5942
+ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+ * Boston, MA 02110-1301, USA gnu at gnu.org
+ */
+
+/**
+ * @internal
+ * @file gnc-plugin-customer-import.c
+ * @brief Plugin registration of the customer_import plugin
+ * @author Copyright (C) 2009 Sebastian Held <sebastian.held at gmx.de>
+ */
+
+#include <config.h>
+
+//#include <glade/glade.h>
+//#include <glade/glade-xml.h>
+#include <glib/gi18n.h>
+
+#include "dialog-utils.h"
+
+#include "gnc-plugin-customer-import.h"
+#include "dialog-customer-import-gui.h"
+
+/* This static indicates the debugging module that this .o belongs to. */
+static QofLogModule log_module = G_LOG_DOMAIN;
+
+static void gnc_plugin_customer_import_class_init (GncPlugincustomer_importClass *klass);
+static void gnc_plugin_customer_import_init (GncPlugincustomer_import *plugin);
+static void gnc_plugin_customer_import_finalize (GObject *object);
+
+/* Command callbacks */
+static void gnc_plugin_customer_import_cmd_test (GtkAction *action, GncMainWindowActionData *data);
+
+#define PLUGIN_ACTIONS_NAME "gnc-plugin-customer-import-actions"
+#define PLUGIN_UI_FILENAME "gnc-plugin-customer-import-ui.xml"
+
+static GtkActionEntry gnc_plugin_actions [] =
+{
+ /* Menu Items */
- { "ImportMenuAction", NULL, N_("I_mport"), NULL, NULL, NULL },
- { "customer_importAction", "go-previous", N_("Import Customers and Vendors"), NULL, N_("customer_import tooltip"), G_CALLBACK(gnc_plugin_customer_import_cmd_test) },
++ { "ImportMenuAction", NULL, N_("_Import"), NULL, NULL, NULL },
++ /* Menu entry with label and tooltip */
++ { "customer_importAction", "go-previous", N_("Import _Customers & Vendors..."), NULL, N_("Import Customers and Vendors from a CSV text file."), G_CALLBACK(gnc_plugin_customer_import_cmd_test) },
+};
+static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions);
+
+
+/************************************************************
+ * Object Implementation *
+ ************************************************************/
+
+G_DEFINE_TYPE(GncPlugincustomer_import, gnc_plugin_customer_import, GNC_TYPE_PLUGIN);
+
+GncPlugin *
+gnc_plugin_customer_import_new (void)
+{
+ return GNC_PLUGIN (g_object_new (GNC_TYPE_PLUGIN_customer_import, (gchar*) NULL));
+}
+
+static void
+gnc_plugin_customer_import_class_init (GncPlugincustomer_importClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GncPluginClass *plugin_class = GNC_PLUGIN_CLASS(klass);
+
+ object_class->finalize = gnc_plugin_customer_import_finalize;
+
+ /* plugin info */
+ plugin_class->plugin_name = GNC_PLUGIN_customer_import_NAME;
+
+ /* widget addition/removal */
+ plugin_class->actions_name = PLUGIN_ACTIONS_NAME;
+ plugin_class->actions = gnc_plugin_actions;
+ plugin_class->n_actions = gnc_plugin_n_actions;
+ plugin_class->ui_filename = PLUGIN_UI_FILENAME;
+}
+
+static void
+gnc_plugin_customer_import_init (GncPlugincustomer_import *plugin)
+{
+}
+
+static void
+gnc_plugin_customer_import_finalize (GObject *object)
+{
+}
+
+/************************************************************
+ * Command Callbacks *
+ ************************************************************/
+
+static void
+gnc_plugin_customer_import_cmd_test (GtkAction *action, GncMainWindowActionData *data)
+{
+ ENTER ("action %p, main window data %p", action, data);
+ g_message ("customer_import");
+
+ gnc_plugin_customer_import_showGUI();
+
+ LEAVE (" ");
+}
diff --cc gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
index 1684612,0000000..cef519f
mode 100644,000000..100644
--- a/gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
+++ b/gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
@@@ -1,398 -1,0 +1,398 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkDialog" id="customer_import_dialog">
+ <property name="width_request">500</property>
+ <property name="height_request">500</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
- <property name="title" translatable="yes">Import customers or vendors from text file</property>
++ <property name="title" translatable="yes" comments="Title of dialog">Import customers or vendors from text file</property>
+ <property name="type_hint">dialog</property>
+ <signal name="destroy" handler="gnc_customer_import_gui_destroy_cb" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton">
+ <property name="label" translatable="yes">_Help</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">top</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_help_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <property name="label" translatable="yes">_Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_cancel_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton">
+ <property name="label" translatable="yes">_OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_ok_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">3</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="entryFilename">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="gnc_customer_import_gui_filenameChanged_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="buttonOpen">
+ <property name="label" translatable="yes">_Open</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_buttonOpen_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>1. Choose the file to import</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_customer">
+ <property name="label" translatable="yes">Customer</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">For importing customer lists.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_type_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_vendor">
+ <property name="label" translatable="yes">Vendor</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">For importing vendor lists.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_customer</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_type_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>2. Select Import Type</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">3</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton1">
+ <property name="label" translatable="yes">Semicolon separated</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="gnc_customer_import_gui_option1_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton2">
+ <property name="label" translatable="yes">Comma separated</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton1</property>
+ <signal name="toggled" handler="gnc_customer_import_gui_option2_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton3">
+ <property name="label" translatable="yes">Semicolon separated with quotes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton1</property>
+ <signal name="toggled" handler="gnc_customer_import_gui_option3_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton4">
+ <property name="label" translatable="yes">Comma separated with quotes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton1</property>
+ <signal name="toggled" handler="gnc_customer_import_gui_option4_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton5">
+ <property name="label" translatable="yes">Custom regular expression</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton1</property>
+ <signal name="clicked" handler="gnc_customer_import_gui_option5_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>3. Select import options</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">3</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview1">
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>4. Preview</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">helpbutton</action-widget>
+ <action-widget response="-6">cancelbutton</action-widget>
+ <action-widget response="-5">okbutton</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 794090d671efd4a0dbc22903c022da4c294baf70
Author: fell <frank.h.ellenberger at gmail.com>
Date: Fri Feb 2 23:43:58 2018 +0100
update de.po
4680 translated messages, 4 untranslated messages.
diff --git a/po/de.po b/po/de.po
index bd39464..dedffbf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuCash 2.6.19\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-16 11:42+0100\n"
+"POT-Creation-Date: 2018-02-02 23:20+0100\n"
"PO-Revision-Date: 2018-01-03 03:27+0100\n"
"Last-Translator: Mechtilde <ooo at mechtilde.de>\n"
"Language-Team: GnuCash-de <gnucash-de at gnucash.org>\n"
@@ -3518,7 +3518,7 @@ msgstr "Bemerkung"
#: ../src/business/business-gnome/search-owner.c:238
#: ../src/gnome-search/dialog-search.c:1057
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2883
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:3
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:4
#: ../src/register/ledger-core/split-register-model.c:283
#: ../src/report/business-reports/customer-summary.scm:735
#: ../src/report/business-reports/customer-summary.scm:845
@@ -3941,7 +3941,7 @@ msgstr ""
#: ../src/business/business-gnome/search-owner.c:239
#: ../src/gnome-search/dialog-search.c:1089
#: ../src/gnome-utils/gnc-tree-view-split-reg.c:2894
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:5
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:6
#: ../src/register/ledger-core/split-register-model.c:285
#: ../src/report/business-reports/customer-summary.scm:737
#: ../src/report/business-reports/job-report.scm:579
@@ -7590,6 +7590,17 @@ msgstr ""
"Die Anzeige des »Tipp des Tages« beim Programmstart einschalten. Wenn "
"aktiviert, wird der Tipp gezeigt. Andernfalls wird er nicht gezeigt."
+#: ../src/gnome/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:1
+#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:217
+msgid "Alpha Vantage API key"
+msgstr ""
+
+#: ../src/gnome/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:2
+msgid ""
+"To retrieve online quotes from Alphavantage, this key needs to be set. A key "
+"can be retrieved from the Alpha Vantage website."
+msgstr ""
+
#: ../src/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:1
msgid "Save window sizes and locations"
msgstr "Fenstergröße und -positionen speichern"
@@ -11438,6 +11449,7 @@ msgstr "(unbenannt)"
#. Menu Items
#: ../src/gnome-utils/gnc-file.c:105 ../src/gnome-utils/gnc-main-window.c:272
#: ../src/plugins/bi_import/gnc-plugin-bi-import.c:56
+#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:56
msgid "_Import"
msgstr "_Importieren"
@@ -12226,7 +12238,7 @@ msgstr "© 1997-%s Mitwirkende"
#. * Enter your name or that of your team and an email contact for feedback.
#. * The string can have multiple rows, so you can also add a list of
#. * contributors.
-#: ../src/gnome-utils/gnc-main-window.c:4410
+#: ../src/gnome-utils/gnc-main-window.c:4413
msgid "translator_credits"
msgstr "Christian Stimming <christian at cstimming.de> et. al."
@@ -14675,6 +14687,10 @@ msgstr "Zeichen"
msgid "Windows"
msgstr "Fenster"
+#: ../src/gnome-utils/gtkbuilder/dialog-preferences.glade.h:218
+msgid "Online Quotes"
+msgstr "Online Kurse"
+
#: ../src/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:1
msgid "Reset Warnings"
msgstr "Warnung zurücksetzen"
@@ -19091,7 +19107,7 @@ msgid "These lines were ignored during import"
msgstr "Diese Zeilen wurden beim Importieren ignoriert"
#: ../src/plugins/bi_import/gnc-plugin-bi-import.c:57
-msgid "Import Bills & Invoices..."
+msgid "Import Bills & _Invoices..."
msgstr "_Rechnungen importieren..."
#: ../src/plugins/bi_import/gnc-plugin-bi-import.c:57
@@ -19119,27 +19135,27 @@ msgid "2. Select import type"
msgstr "2. Wählen Sie die Import-Art"
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:8
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:8
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:9
msgid "Semicolon separated"
msgstr "Semikolon-getrennt"
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:9
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:9
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:10
msgid "Comma separated"
msgstr "Komma-getrennt"
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:10
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:10
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:11
msgid "Semicolon separated with quotes"
msgstr "Semikolon-getrennt mit Anführungszeichen"
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:11
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:11
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:12
msgid "Comma separated with quotes"
msgstr "Komma-getrennt mit Anführungszeichen"
#: ../src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade.h:12
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:12
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:13
msgid "Custom regular expression"
msgstr "Benutzerdefinierter Regulärer Ausdruck"
@@ -19201,62 +19217,45 @@ msgstr ""
" %u %s neu angelegt\n"
" %u %s aktualisiert (gemäß ID)"
-# Fixme: Source Module has several issues, e.g. flying buttons
-#. Menu Items
-#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:56
-msgid "I_mport"
-msgstr "I_mport"
-
-# Fixme: Source "Import Customers & Vendors from CSV..."
-#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:57
-msgid "Import Customers and Vendors"
-msgstr "Importiert K_unden und Lieferanten"
+#. Menu entry with label and tooltip
+#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:58
+msgid "Import _Customers & Vendors..."
+msgstr "Importiert K_unden und Lieferanten..."
-# Fixme: Source "Import customers or vendors from a CSV text file."
-#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:57
-msgid "customer_import tooltip"
-msgstr ""
+#: ../src/plugins/customer_import/gnc-plugin-customer_import.c:58
+msgid "Import Customers and Vendors from a CSV text file"
+msgstr "Importiert Kunden und Lieferanten aus einer CSV-Textdatei"
-# Fixme: Source "Customers & Vendors Import"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:1
+#. Title of dialog
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:2
msgid "Import customers or vendors from text file"
-msgstr "Importiert Kunden oder Lieferanten aus Textdatei"
+msgstr "Import von Kunden oder Lieferanten aus Textdatei"
# Fixme: Source Can we reuse strings from other CSV imports?
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:2
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:3
msgid "<b>1. Choose the file to import</b>"
msgstr "<b>1. Wählen Sie die zu importierende Datei</b>"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:4
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:5
msgid "For importing customer lists."
msgstr "Zum Import von Kunden-Listen"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:6
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:7
msgid "For importing vendor lists."
msgstr "Zum Import von Lieferanten-Listen"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:7
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:8
msgid "<b>2. Select Import Type</b>"
msgstr "<b>2. Wählen Sie die Import-Art</b>"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:13
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:14
msgid "<b>3. Select import options</b>"
msgstr "<b>3. Bestimmen Sie die Importoptionen</b>"
-#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:14
+#: ../src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade.h:15
msgid "<b>4. Preview</b>"
msgstr "<b>4. Vorschau</b>"
-# Fixme: Source Is this plugin really used or should it be excluded from xgettext?
-#. Menu Items
-#: ../src/plugins/example/gnc-plugin.example.c:50
-msgid "example description..."
-msgstr "Beispiel-Beschreibung"
-
-#: ../src/plugins/example/gnc-plugin.example.c:51
-msgid "example tooltip"
-msgstr "Beispiel Tooltip"
-
#: ../src/register/ledger-core/split-register.c:185
msgid ""
"This transaction is already being edited in another register. Please finish "
@@ -20683,8 +20682,6 @@ msgstr "Betrag dankend erhalten"
msgid "Net Price"
msgstr "Nettobetrag"
-# strange, had fuzzy translation Saldo (Periodenbezogen)
-# Ja, der Kundenbericht hat einen solchen
#: ../src/report/business-reports/easy-invoice.scm:481
#: ../src/report/business-reports/fancy-invoice.scm:520
#: ../src/report/business-reports/invoice.scm:457
@@ -25953,18 +25950,18 @@ msgstr "Willkommen bei GnuCash ~a"
msgid "GnuCash ~a has lots of nice features. Here are a few."
msgstr "GnuCash ~a hat viele neue Funktionen. Hier sind einige Beispiele."
-#: ../src/scm/price-quotes.scm:490 ../src/scm/price-quotes.scm:491
+#: ../src/scm/price-quotes.scm:497 ../src/scm/price-quotes.scm:498
msgid "No commodities marked for quote retrieval."
msgstr "Keine Devisen/Wertpapiere zum Börsenkurs-Abruf markiert."
-#: ../src/scm/price-quotes.scm:495 ../src/scm/price-quotes.scm:496
-#: ../src/scm/price-quotes.scm:519 ../src/scm/price-quotes.scm:522
+#: ../src/scm/price-quotes.scm:502 ../src/scm/price-quotes.scm:503
+#: ../src/scm/price-quotes.scm:526 ../src/scm/price-quotes.scm:529
msgid "Unable to get quotes or diagnose the problem."
msgstr ""
"Abrufen der Börsenkurse fehlgeschlagen. Genauere Diagnose ebenfalls "
"fehlgeschlagen."
-#: ../src/scm/price-quotes.scm:501 ../src/scm/price-quotes.scm:503
+#: ../src/scm/price-quotes.scm:508 ../src/scm/price-quotes.scm:510
msgid ""
"You are missing some needed Perl libraries.\n"
"Run 'gnc-fq-update' as root to install them."
@@ -25972,37 +25969,37 @@ msgstr ""
"Ihnen fehlen einige benötigte Perl Bibliotheken.\n"
"Führen Sie 'gnc-fq-update' als root aus, um diese zu installieren."
-#: ../src/scm/price-quotes.scm:509 ../src/scm/price-quotes.scm:510
+#: ../src/scm/price-quotes.scm:516 ../src/scm/price-quotes.scm:517
msgid "There was a system error while retrieving the price quotes."
msgstr "Beim Herunterladen der Börsenkurse ist ein Systemfehler aufgetreten."
-#: ../src/scm/price-quotes.scm:515 ../src/scm/price-quotes.scm:516
+#: ../src/scm/price-quotes.scm:522 ../src/scm/price-quotes.scm:523
msgid "There was an unknown error while retrieving the price quotes."
msgstr ""
"Beim Herunterladen der Börsenkurse ist ein unbekannter Fehler aufgetreten."
-#: ../src/scm/price-quotes.scm:532 ../src/scm/price-quotes.scm:543
-#: ../src/scm/price-quotes.scm:551
+#: ../src/scm/price-quotes.scm:539 ../src/scm/price-quotes.scm:550
+#: ../src/scm/price-quotes.scm:558
msgid "Unable to retrieve quotes for these items:"
msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
-#: ../src/scm/price-quotes.scm:537
+#: ../src/scm/price-quotes.scm:544
msgid "Continue using only the good quotes?"
msgstr "Mit den benutzbaren Kursen fortsetzen?"
-#: ../src/scm/price-quotes.scm:556
+#: ../src/scm/price-quotes.scm:563
msgid "Continuing with good quotes."
msgstr "Es wird mit den benutzbaren Kursen fortgesetzt."
-#: ../src/scm/price-quotes.scm:571 ../src/scm/price-quotes.scm:580
+#: ../src/scm/price-quotes.scm:578 ../src/scm/price-quotes.scm:587
msgid "Unable to create prices for these items:"
msgstr "Preis-Eintrag für folgende Werte fehlgeschlagen:"
-#: ../src/scm/price-quotes.scm:576
+#: ../src/scm/price-quotes.scm:583
msgid "Add remaining good quotes?"
msgstr "Ãœbrige benutzbare Kurse eintragen?"
-#: ../src/scm/price-quotes.scm:585
+#: ../src/scm/price-quotes.scm:592
msgid "Adding remaining good quotes."
msgstr "Benutzbare Kurse werden eingetragen."
@@ -26390,176 +26387,3 @@ msgstr ""
"Banking-Zugangs. Nachdem ein Online-Banking-Zugang eingerichtet wurde, "
"können die Menüpunkte im Kontofenster unter Aktionen -> Online Aktionen "
"verwendet werden."
-
-#~ msgid "(dummy)"
-#~ msgstr "(dummy)"
-
-#~ msgid "Remember _PIN"
-#~ msgstr "_PIN merken"
-
-#~ msgid "CURRENCY"
-#~ msgstr "WÄHRUNG"
-
-#~ msgid ""
-#~ "On high-resolution displays the reports will be unreadable by default. "
-#~ "Setting a zoom factor to a number bigger than 1.0 can help improve this "
-#~ "situation."
-#~ msgstr ""
-#~ "Auf hochauflösenden Monitoren können Berichte in der Standardeinstellung "
-#~ "schwer lesbar sein. Das Setzen eines Vergrößerungsfaktors größer 1 kann "
-#~ "dann eine ABhilfe sein."
-
-#~ msgid "Clear the entry"
-#~ msgstr "Löschen des Eintrages"
-
-#~ msgid "You must select a commodity. To create a new one, click \"New\""
-#~ msgstr ""
-#~ "Sie müssen eine Devise/Wertpapier auswählen. Wenn Sie eine neue anlegen "
-#~ "möchten, klicken Sie auf »Neu«."
-
-#~ msgid "set true"
-#~ msgstr "auf wahr setzen"
-
-#~ msgid "UTC"
-#~ msgstr "UTC"
-
-#~ msgid "Dates earlier than 1970 are not supported."
-#~ msgstr "Ein Datum vor 1970 wird nicht unterstützt"
-
-#~ msgid "Owner Name"
-#~ msgstr "Inhabername"
-
-#~ msgid "Owner ID"
-#~ msgstr "Inhaber ID"
-
-#~ msgid "Dummy message"
-#~ msgstr "Beispiel-Nachricht"
-
-#~ msgid "postd"
-#~ msgstr "Gebucht"
-
-#~ msgid "duedate"
-#~ msgstr "Fällig"
-
-#~ msgid "acct"
-#~ msgstr "Konto"
-
-#~ msgid "question"
-#~ msgstr "Frage"
-
-#~ msgid "(USD)"
-#~ msgstr "(USD)"
-
-#~ msgid "Retrieve the current online quote"
-#~ msgstr "Aktuellen Kurs online abrufen"
-
-#~ msgid "Auto pay on post_ing"
-#~ msgstr "Automatisch durchbuchen"
-
-#~ msgid "_Use system theme colors"
-#~ msgstr "Farben der _systemweiten Einstellungen verwenden"
-
-#~ msgid ""
-#~ "If checked, the system color theme will be applied to register windows. "
-#~ "If clear, the original GnuCash register colors will be used."
-#~ msgstr ""
-#~ "Wenn aktiviert, werden die systemweiten Farbeinstellungen in den "
-#~ "Kontofenstern verwendet. Wenn nicht aktiviert, werden GnuCash-spezifische "
-#~ "Farben in den Kontofenstern verwendet."
-
-#~ msgid "Negative amounts are not allowed."
-#~ msgstr "Negative Beträge sind hier nicht möglich."
-
-#~ msgid "Percentage amount must be between 0 and 100."
-#~ msgstr "Die Prozentzahl muss zwischen 0 und 100 liegen."
-
-#~ msgid ""
-#~ "You must enter the amount of the payment. The payment amount must not be "
-#~ "zero."
-#~ msgstr ""
-#~ "Sie müssen den Zahlungsbetrag angeben. Der Betrag muss größer als Null "
-#~ "sein."
-
-#~ msgid "Internal link between invoice and payment lots"
-#~ msgstr "Interne Verknüpfung zwischen Rechnungs- und Zahlungsposten"
-
-#~ msgid ""
-#~ "Since you are creating a new file, you will next see a dialog for setting "
-#~ "book options. These can affect how GnuCash transactions are handled "
-#~ "later, during account setup. If you come back to this page without "
-#~ "cancelling and starting over, the dialog for setting book options will "
-#~ "not be shown a second time when you go forward. You can access it "
-#~ "directly from the menu via File->Properties."
-#~ msgstr ""
-#~ "Da gerade eine neue Datei erstellt werden soll, wird als nächstes ein "
-#~ "Fenster für die »Buch-Eigenschaften« geöffnet. Die Einstellungen dieser "
-#~ "Eigenschaften sind wichtig für die Eröffnungsbuchungen, die mit den neuen "
-#~ "Konten im darauf folgenden Schritt erzeugt werden.\n"
-#~ "\n"
-#~ "Die Buch-Eigenschaften können später jederzeit geändert werden über den "
-#~ "Menüeintrag Datei->Eigenschaften."
-
-#~ msgid "New item"
-#~ msgstr "Neuer Eintrag"
-
-#~ msgid "%s at %s (code %s)"
-#~ msgstr "%s bei %s (BLZ %s)"
-
-#~ msgid "%s at bank code %s"
-#~ msgstr "%s bei %s"
-
-#~ msgid "Semicolon Separated with Quotes"
-#~ msgstr "Semikolon-getrennt mit Anführungszeichen"
-
-#~ msgid "Comma Separated with Quotes"
-#~ msgstr "Komma-getrennt mit Anführungszeichen"
-
-#~ msgid "Run preconfigured report"
-#~ msgstr "Konfigurierten Bericht öffnen"
-
-#~ msgid "Preconfigured Reports"
-#~ msgstr "Konfigurierte Berichte"
-
-#~ msgid "Net Price"
-#~ msgstr "Nettobetrag"
-
-#~ msgid "Total Price"
-#~ msgstr "Gesamtbetrag"
-
-#~ msgid "Amount Due"
-#~ msgstr "Fälliger_Betrag"
-
-#~ msgid "Invoice number: "
-#~ msgstr "Rechnungsnummer: "
-
-#~ msgid "Job number: "
-#~ msgstr "Auftragsnummer: "
-
-#~ msgid "Job name: "
-#~ msgstr "Auftragsname: "
-
-#~ msgid "Custom Reports"
-#~ msgstr "_Benutzerdefinierte Berichte"
-
-#~ msgid "and"
-#~ msgstr "und"
-
-#~ msgid "Ignore brokerage fees when calculating returns"
-#~ msgstr "Ignoriere Vermittlungsgebühren bei der Ermittlung der Erträge"
-
-#~ msgid "Most recent to report"
-#~ msgstr "Neuester vor Berichtsdatum"
-
-#~ msgid "The most recent recorded price before report date."
-#~ msgstr "Der aktuellste aufgezeichnete Preis vor dem Datum des Berichts."
-
-#~ msgid "FILO"
-#~ msgstr "FILO"
-
-#~ msgid "Use first-in last-out method for basis."
-#~ msgstr ""
-#~ "Verwende die First-In Last-Out-Zuordnung (zuerst erworbene werden zuletzt "
-#~ "verkauft) zur Ermittlung der Basis."
-
-#~ msgid "Welcome to GnuCash 2.4!"
-#~ msgstr "Willkommen zu GnuCash 2.4!"
commit 2b122d1faae05b2ca7df9823effabab02272b162
Author: fell <frank.h.ellenberger at gmail.com>
Date: Tue Jan 30 02:20:40 2018 +0100
Improve Import menu entries Customer & vendors...
use same menu label as others,
replace template by tooltip,
add ellipsis to entry,
add comments to distinguish "Import" as verb and substantive.
diff --git a/src/plugins/bi_import/gnc-plugin-bi-import.c b/src/plugins/bi_import/gnc-plugin-bi-import.c
index 56ebf93..79b7d35 100644
--- a/src/plugins/bi_import/gnc-plugin-bi-import.c
+++ b/src/plugins/bi_import/gnc-plugin-bi-import.c
@@ -54,7 +54,7 @@ static GtkActionEntry gnc_plugin_actions [] =
{
/* Menu Items */
{ "ImportMenuAction", NULL, N_("_Import"), NULL, NULL, NULL },
- { "bi_importAction", NULL, N_("Import Bills & Invoices..."), NULL, N_("Import bills and invoices from a CSV text file"), G_CALLBACK(gnc_plugin_bi_import_cmd_test) },
+ { "bi_importAction", GTK_STOCK_CONVERT, N_("Import Bills & _Invoices..."), NULL, N_("Import bills and invoices from a CSV text file"), G_CALLBACK(gnc_plugin_bi_import_cmd_test) },
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions);
diff --git a/src/plugins/customer_import/gnc-plugin-customer_import.c b/src/plugins/customer_import/gnc-plugin-customer_import.c
index b168e81..1b22a36 100644
--- a/src/plugins/customer_import/gnc-plugin-customer_import.c
+++ b/src/plugins/customer_import/gnc-plugin-customer_import.c
@@ -53,8 +53,9 @@ static void gnc_plugin_customer_import_cmd_test (GtkAction *action, GncMainWindo
static GtkActionEntry gnc_plugin_actions [] =
{
/* Menu Items */
- { "ImportMenuAction", NULL, N_("I_mport"), NULL, NULL, NULL },
- { "customer_importAction", NULL, N_("Import Customers and Vendors"), NULL, N_("customer_import tooltip"), G_CALLBACK(gnc_plugin_customer_import_cmd_test) },
+ { "ImportMenuAction", NULL, N_("_Import"), NULL, NULL, NULL },
+ /* Menu entry with label and tooltip */
+ { "customer_importAction", GTK_STOCK_CONVERT, N_("Import _Customers & Vendors..."), NULL, N_("Import Customers and Vendors from a CSV text file."), G_CALLBACK(gnc_plugin_customer_import_cmd_test) },
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions);
diff --git a/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade b/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
index 76a4c79..129c962 100644
--- a/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
+++ b/src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
@@ -6,7 +6,7 @@
<property name="height_request">500</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="title" translatable="yes">Import customers or vendors from text file</property>
+ <property name="title" translatable="yes" comments="Title of dialog">Import customers or vendors from text file</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_customer_import_gui_destroy_cb" swapped="no"/>
<child internal-child="vbox">
Summary of changes:
gnucash/import-export/customer-import/gnc-plugin-customer-import.c | 5 +++--
.../customer-import/gtkbuilder/dialog-customer-import-gui.glade | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list