gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Apr 28 13:20:34 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/94bb28d9 (commit)
via https://github.com/Gnucash/gnucash/commit/4d529c02 (commit)
via https://github.com/Gnucash/gnucash/commit/b5fe4e3c (commit)
via https://github.com/Gnucash/gnucash/commit/9885ac46 (commit)
via https://github.com/Gnucash/gnucash/commit/b4ae45d5 (commit)
via https://github.com/Gnucash/gnucash/commit/d1ee651b (commit)
via https://github.com/Gnucash/gnucash/commit/b87ba7ae (commit)
via https://github.com/Gnucash/gnucash/commit/701974b2 (commit)
via https://github.com/Gnucash/gnucash/commit/4368e18a (commit)
via https://github.com/Gnucash/gnucash/commit/9f0558ff (commit)
via https://github.com/Gnucash/gnucash/commit/af96c746 (commit)
via https://github.com/Gnucash/gnucash/commit/ede281e2 (commit)
via https://github.com/Gnucash/gnucash/commit/93c8535e (commit)
via https://github.com/Gnucash/gnucash/commit/397c5d13 (commit)
via https://github.com/Gnucash/gnucash/commit/2262142b (commit)
via https://github.com/Gnucash/gnucash/commit/82a2fca2 (commit)
via https://github.com/Gnucash/gnucash/commit/a20f3368 (commit)
via https://github.com/Gnucash/gnucash/commit/483f9a4c (commit)
via https://github.com/Gnucash/gnucash/commit/5311e5a3 (commit)
via https://github.com/Gnucash/gnucash/commit/c48da078 (commit)
via https://github.com/Gnucash/gnucash/commit/0cf49f12 (commit)
via https://github.com/Gnucash/gnucash/commit/7d15e6e4 (commit)
via https://github.com/Gnucash/gnucash/commit/a12bbacc (commit)
via https://github.com/Gnucash/gnucash/commit/92a920c4 (commit)
via https://github.com/Gnucash/gnucash/commit/84cc7b1b (commit)
via https://github.com/Gnucash/gnucash/commit/268dbbe3 (commit)
via https://github.com/Gnucash/gnucash/commit/79a21b42 (commit)
via https://github.com/Gnucash/gnucash/commit/d9623b0a (commit)
via https://github.com/Gnucash/gnucash/commit/4d8ef9b9 (commit)
via https://github.com/Gnucash/gnucash/commit/3815e17e (commit)
via https://github.com/Gnucash/gnucash/commit/79f4536a (commit)
via https://github.com/Gnucash/gnucash/commit/4f51f172 (commit)
via https://github.com/Gnucash/gnucash/commit/b1fdf781 (commit)
via https://github.com/Gnucash/gnucash/commit/7e9463db (commit)
via https://github.com/Gnucash/gnucash/commit/3985541f (commit)
via https://github.com/Gnucash/gnucash/commit/91c992d9 (commit)
via https://github.com/Gnucash/gnucash/commit/d82939a9 (commit)
via https://github.com/Gnucash/gnucash/commit/fc0a7292 (commit)
via https://github.com/Gnucash/gnucash/commit/2745b18d (commit)
via https://github.com/Gnucash/gnucash/commit/aa53c232 (commit)
via https://github.com/Gnucash/gnucash/commit/3c946a84 (commit)
via https://github.com/Gnucash/gnucash/commit/ce4d3dee (commit)
via https://github.com/Gnucash/gnucash/commit/fe94541a (commit)
via https://github.com/Gnucash/gnucash/commit/ba8a9c84 (commit)
via https://github.com/Gnucash/gnucash/commit/b250ad62 (commit)
via https://github.com/Gnucash/gnucash/commit/20e2b6b5 (commit)
via https://github.com/Gnucash/gnucash/commit/efbdab6f (commit)
via https://github.com/Gnucash/gnucash/commit/480aa4a5 (commit)
via https://github.com/Gnucash/gnucash/commit/23948485 (commit)
via https://github.com/Gnucash/gnucash/commit/4868e046 (commit)
via https://github.com/Gnucash/gnucash/commit/ecab7968 (commit)
via https://github.com/Gnucash/gnucash/commit/e2fd2418 (commit)
via https://github.com/Gnucash/gnucash/commit/9afc856c (commit)
via https://github.com/Gnucash/gnucash/commit/5f902001 (commit)
via https://github.com/Gnucash/gnucash/commit/e3e11afc (commit)
via https://github.com/Gnucash/gnucash/commit/0ebb02e2 (commit)
via https://github.com/Gnucash/gnucash/commit/0251d044 (commit)
via https://github.com/Gnucash/gnucash/commit/5a73b9af (commit)
via https://github.com/Gnucash/gnucash/commit/cc7673cc (commit)
via https://github.com/Gnucash/gnucash/commit/bf9ec70f (commit)
via https://github.com/Gnucash/gnucash/commit/d93d4efd (commit)
via https://github.com/Gnucash/gnucash/commit/af3b9bf2 (commit)
via https://github.com/Gnucash/gnucash/commit/fc355958 (commit)
via https://github.com/Gnucash/gnucash/commit/b2f25408 (commit)
via https://github.com/Gnucash/gnucash/commit/8823f728 (commit)
via https://github.com/Gnucash/gnucash/commit/f772b505 (commit)
via https://github.com/Gnucash/gnucash/commit/0f6465ca (commit)
via https://github.com/Gnucash/gnucash/commit/c091197f (commit)
via https://github.com/Gnucash/gnucash/commit/6e7a4ccc (commit)
via https://github.com/Gnucash/gnucash/commit/19bbeaa6 (commit)
via https://github.com/Gnucash/gnucash/commit/d44e0ee7 (commit)
via https://github.com/Gnucash/gnucash/commit/e745f4cf (commit)
via https://github.com/Gnucash/gnucash/commit/57eac14d (commit)
via https://github.com/Gnucash/gnucash/commit/0cce764e (commit)
via https://github.com/Gnucash/gnucash/commit/58e79e5a (commit)
via https://github.com/Gnucash/gnucash/commit/e4d5e2c9 (commit)
via https://github.com/Gnucash/gnucash/commit/eab53d44 (commit)
via https://github.com/Gnucash/gnucash/commit/1c9ad3af (commit)
via https://github.com/Gnucash/gnucash/commit/8d36079c (commit)
via https://github.com/Gnucash/gnucash/commit/833decc0 (commit)
via https://github.com/Gnucash/gnucash/commit/ad51c5e0 (commit)
via https://github.com/Gnucash/gnucash/commit/3352b534 (commit)
via https://github.com/Gnucash/gnucash/commit/1fcd05df (commit)
via https://github.com/Gnucash/gnucash/commit/0c028669 (commit)
via https://github.com/Gnucash/gnucash/commit/18a26884 (commit)
via https://github.com/Gnucash/gnucash/commit/db9e98a8 (commit)
via https://github.com/Gnucash/gnucash/commit/3884e6ab (commit)
via https://github.com/Gnucash/gnucash/commit/8ba5e552 (commit)
via https://github.com/Gnucash/gnucash/commit/dafdd702 (commit)
via https://github.com/Gnucash/gnucash/commit/79decfb7 (commit)
via https://github.com/Gnucash/gnucash/commit/445ff7e6 (commit)
via https://github.com/Gnucash/gnucash/commit/c779bcb7 (commit)
via https://github.com/Gnucash/gnucash/commit/6925ee31 (commit)
via https://github.com/Gnucash/gnucash/commit/876079f8 (commit)
via https://github.com/Gnucash/gnucash/commit/6eae4405 (commit)
via https://github.com/Gnucash/gnucash/commit/b73be1b5 (commit)
via https://github.com/Gnucash/gnucash/commit/b0680118 (commit)
via https://github.com/Gnucash/gnucash/commit/e7d940ac (commit)
via https://github.com/Gnucash/gnucash/commit/77727ffc (commit)
via https://github.com/Gnucash/gnucash/commit/64a01f30 (commit)
via https://github.com/Gnucash/gnucash/commit/0068475b (commit)
via https://github.com/Gnucash/gnucash/commit/d64fb74b (commit)
via https://github.com/Gnucash/gnucash/commit/66ae2abb (commit)
via https://github.com/Gnucash/gnucash/commit/816dd3ea (commit)
via https://github.com/Gnucash/gnucash/commit/d39f180c (commit)
via https://github.com/Gnucash/gnucash/commit/492539e1 (commit)
via https://github.com/Gnucash/gnucash/commit/3923dfa1 (commit)
via https://github.com/Gnucash/gnucash/commit/298797a9 (commit)
via https://github.com/Gnucash/gnucash/commit/206ed632 (commit)
via https://github.com/Gnucash/gnucash/commit/247d04a5 (commit)
via https://github.com/Gnucash/gnucash/commit/1184e926 (commit)
via https://github.com/Gnucash/gnucash/commit/002595f4 (commit)
via https://github.com/Gnucash/gnucash/commit/61f7613b (commit)
via https://github.com/Gnucash/gnucash/commit/505514e1 (commit)
via https://github.com/Gnucash/gnucash/commit/f4220c32 (commit)
via https://github.com/Gnucash/gnucash/commit/df80796a (commit)
via https://github.com/Gnucash/gnucash/commit/b14cb64d (commit)
from https://github.com/Gnucash/gnucash/commit/3ddd76f8 (commit)
commit 94bb28d9ab823bbc6877a5fcc10a6838bb57c119
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 27 13:23:54 2019 -0700
Bug 797127 - Company name and address in reports not display properly
Ensure that all includes of swig-runtime.h are *followed* by
including guile-mappings.h so that the defines masking
scm_to_utf8_string and scm_from_utf8_string are undone.
diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
index b8d1eff2b..2cc489824 100644
--- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c
+++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
@@ -38,6 +38,7 @@
#include <gtk/gtk.h>
#include <string.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "guile-util.h"
#include "gnc-engine.h"
diff --git a/gnucash/gnome/business-options-gnome.c b/gnucash/gnome/business-options-gnome.c
index 9b43335ee..cc058803b 100644
--- a/gnucash/gnome/business-options-gnome.c
+++ b/gnucash/gnome/business-options-gnome.c
@@ -27,6 +27,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include <libguile.h>
#include "gnc-ui-util.h"
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index ae2ed52f3..29586d9c0 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -28,7 +28,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <time.h>
#include "dialog-utils.h"
@@ -47,9 +46,10 @@
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-warnings.h"
+#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "guile-util.h"
#include "engine-helpers-guile.h"
-#include "swig-runtime.h"
#define DIALOG_PRICE_DB_CM_CLASS "dialog-price-edit-db"
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 47c7a2ca7..e7d18cde4 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -36,10 +36,10 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-plugin-page-register.h"
/*################## Added for Reg2 #################*/
diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c
index 91d9736c2..41f89ca47 100644
--- a/gnucash/gnome/gnc-plugin-page-register2.c
+++ b/gnucash/gnome/gnc-plugin-page-register2.c
@@ -36,10 +36,10 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 16cc3ef7d..12866092f 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -55,6 +55,7 @@
#include "gnc-session.h"
#include "engine-helpers-guile.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#ifdef __MINGW32__
#include <Windows.h>
#endif
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c
index 4d117a0fa..3e89180cf 100644
--- a/gnucash/import-export/qif-imp/assistant-qif-import.c
+++ b/gnucash/import-export/qif-imp/assistant-qif-import.c
@@ -58,11 +58,10 @@
#include "gnc-plugin-page-account-tree.h"
#include "gnc-prefs.h"
#include "gnc-ui.h"
+#include "swig-runtime.h"
#include "guile-mappings.h"
#include <gfec.h>
-#include "swig-runtime.h"
-
#define ASSISTANT_QIF_IMPORT_CM_CLASS "assistant-qif-import"
#define GNC_PREFS_GROUP "dialogs.import.qif"
#define GNC_PREF_SHOW_DOC "show-doc"
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 07602873b..2ff828e1e 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -71,6 +71,7 @@
#include "option-util.h"
#include "window-report.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "business-options.h"
#include "gnc-icons.h"
#include "print-session.h"
diff --git a/libgnucash/app-utils/business-options.c b/libgnucash/app-utils/business-options.c
index 6e6782b4c..2eb18a416 100644
--- a/libgnucash/app-utils/business-options.c
+++ b/libgnucash/app-utils/business-options.c
@@ -26,6 +26,7 @@
#include "business-options.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#define FUNC_NAME G_STRFUNC
diff --git a/libgnucash/app-utils/gnc-helpers.c b/libgnucash/app-utils/gnc-helpers.c
index 219afbb39..302f32cf3 100644
--- a/libgnucash/app-utils/gnc-helpers.c
+++ b/libgnucash/app-utils/gnc-helpers.c
@@ -24,9 +24,9 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <string.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-engine.h"
#include "engine-helpers-guile.h"
diff --git a/libgnucash/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
index 802bbad73..3daf522eb 100644
--- a/libgnucash/app-utils/option-util.c
+++ b/libgnucash/app-utils/option-util.c
@@ -32,9 +32,9 @@
#include "glib-helpers.h"
#include "gnc-guile-utils.h"
#include "qof.h"
+#include "swig-runtime.h"
#include "guile-mappings.h"
-#include "swig-runtime.h"
/* TODO:
diff --git a/libgnucash/engine/glib-helpers.c b/libgnucash/engine/glib-helpers.c
index 154b1ddc0..9651c6f09 100644
--- a/libgnucash/engine/glib-helpers.c
+++ b/libgnucash/engine/glib-helpers.c
@@ -27,9 +27,9 @@
#include <string.h>
#include <glib.h>
#include <libguile.h>
+#include "swig-runtime.h"
#include "guile-mappings.h"
#include "gnc-guile-utils.h"
-#include "swig-runtime.h"
#include "glib-helpers.h"
diff --git a/libgnucash/engine/gnc-hooks.c b/libgnucash/engine/gnc-hooks.c
index 51b2b8cfc..a30a2065a 100644
--- a/libgnucash/engine/gnc-hooks.c
+++ b/libgnucash/engine/gnc-hooks.c
@@ -26,8 +26,8 @@
#include <glib.h>
#include <stdio.h>
#include <libguile.h>
-#include <guile-mappings.h>
#include "swig-runtime.h"
+#include <guile-mappings.h>
#include "gnc-hooks.h"
#include "gnc-hooks-scm.h"
#include "gnc-engine.h"
diff --git a/libgnucash/engine/kvp-scm.cpp b/libgnucash/engine/kvp-scm.cpp
index ba7e785af..79d76372c 100644
--- a/libgnucash/engine/kvp-scm.cpp
+++ b/libgnucash/engine/kvp-scm.cpp
@@ -7,11 +7,10 @@ extern "C"
#include <config.h>
#include <qof.h>
-#include "engine-helpers-guile.h"
-
+#include "swig-runtime.h"
#include "guile-mappings.h"
+#include "engine-helpers-guile.h"
#include "gnc-guile-utils.h"
-#include "swig-runtime.h"
#include "kvp-scm.h"
}
commit 4d529c02cd212aed39c49ff379415d2694dc8f7e
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Apr 27 17:04:02 2019 +0800
[libgnucash-scm-utilities] remove unneeded section in CMakeLists
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
index 2e7a880c4..eb5858239 100644
--- a/libgnucash/scm/test/CMakeLists.txt
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -16,9 +16,6 @@ if (HAVE_SRFI64)
FALSE
)
- set(srfi64_extras_SCHEME_DIST
- srfi64-extras.scm
- )
gnc_add_scheme_tests("${scm_test_SCHEME}")
endif (HAVE_SRFI64)
commit b5fe4e3c6429da5814f3fb91ab0b0a772190c4b5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Apr 27 17:03:41 2019 +0800
[guile-json] add files to fix distcheck
diff --git a/borrowed/guile-json/CMakeLists.txt b/borrowed/guile-json/CMakeLists.txt
index b7f4f9f80..60c302627 100644
--- a/borrowed/guile-json/CMakeLists.txt
+++ b/borrowed/guile-json/CMakeLists.txt
@@ -13,7 +13,7 @@ set_local_dist(guile-json_DIST_LOCAL
COPYING
json.scm
NEWS
- README
+ README.org
)
set(guile-json_DIST ${guile-json_DIST_LOCAL} ${guile-json-details_DIST} PARENT_SCOPE)
diff --git a/borrowed/guile-json/COPYING b/borrowed/guile-json/COPYING
new file mode 100644
index 000000000..94a9ed024
--- /dev/null
+++ b/borrowed/guile-json/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/borrowed/guile-json/INSTALL b/borrowed/guile-json/INSTALL
new file mode 100644
index 000000000..8865734f8
--- /dev/null
+++ b/borrowed/guile-json/INSTALL
@@ -0,0 +1,368 @@
+Installation Instructions
+*************************
+
+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+ Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package. The following
+more-detailed instructions are generic; see the 'README' file for
+instructions specific to this package. Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The 'configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions. Finally, it creates a shell script 'config.status' that
+you can run in the future to recreate the current configuration, and a
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
+
+ It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
+be considered for the next release. If you are using the cache, and at
+some point 'config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'. You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. 'cd' to the directory containing the package's source code and type
+ './configure' to configure the package for your system.
+
+ Running 'configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type 'make' to compile the package.
+
+ 3. Optionally, type 'make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type 'make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the 'make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior 'make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing 'make clean'. To also remove the
+ files that 'configure' created (so you can compile the package for
+ a different kind of computer), type 'make distclean'. There is
+ also a 'make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 7. Often, you can also type 'make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide 'make
+ distcheck', which can by used by developers to test that all other
+ targets like 'make install' and 'make uninstall' work correctly.
+ This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the 'configure' script does not know about. Run './configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU 'make'. 'cd' to the
+directory where you want the object files and executables to go and run
+the 'configure' script. 'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'. This is known
+as a "VPATH" build.
+
+ With a non-GNU 'make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use 'make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the 'lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc. You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like '--bindir=DIR' to specify different values for particular
+kinds of files. Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to 'configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+'make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, 'make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+'${prefix}'. Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the 'DESTDIR' variable. For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names. The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+ Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System). The
+'README' should mention any '--enable-' and '--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, 'configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of 'make' will be. For these packages, running './configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with 'make V=1'; while running './configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with 'make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
+is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved. Use GNU 'make' instead.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its '<wchar.h>' header file. The option '-nodtk' can be used as a
+workaround. If GNU CC is not installed, it is therefore recommended to
+try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
+
+ On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+ There may be some features 'configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, 'configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+'--build=TYPE' option. TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file 'config.sub' for the possible values of each field. If
+'config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option '--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with '--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists. Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to 'configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the 'configure' command line, using 'VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified 'gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
+
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+'configure' Invocation
+======================
+
+ 'configure' recognizes the following options to control how it
+operates.
+
+'--help'
+'-h'
+ Print a summary of all of the options to 'configure', and exit.
+
+'--help=short'
+'--help=recursive'
+ Print a summary of the options unique to this package's
+ 'configure', and exit. The 'short' variant lists options used only
+ in the top level, while the 'recursive' variant lists options also
+ present in any nested packages.
+
+'--version'
+'-V'
+ Print the version of Autoconf used to generate the 'configure'
+ script, and exit.
+
+'--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
+ disable caching.
+
+'--config-cache'
+'-C'
+ Alias for '--cache-file=config.cache'.
+
+'--quiet'
+'--silent'
+'-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to '/dev/null' (any error
+ messages will still be shown).
+
+'--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ 'configure' can determine that directory automatically.
+
+'--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names:: for
+ more details, including other options available for fine-tuning the
+ installation locations.
+
+'--no-create'
+'-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+'configure' also accepts some other, not widely useful, options. Run
+'configure --help' for more details.
commit 9885ac4687b62fdd7354da76e8026990a02ba227
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Apr 26 19:27:49 2019 +0200
.gitignore housekeeping
Remove lots of ignores that were only relevant for our former autotools/intltool based build system.
Note if people still have very old working directories, some of these files may suddenly appear
as untracked files after pulling in this commit. A good time to clean them up...
diff --git a/.gitignore b/.gitignore
index e669208f3..749f5a5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,65 +13,28 @@
*.schemas
*~
.*.sw?
-.autotools
.build*/
.cproject
-.deps
-.libs
.project
.scm-links
-COPYING
ChangeLog
-INSTALL
Makefile
Makefile.in
TAGS
tags
-aclocal.m4
-autom4te.cache
-compile
-config.guess
config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
cscope.files
cscope.out
-depcomp
gnucash.trace
doc/gnc-prices.1
doc/gnucash.1
doc/tip_of_the_day.list
gnucash-*.*.*.tar.*
gnucash-*.*.*/
-install-sh
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
-libtool
-ltmain.sh
-macros/intltool.m4
-macros/libtool.m4
-macros/ltmain.sh
-macros/ltoptions.m4
-macros/ltsugar.m4
-macros/ltversion.m4
-macros/lt~obsolete.m4
-make-gnucash-potfiles
-missing
-mkinstalldirs
-po/.intltool-merge-cache
po/LINGUAS
-po/Makefile.in.in
po/POTFILES
po/POTFILES.in
po/gnucash.pot
-po/stamp-it
po/glossary/gnc-glossary.pot
py-compile
bindings/python/.py-links
@@ -185,12 +148,6 @@ libgnucash/tax/us/test/test-link-module
gnucash/environment
gnucash/gnucash
gnucash/gnucash-bin
-gnucash/gnucash-ddd
-gnucash/gnucash-env
-gnucash/gnucash-gdb
-gnucash/gnucash-launcher
-gnucash/gnucash-make-guids
-gnucash/gnucash-setup-env
gnucash/gnucash-valgrind
gnucash/gnome/gnucash
gnucash/gnome/gnucash.desktop
@@ -223,7 +180,6 @@ gnucash/report/report-system/test/test-link-module
gnucash/report/standard-reports/gnucash
gnucash/report/stylesheets/gnucash
gnucash/report/utility-reports/gnucash
-stamp-h1
swig-*.c
test-driver
translog.*.log
commit b4ae45d55635273a1d0560981fabc6a07a34d96f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Apr 26 05:35:39 2019 +0200
Drop po/ChangeLog
It is no longer required by make dist.
Probably it was a requirement of IntlTool.
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index fbba09b5b..ccbdf8f2f 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach(lingua ${ALL_LINGUAS})
file (APPEND LINGUAS "${lingua} ")
endforeach()
-set_local_dist(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars
+set_local_dist(po_DIST_local ${po_SOURCES} CMakeLists.txt Makevars
POTFILES.in POTFILES.skip README gnucash-pot.cmake)
set(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index e346dd759..000000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2005-11-07 Christian Stimming <stimming at tuhh.de>
-
- * This file is required for "make dist" in the po/
- directory. Please don't use it for any actual ChangeLog comments;
- instead, add all ChangeLog comments to the top-level ChangeLog.
-
-2005-11-03 Neil Williams <linux at codehelp.co.uk>
-
- * po/ChangeLog : Add ChangeLog for translations.
-
commit d1ee651bbc749d58b9441bc725dbd422c2eb0fcc
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Apr 24 17:02:01 2019 +0100
Modify the qof log format based on max logger name from log.conf
When you have multiple loggers enabled, the log file indentations are
partly based on logger name length and so you can have false
indentations which can cause confusion. This change gets the maximum
name logger length and uses this for all with a minimum default length
of 12 characters.
diff --git a/libgnucash/engine/qoflog.cpp b/libgnucash/engine/qoflog.cpp
index 6ed9c7c7c..841e85536 100644
--- a/libgnucash/engine/qoflog.cpp
+++ b/libgnucash/engine/qoflog.cpp
@@ -65,6 +65,7 @@ static gchar* function_buffer = NULL;
static gint qof_log_num_spaces = 0;
static GHashTable *log_table = NULL;
static GLogFunc previous_handler = NULL;
+static gchar* qof_logger_format = NULL;
void
qof_log_indent(void)
@@ -124,7 +125,7 @@ log4glib_handler(const gchar *log_domain,
gnc_localtime_r (&now, &now_tm);
qof_strftime(timestamp_buf, 9, format_24hour, &now_tm);
- fprintf(fout, "* %s %*s <%s> %*s%s%s",
+ fprintf(fout, qof_logger_format,
timestamp_buf,
5, level_str,
(log_domain == NULL ? "" : log_domain),
@@ -151,6 +152,9 @@ qof_log_init_filename(const gchar* log_filename)
log_table = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
+ if (!qof_logger_format)
+ qof_logger_format = g_strdup ("* %s %*s <%s> %*s%s%s"); //default format
+
if (log_filename)
{
int fd;
@@ -263,13 +267,13 @@ qof_log_prettify (const char *name)
if (p) *p = '\0';
begin = g_strrstr (buffer, "*");
if (begin == NULL)
- begin = g_strrstr (buffer, " ");
+ begin = g_strrstr (buffer, " ");
else if (* (begin + 1) == ' ')
++ begin;
if (begin != NULL)
- p = begin + 1;
+ p = begin + 1;
else
- p = buffer;
+ p = buffer;
if (function_buffer)
g_free(function_buffer);
@@ -317,6 +321,8 @@ qof_log_parse_log_config(const char *filename)
gsize num_levels;
unsigned int key_idx;
gchar **levels;
+ gint logger_max_name_length = 12;
+ gchar *str = NULL;
levels = g_key_file_get_keys(conf, levels_group, &num_levels, NULL);
@@ -326,6 +332,7 @@ qof_log_parse_log_config(const char *filename)
gchar *logger_name = NULL, *level_str = NULL;
logger_name = g_strdup(levels[key_idx]);
+ logger_max_name_length = MAX (logger_max_name_length, (gint) strlen (logger_name));
level_str = g_key_file_get_string(conf, levels_group, logger_name, NULL);
level = qof_log_level_from_string(level_str);
@@ -335,6 +342,13 @@ qof_log_parse_log_config(const char *filename)
g_free(logger_name);
g_free(level_str);
}
+
+ str = g_strdup_printf ("%d", logger_max_name_length);
+ if (qof_logger_format)
+ g_free (qof_logger_format);
+ qof_logger_format = g_strconcat ("* %s %*s <%-", str, ".", str, "s> %*s%s%s", NULL);
+
+ g_free (str);
g_strfreev(levels);
}
@@ -380,8 +394,7 @@ qof_log_check(QofLogModule log_domain, QofLogLevel log_level)
{
gpointer match_level;
- if (log_levels &&
- (match_level = g_hash_table_lookup(log_levels, "")) != NULL)
+ if (log_levels && (match_level = g_hash_table_lookup(log_levels, "")) != NULL)
longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
}
commit b87ba7ae917aae30d2eff580740d8fe1bc66b7de
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Apr 24 15:40:06 2019 +0100
Bug 797051 - Overwrite prices without warning
Currently if you add a price and a price already exists for that
commodity/currency/day combination it will silently replace that price.
The same is also true for editing a prices if you decide to change the
date. To overcome this add a gnc-warning which allows the response to
be saved temporary or permanently.
diff --git a/gnucash/gnome/dialog-price-editor.c b/gnucash/gnome/dialog-price-editor.c
index 70f771560..5b88992f4 100644
--- a/gnucash/gnome/dialog-price-editor.c
+++ b/gnucash/gnome/dialog-price-editor.c
@@ -44,6 +44,7 @@
#include "gnc-session.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
+#include "gnc-warnings.h"
#include "guile-util.h"
#include "engine-helpers.h"
@@ -93,6 +94,7 @@ gnc_prices_set_changed (PriceEditDialog *pedit_dialog, gboolean changed)
pedit_dialog->changed = changed;
gtk_widget_set_sensitive (pedit_dialog->apply_button, changed);
+ gtk_widget_set_sensitive (pedit_dialog->ok_button, changed);
}
@@ -192,6 +194,56 @@ price_to_gui (PriceEditDialog *pedit_dialog)
}
+static gboolean
+pedit_dialog_replace_found_price (PriceEditDialog *pedit_dialog,
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency, time64 t)
+{
+ gboolean price_found = FALSE;
+ GNCPrice *test_price = gnc_pricedb_lookup_day_t64 (pedit_dialog->price_db,
+ commodity, currency, t);
+
+ if (test_price)
+ {
+ if (pedit_dialog->is_new) // new price
+ price_found = TRUE;
+ else // edit price
+ {
+ if (!gnc_price_equal (test_price, pedit_dialog->price))
+ price_found = TRUE;
+ }
+ gnc_price_unref (test_price);
+ }
+
+ if (price_found)
+ {
+ gint response;
+ GtkWidget *dialog;
+ gchar *message = _("Are you sure you want to replace the existing price?");
+
+ dialog = gtk_message_dialog_new (GTK_WINDOW (pedit_dialog->dialog),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "%s", _("Replace price?"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ "%s", message);
+
+ gtk_dialog_add_buttons (GTK_DIALOG(dialog),
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Replace"), GTK_RESPONSE_YES,
+ (gchar *)NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_YES);
+ response = gnc_dialog_run (GTK_DIALOG(dialog), GNC_PREF_WARN_PRICE_QUOTES_REPLACE);
+ gtk_widget_destroy (dialog);
+
+ if (response == GTK_RESPONSE_CANCEL)
+ return FALSE;
+ }
+ return TRUE;
+}
+
+
static const char *
gui_to_price (PriceEditDialog *pedit_dialog)
{
@@ -229,20 +281,27 @@ gui_to_price (PriceEditDialog *pedit_dialog)
value = gnc_amount_edit_get_amount
(GNC_AMOUNT_EDIT (pedit_dialog->price_edit));
- if (!pedit_dialog->price)
- pedit_dialog->price = gnc_price_create (pedit_dialog->book);
- gnc_price_begin_edit (pedit_dialog->price);
- gnc_price_set_commodity (pedit_dialog->price, commodity);
- gnc_price_set_currency (pedit_dialog->price, currency);
- gnc_price_set_time64 (pedit_dialog->price, date);
- gnc_price_set_source_string (pedit_dialog->price, source);
- gnc_price_set_typestr (pedit_dialog->price, type);
- gnc_price_set_value (pedit_dialog->price, value);
- gnc_price_commit_edit (pedit_dialog->price);
-
- g_free(name_space);
-
- return NULL;
+ // test for existing price on same day
+ if (pedit_dialog_replace_found_price (pedit_dialog, commodity, currency, date))
+ {
+ if (!pedit_dialog->price)
+ pedit_dialog->price = gnc_price_create (pedit_dialog->book);
+ gnc_price_begin_edit (pedit_dialog->price);
+ gnc_price_set_commodity (pedit_dialog->price, commodity);
+ gnc_price_set_currency (pedit_dialog->price, currency);
+ gnc_price_set_time64 (pedit_dialog->price, date);
+ gnc_price_set_source_string (pedit_dialog->price, source);
+ gnc_price_set_typestr (pedit_dialog->price, type);
+ gnc_price_set_value (pedit_dialog->price, value);
+ gnc_price_commit_edit (pedit_dialog->price);
+ g_free (name_space);
+ return NULL;
+ }
+ else
+ {
+ g_free (name_space);
+ return "CANCEL";
+ }
}
@@ -271,32 +330,39 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
PriceEditDialog *pedit_dialog = data;
GNCPrice *new_price = NULL;
const char *error_str;
+ gboolean price_is_ok = TRUE;
if ((response == GTK_RESPONSE_OK) || (response == GTK_RESPONSE_APPLY))
{
error_str = gui_to_price (pedit_dialog);
- if (error_str)
+ if (g_strcmp0 (error_str, "CANCEL") == 0)
+ price_is_ok = FALSE;
+ else if (error_str)
{
gnc_warning_dialog (GTK_WINDOW (pedit_dialog->dialog), "%s", error_str);
return;
}
gnc_prices_set_changed (pedit_dialog, FALSE);
- if (TRUE == pedit_dialog->is_new)
+ if (price_is_ok)
{
- gnc_pricedb_add_price (pedit_dialog->price_db, pedit_dialog->price);
- }
+ if (pedit_dialog->is_new)
+ gnc_pricedb_add_price (pedit_dialog->price_db, pedit_dialog->price);
- gnc_gui_refresh_all ();
+ gnc_gui_refresh_all ();
+ }
}
if (response == GTK_RESPONSE_APPLY)
{
- new_price = gnc_price_clone (pedit_dialog->price, pedit_dialog->book);
- pedit_dialog->is_new = TRUE;
+ if (price_is_ok)
+ {
+ new_price = gnc_price_clone (pedit_dialog->price, pedit_dialog->book);
+ pedit_dialog->is_new = TRUE;
- gnc_price_unref (pedit_dialog->price);
- pedit_dialog->price = new_price;
+ gnc_price_unref (pedit_dialog->price);
+ pedit_dialog->price = new_price;
+ }
}
else
{
@@ -475,11 +541,12 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_apply_button"));
pedit_dialog->apply_button = w;
- gnc_prices_set_changed (pedit_dialog, FALSE);
w = GTK_WIDGET(gtk_builder_get_object (builder, "pd_ok_button"));
pedit_dialog->ok_button = w;
+ gnc_prices_set_changed (pedit_dialog, FALSE);
+
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, pedit_dialog);
g_object_unref(G_OBJECT(builder));
diff --git a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
index 912dcd8ee..1e1effc22 100644
--- a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
@@ -34,6 +34,11 @@
<summary>Delete multiple price quotes</summary>
<description>This dialog is presented before allowing you to delete multiple price quotes at one time.</description>
</key>
+ <key name="price-quotes-replace" type="i">
+ <default>0</default>
+ <summary>Replace existing price</summary>
+ <description>This dialog is presented before allowing you to replace an existing price.</description>
+ </key>
<key name="reg-is-acct-pay-rec" type="i">
<default>0</default>
<summary>Edit account payable/accounts receivable register</summary>
@@ -127,6 +132,11 @@
<summary>Delete multiple price quotes</summary>
<description>This dialog is presented before allowing you to delete multiple price quotes at one time.</description>
</key>
+ <key name="price-quotes-replace" type="i">
+ <default>0</default>
+ <summary>Replace existing price</summary>
+ <description>This dialog is presented before allowing you to replace an existing price.</description>
+ </key>
<key name="reg-is-acct-pay-rec" type="i">
<default>0</default>
<summary>Edit account payable/accounts receivable register</summary>
commit 701974b2c06cf88af555f44fcc910299a2b3e14c
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 15:30:39 2019 +0100
Change the sensitivity of Add price button
Enable the Add price button based on the number of rows selected as it
does not make sense for it to be enabled with more than one row.
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index 93285a07e..ae2ed52f3 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -80,6 +80,7 @@ typedef struct
GtkWidget * edit_button;
GtkWidget * remove_button;
+ GtkWidget * add_button;
GtkWidget *remove_dialog;
GtkTreeView *remove_view;
@@ -580,6 +581,8 @@ gnc_prices_dialog_selection_changed (GtkTreeSelection *treeselection,
length == 1);
gtk_widget_set_sensitive (pdb_dialog->remove_button,
length >= 1);
+ gtk_widget_set_sensitive (pdb_dialog->add_button,
+ length <= 1);
LEAVE("%d prices selected", length);
}
@@ -708,6 +711,9 @@ gnc_prices_dialog_create (GtkWidget * parent, PricesDialog *pdb_dialog)
button = GTK_WIDGET(gtk_builder_get_object (builder, "remove_button"));
pdb_dialog->remove_button = button;
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "add_button"));
+ pdb_dialog->add_button = button;
+
if (!gnc_quote_source_fq_installed())
{
button = GTK_WIDGET(gtk_builder_get_object (builder, "get_quotes_button"));
commit 4368e18ac570f308a020f9fa06ac60a09af87f77
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 15:21:49 2019 +0100
Bug 797165 - Crash on price deletion.
Caused by the introduction of caching used in gnc_pricedb_nth_price,
when prices were deleted, the cached list was never updated and so the
tree model could reference a deleted price and hence crash. This also
affected adding prices as the new prices would not show due to the
cache not being updated. To fix this a function was added to reset the
cache when prices are updated from the model.
diff --git a/gnucash/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c
index cca362972..600631583 100644
--- a/gnucash/gnome-utils/gnc-tree-model-price.c
+++ b/gnucash/gnome-utils/gnc-tree-model-price.c
@@ -1474,7 +1474,7 @@ gnc_tree_model_price_row_delete (GncTreeModelPrice *model,
* item removal.
*/
static gboolean
-gnc_tree_model_price_do_deletions (gpointer unused)
+gnc_tree_model_price_do_deletions (gpointer price_db)
{
ENTER(" ");
@@ -1490,6 +1490,7 @@ gnc_tree_model_price_do_deletions (gpointer unused)
/* Remove the path. */
gnc_tree_model_price_row_delete(data->model, data->path);
+ gnc_pricedb_nth_price_reset_cache (price_db);
gtk_tree_path_free(data->path);
g_free(data);
@@ -1540,6 +1541,7 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
gpointer event_data)
{
GncTreeModelPrice *model;
+ GncTreeModelPricePrivate *priv;
GtkTreePath *path;
GtkTreeIter iter;
remove_data *data;
@@ -1548,10 +1550,11 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
ENTER("entity %p, event %d, model %p, event data %p",
entity, event_type, user_data, event_data);
model = (GncTreeModelPrice *)user_data;
+ priv = GNC_TREE_MODEL_PRICE_GET_PRIVATE(model);
/* Do deletions if any are pending. */
if (pending_removals)
- gnc_tree_model_price_do_deletions(NULL);
+ gnc_tree_model_price_do_deletions (priv->price_db);
/* hard failures */
g_return_if_fail(GNC_IS_TREE_MODEL_PRICE(model));
@@ -1611,8 +1614,9 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
switch (event_type)
{
case QOF_EVENT_ADD:
- /* Tell the filters/views where the new account was added. */
+ /* Tell the filters/views where the new price was added. */
DEBUG("add %s", name);
+ gnc_pricedb_nth_price_reset_cache (priv->price_db);
gnc_tree_model_price_row_add (model, &iter);
break;
@@ -1631,7 +1635,7 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
data->path = path;
pending_removals = g_slist_append (pending_removals, data);
g_idle_add_full(G_PRIORITY_HIGH_IDLE,
- gnc_tree_model_price_do_deletions, NULL, NULL);
+ gnc_tree_model_price_do_deletions, priv->price_db, NULL);
LEAVE(" ");
return;
diff --git a/libgnucash/engine/gnc-pricedb-p.h b/libgnucash/engine/gnc-pricedb-p.h
index 06c611e8c..84ea6df73 100644
--- a/libgnucash/engine/gnc-pricedb-p.h
+++ b/libgnucash/engine/gnc-pricedb-p.h
@@ -57,6 +57,7 @@ struct gnc_price_db_s
QofInstance inst; /* globally unique object identifier */
GHashTable *commodity_hash;
gboolean bulk_update; /* TRUE while reading XML file, etc. */
+ gboolean reset_nth_price_cache;
};
struct _GncPriceDBClass
diff --git a/libgnucash/engine/gnc-pricedb.c b/libgnucash/engine/gnc-pricedb.c
index e5d07b97e..94075ac03 100644
--- a/libgnucash/engine/gnc-pricedb.c
+++ b/libgnucash/engine/gnc-pricedb.c
@@ -839,6 +839,7 @@ QOF_GOBJECT_IMPL(gnc_pricedb, GNCPriceDB, QOF_TYPE_INSTANCE);
static void
gnc_pricedb_init(GNCPriceDB* pdb)
{
+ pdb->reset_nth_price_cache = FALSE;
}
static void
@@ -2202,7 +2203,7 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
if (!db || !c || n < 0) return NULL;
ENTER ("db=%p commodity=%s index=%d", db, gnc_commodity_get_mnemonic(c), n);
- if (last_c && prices && last_c == c)
+ if (last_c && prices && last_c == c && db->reset_nth_price_cache == FALSE)
{
result = g_list_nth_data (prices, n);
LEAVE ("price=%p", result);
@@ -2217,6 +2218,8 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
prices = NULL;
}
+ db->reset_nth_price_cache = FALSE;
+
currency_hash = g_hash_table_lookup (db->commodity_hash, c);
if (currency_hash)
{
@@ -2230,6 +2233,13 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
return result;
}
+void
+gnc_pricedb_nth_price_reset_cache (GNCPriceDB *db)
+{
+ if (db)
+ db->reset_nth_price_cache = TRUE;
+}
+
GNCPrice *
gnc_pricedb_lookup_day_t64(GNCPriceDB *db,
const gnc_commodity *c,
diff --git a/libgnucash/engine/gnc-pricedb.h b/libgnucash/engine/gnc-pricedb.h
index 3fbefe4f3..6a8301f3c 100644
--- a/libgnucash/engine/gnc-pricedb.h
+++ b/libgnucash/engine/gnc-pricedb.h
@@ -633,6 +633,8 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
const gnc_commodity *c,
const int n);
+void gnc_pricedb_nth_price_reset_cache (GNCPriceDB *db);
+
/* The following two convenience functions are used to test the xml backend */
/** @brief Return the number of prices in the database.
*
commit 9f0558ffb53061b5ca62a105273a173741fc1539
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 13:48:21 2019 +0100
Add some missing log Macros for the price model
Add some missing LEAVE macro statements so the log entries do not get
longer and longer.
diff --git a/gnucash/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c
index eaf24e897..cca362972 100644
--- a/gnucash/gnome-utils/gnc-tree-model-price.c
+++ b/gnucash/gnome-utils/gnc-tree-model-price.c
@@ -219,6 +219,8 @@ gnc_tree_model_price_new (QofBook *book, GNCPriceDB *price_db)
GncTreeModelPricePrivate *priv;
const GList *item;
+ ENTER(" ");
+
item = gnc_gobject_tracking_get_list(GNC_TREE_MODEL_PRICE_NAME);
for ( ; item; item = g_list_next(item))
{
@@ -232,8 +234,7 @@ gnc_tree_model_price_new (QofBook *book, GNCPriceDB *price_db)
}
}
- model = g_object_new (GNC_TYPE_TREE_MODEL_PRICE,
- NULL);
+ model = g_object_new (GNC_TYPE_TREE_MODEL_PRICE, NULL);
priv = GNC_TREE_MODEL_PRICE_GET_PRIVATE(model);
priv->book = book;
@@ -242,6 +243,7 @@ gnc_tree_model_price_new (QofBook *book, GNCPriceDB *price_db)
priv->event_handler_id =
qof_event_register_handler (gnc_tree_model_price_event_handler, model);
+ LEAVE("returning new model %p", model);
return GTK_TREE_MODEL (model);
}
@@ -1244,7 +1246,7 @@ gnc_tree_model_price_get_iter_from_commodity (GncTreeModelPrice *model,
n = g_list_index(list, commodity);
if (n == -1)
{
- LEAVE("not in list");
+ LEAVE("commodity not in list");
return FALSE;
}
@@ -1280,11 +1282,17 @@ gnc_tree_model_price_get_iter_from_namespace (GncTreeModelPrice *model,
ct = qof_book_get_data (priv->book, GNC_COMMODITY_TABLE);
list = gnc_commodity_table_get_namespaces_list(ct);
if (list == NULL)
+ {
+ LEAVE("namespace list empty");
return FALSE;
+ }
n = g_list_index(list, name_space);
if (n == -1)
+ {
+ LEAVE("namespace not found");
return FALSE;
+ }
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
@@ -1596,6 +1604,7 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
}
else
{
+ LEAVE(" ");
return;
}
diff --git a/libgnucash/engine/gnc-pricedb.c b/libgnucash/engine/gnc-pricedb.c
index 3e5df1850..e5d07b97e 100644
--- a/libgnucash/engine/gnc-pricedb.c
+++ b/libgnucash/engine/gnc-pricedb.c
@@ -309,18 +309,19 @@ gnc_price_create (QofBook *book)
g_return_val_if_fail (book, NULL);
+ ENTER(" ");
p = g_object_new(GNC_TYPE_PRICE, NULL);
qof_instance_init_data (&p->inst, GNC_ID_PRICE, book);
qof_event_gen (&p->inst, QOF_EVENT_CREATE, NULL);
-
+ LEAVE ("price created %p", p);
return p;
}
static void
gnc_price_destroy (GNCPrice *p)
{
- ENTER(" ");
+ ENTER("destroy price %p", p);
qof_event_gen (&p->inst, QOF_EVENT_DESTROY, NULL);
if (p->type) CACHE_REMOVE(p->type);
@@ -372,14 +373,14 @@ gnc_price_clone (GNCPrice* p, QofBook *book)
if (!p)
{
- LEAVE (" ");
+ LEAVE ("return NULL");
return NULL;
}
new_p = gnc_price_create(book);
if (!new_p)
{
- LEAVE (" ");
+ LEAVE ("return NULL");
return NULL;
}
@@ -394,7 +395,7 @@ gnc_price_clone (GNCPrice* p, QofBook *book)
gnc_price_set_value(new_p, gnc_price_get_value(p));
gnc_price_set_currency(new_p, gnc_price_get_currency(p));
gnc_price_commit_edit(new_p);
- LEAVE (" ");
+ LEAVE ("return cloned price %p", new_p);
return(new_p);
}
@@ -1801,7 +1802,7 @@ GNCPrice *gnc_pricedb_lookup_latest(GNCPriceDB *db,
result = price_list->data;
gnc_price_ref(result);
g_list_free (price_list);
- LEAVE(" ");
+ LEAVE("price is %p", result);
return result;
}
@@ -2202,7 +2203,11 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
ENTER ("db=%p commodity=%s index=%d", db, gnc_commodity_get_mnemonic(c), n);
if (last_c && prices && last_c == c)
- return g_list_nth_data (prices, n);
+ {
+ result = g_list_nth_data (prices, n);
+ LEAVE ("price=%p", result);
+ return result;
+ }
last_c = c;
@@ -2255,6 +2260,7 @@ gnc_pricedb_lookup_at_time64(GNCPriceDB *db,
{
gnc_price_ref(p);
g_list_free (price_list);
+ LEAVE("price is %p", p);
return p;
}
item = item->next;
commit af96c746a1c5260f29f96e5398c78f1ae9a5687d
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 13:47:19 2019 +0100
Improve setting up the price tree views
Before setting up the price tree view filters, disconnect the model
from the tree view and then connect them after the re-filter.
diff --git a/gnucash/gnome-utils/gnc-tree-view-price.c b/gnucash/gnome-utils/gnc-tree-view-price.c
index 129a67c9d..35df37e7f 100644
--- a/gnucash/gnome-utils/gnc-tree-view-price.c
+++ b/gnucash/gnome-utils/gnc-tree-view-price.c
@@ -601,6 +601,11 @@ gnc_tree_view_price_set_filter (GncTreeViewPrice *view,
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
+
+ /* disconnect model from view */
+ g_object_ref (G_OBJECT(s_model));
+ gtk_tree_view_set_model (GTK_TREE_VIEW(view), NULL);
+
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
gnc_tree_view_price_filter_helper,
fd,
@@ -613,6 +618,11 @@ gnc_tree_view_price_set_filter (GncTreeViewPrice *view,
* prices in the price database. Once the very first price has been
* added this error message goes away. */
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
+
+ /* connect model to view */
+ gtk_tree_view_set_model (GTK_TREE_VIEW(view), s_model);
+ g_object_unref (G_OBJECT(s_model));
+
LEAVE(" ");
}
commit ede281e2a8bc2786e0b5b08f2376465c0a87a387
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 13:46:06 2019 +0100
Change the Prices dialogue to a GtkWindow.
This removes the need for setting the transient parent which allows the
dialogue to be placed behind the main application.
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index 602a9cd43..93285a07e 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -62,7 +62,6 @@ static QofLogModule log_module = GNC_MOD_GUI;
void gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data);
void gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data);
-void gnc_prices_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
void gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data);
void gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data);
@@ -72,7 +71,7 @@ void gnc_prices_dialog_get_quotes_clicked (GtkWidget *widget, gpointer data);
typedef struct
{
- GtkWidget * dialog;
+ GtkWidget * window;
QofSession *session;
QofBook *book;
GNCPriceDB *price_db;
@@ -96,10 +95,10 @@ gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data)
ENTER(" ");
gnc_unregister_gui_component_by_data (DIALOG_PRICE_DB_CM_CLASS, pdb_dialog);
- if (pdb_dialog->dialog)
+ if (pdb_dialog->window)
{
- gtk_widget_destroy(pdb_dialog->dialog);
- pdb_dialog->dialog = NULL;
+ gtk_widget_destroy(pdb_dialog->window);
+ pdb_dialog->window = NULL;
}
g_free (pdb_dialog);
@@ -118,17 +117,6 @@ gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data)
}
-void
-gnc_prices_dialog_response (GtkDialog *dialog, gint response_id, gpointer data)
-{
- PricesDialog *pdb_dialog = data;
-
- ENTER(" ");
- gnc_close_gui_component_by_data (DIALOG_PRICE_DB_CM_CLASS, pdb_dialog);
- LEAVE(" ");
-}
-
-
void
gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data)
{
@@ -149,7 +137,7 @@ gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data)
return;
}
- gnc_price_edit_dialog (pdb_dialog->dialog, pdb_dialog->session,
+ gnc_price_edit_dialog (pdb_dialog->window, pdb_dialog->session,
price_list->data, GNC_PRICE_EDIT);
g_list_free(price_list);
LEAVE(" ");
@@ -190,7 +178,7 @@ gnc_prices_dialog_remove_clicked (GtkWidget *widget, gpointer data)
"Are you sure you want to delete the %d selected prices?",
length),
length);
- dialog = gtk_message_dialog_new(GTK_WINDOW(pdb_dialog->dialog),
+ dialog = gtk_message_dialog_new(GTK_WINDOW(pdb_dialog->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
@@ -378,7 +366,6 @@ get_fiscal_end_date (void)
PINFO("Fiscal end date is %s", datebuff);
return time64_to_gdate (end);
-
}
void
@@ -435,7 +422,7 @@ gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data)
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, pdb_dialog);
- gtk_window_set_transient_for (GTK_WINDOW (pdb_dialog->remove_dialog), GTK_WINDOW (pdb_dialog->dialog));
+ gtk_window_set_transient_for (GTK_WINDOW (pdb_dialog->remove_dialog), GTK_WINDOW (pdb_dialog->window));
pdb_dialog->remove_source = 9; // FQ and Commodities highlighted
button = GTK_WIDGET(gtk_builder_get_object (builder, "checkbutton_fq"));
@@ -533,7 +520,7 @@ gnc_prices_dialog_add_clicked (GtkWidget *widget, gpointer data)
price = price_list->data;
g_list_free(price_list);
}
- gnc_price_edit_dialog (pdb_dialog->dialog, pdb_dialog->session,
+ gnc_price_edit_dialog (pdb_dialog->window, pdb_dialog->session,
price, GNC_PRICE_NEW);
LEAVE(" ");
}
@@ -562,7 +549,7 @@ gnc_prices_dialog_get_quotes_clicked (GtkWidget *widget, gpointer data)
return;
}
- scm_window = SWIG_NewPointerObj(pdb_dialog->dialog,
+ scm_window = SWIG_NewPointerObj(pdb_dialog->window,
SWIG_TypeQuery("_p_GtkWindow"), 0);
gnc_set_busy_cursor (NULL, TRUE);
@@ -670,32 +657,25 @@ row_activated_cb (GtkTreeView *view, GtkTreePath *path,
static void
gnc_prices_dialog_create (GtkWidget * parent, PricesDialog *pdb_dialog)
{
- GtkWidget *dialog, *scrolled_window;
+ GtkWidget *window, *scrolled_window;
GtkBuilder *builder;
GtkTreeView *view;
GtkTreeSelection *selection;
ENTER(" ");
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "dialog-price.glade", "prices_dialog");
+ gnc_builder_add_from_file (builder, "dialog-price.glade", "prices_window");
- dialog = GTK_WIDGET(gtk_builder_get_object (builder, "prices_dialog"));
- pdb_dialog->dialog = dialog;
+ window = GTK_WIDGET(gtk_builder_get_object (builder, "prices_window"));
+ pdb_dialog->window = window;
// Set the style context for this dialog so it can be easily manipulated with css
- gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncPriceEditDialog");
+ gnc_widget_set_style_context (GTK_WIDGET(window), "GncPriceEditDialog");
pdb_dialog->session = gnc_get_current_session();
pdb_dialog->book = qof_session_get_book(pdb_dialog->session);
pdb_dialog->price_db = gnc_pricedb_get_db(pdb_dialog->book);
- /* parent */
- if (parent != NULL)
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-
- /* default to 'close' button */
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
-
/* price tree */
scrolled_window = GTK_WIDGET(gtk_builder_get_object (builder, "price_list_window"));
view = gnc_tree_view_price_new(pdb_dialog->book,
@@ -733,13 +713,20 @@ gnc_prices_dialog_create (GtkWidget * parent, PricesDialog *pdb_dialog)
button = GTK_WIDGET(gtk_builder_get_object (builder, "get_quotes_button"));
gtk_widget_set_sensitive(button, FALSE);
}
+ /* default to 'close' button */
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "close_button"));
+ gtk_widget_grab_default (button);
+ gtk_widget_grab_focus (button);
+
}
- gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, pdb_dialog);
+ g_signal_connect (pdb_dialog->window, "destroy",
+ G_CALLBACK(gnc_prices_dialog_window_destroy_cb), pdb_dialog);
+ gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, pdb_dialog);
g_object_unref(G_OBJECT(builder));
- gnc_restore_window_size(GNC_PREFS_GROUP, GTK_WINDOW(pdb_dialog->dialog), GTK_WINDOW (parent));
+ gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW(pdb_dialog->window), GTK_WINDOW (parent));
LEAVE(" ");
}
@@ -750,9 +737,9 @@ close_handler (gpointer user_data)
PricesDialog *pdb_dialog = user_data;
ENTER(" ");
- gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(pdb_dialog->dialog));
+ gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(pdb_dialog->window));
- gtk_widget_destroy (GTK_WIDGET (pdb_dialog->dialog));
+ gtk_widget_destroy (GTK_WIDGET (pdb_dialog->window));
LEAVE(" ");
}
@@ -778,7 +765,7 @@ show_handler (const char *klass, gint component_id,
return(FALSE);
}
- gtk_window_present (GTK_WINDOW(pdb_dialog->dialog));
+ gtk_window_present (GTK_WINDOW(pdb_dialog->window));
LEAVE(" ");
return(TRUE);
}
@@ -815,6 +802,6 @@ gnc_prices_dialog (GtkWidget * parent)
gtk_widget_grab_focus (GTK_WIDGET(pdb_dialog->price_tree));
- gtk_widget_show (pdb_dialog->dialog);
+ gtk_widget_show (pdb_dialog->window);
LEAVE(" ");
}
diff --git a/gnucash/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
index e09c6ccb9..6d33455f9 100644
--- a/gnucash/gtkbuilder/dialog-price.glade
+++ b/gnucash/gtkbuilder/dialog-price.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="liststore1">
@@ -54,6 +54,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<signal name="response" handler="pedit_dialog_response_cb" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox18">
<property name="visible">True</property>
@@ -366,6 +369,9 @@
<property name="title" translatable="yes">Remove Old Prices</property>
<property name="default_height">500</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -778,64 +784,30 @@ These prices were added so that there's always a "nearest in time" price for eve
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkDialog" id="prices_dialog">
+ <object class="GtkWindow" id="prices_window">
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="title" translatable="yes">Price Database</property>
- <property name="default_width">400</property>
+ <property name="default_width">800</property>
<property name="default_height">400</property>
- <property name="type_hint">normal</property>
- <signal name="close" handler="gnc_prices_dialog_close_cb" after="yes" swapped="no"/>
- <signal name="destroy" handler="gnc_prices_dialog_window_destroy_cb" swapped="no"/>
- <signal name="response" handler="gnc_prices_dialog_response" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="vbox121">
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label" translatable="yes">_Close</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <object class="GtkBox" id="hbox118">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="price_list_window">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -844,22 +816,106 @@ These prices were added so that there's always a "nearest in time" price for eve
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="vbuttonbox5">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
- <property name="layout_style">spread</property>
<child>
- <object class="GtkButton" id="get_quotes_button">
- <property name="label" translatable="yes">_Get Quotes</property>
+ <object class="GtkButtonBox" id="vbuttonbox1">
<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="tooltip_text" translatable="yes">Get new online quotes for stock accounts.</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="add_button">
+ <property name="label" translatable="yes">_Add</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="tooltip_text" translatable="yes">Add a new price.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_add_clicked" 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="remove_button">
+ <property name="label" translatable="yes">_Remove</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Remove the current price.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" 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="edit_button">
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Edit the current price.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="remove_old_button">
+ <property name="label" translatable="yes">Remove _Old</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="tooltip_text" translatable="yes">Remove prices older than a user-entered date.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="get_quotes_button">
+ <property name="label" translatable="yes">_Get Quotes</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="tooltip_text" translatable="yes">Get new online quotes for stock accounts.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -868,93 +924,52 @@ These prices were added so that there's always a "nearest in time" price for eve
</packing>
</child>
<child>
- <object class="GtkButton" id="add_button">
- <property name="label" translatable="yes">_Add</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="tooltip_text" translatable="yes">Add a new price.</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_add_clicked" 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="remove_button">
- <property name="label" translatable="yes">_Remove</property>
+ <object class="GtkButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Remove the current price.</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="valign">end</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label" translatable="yes">_Close</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="valign">start</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_prices_dialog_close_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="edit_button">
- <property name="label" translatable="yes">_Edit</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Edit the current price.</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_old_button">
- <property name="label" translatable="yes">Remove _Old</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="tooltip_text" translatable="yes">Remove prices older than a user-entered date.</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="-7">close_button</action-widget>
- </action-widgets>
</object>
</interface>
commit 93c8535ea9eaca5e22349096795accaac2b5c7df
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 11:56:35 2019 +0100
Improve setting up the commodity tree view filters
Before setting up the commodity tree view filters, disconnect the model
from the tree view and then connect them after the re-filter.
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index d24fc787e..40f028964 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -576,6 +576,11 @@ gnc_tree_view_commodity_set_filter (GncTreeViewCommodity *view,
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
+
+ /* disconnect model from view */
+ g_object_ref (G_OBJECT(s_model));
+ gtk_tree_view_set_model (GTK_TREE_VIEW(view), NULL);
+
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
gnc_tree_view_commodity_filter_helper,
fd,
@@ -584,6 +589,11 @@ gnc_tree_view_commodity_set_filter (GncTreeViewCommodity *view,
/* Whack any existing levels. The top two levels have been created
* before this routine can be called. */
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
+
+ /* connect model to view */
+ gtk_tree_view_set_model (GTK_TREE_VIEW(view), s_model);
+ g_object_unref (G_OBJECT(s_model));
+
LEAVE(" ");
}
commit 397c5d13583d8499eacb42d6e75c86c806e37e27
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 11:55:03 2019 +0100
Keep selection on commodity after updates and adding
After a commodity is updated or added, another row will be selected so
add function to select a given commodity and call this after the
changes so the selection can be maintained. For removal the selection
is cleared so it is consistent.
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index f9c2cf9b7..d24fc787e 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -647,6 +647,44 @@ gnc_tree_view_commodity_get_selected_commodity (GncTreeViewCommodity *view)
return commodity;
}
+/*
+ * Select the commodity in the commodity tree view.
+ */
+void
+gnc_tree_view_commodity_select_commodity (GncTreeViewCommodity *view, gnc_commodity *commodity)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model, *f_model, *s_model;
+ GtkTreePath *tree_path;
+ GtkTreePath *f_tree_path;
+ GtkTreePath *s_tree_path;
+
+ g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY(view));
+ g_return_if_fail (commodity != NULL);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
+
+ s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
+ f_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
+ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (f_model));
+
+ tree_path = gnc_tree_model_commodity_get_path_from_commodity (GNC_TREE_MODEL_COMMODITY(model), commodity);
+
+ if (tree_path)
+ {
+ f_tree_path = gtk_tree_model_filter_convert_child_path_to_path
+ (GTK_TREE_MODEL_FILTER (f_model), tree_path);
+
+ s_tree_path = gtk_tree_model_sort_convert_child_path_to_path
+ (GTK_TREE_MODEL_SORT (s_model), f_tree_path);
+
+ gtk_tree_view_expand_to_path (GTK_TREE_VIEW(view), s_tree_path);
+ gtk_tree_selection_select_path (selection, s_tree_path);
+ gtk_tree_path_free (tree_path);
+ gtk_tree_path_free (f_tree_path);
+ gtk_tree_path_free (s_tree_path);
+ }
+}
#if 0 /* Not Used */
/*
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.h b/gnucash/gnome-utils/gnc-tree-view-commodity.h
index 52b61dde1..59280a0f7 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.h
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.h
@@ -203,6 +203,16 @@ gnc_commodity * gnc_tree_view_commodity_get_cursor_commodity (GncTreeViewCommodi
*/
gnc_commodity * gnc_tree_view_commodity_get_selected_commodity (GncTreeViewCommodity *view);
+
+/** Select the commodity in the associated commodity tree view.
+ *
+ * @param view A pointer to an commodity tree view.
+ *
+ * @param The commodity to select.
+ */
+void gnc_tree_view_commodity_select_commodity (GncTreeViewCommodity *view, gnc_commodity *commodity);
+
+
/** This function selects all sub-commodities of an commodity in the
* commodity tree view. All other commodities will be unselected.
*
diff --git a/gnucash/gnome/dialog-commodities.c b/gnucash/gnome/dialog-commodities.c
index ea93e0779..8bcb80f6e 100644
--- a/gnucash/gnome/dialog-commodities.c
+++ b/gnucash/gnome/dialog-commodities.c
@@ -96,7 +96,10 @@ gnc_commodities_dialog_edit_clicked (GtkWidget *widget, gpointer data)
return;
if (gnc_ui_edit_commodity_modal (commodity, cd->window))
+ {
+ gnc_tree_view_commodity_select_commodity (cd->commodity_tree, commodity);
gnc_gui_refresh_all ();
+ }
}
static void
@@ -213,6 +216,9 @@ gnc_commodities_dialog_remove_clicked (GtkWidget *widget, gpointer data)
gnc_commodity_table_remove (ct, commodity);
gnc_commodity_destroy (commodity);
commodity = NULL;
+
+ // to be consistent, unselect all after remove
+ gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW(cd->commodity_tree)));
}
gnc_price_list_destroy(prices);
@@ -224,6 +230,7 @@ gnc_commodities_dialog_add_clicked (GtkWidget *widget, gpointer data)
{
CommoditiesDialog *cd = data;
gnc_commodity *commodity;
+ gnc_commodity *ret_commodity;
const char *name_space;
commodity = gnc_tree_view_commodity_get_selected_commodity (cd->commodity_tree);
@@ -232,7 +239,8 @@ gnc_commodities_dialog_add_clicked (GtkWidget *widget, gpointer data)
else
name_space = NULL;
- gnc_ui_new_commodity_modal (name_space, cd->window);
+ ret_commodity = gnc_ui_new_commodity_modal (name_space, cd->window);
+ gnc_tree_view_commodity_select_commodity (cd->commodity_tree, ret_commodity);
}
void
commit 2262142b6a72023c60625b33e0df9bcd4855ffb7
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 23 11:42:38 2019 +0100
Change the Securities dialogue to use GtkWindow
Change the Securities dialogue from a GtkDialog to GtkWindow. This
removes the need for setting the transient parent which allows the
dialogue to be placed behind the main application.
diff --git a/gnucash/gnome/dialog-commodities.c b/gnucash/gnome/dialog-commodities.c
index b392c5b85..ea93e0779 100644
--- a/gnucash/gnome/dialog-commodities.c
+++ b/gnucash/gnome/dialog-commodities.c
@@ -51,7 +51,7 @@
typedef struct
{
- GtkWidget * dialog;
+ GtkWidget * window;
QofSession *session;
QofBook *book;
@@ -65,29 +65,37 @@ typedef struct
void gnc_commodities_window_destroy_cb (GtkWidget *object, CommoditiesDialog *cd);
-void gnc_commodities_dialog_response (GtkDialog *dialog, gint response, CommoditiesDialog *cd);
+void gnc_commodities_dialog_add_clicked (GtkWidget *widget, gpointer data);
+void gnc_commodities_dialog_edit_clicked (GtkWidget *widget, gpointer data);
+void gnc_commodities_dialog_remove_clicked (GtkWidget *widget, gpointer data);
+void gnc_commodities_dialog_close_clicked (GtkWidget *widget, gpointer data);
void gnc_commodities_show_currencies_toggled (GtkToggleButton *toggle, CommoditiesDialog *cd);
-
void
gnc_commodities_window_destroy_cb (GtkWidget *object, CommoditiesDialog *cd)
{
gnc_unregister_gui_component_by_data (DIALOG_COMMODITIES_CM_CLASS, cd);
+ if (cd->window)
+ {
+ gtk_widget_destroy(cd->window);
+ cd->window = NULL;
+ }
g_free (cd);
}
-static void
-edit_clicked (CommoditiesDialog *cd)
+void
+gnc_commodities_dialog_edit_clicked (GtkWidget *widget, gpointer data)
{
+ CommoditiesDialog *cd = data;
gnc_commodity *commodity;
commodity = gnc_tree_view_commodity_get_selected_commodity (cd->commodity_tree);
if (commodity == NULL)
return;
- if (gnc_ui_edit_commodity_modal (commodity, cd->dialog))
+ if (gnc_ui_edit_commodity_modal (commodity, cd->window))
gnc_gui_refresh_all ();
}
@@ -114,13 +122,14 @@ row_activated_cb (GtkTreeView *view, GtkTreePath *path,
}
else
/* It's a commodity, so click the Edit button. */
- edit_clicked(cd);
+ gnc_commodities_dialog_edit_clicked (NULL, cd);
}
}
-static void
-remove_clicked (CommoditiesDialog *cd)
+void
+gnc_commodities_dialog_remove_clicked (GtkWidget *widget, gpointer data)
{
+ CommoditiesDialog *cd = data;
GNCPriceDB *pdb;
GList *node;
GList *prices;
@@ -157,14 +166,14 @@ remove_clicked (CommoditiesDialog *cd)
"at least one of your accounts. You may "
"not delete it.");
- gnc_warning_dialog (GTK_WINDOW (cd->dialog), "%s", message);
+ gnc_warning_dialog (GTK_WINDOW (cd->window), "%s", message);
g_list_free (accounts);
return;
}
g_list_free (accounts);
pdb = gnc_pricedb_get_db (cd->book);
- prices = gnc_pricedb_get_prices(pdb, commodity, NULL);
+ prices = gnc_pricedb_get_prices (pdb, commodity, NULL);
if (prices)
{
message = _("This commodity has price quotes. Are "
@@ -179,19 +188,19 @@ remove_clicked (CommoditiesDialog *cd)
warning = GNC_PREF_WARN_PRICE_COMM_DEL;
}
- dialog = gtk_message_dialog_new(GTK_WINDOW(cd->dialog),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- "%s", _("Delete commodity?"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
- "%s", message);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog),
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_Delete"), GTK_RESPONSE_OK,
- (gchar *)NULL);
- response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
- gtk_widget_destroy(dialog);
+ dialog = gtk_message_dialog_new (GTK_WINDOW(cd->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "%s", _("Delete commodity?"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ "%s", message);
+ gtk_dialog_add_buttons (GTK_DIALOG(dialog),
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_OK,
+ (gchar *)NULL);
+ response = gnc_dialog_run (GTK_DIALOG(dialog), warning);
+ gtk_widget_destroy (dialog);
if (response == GTK_RESPONSE_OK)
{
@@ -210,9 +219,10 @@ remove_clicked (CommoditiesDialog *cd)
gnc_gui_refresh_all ();
}
-static void
-add_clicked (CommoditiesDialog *cd)
+void
+gnc_commodities_dialog_add_clicked (GtkWidget *widget, gpointer data)
{
+ CommoditiesDialog *cd = data;
gnc_commodity *commodity;
const char *name_space;
@@ -222,33 +232,14 @@ add_clicked (CommoditiesDialog *cd)
else
name_space = NULL;
- gnc_ui_new_commodity_modal (name_space, cd->dialog);
+ gnc_ui_new_commodity_modal (name_space, cd->window);
}
void
-gnc_commodities_dialog_response (GtkDialog *dialog,
- gint response,
- CommoditiesDialog *cd)
+gnc_commodities_dialog_close_clicked (GtkWidget *widget, gpointer data)
{
- switch (response)
- {
- case GNC_RESPONSE_NEW:
- add_clicked (cd);
- return;
-
- case GNC_RESPONSE_DELETE:
- remove_clicked (cd);
- return;
-
- case GNC_RESPONSE_EDIT:
- edit_clicked (cd);
- return;
-
- case GTK_RESPONSE_CLOSE:
- default:
- gnc_close_gui_component_by_data (DIALOG_COMMODITIES_CM_CLASS, cd);
- return;
- }
+ CommoditiesDialog *cd = data;
+ gnc_close_gui_component_by_data (DIALOG_COMMODITIES_CM_CLASS, cd);
}
static void
@@ -268,7 +259,6 @@ void
gnc_commodities_show_currencies_toggled (GtkToggleButton *toggle,
CommoditiesDialog *cd)
{
-
cd->show_currencies = gtk_toggle_button_get_active (toggle);
gnc_tree_view_commodity_refilter (cd->commodity_tree);
}
@@ -316,28 +306,21 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd)
GtkTreeSelection *selection;
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "dialog-commodities.glade", "securities_dialog");
+ gnc_builder_add_from_file (builder, "dialog-commodities.glade", "securities_window");
- cd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "securities_dialog"));
+ cd->window = GTK_WIDGET(gtk_builder_get_object (builder, "securities_window"));
cd->session = gnc_get_current_session();
cd->book = qof_session_get_book(cd->session);
cd->show_currencies = gnc_prefs_get_bool(GNC_PREFS_GROUP, GNC_PREF_INCL_ISO);
// Set the style context for this dialog so it can be easily manipulated with css
- gnc_widget_set_style_context (GTK_WIDGET(cd->dialog), "GncCommoditiesDialog");
-
- gtk_builder_connect_signals(builder, cd);
-
- /* parent */
- if (parent != NULL)
- gtk_window_set_transient_for (GTK_WINDOW (cd->dialog), GTK_WINDOW (parent));
+ gnc_widget_set_style_context (GTK_WIDGET(cd->window), "GncCommoditiesDialog");
/* buttons */
cd->remove_button = GTK_WIDGET(gtk_builder_get_object (builder, "remove_button"));
cd->edit_button = GTK_WIDGET(gtk_builder_get_object (builder, "edit_button"));
/* commodity tree */
-
scrolled_window = GTK_WIDGET(gtk_builder_get_object (builder, "commodity_list_window"));
view = gnc_tree_view_commodity_new(cd->book,
"state-section", STATE_SECTION,
@@ -361,8 +344,18 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd)
button = GTK_WIDGET(gtk_builder_get_object (builder, "show_currencies_button"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), cd->show_currencies);
- g_object_unref(G_OBJECT(builder));
- gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW(cd->dialog), GTK_WINDOW(parent));
+ /* default to 'close' button */
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "close_button"));
+ gtk_widget_grab_default (button);
+ gtk_widget_grab_focus (button);
+
+ g_signal_connect (cd->window, "destroy",
+ G_CALLBACK(gnc_commodities_window_destroy_cb), cd);
+
+ gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, cd);
+ g_object_unref (G_OBJECT(builder));
+
+ gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW(cd->window), GTK_WINDOW(parent));
}
static void
@@ -370,11 +363,11 @@ close_handler (gpointer user_data)
{
CommoditiesDialog *cd = user_data;
- gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(cd->dialog));
+ gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(cd->window));
- gnc_prefs_set_bool(GNC_PREFS_GROUP, GNC_PREF_INCL_ISO, cd->show_currencies);
+ gnc_prefs_set_bool (GNC_PREFS_GROUP, GNC_PREF_INCL_ISO, cd->show_currencies);
- gtk_widget_destroy(cd->dialog);
+ gtk_widget_destroy (cd->window);
}
static void
@@ -395,7 +388,7 @@ show_handler (const char *klass, gint component_id,
if (!cd)
return(FALSE);
- gtk_window_present (GTK_WINDOW(cd->dialog));
+ gtk_window_present (GTK_WINDOW(cd->window));
return(TRUE);
}
@@ -427,5 +420,5 @@ gnc_commodities_dialog (GtkWidget * parent)
gtk_widget_grab_focus (GTK_WIDGET(cd->commodity_tree));
- gtk_widget_show (cd->dialog);
+ gtk_widget_show (cd->window);
}
diff --git a/gnucash/gtkbuilder/dialog-commodities.glade b/gnucash/gtkbuilder/dialog-commodities.glade
index 457f2d0fa..3c3ff0140 100644
--- a/gnucash/gtkbuilder/dialog-commodities.glade
+++ b/gnucash/gtkbuilder/dialog-commodities.glade
@@ -1,108 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
- <object class="GtkDialog" id="securities_dialog">
+ <object class="GtkWindow" id="securities_window">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Securities</property>
<property name="default_width">400</property>
<property name="default_height">400</property>
- <property name="type_hint">normal</property>
- <signal name="destroy" handler="gnc_commodities_window_destroy_cb" swapped="no"/>
- <signal name="response" handler="gnc_commodities_dialog_response" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox" id="vbox127">
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="hbuttonbox6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="add_button">
- <property name="label" translatable="yes">_Add</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="tooltip_text" translatable="yes">Add a new commodity.</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="remove_button">
- <property name="label" translatable="yes">_Remove</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Remove the current commodity.</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit_button">
- <property name="label" translatable="yes">_Edit</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Edit the current commodity.</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label" translatable="yes">_Close</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <object class="GtkBox" id="commodities_vbox">
+ <object class="GtkBox" id="commodities_vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Securities</b></property>
@@ -116,12 +38,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"> </property>
@@ -133,7 +55,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox128">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -145,9 +67,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -191,16 +110,93 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="add_button">
+ <property name="label" translatable="yes">_Add</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="tooltip_text" translatable="yes">Add a new commodity.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_commodities_dialog_add_clicked" 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="remove_button">
+ <property name="label" translatable="yes">_Remove</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Remove the current commodity.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_commodities_dialog_remove_clicked" 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="edit_button">
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Edit the current commodity.</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="gnc_commodities_dialog_edit_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label" translatable="yes">_Close</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_commodities_dialog_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="1">add_button</action-widget>
- <action-widget response="2">remove_button</action-widget>
- <action-widget response="3">edit_button</action-widget>
- <action-widget response="-6">close_button</action-widget>
- </action-widgets>
</object>
</interface>
commit 82a2fca27ac589de30086c970bf429ff11e61858
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Apr 26 02:30:48 2019 +0200
[I18N] Mask line endings of continuous text in income-gst-statement.scm
While the HTML renderer ignored them, translators got confused.
diff --git a/gnucash/report/standard-reports/income-gst-statement.scm b/gnucash/report/standard-reports/income-gst-statement.scm
index 456d8875e..b85eb9ebf 100644
--- a/gnucash/report/standard-reports/income-gst-statement.scm
+++ b/gnucash/report/standard-reports/income-gst-statement.scm
@@ -40,14 +40,14 @@
(define pagename-filter (N_ "Filter"))
(define TAX-SETUP-DESC
(gnc:make-html-text
- (_ "This report is useful to calculate periodic business tax payable/receivable from
- authorities. From 'Edit report options' above, choose your Business Income and Business Expense accounts.
- Each transaction may contain, in addition to the accounts payable/receivable or bank accounts,
- a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100.")
+ (_ "This report is useful to calculate periodic business tax payable/receivable from \
+authorities. From 'Edit report options' above, choose your Business Income and Business Expense accounts. \
+Each transaction may contain, in addition to the accounts payable/receivable or bank accounts, \
+a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100.")
(gnc:html-markup-br)
(gnc:html-markup-br)
- (_ "These tax accounts can either be populated using the standard register, or from Business Invoices and Bills
- which will require Tax Tables to be set up correctly. Please see the documentation.")
+ (_ "These tax accounts can either be populated using the standard register, or from Business Invoices and Bills \
+which will require Tax Tables to be set up correctly. Please see the documentation.")
(gnc:html-markup-br)
(gnc:html-markup-br)
(_ "From the Report Options, you will need to select the accounts which will \
commit a20f3368ae9bd920187cc43ec7b775649dfb78f9
Merge: 483f9a4c8 c48da0782
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Apr 25 13:38:02 2019 -0700
Merge Christoph Holtermann's 'fix-deprecated-positional-arguments' into maint.
commit 483f9a4c8331f82e8f13f51a52b5d51339d13557
Author: thetedmunds <tedmunds at gmail.com>
Date: Mon Apr 15 14:31:23 2019 -0700
Bug 797196 - Allow for per-payment rounding in amortization calculations
Provides functions gnc:amort_pmt, gnc:amort_ppmt, and gnc:amort_ipmt in
fin.scm.
diff --git a/libgnucash/app-utils/fin.scm b/libgnucash/app-utils/fin.scm
index a8edf0506..4ffc3c1fa 100644
--- a/libgnucash/app-utils/fin.scm
+++ b/libgnucash/app-utils/fin.scm
@@ -182,3 +182,171 @@
)
)
)
+
+;; Further options to match what some (several? many?) lenders do (at
+;; least in Canada):
+;; The posted interest rate is an annual rate that has a specified
+;; compounding frequency per year (2 for mortgages in Canada).
+;; A payment frequency and amortization length are selected (e.g.
+;; monthly payments for 25 years).
+;; The posted nominal rate is converted from the specified compounding
+;; frequency to the equivalent rate at the payment frequency.
+;; The required payment is calculated.
+;; The payment is rounded up to the next dollar (or $10 dollars,
+;; or whatever...)
+;; Each payment period, interest is calculated on the outstanding
+;; balance.
+;; The interest is rounded to the nearest cent and added to the
+;; balance.
+;; The payment is subtracted from the balance.
+;; The final payment will be smaller because all the other payments
+;; were rounded up.
+;;
+;; For the purpose of creating scheduled transactions that properly
+;; debit a source account while crediting the loan account and the
+;; interest expense account, the first part (the calculation of the
+;; required payment) doesn't really matter. You have agreed
+;; with the lender what the payment terms (interest rate, payment
+;; frequency, payment amount) will be; you keep paying until the
+;; balance is zero.
+;;
+;; To create the scheduled transactions, we need to build an
+;; amortization table.
+;; If it weren't for the rounding of the interest to the nearest cent
+;; each period, we could calculate the ith row of the amortization
+;; table directly from the general annuity equation (as is done by
+;; gnc:ipmt and gnc:ppmt). But to deal with the intermediate
+;; rounding, the amortization table has to be constructed iteratively
+;; (as is done by the AMORT worksheet on the TI BA II Plus
+;; financial calculator).
+;;
+;; =================================
+;; EXAMPLE:
+;; Say you borrow $100,000 at 5%/yr, compounded semi-annually.
+;; You amortize the loan over 2 years with 24 monthly payments.
+;; This calls for payments of $4,384.8418 at the end of each month.
+;; The lender rounds this up to $4,385.
+;;
+;; If you calculate the balance at each period directly using the annuity
+;; formula (like calc-principal does), and then use the those values to calculate
+;; the principal and interest paid, the first 10 rows of the amortization table
+;; look like this (the values are rounded to the nearest cent for _display_, but
+;; not for calculating the next period):
+;;
+;; PERIOD | Open | Interest | Principal | End
+;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
+;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
+;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
+;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
+;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
+;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
+;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
+;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
+;; 9 | $67,756.61 | $279.43 | $4,105.57 | $63,651.04
+;; 10 | $63,651.04 | $262.49 | $4,122.51 | $59,528.53
+;;
+;; If you calculate each period sequentially (rounding the interest and balance
+;; at each step), you get:
+;;
+;; PERIOD | Open | Interest | Principal | End
+;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
+;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
+;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
+;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
+;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
+;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
+;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
+;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
+;; 9 | $67,756.61 | $279.42 | $4,105.58 | $63,651.03 <- Different
+;; 10 | $63,651.03 | $262.49 | $4,122.51 | $59,528.52 <- still $0.01 off
+;;
+;; =================================
+;;
+;; For the following functions the argument names are:
+;; py: payment frequency (number of payments per year)
+;; cy: compounding frequency of the nominal rate (per year)
+;; iy: nominal annual interest rate
+;; pv: the present value (opening balance)
+;; pmt: the size of the periodic payment
+;; n: the payment period we are asking about (the first payment is n=1)
+;; places: number of decimal places to round the interest amount to
+;; at each payment (999 does no rounding)
+;;
+;; Note: only ordinary annuities are supported (payments at the end of
+;; each period, not at the beginning of each period)
+;;
+;; Unlike the AMORT worksheet on the BA II Plus, these methods will
+;; handle the smaller payment (bringing the balance to zero, then
+;; zeroing future payments)
+;;
+;; The present value (pv) must be non-negative. If not, the balance will be
+;; treated as 0.
+;; The payment (pmt) can be positive (paying interest, and hopefully
+;; reducing the balance each payment), or negative (increasing the balance
+; each payment).
+;; The payment number (n) must be positive for amort_pmt, amort_ppmt, and
+;; amort_ipmt. I.e., the first payment is payment 1.
+;; The payment number (n) must be non-negative for amort_balance. (In this
+;; case, payment zero is at the _beginning_ of the first period, so
+;; amort_balance will just be the initial balance.)
+;; If the above conditions on n are violated, the functions return -1 (#f is
+;; not used, because it causes gnucash to crash).
+;;
+;; A negative interest rate works (if you can find a lender who charges
+;; negative rates), but negative compounding frequency, or negative payment
+;; frequency is a bad idea.
+
+;; Calculate the balance remaining after the nth payment
+;; (n must be greater than or equal to zero)
+(define (gnc:amort_pmt py cy iy pv pmt n places)
+ (if (< n 1) -1 ;; Returning #f here causes gnucash to crash on startup
+ (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+ (balBeforePayment
+ (amort_balanceAfterInterest prevBal py cy iy places))
+ (balAfterPayment (amort_balanceAfterPayment balBeforePayment pmt)))
+ (- balBeforePayment balAfterPayment))))
+
+;; Calculate the amount of the nth payment that is principal
+;; (n must be greater than zero)
+(define (gnc:amort_ppmt py cy iy pv pmt n places)
+ (if (< n 1) -1
+ (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+ (bal-after-int (amort_balanceAfterInterest prevBal py cy iy places))
+ (newBal (amort_balanceAfterPayment bal-after-int pmt)))
+ (- prevBal newBal))))
+
+;; Calculate the amount of the nth payment that is interest
+;; (n must be greater than zero)
+(define (gnc:amort_ipmt py cy iy pv pmt n places)
+ (if (< n 1) -1
+ (let* ((prevBal(gnc:amort_balance py cy iy pv pmt (- n 1) places)))
+ (amort_interest prevBal py cy iy places))))
+
+;; "Private" helper functions:
+
+;; Calculate the amount of interest on the current balance,
+;; rounded to the specified number of decimal places
+(define (amort_interest balance py cy iy places)
+ (roundToPlaces (* balance (gnc:periodic_rate iy py cy)) places)
+)
+
+;; Calculate the new balance after applying the interest, but before
+;; applying the payment
+(define (amort_balanceAfterInterest prevBalance py cy iy places)
+ (+ prevBalance (amort_interest prevBalance py cy iy places))
+)
+
+;; Apply the payment to the balance (after the interest has been
+;; added), without letting the balance go below zero.
+(define (amort_balanceAfterPayment balanceBeforePmt pmt)
+ (max 0 (- balanceBeforePmt pmt))
+)
+
+;; Round the value to the specified number of decimal places.
+;; 999 places means no rounding (#f is not used, because only numbers can be
+;; entered in the scheduled transaction editor)
+(define (roundToPlaces value places)
+ (if (= places 999) value
+ (/ (round (* value (expt 10 places))) (expt 10 places))
+ )
+)
commit 5311e5a386e48a07a8d4dbc8f032750a9ca76bf7
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Apr 25 13:19:28 2019 -0700
Revert "Merge T Edmunds's 'amortization-rounding' into maint."
This reverts commit aa53c23239dc05da44c78a085c4db342adfbf707, reversing
changes made to 3c946a84496a846196ba04667e3a7f0c7bee0eb5, because
aa53c23 was based on master and so undid other changes made to maint
since the last merge-to-master.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 903ebcc5d..23eb5e9ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,13 @@ enable_testing()
# Version number of gnucash
set (GNUCASH_MAJOR_VERSION 3)
-set (GNUCASH_MINOR_VERSION 900)
+set (GNUCASH_MINOR_VERSION 5)
set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
set (GNUCASH_LATEST_STABLE_SERIES 3.x)
set (PACKAGE gnucash)
set (PACKAGE_NAME GnuCash)
-set (PACKAGE_VERSION 3.900)
+set (PACKAGE_VERSION 3.5)
set (PACKAGE_BUGREPORT "https://bugs.gnucash.org")
set (PACKAGE_TARNAME ${PACKAGE})
set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index fd8935b5a..59ed257be 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -14,9 +14,6 @@
<property name="default_height">600</property>
<property name="type_hint">dialog</property>
<signal name="map" handler="gnc_ui_generic_account_picker_map_cb" swapped="no"/>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="account_picker_vbox">
<property name="visible">True</property>
@@ -168,6 +165,7 @@
<property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="format_picker_dialog">
+ <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Choose a format</property>
<property name="resizable">False</property>
@@ -175,9 +173,6 @@
<property name="default_width">600</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox16">
<property name="visible">True</property>
@@ -306,9 +301,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Preferences</property>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkGrid" id="matcher_prefs">
<property name="visible">True</property>
@@ -562,9 +554,6 @@
<property name="default_width">600</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox14">
<property name="visible">True</property>
@@ -728,8 +717,7 @@
<property name="text" translatable="yes">This transaction requires your intervention or it will NOT be imported.</property>
</object>
<object class="GtkTextBuffer" id="textbuffer5">
- <property name="text" translatable="yes">Double click on the transaction to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required).
-Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Click or Shift-F10 to bring up popup menu and click or select to assign a destination account to the selected rows.</property>
+ <property name="text" translatable="yes">Double click on the transaction to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required).</property>
</object>
<object class="GtkDialog" id="matcher_help_dialog">
<property name="can_focus">False</property>
@@ -738,9 +726,6 @@ Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Cl
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<signal name="close" handler="on_matcher_help_close_clicked" swapped="no"/>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox18">
<property name="visible">True</property>
@@ -779,7 +764,6 @@ Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Cl
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">42</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
@@ -1006,7 +990,6 @@ Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Cl
<object class="GtkTextView" id="textview5">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_bottom">2</property>
<property name="pixels_above_lines">5</property>
<property name="pixels_below_lines">5</property>
<property name="editable">False</property>
@@ -1124,11 +1107,8 @@ Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Cl
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
<property name="enable_search">False</property>
- <property name="rubber_banding">True</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection3">
- <property name="mode">multiple</property>
- </object>
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
</object>
</child>
@@ -1165,9 +1145,6 @@ Multiply select rows using Ctrl-Click, Shift-Click and Rubber banding . Right-Cl
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<signal name="close" handler="on_matcher_cancel_clicked" swapped="no"/>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="transaction_matcher_vbox">
<property name="visible">True</property>
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 7172c52e2..773429602 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -98,28 +98,9 @@ void on_matcher_help_clicked (GtkButton *button, gpointer user_data);
void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
/* Local prototypes */
-static void gnc_gen_trans_assign_transfer_account(
- GtkTreeView *treeview,
- gboolean *first,
- gboolean *is_selection,
- GtkTreePath *path,
- Account **new_acc,
- GNCImportMainMatcher *info);
-static void gnc_gen_trans_assign_transfer_account_to_selection_cb (
- GtkMenuItem *menuitem,
- GNCImportMainMatcher *info);
-static void gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info);
-static gboolean gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info);
-static gboolean gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info);
-static void refresh_model_row(GNCImportMainMatcher *gui, GtkTreeModel *model,
+static void
+refresh_model_row(GNCImportMainMatcher *gui, GtkTreeModel *model,
GtkTreeIter *iter, GNCImportTransInfo *info);
-/* end local prototypes */
void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
{
@@ -380,238 +361,54 @@ gnc_gen_trans_update_toggled_cb (GtkCellRendererToggle *cell_renderer,
}
static void
-gnc_gen_trans_assign_transfer_account(GtkTreeView *treeview,
- gboolean *first,
- gboolean *is_selection,
- GtkTreePath *path,
- Account **new_acc,
- GNCImportMainMatcher *info)
+gnc_gen_trans_row_activated_cb (GtkTreeView *view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ GNCImportMainMatcher *gui)
{
GtkTreeModel *model;
GtkTreeIter iter;
GNCImportTransInfo *trans_info;
- Account *old_acc;
- gboolean ok_pressed;
- ENTER("");
- DEBUG("first = %s",*first?"true":"false");
- DEBUG("is_selection = %s",*is_selection?"true":"false");
- DEBUG("path = %s", gtk_tree_path_to_string(path));
- DEBUG("account passed in = %s", gnc_get_account_name_for_register(*new_acc));
- model = gtk_tree_view_get_model(treeview);
- if (gtk_tree_model_get_iter(model, &iter, path))
- {
- gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+ model = gtk_tree_view_get_model(gui->view);
+ if (!gtk_tree_model_get_iter(model, &iter, path))
+ return;
+ gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
- switch (gnc_import_TransInfo_get_action (trans_info))
+ switch (gnc_import_TransInfo_get_action (trans_info))
+ {
+ case GNCImport_ADD:
+ if (gnc_import_TransInfo_is_balanced(trans_info) == FALSE)
{
- case GNCImport_ADD:
- if (gnc_import_TransInfo_is_balanced(trans_info) == FALSE)
- {
- ok_pressed = TRUE;
- old_acc = gnc_import_TransInfo_get_destacc (trans_info);
- if (*first)
- {
- ok_pressed = FALSE;
- *new_acc = gnc_import_select_account(info->main_widget,
- NULL,
- TRUE,
- _("Destination account for the auto-balance split."),
- xaccTransGetCurrency(
- gnc_import_TransInfo_get_trans(trans_info)),
- ACCT_TYPE_NONE,
- old_acc,
- &ok_pressed);
- *first = FALSE;
- DEBUG("account selected = %s",
- gnc_account_get_full_name(*new_acc));
- }
- if (ok_pressed)
- gnc_import_TransInfo_set_destacc (trans_info,
- *new_acc, TRUE);
- }
- break;
- case GNCImport_CLEAR:
- case GNCImport_UPDATE:
- if (first && !is_selection) run_match_dialog (info, trans_info);
- break;
- case GNCImport_SKIP:
- break;
- default:
- PERR("InvalidGNCImportValue");
- break;
+ run_account_picker_dialog (gui, model, &iter, trans_info);
}
- refresh_model_row(info, model, &iter, trans_info);
- }
- LEAVE("");
-}
-
-static void
-gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
- GNCImportMainMatcher *info)
-{
- GtkTreeView *treeview;
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GNCImportTransInfo *trans_info;
- Account *assigned_account;
- GList *selected_rows, *l;
- gboolean first, is_selection;
-
- ENTER("");
- treeview = GTK_TREE_VIEW(info->view);
- model = gtk_tree_view_get_model(treeview);
- selection = gtk_tree_view_get_selection(treeview);
- selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
- assigned_account = NULL;
- first = TRUE;
- is_selection = TRUE;
- DEBUG("Rows in selection = %i",
- gtk_tree_selection_count_selected_rows(selection));
- DEBUG("Entering loop over selection");
-
- for (l = selected_rows; l != NULL; l = l->next)
- {
- DEBUG("passing first = %s",
- first?"true":"false");
- DEBUG("passing is_selection = %s",
- is_selection?"true":"false");
- DEBUG("passing path = %s",
- gtk_tree_path_to_string(l->data));
- DEBUG("passing account value = %s",
- gnc_account_get_full_name(assigned_account));
- gnc_gen_trans_assign_transfer_account(treeview,
- &first, &is_selection, l->data, &assigned_account, info);
- DEBUG("returned value of account = %s",
- gnc_account_get_full_name(assigned_account));
- DEBUG("returned value of first = %s",first?"true":"false");
- if (assigned_account == NULL) break;
- gtk_tree_selection_unselect_path(selection, l->data);
+ break;
+ case GNCImport_CLEAR:
+ case GNCImport_UPDATE:
+ run_match_dialog (gui, trans_info);
+ break;
+ case GNCImport_SKIP:
+ /*The information displayed is only informative, until you select an action*/
+ break;
+ default:
+ PERR("I don't know what to do! (Yet...)");
+ break;
}
-
- g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
- g_list_free_full(l, (GDestroyNotify) gtk_tree_path_free);
- LEAVE("");
-}
-
-static void
-gnc_gen_trans_row_activated_cb (GtkTreeView *treeview,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GNCImportMainMatcher *info)
-{
- Account *assigned_account;
- gboolean first, is_selection;
-
- ENTER("");
- assigned_account = NULL;
- first = TRUE;
- is_selection = FALSE;
- gnc_gen_trans_assign_transfer_account(treeview,
- &first, &is_selection, path,
- &assigned_account, info);
- DEBUG("account returned = %s", gnc_account_get_full_name(assigned_account));
- LEAVE("");
+ refresh_model_row(gui, model, &iter, trans_info);
}
static void
gnc_gen_trans_row_changed_cb (GtkTreeSelection *selection,
- GNCImportMainMatcher *info)
+ GNCImportMainMatcher *gui)
{
GtkTreeModel *model;
GtkTreeIter iter;
- GtkSelectionMode mode;
-
- ENTER("");
- mode = gtk_tree_selection_get_mode(selection);
- switch (mode)
- {
- case GTK_SELECTION_MULTIPLE:
- DEBUG("mode = GTK_SELECTION_MULTIPLE, no action");
- break;
- case GTK_SELECTION_NONE:
- DEBUG("mode = GTK_SELECTION_NONE, no action");
- break;
- case GTK_SELECTION_BROWSE:
- DEBUG("mode = GTK_SELECTION_BROWSE->default");
- case GTK_SELECTION_SINGLE:
- DEBUG("mode = GTK_SELECTION_SINGLE->default");
- default:
- DEBUG("mode = default unselect selected row");
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- gtk_tree_selection_unselect_iter(selection, &iter);
- }
- }
- LEAVE("");
-}
-static void
-gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info)
-{
- GtkWidget *menu, *menuitem;
- GdkEventButton *event_button;
-
- ENTER ("");
- menu = gtk_menu_new();
- menuitem = gtk_menu_item_new_with_label(_("Assign a transfer account."));
- g_signal_connect(menuitem, "activate",
- G_CALLBACK(
- gnc_gen_trans_assign_transfer_account_to_selection_cb),
- info);
- DEBUG("Callback to assign destination account to selection connected");
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
- gtk_widget_show_all(menu);
- event_button = (GdkEventButton *) event;
- /* Note: event can be NULL here when called from view_onPopupMenu;
- * gdk_event_get_time() accepts a NULL argument */
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
- (event_button != NULL) ? event_button->button : 0,
- gdk_event_get_time((GdkEvent*)event));
- LEAVE ("");
-}
-
-static gboolean
-gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info)
-{
- GdkEventButton *event_button;
- ENTER("");
- g_return_val_if_fail (treeview != NULL, FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
- /* handle single click with the right mouse button? */
- if (event->type == GDK_BUTTON_PRESS)
- {
- event_button = (GdkEventButton *) event;
- if (event_button->button == GDK_BUTTON_SECONDARY)
- {
- DEBUG("Right mouseClick detected- popup the menu.");
- gnc_gen_trans_view_popup_menu(treeview, event, info);
- LEAVE("return TRUE");
- return TRUE;
- }
- }
- LEAVE("return FALSE");
- return FALSE;
-}
-
-static gboolean
-gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
- GdkEvent *event,
- GNCImportMainMatcher *info)
-{
- ENTER("");
- /* respond to Shift-F10 popup menu hotkey */
- gnc_gen_trans_view_popup_menu(treeview, NULL, info);
- LEAVE ("");
- return TRUE;
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+ gtk_tree_selection_unselect_iter(selection, &iter);
}
-
static GtkTreeViewColumn *
add_text_column(GtkTreeView *view, const gchar *title, int col_num)
{
@@ -739,11 +536,6 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
G_CALLBACK(gnc_gen_trans_row_activated_cb), info);
g_signal_connect(selection, "changed",
G_CALLBACK(gnc_gen_trans_row_changed_cb), info);
-
- g_signal_connect(view, "button-press-event",
- G_CALLBACK(gnc_gen_trans_onButtonPressed_cb), info);
- g_signal_connect(view, "popup-menu",
- G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info);
}
static void
diff --git a/libgnucash/app-utils/fin.scm b/libgnucash/app-utils/fin.scm
index 4ffc3c1fa..a8edf0506 100644
--- a/libgnucash/app-utils/fin.scm
+++ b/libgnucash/app-utils/fin.scm
@@ -182,171 +182,3 @@
)
)
)
-
-;; Further options to match what some (several? many?) lenders do (at
-;; least in Canada):
-;; The posted interest rate is an annual rate that has a specified
-;; compounding frequency per year (2 for mortgages in Canada).
-;; A payment frequency and amortization length are selected (e.g.
-;; monthly payments for 25 years).
-;; The posted nominal rate is converted from the specified compounding
-;; frequency to the equivalent rate at the payment frequency.
-;; The required payment is calculated.
-;; The payment is rounded up to the next dollar (or $10 dollars,
-;; or whatever...)
-;; Each payment period, interest is calculated on the outstanding
-;; balance.
-;; The interest is rounded to the nearest cent and added to the
-;; balance.
-;; The payment is subtracted from the balance.
-;; The final payment will be smaller because all the other payments
-;; were rounded up.
-;;
-;; For the purpose of creating scheduled transactions that properly
-;; debit a source account while crediting the loan account and the
-;; interest expense account, the first part (the calculation of the
-;; required payment) doesn't really matter. You have agreed
-;; with the lender what the payment terms (interest rate, payment
-;; frequency, payment amount) will be; you keep paying until the
-;; balance is zero.
-;;
-;; To create the scheduled transactions, we need to build an
-;; amortization table.
-;; If it weren't for the rounding of the interest to the nearest cent
-;; each period, we could calculate the ith row of the amortization
-;; table directly from the general annuity equation (as is done by
-;; gnc:ipmt and gnc:ppmt). But to deal with the intermediate
-;; rounding, the amortization table has to be constructed iteratively
-;; (as is done by the AMORT worksheet on the TI BA II Plus
-;; financial calculator).
-;;
-;; =================================
-;; EXAMPLE:
-;; Say you borrow $100,000 at 5%/yr, compounded semi-annually.
-;; You amortize the loan over 2 years with 24 monthly payments.
-;; This calls for payments of $4,384.8418 at the end of each month.
-;; The lender rounds this up to $4,385.
-;;
-;; If you calculate the balance at each period directly using the annuity
-;; formula (like calc-principal does), and then use the those values to calculate
-;; the principal and interest paid, the first 10 rows of the amortization table
-;; look like this (the values are rounded to the nearest cent for _display_, but
-;; not for calculating the next period):
-;;
-;; PERIOD | Open | Interest | Principal | End
-;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
-;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
-;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
-;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
-;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
-;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
-;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
-;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
-;; 9 | $67,756.61 | $279.43 | $4,105.57 | $63,651.04
-;; 10 | $63,651.04 | $262.49 | $4,122.51 | $59,528.53
-;;
-;; If you calculate each period sequentially (rounding the interest and balance
-;; at each step), you get:
-;;
-;; PERIOD | Open | Interest | Principal | End
-;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
-;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
-;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
-;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
-;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
-;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
-;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
-;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
-;; 9 | $67,756.61 | $279.42 | $4,105.58 | $63,651.03 <- Different
-;; 10 | $63,651.03 | $262.49 | $4,122.51 | $59,528.52 <- still $0.01 off
-;;
-;; =================================
-;;
-;; For the following functions the argument names are:
-;; py: payment frequency (number of payments per year)
-;; cy: compounding frequency of the nominal rate (per year)
-;; iy: nominal annual interest rate
-;; pv: the present value (opening balance)
-;; pmt: the size of the periodic payment
-;; n: the payment period we are asking about (the first payment is n=1)
-;; places: number of decimal places to round the interest amount to
-;; at each payment (999 does no rounding)
-;;
-;; Note: only ordinary annuities are supported (payments at the end of
-;; each period, not at the beginning of each period)
-;;
-;; Unlike the AMORT worksheet on the BA II Plus, these methods will
-;; handle the smaller payment (bringing the balance to zero, then
-;; zeroing future payments)
-;;
-;; The present value (pv) must be non-negative. If not, the balance will be
-;; treated as 0.
-;; The payment (pmt) can be positive (paying interest, and hopefully
-;; reducing the balance each payment), or negative (increasing the balance
-; each payment).
-;; The payment number (n) must be positive for amort_pmt, amort_ppmt, and
-;; amort_ipmt. I.e., the first payment is payment 1.
-;; The payment number (n) must be non-negative for amort_balance. (In this
-;; case, payment zero is at the _beginning_ of the first period, so
-;; amort_balance will just be the initial balance.)
-;; If the above conditions on n are violated, the functions return -1 (#f is
-;; not used, because it causes gnucash to crash).
-;;
-;; A negative interest rate works (if you can find a lender who charges
-;; negative rates), but negative compounding frequency, or negative payment
-;; frequency is a bad idea.
-
-;; Calculate the balance remaining after the nth payment
-;; (n must be greater than or equal to zero)
-(define (gnc:amort_pmt py cy iy pv pmt n places)
- (if (< n 1) -1 ;; Returning #f here causes gnucash to crash on startup
- (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
- (balBeforePayment
- (amort_balanceAfterInterest prevBal py cy iy places))
- (balAfterPayment (amort_balanceAfterPayment balBeforePayment pmt)))
- (- balBeforePayment balAfterPayment))))
-
-;; Calculate the amount of the nth payment that is principal
-;; (n must be greater than zero)
-(define (gnc:amort_ppmt py cy iy pv pmt n places)
- (if (< n 1) -1
- (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
- (bal-after-int (amort_balanceAfterInterest prevBal py cy iy places))
- (newBal (amort_balanceAfterPayment bal-after-int pmt)))
- (- prevBal newBal))))
-
-;; Calculate the amount of the nth payment that is interest
-;; (n must be greater than zero)
-(define (gnc:amort_ipmt py cy iy pv pmt n places)
- (if (< n 1) -1
- (let* ((prevBal(gnc:amort_balance py cy iy pv pmt (- n 1) places)))
- (amort_interest prevBal py cy iy places))))
-
-;; "Private" helper functions:
-
-;; Calculate the amount of interest on the current balance,
-;; rounded to the specified number of decimal places
-(define (amort_interest balance py cy iy places)
- (roundToPlaces (* balance (gnc:periodic_rate iy py cy)) places)
-)
-
-;; Calculate the new balance after applying the interest, but before
-;; applying the payment
-(define (amort_balanceAfterInterest prevBalance py cy iy places)
- (+ prevBalance (amort_interest prevBalance py cy iy places))
-)
-
-;; Apply the payment to the balance (after the interest has been
-;; added), without letting the balance go below zero.
-(define (amort_balanceAfterPayment balanceBeforePmt pmt)
- (max 0 (- balanceBeforePmt pmt))
-)
-
-;; Round the value to the specified number of decimal places.
-;; 999 places means no rounding (#f is not used, because only numbers can be
-;; entered in the scheduled transaction editor)
-(define (roundToPlaces value places)
- (if (= places 999) value
- (/ (round (* value (expt 10 places))) (expt 10 places))
- )
-)
commit c48da0782434f6636c1d768c211b76a8019fd833
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 25 17:16:55 2019 +0200
fix deprecated positional arguments with the GObject constructor (Bug 797205)
diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index 74094e53f..5659c6a57 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -98,7 +98,7 @@ class Console (cons.Console):
if False:
console = Console(argv = [], shelltype = 'python', banner = [['woop', 'title']], size = 100)
- window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+ window = Gtk.Window(type = Gtk.WindowType.TOPLEVEL)
window.set_position(Gtk.WindowPosition.CENTER)
window.set_default_size(800,600)
window.set_border_width(0)
commit 0cf49f124402f1748fa47f9e8414a00bf1472e45
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Apr 25 11:20:11 2019 +0800
[test-libgnucash-scm-utilities] amend info to explain comment fix
diff --git a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
index cd426c5db..b5db94b24 100644
--- a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
+++ b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
@@ -31,8 +31,8 @@
"fooxyzfooxyz"
(gnc:substring-replace "foobarfoobar" "bar" "xyz"))
- ;; note the following 2 tests show the code was not coded according
- ;; to the example in the comments.
+ ;; note the following 2 tests illustrate code behaviour: start from
+ ;; 2nd matched substring, and perform either 2 or 1 substitution.
(test-equal "gnc:substring-replace-from-to ... ... 2 2"
"foobarfooxyzfooxyz"
(gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 2))
commit 7d15e6e4e727c87fb4a501e924c4ae02276e508d
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Apr 21 23:15:47 2019 +0800
[utilities] create general string-replace-substring
copied function created by Mark Weaver, core guile dev and augmented
to selectively replace substring indices
This is a much more efficient function than the previous
gnc:substring-replace which will constantly split lists using
substring, and create new strings using string-append.
It also does tail call optimization properly, unlike the previous
functions.
https://lists.gnu.org/archive/html/guile-devel/2013-09/msg00029.html -
original
"Here's an implementation that does this benchmark about 80 times
faster on my machine: (20 milliseconds vs 1.69 seconds)
--8<---------------cut here---------------start------------->8---
(define* (string-replace-substring s substr replacement
#:optional
(start 0)
(end (string-length s)))
(let ((substr-length (string-length substr)))
(if (zero? substr-length)
(error "string-replace-substring: empty substr")
(let loop ((start start)
(pieces (list (substring s 0 start))))
(let ((idx (string-contains s substr start end)))
(if idx
(loop (+ idx substr-length)
(cons* replacement
(substring s start idx)
pieces))
(string-concatenate-reverse (cons (substring s start)
pieces))))))))
--8<---------------cut here---------------end--------------->8---
The reason this is so much faster is because it avoids needless
generation of intermediate strings."
diff --git a/libgnucash/scm/utilities.scm b/libgnucash/scm/utilities.scm
index 93565600e..76b09ba51 100644
--- a/libgnucash/scm/utilities.scm
+++ b/libgnucash/scm/utilities.scm
@@ -31,7 +31,6 @@
;; and only have the use-modules statements in those files).
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-8))
-
(use-modules (gnucash gnc-module))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -72,9 +71,11 @@
(define (gnc:debug . items)
(gnc-scm-log-debug (strify items)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the following functions are initialized to log message to tracefile
;; and will be redefined in UI initialization to display dialog
;; messages
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (gnc:gui-warn str1 str2) (gnc:warn str1))
(define-public (gnc:gui-error str1 str2) (gnc:error str1))
(define-public (gnc:gui-msg str1 str2) (gnc:msg str1))
@@ -84,9 +85,11 @@
((addto! alist element)
(set! alist (cons element alist)))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; pair of utility functions for use with guile-json which requires
;; lists converted vectors to save as json arrays. traverse list
;; converting into vectors, and vice versa.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (traverse-list->vec lst)
(cond
((list? lst) (list->vector (map traverse-list->vec lst)))
@@ -97,6 +100,36 @@
((vector? vec) (map traverse-vec->list (vector->list vec)))
(else vec)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; general and efficent string-replace-substring function, based on
+;; function designed by Mark H Weaver, core guile developer. avoids
+;; string-append which will constantly build new strings. augmented
+;; with start and end indices; will selective choose to replace
+;; substring if start-idx <= index <= end-idx
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define* (string-replace-substring s substr replacement #:optional
+ (start 0)
+ (end (string-length s))
+ (start-idx #f)
+ (end-idx #f))
+ (let ((substr-length (string-length substr))
+ (start-idx (or start-idx 0))
+ (end-idx (or end-idx +inf.0)))
+ (if (zero? substr-length)
+ (error "string-replace-substring: empty substr")
+ (let loop ((start start)
+ (i 0)
+ (pieces (list (substring s 0 start))))
+ (let ((idx (string-contains s substr start end)))
+ (if idx
+ (loop (+ idx substr-length)
+ (1+ i)
+ (cons* (if (<= start-idx i end-idx) replacement substr)
+ (substring s start idx)
+ pieces))
+ (string-concatenate-reverse (cons (substring s start)
+ pieces))))))))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; gnc:substring-replace
;;
@@ -108,14 +141,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (gnc:substring-replace s1 s2 s3)
- (let ((s2len (string-length s2)))
- (let loop ((start1 0)
- (i (string-contains s1 s2)))
- (if i
- (string-append (substring s1 start1 i)
- s3
- (loop (+ i s2len) (string-contains s1 s2 (+ i s2len))))
- (substring s1 start1)))))
+ (string-replace-substring s1 s2 s3))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -124,7 +150,7 @@
;; start: from which occurrence onwards the replacement shall start
;; end-after: max. number times the replacement should executed
;;
-;; Example: (gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 2)
+;; Example: (gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 1)
;; returns "foobarfooxyzfoobar".
;;
;; start=1 and end-after<=0 will call gnc:substring-replace (replace all)
@@ -132,64 +158,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (gnc:substring-replace-from-to s1 s2 s3 start end-after)
- (let (
- (s2len (string-length s2))
- )
-
- ;; if start<=0 and end<=0 => don't do anything
-
- (if (and
- (<= start 0)
- (<= end-after 0)
- )
- s1
- )
-
- ;; else
- (begin
-
- ;; normalize start
- (if (= start 0)
- (set! start 1)
- )
- ;; start=1 and end<=0 => replace all
- ;; call gnc:substring-replace for that
- (if (and (= start 1) (<= end-after 0))
- (gnc:substring-replace s1 s2 s3)
-
- ;; else
- (begin
- (let loop (
- (start1 0)
- (i (string-contains s1 s2))
- )
- (if i
- (begin
- (set! start (- start 1))
- (if (or
- (> start 0)
- (and (> end-after 0)
- (<= (+ end-after start) 0)
- )
- )
- (string-append
- (substring s1 start1 i)
- s2 ;; means: do not change anything
- (loop (+ i s2len) (string-contains s1 s2 (+ i s2len)))
- )
- (string-append
- (substring s1 start1 i)
- s3
- (loop (+ i s2len) (string-contains s1 s2 (+ i s2len)))
- )
- )
- )
- ;; else
- (substring s1 start1)
- )
- )
- )
- )
- )
- )
-)
+ (string-replace-substring
+ s1 s2 s3 0 (string-length s1) (max 0 (1- start))
+ (and (positive? end-after) (+ (max 0 (1- start)) (1- end-after)))))
commit a12bbaccd363756a8a0c708ac5194ed679567e2f
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 23 16:38:37 2019 -0700
Create CMakeLists.txt in libgnucash/scm/test.
Amended by chris to add a working scm/test/CMakeLists.txt.
diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
index 021ab99cd..731e44a33 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(test)
+
set(GUILE_DEPENDS scm-core-utils scm-gnc-module)
@@ -17,6 +19,6 @@ gnc_add_scheme_targets(price-quotes
set_local_dist(scm_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
-set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)
+set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} ${test_scm_DIST} PARENT_SCOPE)
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
new file mode 100644
index 000000000..2e7a880c4
--- /dev/null
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -0,0 +1,29 @@
+set(scm_test_SCHEME
+ test-libgnucash-scm-utilities.scm
+ )
+
+set(GUILE_DEPENDS
+ scm-gnc-module
+ scm-app-utils
+ scm-scm scm-engine
+ )
+
+if (HAVE_SRFI64)
+ gnc_add_scheme_targets(scm-test-scm
+ "${scm_test_SCHEME}"
+ ""
+ "${GUILE_DEPENDS}"
+ FALSE
+ )
+
+ set(srfi64_extras_SCHEME_DIST
+ srfi64-extras.scm
+ )
+ gnc_add_scheme_tests("${scm_test_SCHEME}")
+
+endif (HAVE_SRFI64)
+
+set_dist_list(test_scm_DIST
+ CMakeLists.txt
+ ${scm_test_SCHEME}
+ )
commit 92a920c4e0a6d503357d317e6ea8faa197075e20
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Apr 24 22:42:40 2019 +0800
[test-libgnucash-scm-utilities] renamed from test-utilities.scm
diff --git a/libgnucash/scm/test/test-utilities.scm b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
similarity index 95%
rename from libgnucash/scm/test/test-utilities.scm
rename to libgnucash/scm/test/test-libgnucash-scm-utilities.scm
index 8ee2f5975..cd426c5db 100644
--- a/libgnucash/scm/test/test-utilities.scm
+++ b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
@@ -6,10 +6,10 @@
(define (run-test)
(test-runner-factory gnc:test-runner)
- (test-begin "test-utilities.scm")
+ (test-begin "test-libgnucash-scm-utilities.scm")
(test-traverse-vec)
(test-substring-replace)
- (test-begin "test-utilities.scm"))
+ (test-begin "test-libgnucash-scm-utilities.scm"))
(define (test-traverse-vec)
(test-begin "traverse-vec")
commit 84cc7b1bff104977f03e7430a34e587dc3563847
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Apr 24 22:26:17 2019 +0800
[guile-json] fix CMakeLists.txt
one file was renamed during the guile-json update.
diff --git a/borrowed/guile-json/CMakeLists.txt b/borrowed/guile-json/CMakeLists.txt
index e3fba175b..b7f4f9f80 100644
--- a/borrowed/guile-json/CMakeLists.txt
+++ b/borrowed/guile-json/CMakeLists.txt
@@ -10,7 +10,7 @@ gnc_add_scheme_targets (guile-json
set_local_dist(guile-json_DIST_LOCAL
AUTHORS
CMakeLists.txt
- COPYING.LESSER
+ COPYING
json.scm
NEWS
README
commit 268dbbe3af3632f160b32fd7576d04e29b0a96a7
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Apr 25 00:58:29 2019 +0200
Minor iprovement of 2 Strings in de.po
diff --git a/po/de.po b/po/de.po
index 8fc9bddca..8ce19ce5b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19187,8 +19187,8 @@ msgstr "DTAUS importieren und _senden..."
msgid ""
"Import a DTAUS file into GnuCash and transmit its orders by Online Banking."
msgstr ""
-"Buchungen aus einer DTAUS Datei importieren und als Online-Banking Aufträge "
-"an die Bank schicken"
+"Importiert Buchungen aus einer DTAUS-Datei und schickt sie als "
+"Online-Banking-Aufträge an die Bank."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:170
msgid "Show _log window"
@@ -19196,7 +19196,7 @@ msgstr "Verlaufs_fenster anzeigen"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:171
msgid "Show the online banking log window."
-msgstr "Online-Banking Verlaufsfenster anzeigen"
+msgstr "Zeigt das Protokollfenster vom Online-Banking."
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:15
msgid "Close window when finished"
commit 79a21b42016cecc35972e144338efdc172694400
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 23 21:30:31 2019 +0200
Fix a typo in de.po
https://github.com/Gnucash/gnucash/commit/1c9ad3af35f00285d6504da9c88d0841d1109322#r33267294
diff --git a/po/de.po b/po/de.po
index 9d40da9e9..8fc9bddca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16112,7 +16112,7 @@ msgstr "<b>Layout</b>"
#: gnucash/gtkbuilder/dialog-preferences.glade:2215
msgid "_Future transactions after blank transaction"
-msgstr "_Zukünftige Transaktinen nach leerer Buchung"
+msgstr "_Zukünftige Transaktionen nach leerer Buchung"
#: gnucash/gtkbuilder/dialog-preferences.glade:2221
msgid ""
commit d9623b0ad1878e0f11d870cd3c47fa2f2fed12d1
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Apr 23 18:46:48 2019 +0800
[test-utilities] initial commit
Add tests for libgnucash/scm/utilities.scm functions
- tests for list<->vec
- tests for gnc:substring-replace
- tests for gnc:substring-replace-from-to
The latter confirms that the comment before the function definition
is *incorrect* - it describes that substring-replace-from-to will
start from the 2nd substring for the first substitution, and
performs 2 substitutions. However the comment illustrates only 1
substitution. The test suite performs the test according to code
behaviour, rather than the comment. This issue is moot in practice
because the end-after is always called with negative in the code
base.
original comment:
;; gnc:substring-replace-from-to
;; same as gnc:substring-replace extended by:
;; start: from which occurrence onwards the replacement shall start
;; end-after: max. number times the replacement should executed
;;
;; Example: (gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 2)
;; returns "foobarfooxyzfoobar".
diff --git a/libgnucash/scm/test/test-utilities.scm b/libgnucash/scm/test/test-utilities.scm
new file mode 100644
index 000000000..8ee2f5975
--- /dev/null
+++ b/libgnucash/scm/test/test-utilities.scm
@@ -0,0 +1,63 @@
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash utilities))
+(use-modules (srfi srfi-64))
+(use-modules (gnucash engine test srfi64-extras))
+
+(define (run-test)
+ (test-runner-factory gnc:test-runner)
+ (test-begin "test-utilities.scm")
+ (test-traverse-vec)
+ (test-substring-replace)
+ (test-begin "test-utilities.scm"))
+
+(define (test-traverse-vec)
+ (test-begin "traverse-vec")
+ (test-equal "list->vec"
+ (vector 1 (vector 2 3))
+ (traverse-list->vec
+ (list 1 (list 2 3))))
+ (test-equal "vec->list"
+ (list 1 (list 2 3))
+ (traverse-vec->list
+ (vector 1 (vector 2 3))))
+ (test-end "traverse-vec"))
+
+(define (test-substring-replace)
+ (test-begin "substring-replace")
+
+ ;; generic gnc:substring-replace used in qif-guess-map.scm
+ (test-equal "gnc:substring-replace"
+ "fooxyzfooxyz"
+ (gnc:substring-replace "foobarfoobar" "bar" "xyz"))
+
+ ;; note the following 2 tests show the code was not coded according
+ ;; to the example in the comments.
+ (test-equal "gnc:substring-replace-from-to ... ... 2 2"
+ "foobarfooxyzfooxyz"
+ (gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 2))
+
+ (test-equal "gnc:substring-replace-from-to ... ... 2 1"
+ "foobarfooxyzfoobar"
+ (gnc:substring-replace-from-to "foobarfoobarfoobar" "bar" "xyz" 2 1))
+
+ ;; comprehensive test suite for gnc:substring-replace-from-to:
+ (test-equal "gnc:substring-replace-from-to ... ... 2 1"
+ "foo xxx foo foo foo foo foo foo"
+ (gnc:substring-replace-from-to
+ "foo foo foo foo foo foo foo foo"
+ "foo" "xxx" 2 1))
+
+ (test-equal "gnc:substring-replace-from-to ... ... 1 1"
+ "xxx foo foo foo foo foo foo foo"
+ (gnc:substring-replace-from-to
+ "foo foo foo foo foo foo foo foo"
+ "foo" "xxx" 1 1))
+
+ (test-equal "gnc:substring-replace-from-to ... ... 4 -1"
+ "foo foo foo xxx xxx xxx xxx xxx"
+ (gnc:substring-replace-from-to
+ "foo foo foo foo foo foo foo foo"
+ "foo" "xxx" 4 -1))
+
+ (test-end "substring-replace"))
commit 4d8ef9b9e461157eaa8f5b19e0198d35e315088f
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Apr 23 06:38:48 2019 +0800
[report] inline args-to-defn
diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
index 5d6f1e874..b48acd828 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-system/report.scm
@@ -119,16 +119,14 @@ not found.")))
;; set of options, and generates the report. the renderer must
;; return as its final value an <html-document> object.
- (define (args-to-defn)
- (let loop ((report-rec (make-report-template)) (args args))
- (cond
- ((null? args) report-rec)
- (else
- (let ((modifier (record-modifier <report-template> (car args))))
- (modifier report-rec (cadr args))
- (loop report-rec (cddr args)))))))
-
- (let* ((report-rec (args-to-defn))
+ (let* ((report-rec
+ (let loop ((report-rec (make-report-template)) (args args))
+ (cond
+ ((null? args) report-rec)
+ (else
+ ((record-modifier <report-template> (car args))
+ report-rec (cadr args))
+ (loop report-rec (cddr args))))))
(report-guid (gnc:report-template-report-guid report-rec))
(report-name (gnc:report-template-name report-rec)))
(cond
commit 3815e17e9f2db7fbd7031b9118885d8567e60ad9
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 22 12:12:03 2019 -0700
Replace VERSION_GREATER_EQUAL with VERSION_GREATER OR VERSION_EQUAL.
The former wasn't introduced until Cmake 3.7.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 9426cfc50..da0706dfa 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -81,7 +81,9 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
set(_GUILE_LOAD_PATH "${current_srcdir}"
"${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm") # to pick up generated build-config.scm
set(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
- if(MINGW64 AND ${GUILE_EFFECTIVE_VERSION} VERSION_GREATER_EQUAL 2.2)
+ # VERSION_GREATER_EQUAL introduced in CMake 3.7.
+ if(MINGW64 AND (${GUILE_EFFECTIVE_VERSION} VERSION_GREATER 2.2 OR
+ ${GUILE_EFFECTIVE_VERSION} VERSION_EQUAL 2.2))
file(TO_CMAKE_PATH $ENV{GUILE_LOAD_PATH} guile_load_path)
file(TO_CMAKE_PATH $ENV{GUILE_LOAD_COMPILED_PATH} guile_load_compiled_path)
list(APPEND _GUILE_LOAD_PATH ${guile_load_path})
commit 79f4536a0fb77e376778ac796a3eb85fc7bce281
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 22 11:28:08 2019 -0700
Fix typo
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 62a17f4f2..9426cfc50 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -123,7 +123,7 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
set(LIBRARY_PATH "PATH=\"${BINDIR_BUILD};${fpath}\"")
else (MINGW64)
- set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash)
+ set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
endif (MINGW64)
if (APPLE)
set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
commit 4f51f172237f888b7b9819f7bf589e16cbcbe345
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 22 11:25:34 2019 -0700
Remove unset _GUILE_LD_LIBRARY_PATH from GncAddSchemeTargets.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 74116c355..62a17f4f2 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -123,10 +123,10 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
set(LIBRARY_PATH "PATH=\"${BINDIR_BUILD};${fpath}\"")
else (MINGW64)
- set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
+ set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash)
endif (MINGW64)
if (APPLE)
- set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
+ set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
endif (APPLE)
set(_GNC_MODULE_PATH "")
if(MINGW64)
commit b1fdf781ecc4acb974e38077887db4dcce3ff109
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 22 10:04:48 2019 -0700
Adjust GncAddSchemeTargets.cmake to build with Guile2.2 on MinGS64.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index ed99179cb..74116c355 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -27,7 +27,7 @@ function(make_unix_path_list PATH)
endfunction()
function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
- MAKE_LINKS)
+ MAKE_LINKS)
set(__DEBUG FALSE)
if (__DEBUG)
message("Parameters to COMPILE_SCHEME for target ${_TARGET}")
@@ -44,7 +44,7 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
set(build_bindir ${BINDIR_BUILD})
set(build_libdir ${LIBDIR_BUILD})
set(build_datadir ${DATADIR_BUILD})
- if(MINGW64)
+ if(MINGW64 AND ${GUILE_EFFECTIVE_VERSION} VERSION_LESS 2.2)
make_unix_path(build_bindir)
make_unix_path(build_libdir)
make_unix_path(build_datadir)
@@ -52,7 +52,7 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
make_unix_path(current_srcdir)
make_unix_path(CMAKE_BINARY_DIR)
make_unix_path(CMAKE_SOURCE_DIR)
- endif(MINGW64)
+ endif()
# If links are requested, we simple link (or copy, for Windows) each source file to the dest directory
if(MAKE_LINKS)
@@ -78,17 +78,20 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
endif(MAKE_LINKS)
# Construct the guile source and compiled load paths
-
set(_GUILE_LOAD_PATH "${current_srcdir}"
"${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm") # to pick up generated build-config.scm
set(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
-
+ if(MINGW64 AND ${GUILE_EFFECTIVE_VERSION} VERSION_GREATER_EQUAL 2.2)
+ file(TO_CMAKE_PATH $ENV{GUILE_LOAD_PATH} guile_load_path)
+ file(TO_CMAKE_PATH $ENV{GUILE_LOAD_COMPILED_PATH} guile_load_compiled_path)
+ list(APPEND _GUILE_LOAD_PATH ${guile_load_path})
+ list(APPEND _GUILE_LOAD_COMPILED_PATH ${guile_load_compiled_path})
+ endif()
set(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
- set(_GUILE_LOAD_PATH "${current_srcdir}")
if (MAKE_LINKS)
list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm")
endif()
- set(_GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
+ list(APPEND _GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
set(_TARGET_FILES "")
@@ -117,11 +120,8 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
endif()
if (MINGW64)
set(fpath "")
- foreach(dir $ENV{PATH})
- make_unix_path(dir)
- set(fpath "${fpath}${dir}:")
- endforeach(dir)
- set(LIBRARY_PATH "PATH=\"${build_bindir}:${fpath}\"")
+ file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
+ set(LIBRARY_PATH "PATH=\"${BINDIR_BUILD};${fpath}\"")
else (MINGW64)
set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
endif (MINGW64)
@@ -134,9 +134,10 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
else(MINGW64)
set(_GNC_MODULE_PATH "${LIBDIR_BUILD}" "${LIBDIR_BUILD}/gnucash" "${GNC_MODULE_PATH}")
endif(MINGW64)
- make_unix_path_list(_GUILE_LOAD_PATH)
- make_unix_path_list(_GUILE_LOAD_COMPILED_PATH)
- make_unix_path_list(_GUILE_LD_LIBRARY_PATH)
+ if(NOT MINGW64 OR ${GUILE_EFFECTIVE_VERSION} VERSION_LESS 2.2)
+ make_unix_path_list(_GUILE_LOAD_PATH)
+ make_unix_path_list(_GUILE_LOAD_COMPILED_PATH)
+ endif()
make_unix_path_list(_GNC_MODULE_PATH)
if (__DEBUG)
message(" ")
@@ -145,15 +146,16 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
message(" GUILE_LOAD_COMPILED_PATH: ${_GUILE_LOAD_COMPILED_PATH}")
message(" GNC_MODULE_PATH: ${_GNC_MODULE_PATH}")
endif(__DEBUG)
+ #We quote the arguments to stop CMake stripping the path separators.
add_custom_command(
OUTPUT ${output_file}
COMMAND ${CMAKE_COMMAND_TMP}
- ${LIBRARY_PATH}
- GNC_UNINSTALLED=YES
- GNC_BUILDDIR=${CMAKE_BINARY_DIR}
- GUILE_LOAD_PATH=${_GUILE_LOAD_PATH}
- GUILE_LOAD_COMPILED_PATH=${_GUILE_LOAD_COMPILED_PATH}
- GNC_MODULE_PATH=${_GNC_MODULE_PATH}
+ "${LIBRARY_PATH}"
+ "GNC_UNINSTALLED=YES"
+ "GNC_BUILDDIR=\"${CMAKE_BINARY_DIR}\""
+ "GUILE_LOAD_PATH=\"${_GUILE_LOAD_PATH}\""
+ "GUILE_LOAD_COMPILED_PATH=\"${_GUILE_LOAD_COMPILED_PATH}\""
+ "GNC_MODULE_PATH=\"${_GNC_MODULE_PATH}\""
${GUILE_EXECUTABLE} -e '\(@@ \(guild\) main\)' -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
DEPENDS ${guile_depends}
MAIN_DEPENDENCY ${source_file_abs_path}
commit 7e9463db1b46a55cd03be5ff5ab8b8508e82806e
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Apr 22 12:09:55 2019 +0100
Change a couple of accelerator keys in CSV Transaction export
There are a couple of items with the same mnemonic accelerator keys so
change them to non conflicting ones.
diff --git a/gnucash/gtkbuilder/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade
index 88359e720..367e29729 100644
--- a/gnucash/gtkbuilder/assistant-csv-export.glade
+++ b/gnucash/gtkbuilder/assistant-csv-export.glade
@@ -451,7 +451,7 @@ Select the type of Export required and the separator that will be used.
</child>
<child>
<object class="GtkRadioButton" id="show_all">
- <property name="label" translatable="yes">Show _All</property>
+ <property name="label" translatable="yes">Sho_w All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -468,7 +468,7 @@ Select the type of Export required and the separator that will be used.
</child>
<child>
<object class="GtkRadioButton" id="show_range">
- <property name="label" translatable="yes">Select Range:</property>
+ <property name="label" translatable="yes">Select _Range:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -519,7 +519,7 @@ Select the type of Export required and the separator that will be used.
</child>
<child>
<object class="GtkRadioButton" id="end_date_choose">
- <property name="label" translatable="yes">Choo_se Date:</property>
+ <property name="label" translatable="yes">Cho_ose Date:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
commit 3985541f48aa2e27740b449cc6e4dae86c6a6a6d
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Apr 22 12:01:25 2019 +0100
Add a select all Accounts button for CSV Transaction export.
diff --git a/gnucash/gtkbuilder/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade
index 6a1da83ad..88359e720 100644
--- a/gnucash/gtkbuilder/assistant-csv-export.glade
+++ b/gnucash/gtkbuilder/assistant-csv-export.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAssistant" id="csv_export_assistant">
@@ -12,6 +12,9 @@
<signal name="cancel" handler="csv_export_assistant_cancel" swapped="no"/>
<signal name="close" handler="csv_export_assistant_close" swapped="no"/>
<signal name="prepare" handler="csv_export_assistant_prepare" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkBox" id="start_page">
<property name="visible">True</property>
@@ -275,7 +278,7 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"><b>_Accounts</b></property>
+ <property name="label" translatable="yes"><b>Accounts</b></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
</object>
@@ -372,6 +375,7 @@ Select the type of Export required and the separator that will be used.
<object class="GtkButtonBox" id="hbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="select_subaccounts_button">
<property name="label" translatable="yes">_Select Subaccounts</property>
@@ -387,6 +391,21 @@ Select the type of Export required and the separator that will be used.
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="select_all_button">
+ <property name="label" translatable="yes">Select _All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">3</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -420,7 +439,7 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"><b>_Dates</b></property>
+ <property name="label" translatable="yes"><b>Dates</b></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
</object>
@@ -735,10 +754,5 @@ Cancel to abort.</property>
<property name="has_padding">False</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkBox" id="assistant-action_area2">
- <property name="can_focus">False</property>
- </object>
- </child>
</object>
</interface>
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
index 8a8d3aa4b..75ab2f479 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.c
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.c
@@ -430,6 +430,25 @@ csv_export_account_changed_cb (GtkTreeSelection *selection,
}
+/*******************************************************
+ * csv_export_select_all_clicked_cb
+ *
+ * select all the accounts
+ *******************************************************/
+static void
+csv_export_select_all_clicked_cb (GtkWidget *widget, gpointer user_data)
+{
+ CsvExportInfo *info = user_data;
+ GtkTreeSelection *selection = gtk_tree_view_get_selection
+ (GTK_TREE_VIEW (info->csva.account_treeview));
+
+ gtk_tree_view_expand_all (GTK_TREE_VIEW (info->csva.account_treeview));
+ gtk_tree_selection_select_all (selection);
+
+ gtk_widget_grab_focus (info->csva.account_treeview);
+}
+
+
/*******************************************************
* csv_export_select_subaccounts_clicked_cb
*
@@ -886,9 +905,14 @@ csv_export_assistant_create (CsvExportInfo *info)
/* select subaccounts button */
button = GTK_WIDGET(gtk_builder_get_object (builder, "select_subaccounts_button"));
info->csva.select_button = button;
-
g_signal_connect (G_OBJECT(button), "clicked",
G_CALLBACK(csv_export_select_subaccounts_clicked_cb), info);
+
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "select_all_button"));
+ info->csva.select_button = button;
+ g_signal_connect (G_OBJECT(button), "clicked",
+ G_CALLBACK(csv_export_select_all_clicked_cb), info);
+
g_signal_connect (G_OBJECT(info->csva.account_treeview), "cursor_changed",
G_CALLBACK(csv_export_cursor_changed_cb), info);
commit 91c992d9474fafb3f4faed0e36dff60ec0964ed5
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Apr 22 11:23:47 2019 +0100
Bug 797123 - Export transactions to CSV file.
When exporting transactions to CSV not all were showing up in the CSV
file. This was due to the start and end dates not being set to the
'start of day' and 'end of day' respectively. Also if you had specified
a range and subsequently used the 'Show All' button the dates used
would still be the ones used for the range.
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
index fdb2c8186..8a8d3aa4b 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.c
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.c
@@ -475,7 +475,7 @@ get_filter_times (CsvExportInfo *info)
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(info->csvd.start_date_today)))
info->csvd.start_time = gnc_time64_get_today_start();
else
- info->csvd.start_time = 0;
+ info->csvd.start_time = info->csvd.earliest_time;
}
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(info->csvd.end_date_choose)))
@@ -489,7 +489,7 @@ get_filter_times (CsvExportInfo *info)
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(info->csvd.end_date_today)))
info->csvd.end_time = gnc_time64_get_today_end();
else
- info->csvd.end_time = gnc_time (NULL);
+ info->csvd.end_time = info->csvd.latest_time;
}
}
@@ -508,6 +508,15 @@ csv_export_show_range_cb (GtkRadioButton *button, gpointer user_data)
g_return_if_fail (GTK_IS_RADIO_BUTTON(button));
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(button));
+
+ if (!active)
+ {
+ info->csvd.start_time = info->csvd.earliest_time;
+ info->csvd.end_time = info->csvd.latest_time;
+ }
+ else
+ get_filter_times (info);
+
gtk_widget_set_sensitive (info->csvd.table, active);
}
@@ -581,22 +590,19 @@ csv_export_end_date_cb (GtkWidget *radio, gpointer user_data)
/*******************************************************************
- * get_earliest_in_book
+ * get_earliest_and_latest_in_book
*
- * Find the earliest date occurring in the book. Do this by making
- * a query and sorting by date. Since the truncated sort returns
- * only the *last* search results, sort in decreasing order.
+ * Find the earliest and latest dates occurring in the book.
*******************************************************************/
-static time64
-get_earliest_in_book (QofBook *book)
+static void
+get_earliest_and_latest_in_book (CsvExportInfo *info, QofBook *book)
{
QofQuery *q;
GSList *p1, *p2;
GList *res;
- time64 earliest;
+ time64 etime, ltime;
q = qof_query_create_for (GNC_ID_SPLIT);
- qof_query_set_max_results (q, 1);
qof_query_set_book (q, book);
/* Sort by transaction date */
@@ -605,24 +611,24 @@ get_earliest_in_book (QofBook *book)
p2 = g_slist_prepend (NULL, QUERY_DEFAULT_SORT);
qof_query_set_sort_order (q, p1, p2, NULL);
- /* Reverse the sort order */
- qof_query_set_sort_increasing (q, FALSE, FALSE, FALSE);
-
- /* Run the query, find the earliest transaction date */
+ /* Run the query, find the earliest and latest transaction dates */
res = qof_query_run (q);
if (res)
{
- earliest = xaccQueryGetEarliestDateFound (q);
+ etime = xaccQueryGetEarliestDateFound (q);
+ ltime = xaccQueryGetLatestDateFound (q);
}
else
{
/* If no results, we don't want to bomb totally */
- earliest = gnc_time (0);
+ etime = gnc_time (0);
+ ltime = gnc_time (NULL);
}
+ info->csvd.earliest_time = gnc_time64_get_day_start (etime);
+ info->csvd.latest_time = gnc_time64_get_day_end (ltime);
qof_query_destroy (q);
- return earliest;
}
@@ -824,7 +830,6 @@ csv_export_assistant_create (CsvExportInfo *info)
GtkWidget *h_box;
GtkWidget *button;
GtkWidget *table, *hbox;
- time64 start_time, end_time;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder , "assistant-csv-export.glade", "csv_export_assistant");
@@ -890,12 +895,11 @@ csv_export_assistant_create (CsvExportInfo *info)
/* Set the date info */
button = GTK_WIDGET(gtk_builder_get_object (builder, "show_range"));
- /* Earliest and Latest in Book */
- start_time = get_earliest_in_book (gnc_get_current_book());
- end_time = gnc_time (NULL);
+ /* Get the Earliest and Latest dates in Book */
+ get_earliest_and_latest_in_book (info, gnc_get_current_book());
- info->csvd.start_time = start_time;
- info->csvd.end_time = end_time;
+ info->csvd.start_time = info->csvd.earliest_time;
+ info->csvd.end_time = info->csvd.latest_time;
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), FALSE);
table = GTK_WIDGET(gtk_builder_get_object (builder, "select_range_table"));
@@ -912,7 +916,7 @@ csv_export_assistant_create (CsvExportInfo *info)
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "start_date_hbox"));
gtk_box_pack_start (GTK_BOX(hbox), info->csvd.start_date, TRUE, TRUE, 0);
gtk_widget_show (info->csvd.start_date);
- gnc_date_edit_set_time (GNC_DATE_EDIT(info->csvd.start_date), start_time);
+ gnc_date_edit_set_time (GNC_DATE_EDIT(info->csvd.start_date), info->csvd.start_time);
g_signal_connect (G_OBJECT(info->csvd.start_date), "date-changed",
G_CALLBACK(csv_export_date_changed_cb), info);
@@ -921,7 +925,7 @@ csv_export_assistant_create (CsvExportInfo *info)
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "end_date_hbox"));
gtk_box_pack_start (GTK_BOX(hbox), info->csvd.end_date, TRUE, TRUE, 0);
gtk_widget_show (info->csvd.end_date);
- gnc_date_edit_set_time (GNC_DATE_EDIT(info->csvd.end_date), end_time);
+ gnc_date_edit_set_time (GNC_DATE_EDIT(info->csvd.end_date), info->csvd.end_time);
g_signal_connect (G_OBJECT (info->csvd.end_date), "date-changed",
G_CALLBACK (csv_export_date_changed_cb), info);
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.h b/gnucash/import-export/csv-exp/assistant-csv-export.h
index 78ea0ff5c..b0cf99cbe 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.h
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.h
@@ -50,6 +50,8 @@ typedef struct
time64 start_time;
time64 end_time;
+ time64 earliest_time;
+ time64 latest_time;
} CsvExportDate;
typedef struct
commit d82939a9ff7253f46f6ffba987c94ab5c45b684a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Apr 22 11:14:49 2019 +0100
Change the New Account Hierarchy glade file
The 'Category Description' scroll window height was not able to be
changed to see all the text without scrolling. Add the 'Categories' and
the 'Category Description' scroll windows to a vertical paned widget.
diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
index 5d9770c6d..141b0e17e 100644
--- a/gnucash/gtkbuilder/assistant-hierarchy.glade
+++ b/gnucash/gtkbuilder/assistant-hierarchy.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAssistant" id="hierarchy_assistant">
@@ -11,6 +11,9 @@
<signal name="cancel" handler="on_cancel" swapped="no"/>
<signal name="close" handler="on_finish" swapped="no"/>
<signal name="prepare" handler="on_prepare" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkLabel" id="intro_page_label">
<property name="visible">True</property>
@@ -96,9 +99,6 @@ Please choose the currency to use for new accounts.</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="title" translatable="yes">Choose Currency</property>
@@ -137,74 +137,128 @@ Select categories that correspond to the ways that you foresee you will use GnuC
<property name="position">300</property>
<property name="position_set">True</property>
<child>
- <object class="GtkPaned" id="vpaned100">
+ <object class="GtkBox" id="vbox200">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="position">200</property>
- <property name="position_set">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox101">
+ <object class="GtkPaned" id="vpaned100">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="border_width">6</property>
+ <property name="can_focus">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label101">
+ <object class="GtkBox" id="vbox101">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Categories</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow101">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="vexpand">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label101">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Categories</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkTreeView" id="account_categories_tree_view">
+ <object class="GtkScrolledWindow" id="scrolledwindow101">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection100"/>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="account_categories_tree_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="reorderable">True</property>
+ <property name="rules_hint">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection100"/>
+ </child>
+ </object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="hbuttonbox100">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <object class="GtkButton" id="select_all_button">
+ <property name="label" translatable="yes">_Select All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="select_all_clicked" 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="clear_all_button">
+ <property name="label" translatable="yes">C_lear All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="clear_all_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="hbuttonbox100">
+ <object class="GtkBox" id="vbox102">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="layout_style">spread</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="select_all_button">
- <property name="label" translatable="yes">_Select All</property>
+ <object class="GtkLabel" id="label103">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="select_all_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Category Description</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -213,77 +267,48 @@ Select categories that correspond to the ways that you foresee you will use GnuC
</packing>
</child>
<child>
- <object class="GtkButton" id="clear_all_button">
- <property name="label" translatable="yes">C_lear All</property>
+ <object class="GtkScrolledWindow" id="scrolledwindow100">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="clear_all_clicked" swapped="no"/>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="account_types_description">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="cursor_visible">False</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label103">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Category Description</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow100">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="account_types_description">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
</object>
<packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="resize">True</property>
- <property name="shrink">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
@@ -326,7 +351,7 @@ Select categories that correspond to the ways that you foresee you will use GnuC
</object>
<packing>
<property name="resize">True</property>
- <property name="shrink">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
</object>
@@ -411,13 +436,7 @@ Press `Cancel' to close this dialog without creating any new accounts.</property
<packing>
<property name="page_type">confirm</property>
<property name="title" translatable="yes">Finish Account Setup</property>
- <property name="has_padding">False</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkBox" id="assistant-action_area100">
- <property name="can_focus">False</property>
- </object>
- </child>
</object>
</interface>
commit fc0a729253b0ddfa3c08b0282cae84222bd93dec
Merge: 2745b18d3 ba8a9c847
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 20 12:55:41 2019 -0700
Merge Christoph Holtermann's 'PR-python-bindings-update-source-doc' into maint
commit 2745b18d3b76eaec15639d35549c720730511dc3
Merge: aa53c2323 efbdab6f4
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 20 12:47:12 2019 -0700
Merge Christoph Holtermann's 'PR-dont-close-gnucash-on-pycons-close' into maint.
commit aa53c23239dc05da44c78a085c4db342adfbf707
Merge: 3c946a844 5f9020016
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 20 12:36:51 2019 -0700
Merge T Edmunds's 'amortization-rounding' into maint.
commit 3c946a84496a846196ba04667e3a7f0c7bee0eb5
Merge: ce4d3dee6 9afc856c2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 20 12:32:17 2019 -0700
Merge T Edmunds's 'computeInterestIncrement' to maint.
commit ce4d3dee6dedc8eac5acaefd0eab843c5807295b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Apr 20 00:37:48 2019 +0200
Review of de.po
Mostly fix of minor formal issues
5218 übersetzte Meldungen, 40 ungenaue Übersetzungen, 2 unübersetzte
Meldungen.
diff --git a/po/de.po b/po/de.po
index 830ff07c1..9d40da9e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,9 +1,11 @@
# German translations for GnuCash
# Messages in Deutsch für GnuCash
-# Copyright (C) 1999-2001, 2004 Free Software Foundation, Inc.
# This file is distributed under the same license as the GnuCash package.
+# Copyright (C) 1999-2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2005-2019 by the translators:
# Dmitriy Mangul <dimang.freetime at gmail.com>, 2017-2018
# Mechtilde Stehmann <ooo at mechtilde.de>, 2014-2018.
+# Joachim Wetzig <jo.wetzig at web.de>, 2019
# Frank H. Ellenberger <frank.h.ellenberger at gmail.com>, 2007, 2009-2019.
# quazgar <quazgar at posteo.de> 2017.
# Christian Stimming <stimming at tuhh.de>, 2001-2014.
@@ -11,13 +13,18 @@
# Herbert Thoma <tma at iis.fhg.de>, 2001.
# Christian Meyer <chrisime at gnome.org>, 2000, 2001.
# Jan-Uwe Finck <Jan-Uwe.Finck at bigfoot.de>, 1999.
+#
+# Konventionen/Tastenkürzel:
+# »Zitate«: [altgr]+[Y]/[X]
+# Gedankenstrich — [altgr]+[Shift]+[-]
+#
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2019-04-08 17:37+0200\n"
-"PO-Revision-Date: 2019-04-17 23:56+0200\n"
+"PO-Revision-Date: 2019-04-20 18:18+0200\n"
"Last-Translator: Christian Stimming <christian at cstimming.de>\n"
"Language-Team: GnuCash-de <gnucash-de at gnucash.org>\n"
"Language: de\n"
@@ -629,10 +636,10 @@ msgid ""
"use. Click the triangle at the far right of the column headings to change "
"the display."
msgstr ""
-"Sie können die Wertpapier-Editor Anzeige die «Quelle» zu einem"
-"Wertpapier anzeigen lassen und so die Herkunft der online-Daten sehen."
-"Klicken Sie dazu auf das Dreieck am rechten Ende der Ãœberschriften und"
-"setzen Sie das Häkchen bei «Quelle»"
+"Sie können die Wertpapier-Editor Anzeige die «Quelle» zu einem "
+"Wertpapier anzeigen lassen und so die Herkunft der online-Daten sehen. "
+"Klicken Sie dazu auf das Dreieck am rechten Ende der Ãœberschriften und "
+"setzen Sie das Häkchen bei »Quelle«"
#: doc/tip_of_the_day.list.c:79
msgid ""
@@ -5672,7 +5679,7 @@ msgid ""
"Exchange by CSV/FinTS(former HBCI) or import SWIFT-MT9xx/QIF/OFX data "
"including Transaction Matching"
msgstr ""
-"Datenaustausch mittels CSV/FinTS(former HBCI) oder importiere"
+"Datenaustausch mittels CSV/FinTS(former HBCI) oder importiere "
"SWIFT-MT9xx/QIF/OFX Daten, einschließlich Buchungsabgleich"
#: gnucash/gnome/gnucash.appdata.xml.in:25
@@ -6719,10 +6726,10 @@ msgid ""
"can expand the tree below the placeholder account by clicking on the arrow "
"to the left.)"
msgstr ""
-"Sie haben ein Platzhalterkonto ausgewählt, das nur gezeigt wird um die"
-"Unterkonten anzuzeigen, selbst aber nicht gültig ist."
+"Sie haben ein Platzhalterkonto ausgewählt, das nur gezeigt wird um die "
+"Unterkonten anzuzeigen, selbst aber nicht gültig ist. "
"Bitte wählen Sie ein anderes Konto. (Die Unterkonten können Sie sichtbar machen"
-"indem Sie auf das Dreieck links neben dem Platzhalterkonto klicken)"
+"indem Sie auf das Dreieck links neben dem Platzhalterkonto klicken.)"
#: gnucash/gnome-utils/dialog-options.c:1294
msgid "Book currency:"
@@ -7964,6 +7971,7 @@ msgstr "Finanzverwaltung für Privatanwender und Kleinbetriebe."
#: gnucash/gnome-utils/gnc-main-window.c:4496
msgid "translator-credits"
msgstr ""
+"Joachim Wetzig, 2019\n"
"Dmitriy Mangul, 2017-2018\n"
"Mechtilde Stehmann, 2014-2018\n"
"Frank H. Ellenberger, 2007, 2009-2019\n"
@@ -8794,25 +8802,25 @@ msgstr "Adressbezeichnung"
#: gnucash/report/business-reports/aging.scm:50
#: gnucash/report/business-reports/aging.scm:700
msgid "Address 1"
-msgstr "Adresse 1 "
+msgstr "Adresse 1"
#: gnucash/gnome-utils/gnc-tree-view-owner.c:427
#: gnucash/report/business-reports/aging.scm:51
#: gnucash/report/business-reports/aging.scm:702
msgid "Address 2"
-msgstr "Adresse 2 "
+msgstr "Adresse 2"
#: gnucash/gnome-utils/gnc-tree-view-owner.c:432
#: gnucash/report/business-reports/aging.scm:52
#: gnucash/report/business-reports/aging.scm:704
msgid "Address 3"
-msgstr "Adresse 3 "
+msgstr "Adresse 3"
#: gnucash/gnome-utils/gnc-tree-view-owner.c:437
#: gnucash/report/business-reports/aging.scm:53
#: gnucash/report/business-reports/aging.scm:706
msgid "Address 4"
-msgstr "Adresse 4 "
+msgstr "Adresse 4"
#: gnucash/gnome-utils/gnc-tree-view-owner.c:447
#: gnucash/report/business-reports/aging.scm:710
@@ -9180,9 +9188,9 @@ msgid ""
"Examples: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
"This can be invoked multiple times."
msgstr ""
-"Log Niveau Override, Format \"modulename={debug,info,warn,crit,"
+"Anpassung der Protokolldetails, Format \"modulename={debug,info,warn,crit,"
"error}\"\n"
-"Beispiel: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
+"Beispiele: \"--log qof=debug\" oder \"--log gnc.backend.file.sx=info\"\n"
"Kann mehrmals aufgerufen werden."
#: gnucash/gnucash-bin.c:125
@@ -9190,7 +9198,7 @@ msgid ""
"File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or "
"\"stdout\"."
msgstr ""
-"Datei, wo die Logmeldungen hingeschrieben werden; Voreinstellung \"/tmp/"
+"Datei, in welche die Logmeldungen geschrieben werden; Voreinstellung \"/tmp/"
"gnucash.trace\"; kann auch \"stderr\" oder \"stdout\" sein."
#: gnucash/gnucash-bin.c:131
@@ -9482,7 +9490,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:127
msgid "Enable extra toolbar buttons for business"
-msgstr "Zusätzliche Werkzeugleisten-Knöpfe aktivieren"
+msgstr "Zusätzliche Werkzeugleisten-Knöpfe für Geschäft aktivieren"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:128
#: gnucash/gtkbuilder/business-prefs.glade:244
@@ -9912,7 +9920,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:226
msgid "Default to 'new search' if fewer than this number of items is returned"
msgstr ""
-"Voreinstellung 'Neue Suche' wählen, wenn diese Anzahl an Ergebnissen "
+"Voreinstellung »Neue Suche« wählen, wenn diese Anzahl an Ergebnissen "
"unterschritten wurde."
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:5
@@ -10407,7 +10415,8 @@ msgstr "Diese Einstellung gibt die Anzahl der automatischen Dezimalstellen an."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:70
msgid "Force prices to display as decimals even if they must be rounded."
-msgstr "Erzwinge Anzeige der Preise als Dezimalzahlen, auch wenn sie dazu gerundet werden müssen"
+msgstr "Erzwinge Anzeige der Preise als Dezimalzahlen, auch wenn sie dazu "
+"gerundet werden müssen."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:71
#: gnucash/gtkbuilder/dialog-preferences.glade:1375
@@ -10416,8 +10425,9 @@ msgid ""
"decimals instead of displaying the exact fraction if the fractional part "
"cannot be exactly represented as a decimal."
msgstr ""
-"Wenn aktiv, wird GnuCash Preise runden um sie anzuzeigen, statt die genauere Angabe "
-"als Bruch zu wählen, falls der Bruch nicht exakt als Dezimalzahl angezeigt werden kann"
+"Wenn aktiv wird GnuCash Preise runden, um sie anzuzeigen, statt die genauere "
+"Angabe als Bruch zu wählen, falls der Bruch nicht exakt als Dezimalzahl "
+"angezeigt werden kann."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:75
msgid ""
@@ -10805,8 +10815,8 @@ msgid ""
"Set book option on new files to use split \"action\" field for \"Num\" field "
"on registers/reports"
msgstr ""
-"Bei neuer Datei: Voreinstellung, ob Aktionsfeld der Buchung für das «Nummer» Feld "
-"verwendet werden soll"
+"Bei neuer Datei: Voreinstellung, ob »Aktion«sfeld des Buchungsteils für das "
+"»Nummer« Feld verwendet werden soll."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:231
#: gnucash/gtkbuilder/dialog-preferences.glade:1166
@@ -10818,14 +10828,15 @@ msgid ""
"files is set so that the 'Num' cell on registers shows/updates the "
"transaction 'num' field."
msgstr ""
-"Wenn gesetzt, wird als Standardeinstellung für das Kontobuch neuer Dateien"
-"im «Nr» Feld in der ersten Zeile der Buchung (Kontobucheintrag)"
-"das «Aktion» Feld der eigenen Teilbuchung angezeigt/aktualisiert"
-"In der zweiten Zeile -- sofern diese sichtbar ist (Ansicht>Bemerkung anzeigen) --"
-"wird eine «B.-Nr.» angezeigt, die die Buchung beschreibt und auch in der Gegenbuchung"
-"sichtbar ist."
-"Andernfalls zeigt das «Nr» Feld (auch in der Gegenbuchung) die Buchungsnummer an"
-"und die Spalte des «Nr.» Feld kann in der zweiten Zeile nicht gefüllt oder verändert werden."
+"Wenn gesetzt, wird als Standardeinstellung für das Kontobuch neuer Dateien "
+"im »Nr« Feld in der ersten Zeile der Buchung (Kontobucheintrag) "
+"das »Aktion« Feld der eigenen Teilbuchung angezeigt/aktualisiert "
+"In der zweiten Zeile – sofern diese sichtbar ist (Ansicht->Bemerkung "
+"anzeigen) – wird eine »B.-Nr.« angezeigt, die die Buchung beschreibt und "
+"auch in der Gegenbuchung sichtbar ist. "
+"Andernfalls zeigt das »Nr« Feld (auch in der Gegenbuchung) die Buchungsnummer "
+"an und die Spalte des »Nr.« Feld kann in der zweiten Zeile nicht gefüllt oder "
+"verändert werden."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:240
msgid "Color the register using a gnucash specific color theme"
@@ -10839,9 +10850,9 @@ msgid ""
"css file to be stored in the gnucash used config directory. More information "
"can be found in the gnucash FAQ."
msgstr ""
-"Wenn gesetzt, wird das Kontobuch ein GnuCash spezifisches Farbschema (grün/gelb)"
-"verwenden. Andernfalls wird das Farbschema des Systems genutzt. Unabhängig davon"
-"kann man das Farbschema immer mit einer CSS Datei im Konfigurationsverzeichnis"
+"Wenn gesetzt, wird das Kontobuch ein GnuCash spezifisches Farbschema (grün/gelb) "
+"verwenden. Andernfalls wird das Farbschema des Systems genutzt. Unabhängig davon "
+"kann man das Farbschema immer mit einer CSS Datei im Konfigurationsverzeichnis "
"vorrangig bestimmen. Sie dazu die GnuCash FAQ."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:245
@@ -10955,9 +10966,9 @@ msgid ""
"bottom of the register after the blank transaction. Otherwise the blank "
"transaction will be at the bottom of the register after all transactions."
msgstr ""
-"Zukünftige Buchungen unter der leeren Buchung am Ende des Kontos anzeigen"
-"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
-"des Kontenblatts nach einer leeren Buchung angezeigt."
+"Zukünftige Buchungen unter der leeren Buchung am Ende des Kontos anzeigen. "
+"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende "
+"des Kontenblatts nach einer leeren Buchung angezeigt. "
"Andernfalls ist die leere Buchung die letzte Buchung."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:290
@@ -11233,6 +11244,7 @@ msgid "This field contains the full path of the most recently opened file."
msgstr ""
"Dieses Feld enthält die Datei mit Pfadangabe, die zuletzt geöffnet war."
+# Fixme: Number missing
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:15
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:20
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:25
@@ -11243,7 +11255,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:50
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:55
msgid "Next most recently opened file"
-msgstr "Vorletzte geöffnete Datei"
+msgstr "Zuvor geöffnete Datei"
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:16
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:21
@@ -11257,7 +11269,7 @@ msgstr "Vorletzte geöffnete Datei"
msgid ""
"This field contains the full path of the next most recently opened file."
msgstr ""
-"Dieses Feld enthält die Datei mit Pfadangabe, die als vorletztes geöffnet "
+"Dieses Feld enthält die Datei mit Pfadangabe, die zuvor geöffnet "
"war."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:9
@@ -12002,6 +12014,7 @@ msgstr "Exportzusammenfassung"
msgid "CSV Price Import"
msgstr "CSV-Kurs Import"
+#Fixme quote multiword names
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:50
msgid ""
"This assistant will help you import Prices from a CSV file.\n"
@@ -12033,43 +12046,38 @@ msgid ""
"\n"
"Click on 'Forward' to proceed or 'Cancel' to Abort Import."
msgstr ""
-"Dieser Assistent hilft Ihnen beim Import von Preisen aus einer CSV Datei."
-"\n"
+"Dieser Assistent hilft Ihnen beim Import von Preisen aus einer CSV Datei.\n"
"\n"
-"Für einen erfolgreichen Import müssen mindestens Spalten vorhanden sein für:"
-"Datum, Betrag, Herkunfts-Wertpapier und Zielwährung"
+"Für einen erfolgreichen Import müssen mindestens Spalten vorhanden sein für "
+"»Datum«, »Betrag«, »Von Wertpapier/Devise« und »Zu Währung«.\n"
"\n"
+"Falls alle Einträge für das gleiche Wertpapier oder Währung sind, "
+"kann das vorausgewählt werden und die benötigten Spalten sind Datum und "
+"Betrag.\n"
"\n"
-"Falls alle Einträge für das gleiche Wertpapier und Währung sind,"
-"kann das vorausgewählt werden und die benötigten Spalten sind Datum und Betrag."
+"Es gibt verschiedene Optionen für Trennzeichen oder feste Breite. "
+"Bei fester Breite doppelklicken Sie in die Tabelle um eine Spaltenbreite "
+"zu setzen und ggf. mit der rechten Maustaste ändern.\n"
"\n"
+"Beispiele: \"SIE.DE\";\"18.04.2019\";106,50;\"EUR\" \n"
+"oder \"EUR\",\"2019-04-18\",1.125,\"USD\"\n"
"\n"
-"Es gibt verschiedene Optionen für Trennzeichen oder feste Breite."
-"Bei fester Breite bitte auf die Zeilen doppelklicken um eine Spaltenbreite"
-"zu wählen, ggf. mit der rechten Maustaste ändern."
-"Beispiele: \"RR.L\",\"21/11/2016\",5.345,\"GBP\" und \"USD\","
-"\"2016-11-21\",1.56,\"GBP\"\n"
-"\n"
-"\n"
-"Es gibt eine Option zur Auswahl der Startzeile, der Endzeile sowie zur Wahl,"
-"wieviele Zeilen wiederholt, ausgehend von der Startzeile, übersprungen werden"
-"sollen, für den Fall, dass Ihre Datei z. Bsp. Kopfzeilen enthält."
-"Es gibt eine Option, bereits vorhandene Preise für den Tag zu überschreiben."
-"\n"
+"Es gibt eine Option zur Auswahl der Startzeile, der Endzeile sowie zur Wahl, "
+"wieviele Zeilen wiederholt, ausgehend von der Startzeile, übersprungen werden "
+"sollen, für den Fall, dass Ihre Datei z. Bsp. Kopfzeilen enthält. "
+"Es gibt eine Option, bereits vorhandene Preise für den Tag zu überschreiben.\n"
"\n"
"Zu guter Letzt hat die Vorschauseite für wiederholte Importe Knöpfe zum "
-"Speichern und Laden der Einstellungen."
-"Justieren Sie Einstellungen nach Wunsch (ggf. ausgehend von einem vorherigen Zustand),"
-"geben Sie ggf. einen neuen Namen ein und drücken Sie den »Einstellungen speichern« Knopf."
+"Speichern und Laden der Einstellungen. "
+"Justieren Sie die Einstellungen nach Wunsch (ggf. ausgehend von einem vorherigen Zustand), "
+"geben Sie ggf. einen neuen Namen ein und drücken Sie den »Einstellungen speichern« Knopf. "
"Bitte beachten Sie, dass Sie nicht unter dem Namen der vorgegebenen Einstellungen "
-"speichern können"
+"speichern können.\n"
"\n"
+"Diese Aktion kann nicht zurückgenommen werden, also "
+"erstellen Sie bitte vorher eine Sicherungskopie.\n"
"\n"
-"Diese Aktion kann nicht zurückgenommen werden,"
-"bitte erstellen Sie vorher eine Sicherungskopie."
-"\n"
-"\n"
-"Klicken Sie jetzt auf »Weiter« um fortzufahren oder »Abbruch« zum Abbrechen."
+"Klicken Sie auf »Weiter« um fortzufahren oder »Abbrechen« zum Abbrechen."
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:69
msgid "Price Import Assistant"
@@ -12254,7 +12262,7 @@ msgstr ""
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:1050
msgid "Import Prices Now"
-msgstr "_Kurse jetzt importieren"
+msgstr "Kurse jetzt importieren"
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:28
msgid "CSV Transaction Import"
@@ -14043,6 +14051,7 @@ msgstr "Konto auswählen"
msgid "_Select or add a GnuCash account:"
msgstr "Aus_wählen oder Hinzufügen eines GnuCash Kontos"
+# Fixme: File type
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:7
msgid "Import transactions from text file"
msgstr "Buchungen aus Textdatei importieren"
@@ -16111,8 +16120,8 @@ msgid ""
"bottom of the register after the blank transaction. If clear, the blank "
"transaction will be at the bottom of the register after all transactions."
msgstr ""
-"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
-"des Kontenblatts nach einer leeren Buchung angezeigt."
+"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am "
+"Ende des Kontenblatts nach einer leeren Buchung angezeigt. "
"Andernfalls ist die leere Buchung die letzte Buchung."
# H und C sind in diesem Dialog durch Hilfe und Schließen belegt
@@ -16465,8 +16474,8 @@ msgid ""
"'One a month' is used for dates older than a year and 'One a week' is used "
"for dates older than six months to a year."
msgstr ""
-"Mit der Option «skaliert» werden Preise, relativ zum gewählten Datum, entfernt."
-"Für Daten, die älter als ein Jahr sind wird »Ein Mal im Monat« verwendet,"
+"Mit der Option »skaliert« werden Preis, relativ zum gewählten Datum, entfernt. "
+"Für Daten, die älter als ein Jahr sind wird »Ein Mal im Monat« verwendet, "
"für Daten, die älter als sechs Monate bis zu einem Jahr alt sind »ein Mal pro Woche«."
#: gnucash/gtkbuilder/dialog-price.glade:582
@@ -17902,7 +17911,7 @@ msgstr "Budget Perioden:"
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:395
msgid "Note: Use View->'Filter By...' to control visible accounts."
msgstr ""
-"Anmerkung: Benutzen Sie 'Ansicht->Filtern nach...'"
+"Anmerkung: Benutzen Sie »Ansicht->Filtern nach...« "
"um zu wählen, welche Konten sichtbar sein sollen."
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:413
@@ -19168,7 +19177,7 @@ msgstr "_DTAUS importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:147
msgid "Import a traditional german DTAUS file into GnuCash."
-msgstr "Buchungen aus einer traditionellen deuscen DTAUS Datei importieren"
+msgstr "Importiert Buchungen aus einer traditionellen deutschen DTAUS-Datei."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:159
msgid "Import DTAUS and _send..."
@@ -19710,8 +19719,8 @@ msgid ""
"There were problems reading some saved settings, continuing to load.\n"
"Please review and save again."
msgstr ""
-"Beim Einlesen einiger gespeicherter Einstellungen gab es ein Problem."
-"Das Einlesen wird fortgesetzt."
+"Beim Einlesen einiger gespeicherter Einstellungen gab es Probleme. "
+"Das Einlesen wird fortgesetzt.\n"
"Bitte prüfen Sie die Einstellungen und speichern Sie sie erneut."
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:853
@@ -19826,12 +19835,13 @@ msgstr ""
msgid "No Linked Account"
msgstr "Kein verbundenes Konto"
+#Todo: Bedeutung "Button..."
#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1957
msgid ""
"To change mapping, double click on a row or select a row and press the "
"button..."
msgstr ""
-"Zum Ändern der Zuordnungen bitte auf ene Zeile doppelklicken"
+"Zum Ändern der Zuordnungen bitte auf ene Zeile doppelklicken "
"oder eine Zeile auswählen und den Knopf drücken..."
#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2001
@@ -19937,8 +19947,8 @@ msgstr "'Herkunfts-Wertpapier' darf nicht identisch mit 'Zielwährung' sein."
msgid ""
"No valid data found in the selected file. It may be empty or the selected "
"encoding is wrong."
-msgstr "In der gewählten Datei wurden keine gültigen Daten gefunden."
-"Entweder ist die Datei leer oder anders kodiert als erwartet."
+msgstr "In der gewählten Datei wurden keine gültigen Daten gefunden. "
+"Entweder ist die Datei leer oder in einem anderen Zeichensatz kodiert als angegeben."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:484
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:522
@@ -19946,7 +19956,7 @@ msgid ""
"No lines are selected for importing. Please reduce the number of lines to "
"skip."
msgstr ""
-"Keine Zeilen zum Import ausgewählt."
+"Keine Zeilen zum Import ausgewählt. "
"Bitte verringern Sie die Zahl der zu überspringenden Zeilen."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:503
@@ -19965,8 +19975,8 @@ msgid ""
"No 'Currency to' column selected and no selected Currency specified either.\n"
"This should never happen. Please report this as a bug."
msgstr ""
-"Ooops: Keine Zielwährungsspalte ausgewählt und auch keine Zeilwährung angegeben."
-"Das dürfte nicht passieren. Bitte melden Sie einen BugReport."
+"Hoppla: Keine Zielwährungsspalte ausgewählt und auch keine Zeilwährung angegeben.\n"
+"Das dürfte nicht passieren. Bitte melden Sie einen Fehler."
#. Oops - the user didn't select a 'commodity from' column *and* we didn't get a selected value either!
#. Note if you get here this suggests a bug in the code!
@@ -19976,8 +19986,9 @@ msgid ""
"either.\n"
"This should never happen. Please report this as a bug."
msgstr ""
-"Ooops: Keine Herkunfts-Wertpapier Spalte ausgewählt und auch kein Wertpapier angegeben."
-"Das dürfte nicht passieren. Bitte melden Sie einen BugReport."
+"Hoppla: Keine Herkunfts-Wertpapier Spalte ausgewählt und auch kein "
+"Wertpapier angegeben.\n"
+"Das dürfte nicht passieren. Bitte melden Sie einen Fehler."
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:470
msgid "Please select an account column."
@@ -20003,7 +20014,7 @@ msgid ""
"Please select a transfer account column or remove the other transfer related "
"columns."
msgstr ""
-"Bitte wählen Sie eine Transferkonto-Spalte oder entfernen Sie die anderen Spalten."
+"Bitte wählen Sie eine Herkunftskonto-Spalte oder entfernen Sie die anderen Spalten."
#. Oops - the user didn't select an Account column *and* we didn't get a default value either!
#. Note if you get here this suggests a bug in the code!
@@ -20112,7 +20123,7 @@ msgstr "Buchung-Abgleichen-Datum"
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:154
msgid "Value can't be parsed into a valid reconcile state."
-msgstr "Wert kann nicht zu einem gültigen Abgleichszustand verarbeitet werden."
+ msgstr "Wert kann nicht zu einem gültigen Abgleichszustand verarbeitet werden."
#. Declare two translatable error strings here as they will be used in several places
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:348
@@ -20172,11 +20183,11 @@ msgstr "Buchungen aus Datei mit durch Komma o.ä. getrennten Werten importieren"
#: gnucash/import-export/csv-imp/gnc-plugin-csv-import.c:60
msgid "Import _Prices from a CSV file..."
-msgstr "K_urse aus Textdatei importieren..."
+msgstr "K_urse aus CSV-Datei importieren..."
#: gnucash/import-export/csv-imp/gnc-plugin-csv-import.c:61
msgid "Import Prices from a CSV file"
-msgstr "Kurse aus Textdatei importieren"
+msgstr "Kurse aus CSV-Datei importieren"
#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:175
msgid "Import Customers from csv"
@@ -22349,6 +22360,7 @@ msgstr "Bericht"
msgid "No Customer"
msgstr "Kein Kunde"
+#Todo: Bedeutung?
#: gnucash/report/business-reports/customer-summary.scm:623
#, scheme-format
msgid "~a ~a - ~a"
@@ -22616,7 +22628,7 @@ msgid ""
"Display all tax categories separately (one per line) instead of one single "
"tax line.?"
msgstr ""
-"Alle Steuerangaben auf getrennten zeilen (statt nur einer Summenzeile)?"
+"Alle Steuerangaben auf getrennten Zeilen (statt nur einer Summenzeile)?"
#: gnucash/report/business-reports/invoice.scm:321
msgid "References"
@@ -25516,7 +25528,7 @@ msgid ""
"The future minimum will add, for each date point, a projected minimum "
"balance including scheduled transactions."
msgstr ""
-"Als Zukunftsminimum wird, für jeden Zeitpunkt, eine vorhergesagter"
+"Als Zukunftsminimum wird, für jeden Zeitpunkt, eine vorhergesagter "
"Mindestwert, einschließlich geplanter Buchungen, hinzugefügt."
#: gnucash/report/standard-reports/balance-forecast.scm:245
@@ -26633,6 +26645,7 @@ msgstr "Einkommens- und Umsatzsteuererklärung"
msgid "Filter"
msgstr "Filter"
+#Todo: I18N: wrong use of \n
#: gnucash/report/standard-reports/income-gst-statement.scm:43
msgid ""
"This report is useful to calculate periodic business tax payable/receivable "
@@ -26644,12 +26657,12 @@ msgid ""
" a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -"
"$100, Asset:Bank $1100."
msgstr ""
-"Dieser Bericht ist nützlich zur Berechnung wiederkehrender geschäftlicher"
-"Steuerzahlungen und -einnahmen."
-"Wählen Sie unter 'Berichtsoptionen' Ihre Geschäftskonten für Einnahmen und Ausgaben."
-"Ihre Buchungen können — zusätzlich zu den Teilbuchungen nach Konten für Forderungen,"
-"Aussenstände und Bankkonten — Teilbuchungen nach Steuerkonten enthalten, "
-"z. Bsp. 'Aktiva:OffFord:Verkäufe -1.000; Aufwendungen:Steuer -100; Erträge:Bank 1.100"
+"Dieser Bericht ist nützlich zur Berechnung wiederkehrender geschäftlicher "
+"Steuerzahlungen und -erstattungen.\n"
+"Wählen Sie unter »Berichtsoptionen« Ihre Geschäftskonten für Einnahmen und Ausgaben.\n"
+"Ihre Buchungen können zusätzlich zu den Teilbuchungen nach Konten für offene "
+"Forderungen oder Verbindlichkeiten und Bankkonten, Teilbuchungen nach Steuerkonten enthalten, "
+"z. Bsp. 'Erträge:Verkäufe -1.000; Verbindlichkeiten:Steuer -190; Aktiva:Bank 1.190"
#: gnucash/report/standard-reports/income-gst-statement.scm:49
msgid ""
@@ -26658,8 +26671,8 @@ msgid ""
" which will require Tax Tables to be set up correctly. Please see the "
"documentation."
msgstr ""
-"Diese Steuerkonten können entweder von den Standardkonten gefüllt werden"
-"oder von Kunden- und Lieferantenrechnungen. Dazu müssen die Steuertabellen"
+"Diese Steuerkonten können entweder von den Standardkonten gefüllt werden "
+"oder von Kunden- und Lieferantenrechnungen. Dazu müssen die Steuertabellen "
"korrekt ausgefüllt sein. Siehe Dokumentation."
#: gnucash/report/standard-reports/income-gst-statement.scm:53
@@ -26671,11 +26684,11 @@ msgid ""
"ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on "
"sales."
msgstr ""
-"Unter Berichtsoptionen müssen Sie die Konten auswählen, die Steuern"
-"(Umsatzsteuer, Mehrwertsteuer) einnehmen oder auszahlen. Die Konten müssen"
-"Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
-"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
-"eingenommene Steuern bei Verkäufen vonm Typ Passiva sein."
+"Unter Berichtsoptionen müssen Sie die Konten auswählen, auf denen die eingenommenen "
+"und gezahlten Steuern (Umsatzsteuer, Mehrwertsteuer) gesammelt werden. Die Konten müssen "
+"auch Teilbuchungen enthalten, die die regelmässig abgführten oder erstatteten Steuerzahlungen erfassen. "
+"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für "
+"eingenommene Steuern bei Verkäufen von Typ Fremdkapital sein."
#: gnucash/report/standard-reports/income-gst-statement.scm:93
msgid "Tax Accounts"
@@ -26689,11 +26702,12 @@ msgid ""
"These accounts must be of type ASSET for taxes paid on expenses, and type "
"LIABILITY for taxes collected on sales."
msgstr ""
-"Bitte wählen Sie die Konten aus, die die eingenommenen und gezahlten Steuern enthalten."
-"Die Konten müssen Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
-"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
-"eingenommene Steuern bei Verkäufen vom Typ Passiva sein."
+"Bitte wählen Sie die Konten aus, die die eingenommenen und gezahlten Steuern enthalten. "
+"Die Konten müssen Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen. "
+"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für "
+"eingenommene Steuern bei Verkäufen von Typ Fremdkapital sein."
+#Todo: Versteht keiner (ff)
#: gnucash/report/standard-reports/income-gst-statement.scm:108
#: gnucash/report/standard-reports/income-gst-statement.scm:211
#, fuzzy
@@ -27455,7 +27469,7 @@ msgid ""
"specified in the options\n"
"will apply to the Reconciliation Date."
msgstr ""
-"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln. "
+"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln.\n"
"Bitte wählen Sie das Konto in den Berichtsoptionen. "
"Die bei den Optionen gewählten Datumsangaben werden das Abgleichdatum."
@@ -28488,7 +28502,7 @@ msgstr "Angaben zum Berichterstatter am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:110
msgid "Per default the preparer info will be shown before the report data."
-msgstr "Standardmässig werden die Angaben zum Berichterstatter vor den Berichtsdaten angezeigt. "
+msgstr "Standardmässig werden die Angaben zum Berichterstatter vor den Berichtsdaten angezeigt."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:115
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:268
@@ -28497,7 +28511,7 @@ msgstr "Empfängerdaten am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:116
msgid "Per default the receiver info will be shown before the report data."
-msgstr "Standardmässig werden die Angaben zum Empfänger vor den Berichtsdaten angezeigt. "
+msgstr "Standardmässig werden die Angaben zum Empfänger vor den Berichtsdaten angezeigt."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:121
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:269
@@ -28511,23 +28525,23 @@ msgstr "Standardmässig werden Datum und Uhrzeit vor den Berichtsdaten angezeigt
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:127
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:270
msgid "Show comments at bottom"
-msgstr "Kommentare in Fußzeile anzeigen"
+msgstr "Kommentare am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:128
msgid ""
"Per default the additional comments text will be shown before the report "
"data."
-msgstr "Standardmässig wird der Text der zusätzlichen Kommentare vor den Berichtsdaten angezeigt. "
+msgstr "Standardmässig wird der Text der zusätzlichen Kommentare vor den Berichtsdaten angezeigt."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:133
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:271
msgid "Show GnuCash version at bottom"
-msgstr "GnuCash Version in Fußzeile anzeigen"
+msgstr "GnuCash Version am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:134
msgid "Per default the GnuCash version will be shown before the report data."
-msgstr "Standardmässig werden die GnuCash Version vor den Berichtsdaten angezeigt. "
+msgstr "Standardmässig werden die GnuCash Version vor den Berichtsdaten angezeigt."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:463
@@ -29227,6 +29241,7 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:150
# Wieso wird hier eine Bewertung hinzugefügt, die im Original nicht vorhanden ist?
+# Weil ich zu faul oder vergeßlich war das, im Englischen zu ändern. ~Fell
msgid ""
"Check to have trading accounts used for transactions involving more than one "
"currency or commodity."
@@ -29247,11 +29262,10 @@ msgid ""
"Tried to look up an undefined date symbol '~a'. This report was probably "
"saved by a later version of GnuCash. Defaulting to today."
msgstr ""
-"Versuch, ein undefiniertes Datumssymbol '~a' nachzuschauen."
-"Dieser Bericht wurde vermutlich mit einer neueren Version von GnuCash erstellt."
+"Versuch, ein undefiniertes Datumssymbol »~a« nachzuschauen. "
+"Dieser Bericht wurde vermutlich mit einer neueren Version von GnuCash erstellt. "
"Als Ersatz wird das heutige Datum genommen."
-
#: libgnucash/app-utils/date-utilities.scm:822
msgid "First day of the current calendar year."
msgstr "Anfang des aktuellen Kalenderjahres"
@@ -29506,7 +29520,7 @@ msgstr "Unbekanntes Konto für GUID [%s], breche SX [%s] Erzeugung ab."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1042
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
-msgstr "Fehler beim Bearbeiten von SX [%s] key [%s]=Formel [%s] bei [%s]: %s."
+msgstr "Fehler beim Bearbeiten von SX [%s] Schlüssel [%s]=Formel [%s] bei [%s]: %s."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1096
#: libgnucash/app-utils/gnc-sx-instance-model.c:1757
@@ -29632,7 +29646,7 @@ msgid ""
"This report was saved using a later version of GnuCash. One of the newer ~a "
"options '~a' is not available, fallback to the option '~a'."
msgstr ""
-"Dieser Bericht wurde von einer neueren Version von GnuCash gespeichert. Eine der neueren ~a"
+"Dieser Bericht wurde von einer neueren Version von GnuCash gespeichert. Eine der neueren ~a "
"Optionen '~a' ist nicht verfügbar, Ausweichen auf die Option '~a'."
#: libgnucash/app-utils/option-util.c:1697
@@ -29679,8 +29693,8 @@ msgid ""
"If you no longer intend to run {1} 2.6.x or older on this system you can "
"safely remove the old directory."
msgstr ""
-"Falls sie nicht beabsichtigen {1} 2.6.x oder älter auf diesem System laufen zu lassen"
-"entfernen Sie das alte Verzeichnis auf sicherem Weg."
+"Falls sie nicht mehr beabsichtigen {1} 2.6.x oder älter auf diesem System laufen zu lassen, "
+"können Sie das alte Verzeichnis risikolos entfernen."
#: libgnucash/core-utils/gnc-filepath-utils.cpp:688
msgid "In addition:"
@@ -29689,8 +29703,8 @@ msgstr "Außerdem:"
#: libgnucash/core-utils/gnc-filepath-utils.cpp:694
msgid "The following file has been copied to {1} instead:"
msgid_plural "The following files have been copied to {1} instead:"
-msgstr[0] "Die folgende Datei wurde stattdessen nach {1} kopiert."
-msgstr[1] "Die folgenden Dateien wurden stattdessen nach {1} kopiert."
+msgstr[0] "Die folgende Datei wurde stattdessen nach {1} kopiert:"
+msgstr[1] "Die folgenden Dateien wurden stattdessen nach {1} kopiert:"
#: libgnucash/core-utils/gnc-filepath-utils.cpp:698
msgid "The following file in {1} has been renamed:"
@@ -29821,7 +29835,7 @@ msgstr "Unbekanntes Datumsformat als Argument übergeben."
#: libgnucash/engine/gnc-datetime.cpp:559
msgid "Value can't be parsed into a date using the selected date format."
msgstr ""
-"Der Wert kann bei Verwendung des ausgewählten Datumsformats"
+"Der Wert kann bei Verwendung des ausgewählten Datumsformats "
"nicht in ein Datum umgewandelt werden."
#: libgnucash/engine/gnc-datetime.cpp:564
@@ -29836,9 +29850,9 @@ msgid ""
"must use a newer version of GnuCash in order to support the following "
"features:"
msgstr ""
-"Diese Datei oder Datenbank benutzt Features von GnuCash, die in "
+"Diese Datei oder Datenbank benutzt Merkmale von GnuCash, die in "
"dieser Version nicht vorhanden sind. Sie brauchen eine neuere GnuCash "
-"Version, um die folgenden Features zu unterstützen: "
+"Version, um die folgenden Features zu unterstützen:"
# Fixme: Source
#. Set memo.
commit fe94541aadd26cff0fc737720d32cd287546f178
Author: Joachim Wetzig <jo.wetzig at web.de>
Date: Thu Apr 18 01:07:29 2019 +0200
Update de.po
5216 übersetzte Meldungen, 42 ungenaue Übersetzungen, 2 unübersetzte
Meldungen
diff --git a/po/de.po b/po/de.po
index f09aa92cf..830ff07c1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,16 +11,13 @@
# Herbert Thoma <tma at iis.fhg.de>, 2001.
# Christian Meyer <chrisime at gnome.org>, 2000, 2001.
# Jan-Uwe Finck <Jan-Uwe.Finck at bigfoot.de>, 1999.
-#
-# Dateiversion 2019-04-17-2356 <-das sollte immer das Datum der letzten Änderung sein! AKTUALISIERE MICH!!!
-#
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2019-04-08 17:37+0200\n"
-"PO-Revision-Date: 2019-03-06 02:16+0100\n"
+"PO-Revision-Date: 2019-04-17 23:56+0200\n"
"Last-Translator: Christian Stimming <christian at cstimming.de>\n"
"Language-Team: GnuCash-de <gnucash-de at gnucash.org>\n"
"Language: de\n"
@@ -10419,7 +10416,7 @@ msgid ""
"decimals instead of displaying the exact fraction if the fractional part "
"cannot be exactly represented as a decimal."
msgstr ""
-"Wenn aktiv, wird GnuCash Preise runden um sie anzuzeigen, statt die genauere Angabe"
+"Wenn aktiv, wird GnuCash Preise runden um sie anzuzeigen, statt die genauere Angabe "
"als Bruch zu wählen, falls der Bruch nicht exakt als Dezimalzahl angezeigt werden kann"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:75
@@ -10828,7 +10825,7 @@ msgstr ""
"wird eine «B.-Nr.» angezeigt, die die Buchung beschreibt und auch in der Gegenbuchung"
"sichtbar ist."
"Andernfalls zeigt das «Nr» Feld (auch in der Gegenbuchung) die Buchungsnummer an"
-"und die Spalte des «Nr.» Feld kann in der zweiten Zeile nicht gefüllt oder verändert werden.""
+"und die Spalte des «Nr.» Feld kann in der zweiten Zeile nicht gefüllt oder verändert werden."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:240
msgid "Color the register using a gnucash specific color theme"
@@ -10961,7 +10958,7 @@ msgstr ""
"Zukünftige Buchungen unter der leeren Buchung am Ende des Kontos anzeigen"
"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
"des Kontenblatts nach einer leeren Buchung angezeigt."
-"Andernfalls ist die leere Buchung die letzte Buchung.""
+"Andernfalls ist die leere Buchung die letzte Buchung."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:290
#: gnucash/gtkbuilder/dialog-preferences.glade:2398
@@ -12063,17 +12060,17 @@ msgstr ""
"Zu guter Letzt hat die Vorschauseite für wiederholte Importe Knöpfe zum "
"Speichern und Laden der Einstellungen."
"Justieren Sie Einstellungen nach Wunsch (ggf. ausgehend von einem vorherigen Zustand),"
-"geben Sie ggf. einen neuen Namen ein und drücken Sie den 'Einstellungen speichern' Knopf."
+"geben Sie ggf. einen neuen Namen ein und drücken Sie den »Einstellungen speichern« Knopf."
"Bitte beachten Sie, dass Sie nicht unter dem Namen der vorgegebenen Einstellungen "
"speichern können"
"\n"
"\n"
"Diese Aktion kann nicht zurückgenommen werden,"
-"bitte erstellen Sie vorher eine Sicherungskopie.""
+"bitte erstellen Sie vorher eine Sicherungskopie."
"\n"
"\n"
-"Klicken Sie jetzt auf "Weiter" um fortzufahren oder "Abbruch" zum Abbrechen.""
-"
+"Klicken Sie jetzt auf »Weiter« um fortzufahren oder »Abbruch« zum Abbrechen."
+
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:69
msgid "Price Import Assistant"
msgstr "Preis-Import-Assistent"
@@ -16116,7 +16113,7 @@ msgid ""
msgstr ""
"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
"des Kontenblatts nach einer leeren Buchung angezeigt."
-"Andernfalls ist die leere Buchung die letzte Buchung.""
+"Andernfalls ist die leere Buchung die letzte Buchung."
# H und C sind in diesem Dialog durch Hilfe und Schließen belegt
#: gnucash/gtkbuilder/dialog-preferences.glade:2234
@@ -16469,8 +16466,8 @@ msgid ""
"for dates older than six months to a year."
msgstr ""
"Mit der Option «skaliert» werden Preise, relativ zum gewählten Datum, entfernt."
-"Für Daten, die älter als ein Jahr sind wird 'ein Mal im Monat' verwendet,"
-"für Daten, die älter als sechs Monate und bis zu einem Jahr alt sind 'ein Mal pro Woche'.""
+"Für Daten, die älter als ein Jahr sind wird »Ein Mal im Monat« verwendet,"
+"für Daten, die älter als sechs Monate bis zu einem Jahr alt sind »ein Mal pro Woche«."
#: gnucash/gtkbuilder/dialog-price.glade:582
msgid "First Date"
@@ -19478,6 +19475,7 @@ msgstr ""
"dann auf 'Weiter', um fortzufahren, oder auf 'Abbrechen', um den Export "
"abzubrechen.\n"
+# Fixme Source: 1. "\n" widerspricht I18N Regeln, letztes überflüssig? [FE]
#: gnucash/import-export/csv-exp/assistant-csv-export.c:112
msgid ""
"This assistant will help you export the Transactions to a file\n"
@@ -19494,19 +19492,19 @@ msgid ""
"Select the settings you require for the file and then click 'Forward' to "
"proceed or 'Cancel' to Abort Export.\n"
msgstr ""
-"Dieser Assistent wird Ihnen helfen, die Buchungen mit einem zu wählenden"
-"Trennzeichen in eine Datei zu exportieren.\n"
+"Dieser Assistent wird Ihnen helfen, die Buchungen\n"
+"mit dem unten zu wählenden Trennzeichen in eine Datei zu exportieren.\n"
"\n"
-"Jeder Buchung wird mehrere Zeilen ergeben und Sie werden möglicherweise"
-"nacharbeiten müssen, um den Export in ein für Sie nützliches Format zu bringen."
-"Jede Buchung taucht nur ein Mal im Export auf und zwar in der Reihenfolge,"
+"Jede Buchung wird mehrere Zeilen ergeben und Sie werden möglicherweise "
+"nacharbeiten müssen, um den Export in ein für Sie nützliches Format zu bringen. "
+"Jede Buchung taucht nur ein Mal im Export auf und zwar in der Reihenfolge, "
"in der die Kontenblätter verarbeitet werden.\n"
"\n"
-"Wenn Sie das einfache Layout auswählen entspricht die Ausgabe einer einzeiligen"
-"Ansicht; damit können Details verloren gehen.\n"
+"Wenn Sie das einfache Layout auswählen entspricht die Ausgabe der einzeiligen "
+"Konto-Ansicht; dabei können allerdings Details verloren gehen.\n"
"\n"
-"Wählen Sie jetzt die Einstellungen und klicken Sie dann 'Weiter' für den Export"
-"oder klicken Sie 'Abbruch'".
+"Wählen Sie jetzt die Einstellungen und klicken Sie dann »Weiter« für den Export "
+"oder zum Abbrechen des Exports »Abbrechen«.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:732
msgid ""
@@ -22401,11 +22399,11 @@ msgstr "Betrag Steuern"
#. Translators: "Their details" refer to the invoice 'other party' details i.e. client/vendor name/address/ID
#: gnucash/report/business-reports/invoice.scm:114
msgid "Their details"
-msgstr "Kunden- oder Geschäftspartner-Details"
+msgstr "Geschäftspartner-Details"
#: gnucash/report/business-reports/invoice.scm:115
msgid "Client or vendor name, address and ID"
-msgstr "Kunden- oder Geschäftspartner-Name, -Anschrift, -Kennung"
+msgstr "Geschäftspartner Name, Anschrift, Kennung"
#. Translators: "Our details" refer to the book owner's details i.e. name/address/tax-ID
#: gnucash/report/business-reports/invoice.scm:118
@@ -22618,7 +22616,7 @@ msgid ""
"Display all tax categories separately (one per line) instead of one single "
"tax line.?"
msgstr ""
-"Alle Steuerangaben auf getrennten Zeilen (statt nur einer Summenzeile)?"
+"Alle Steuerangaben auf getrennten zeilen (statt nur einer Summenzeile)?"
#: gnucash/report/business-reports/invoice.scm:321
msgid "References"
@@ -26098,7 +26096,6 @@ msgid "First"
msgstr "Erste"
#: gnucash/report/standard-reports/budget.scm:117
-#, fuzzy
msgid "The first period of the budget"
msgstr "Die erste Periode des Budgets."
@@ -26134,7 +26131,7 @@ msgstr "Manuelle Periodenauswahl"
#: gnucash/report/standard-reports/budget.scm:132
msgid "Explicitly select period value with spinner below"
-msgstr "Wählen Sie den Periodenwert mit dem Asuwahlrad"
+msgstr "Wählen Sie den Periodenwert mit dem Auswahlrad."
#: gnucash/report/standard-reports/budget.scm:150
#: gnucash/report/standard-reports/cash-flow.scm:86
@@ -26650,8 +26647,8 @@ msgstr ""
"Dieser Bericht ist nützlich zur Berechnung wiederkehrender geschäftlicher"
"Steuerzahlungen und -einnahmen."
"Wählen Sie unter 'Berichtsoptionen' Ihre Geschäftskonten für Einnahmen und Ausgaben."
-"Ihre Buchungen können --zusätzlich zu den Teilbuchungen nach Konten für Forderungen,"
-"Aussenstände und Bankkonten-- Teilbuchungen nach Steuerkonten enthalten, "
+"Ihre Buchungen können — zusätzlich zu den Teilbuchungen nach Konten für Forderungen,"
+"Aussenstände und Bankkonten — Teilbuchungen nach Steuerkonten enthalten, "
"z. Bsp. 'Aktiva:OffFord:Verkäufe -1.000; Aufwendungen:Steuer -100; Erträge:Bank 1.100"
#: gnucash/report/standard-reports/income-gst-statement.scm:49
@@ -26678,7 +26675,7 @@ msgstr ""
"(Umsatzsteuer, Mehrwertsteuer) einnehmen oder auszahlen. Die Konten müssen"
"Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
-"eingenommene Steuern bei Verkäufen von Typ Passive sein.""
+"eingenommene Steuern bei Verkäufen vonm Typ Passiva sein."
#: gnucash/report/standard-reports/income-gst-statement.scm:93
msgid "Tax Accounts"
@@ -26695,9 +26692,8 @@ msgstr ""
"Bitte wählen Sie die Konten aus, die die eingenommenen und gezahlten Steuern enthalten."
"Die Konten müssen Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
-"eingenommene Steuern bei Verkäufen von Typ Passive sein.""
-"
-"
+"eingenommene Steuern bei Verkäufen vom Typ Passiva sein."
+
#: gnucash/report/standard-reports/income-gst-statement.scm:108
#: gnucash/report/standard-reports/income-gst-statement.scm:211
#, fuzzy
@@ -26797,7 +26793,6 @@ msgstr "Steuerklasse"
#. Translators: "Tax Payable" refer to the difference GST Sales - GST Purchases
#: gnucash/report/standard-reports/income-gst-statement.scm:273
-#, fuzzy
msgid "Tax Payable"
msgstr "Zu zahlende Steuer"
@@ -27460,9 +27455,9 @@ msgid ""
"specified in the options\n"
"will apply to the Reconciliation Date."
msgstr ""
-"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln."
-"Bitte wählen Sie das Konto in den Berichtsoptionen.
-"Die bei den Optionen gewählten Datumsangaben werden das Abgleichdatum.""
+"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln. "
+"Bitte wählen Sie das Konto in den Berichtsoptionen. "
+"Die bei den Optionen gewählten Datumsangaben werden das Abgleichdatum."
#: gnucash/report/standard-reports/transaction.scm:515
msgid "Convert all transactions into a common currency."
@@ -27567,10 +27562,10 @@ msgid ""
"expense accounts to equity, and must usually be excluded from periodic "
"reporting."
msgstr ""
-"Standarmässig sollten normale Nutzer die Abschlussbuchungen nicht in"
-"einem Buchungsbericht aufführen. Abschlussbuchungen sind Buchungen von Einnahmen-"
-"und Ausgabenkonten ins Eigenkapital (Equity). Sie sind üblicherweise"
-"aus wiederkehrenden Berichten auszuschließen. "
+"Standarmässig sollten normale Nutzer die Abschlussbuchungen nicht in "
+"einem Buchungsbericht aufführen. Abschlussbuchungen sind Buchungen von Einnahmen- "
+"und Ausgabenkonten ins Eigenkapital (Equity). Sie sind üblicherweise "
+"aus wiederkehrenden Berichten auszuschließen."
#: gnucash/report/standard-reports/transaction.scm:637
msgid "Filter on these accounts."
@@ -27660,7 +27655,7 @@ msgstr "Kontonummer des Gegenkontos anzeigen?"
msgid ""
"Display a subtotal summary table. This requires Display/Amount being 'single"
msgstr ""
-"Anzeige einer Tabelle mit Zwischensummen. Voraussetzung ist, dass Anzeige/Betrag auf 'einzeln' steht.""
+"Anzeige einer Tabelle mit Zwischensummen. Voraussetzung ist, dass Anzeige/Betrag auf »einzeln« steht."
#: gnucash/report/standard-reports/transaction.scm:924
msgid "Display the trans number?"
@@ -29231,7 +29226,7 @@ msgstr ""
"Berichte, sowie den Im- und Export aus."
#: libgnucash/app-utils/business-prefs.scm:150
-;; Wieso wird hier eine Bewertung hinzugefügt, die im Original nicht vorhanden ist?
+# Wieso wird hier eine Bewertung hinzugefügt, die im Original nicht vorhanden ist?
msgid ""
"Check to have trading accounts used for transactions involving more than one "
"currency or commodity."
commit ba8a9c847883696b559868d4a6ff2a383145e193
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 20 15:10:41 2019 +0200
update python source doc
diff --git a/libgnucash/doc/python-bindings-doxygen.py b/libgnucash/doc/python-bindings-doxygen.py
index c1a4f7b7a..78118a9e1 100644
--- a/libgnucash/doc/python-bindings-doxygen.py
+++ b/libgnucash/doc/python-bindings-doxygen.py
@@ -27,14 +27,14 @@
## @page python_bindings_page Python bindings
# Also have a look at group @ref python_bindings.
#
-# They can be found in src/optional/python-bindings.
+# In the source tree they are located at bindings/python.
#
-# To enable them in the compilation process you have to add --enable-python-bindings
-# to the call of ./configure.
+# To enable them in the compilation process you have to add -DWITH_PYTHON=ON
+# to the call of cmake.
#
# As a starting point have a look at the \link python_bindings_examples example-scripts\endlink.
#
-# @section possibilities What are the Python bindings good for ?
+# @section possibilities What can Python Bindings be used for ?
#
# The python bindings supply the ability to access a wide range of the core functions of GnuCash. You
# can read and write Transactions, Commodities, Lots, access the business stuff... You gain the ability
@@ -43,6 +43,9 @@
# Not everything GnuCash can is possible to access though. The bindings focus on basic accounting functions.
# Have a look at the examples to get an impression.
#
+# Some functions are broken because they have not been wrapped properly. They may crash the program or return unaccessible values.
+# Please file a bug report if you find one to help support the development process.
+#
# @section python_bindings_section Principles
# The python-bindings are generated using SWIG from parts of the source-files of GnuCash.
#
@@ -128,5 +131,5 @@
# @li There is a page in the GnuCash wiki at http://wiki.gnucash.org/wiki/Python
# @li You may also have a look into the archives of gnucash-devel at gnucash.org.
# @li On Bugzilla there is also some interesting talk regarding the development process.
-# @li Then you can use the abilities of svn to see the history of the code by @code svn log @endcode done in the directory of the python-bindings.
+# @li Then you can use the abilities of git to see the history of the code by @code git log @endcode done in the directory of the python-bindings.
#
commit b250ad62c09cca730bd7d232fc501136d20cc0c1
Author: Joachim Wetzig <jo.wetzig at web.de>
Date: Sat Apr 20 01:16:22 2019 +0200
Update de.po
5216 übersetzte Meldungen, 42 ungenaue Übersetzungen, 2 unübersetzte
Meldungen
diff --git a/po/de.po b/po/de.po
index 06d7a8d12..f09aa92cf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,6 +12,8 @@
# Christian Meyer <chrisime at gnome.org>, 2000, 2001.
# Jan-Uwe Finck <Jan-Uwe.Finck at bigfoot.de>, 1999.
#
+# Dateiversion 2019-04-17-2356 <-das sollte immer das Datum der letzten Änderung sein! AKTUALISIERE MICH!!!
+#
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 3.5\n"
@@ -630,6 +632,10 @@ msgid ""
"use. Click the triangle at the far right of the column headings to change "
"the display."
msgstr ""
+"Sie können die Wertpapier-Editor Anzeige die «Quelle» zu einem"
+"Wertpapier anzeigen lassen und so die Herkunft der online-Daten sehen."
+"Klicken Sie dazu auf das Dreieck am rechten Ende der Ãœberschriften und"
+"setzen Sie das Häkchen bei «Quelle»"
#: doc/tip_of_the_day.list.c:79
msgid ""
@@ -3077,7 +3083,7 @@ msgstr "Anfang des Pfades existiert nicht, "
#: gnucash/gnome/dialog-trans-assoc.c:514
#, c-format
msgid "Path head not set, using '%s' for relative paths"
-msgstr ""
+msgstr "Pfad nicht angegeben, benutze '%s' für relative Pfade"
#: gnucash/gnome/dialog-trans-assoc.c:526
msgid "Relative"
@@ -5539,7 +5545,7 @@ msgstr "URL ergänzen:"
#: gnucash/gnome/gnc-split-reg.c:1198
msgid "Enter URL like http://www.gnucash.org:"
-msgstr ""
+msgstr "Geben Sie eine URL ein, z Bsp. http://www.gnucash.org:"
#: gnucash/gnome/gnc-split-reg.c:1344
msgid "This transaction is not associated with a URI."
@@ -5669,6 +5675,8 @@ msgid ""
"Exchange by CSV/FinTS(former HBCI) or import SWIFT-MT9xx/QIF/OFX data "
"including Transaction Matching"
msgstr ""
+"Datenaustausch mittels CSV/FinTS(former HBCI) oder importiere"
+"SWIFT-MT9xx/QIF/OFX Daten, einschließlich Buchungsabgleich"
#: gnucash/gnome/gnucash.appdata.xml.in:25
msgid "Perform financial calculations, such as a loan repayment"
@@ -6714,6 +6722,10 @@ msgid ""
"can expand the tree below the placeholder account by clicking on the arrow "
"to the left.)"
msgstr ""
+"Sie haben ein Platzhalterkonto ausgewählt, das nur gezeigt wird um die"
+"Unterkonten anzuzeigen, selbst aber nicht gültig ist."
+"Bitte wählen Sie ein anderes Konto. (Die Unterkonten können Sie sichtbar machen"
+"indem Sie auf das Dreieck links neben dem Platzhalterkonto klicken)"
#: gnucash/gnome-utils/dialog-options.c:1294
msgid "Book currency:"
@@ -9171,6 +9183,10 @@ msgid ""
"Examples: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
"This can be invoked multiple times."
msgstr ""
+"Log Niveau Override, Format \"modulename={debug,info,warn,crit,"
+"error}\"\n"
+"Beispiel: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
+"Kann mehrmals aufgerufen werden."
#: gnucash/gnucash-bin.c:125
msgid ""
@@ -10234,7 +10250,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in:5
#: gnucash/gtkbuilder/dialog-preferences.glade:3292
msgid "Alpha Vantage API key"
-msgstr ""
+msgstr "Alpha Vantage 'API key'"
#: gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in:6
#: gnucash/gtkbuilder/dialog-preferences.glade:3291
@@ -10291,11 +10307,11 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:25
msgid "Transaction Associations head path"
-msgstr ""
+msgstr "Anfang des Pfades zu Verknüpfungen der Buchungen"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:26
msgid "This is the path head for the Transaction file Associations"
-msgstr ""
+msgstr "Dies ist der Anfang des Pfades zu den Verknüpfungen der Buchungen"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:30
msgid "Compress the data file"
@@ -10394,7 +10410,7 @@ msgstr "Diese Einstellung gibt die Anzahl der automatischen Dezimalstellen an."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:70
msgid "Force prices to display as decimals even if they must be rounded."
-msgstr ""
+msgstr "Erzwinge Anzeige der Preise als Dezimalzahlen, auch wenn sie dazu gerundet werden müssen"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:71
#: gnucash/gtkbuilder/dialog-preferences.glade:1375
@@ -10403,6 +10419,8 @@ msgid ""
"decimals instead of displaying the exact fraction if the fractional part "
"cannot be exactly represented as a decimal."
msgstr ""
+"Wenn aktiv, wird GnuCash Preise runden um sie anzuzeigen, statt die genauere Angabe"
+"als Bruch zu wählen, falls der Bruch nicht exakt als Dezimalzahl angezeigt werden kann"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:75
msgid ""
@@ -10790,7 +10808,7 @@ msgid ""
"Set book option on new files to use split \"action\" field for \"Num\" field "
"on registers/reports"
msgstr ""
-"Bei neuer Datei: Voreinstellung, ob Aktionsfeld des Kontofensters für Nummer "
+"Bei neuer Datei: Voreinstellung, ob Aktionsfeld der Buchung für das «Nummer» Feld "
"verwendet werden soll"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:231
@@ -10803,6 +10821,14 @@ msgid ""
"files is set so that the 'Num' cell on registers shows/updates the "
"transaction 'num' field."
msgstr ""
+"Wenn gesetzt, wird als Standardeinstellung für das Kontobuch neuer Dateien"
+"im «Nr» Feld in der ersten Zeile der Buchung (Kontobucheintrag)"
+"das «Aktion» Feld der eigenen Teilbuchung angezeigt/aktualisiert"
+"In der zweiten Zeile -- sofern diese sichtbar ist (Ansicht>Bemerkung anzeigen) --"
+"wird eine «B.-Nr.» angezeigt, die die Buchung beschreibt und auch in der Gegenbuchung"
+"sichtbar ist."
+"Andernfalls zeigt das «Nr» Feld (auch in der Gegenbuchung) die Buchungsnummer an"
+"und die Spalte des «Nr.» Feld kann in der zweiten Zeile nicht gefüllt oder verändert werden.""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:240
msgid "Color the register using a gnucash specific color theme"
@@ -10816,6 +10842,10 @@ msgid ""
"css file to be stored in the gnucash used config directory. More information "
"can be found in the gnucash FAQ."
msgstr ""
+"Wenn gesetzt, wird das Kontobuch ein GnuCash spezifisches Farbschema (grün/gelb)"
+"verwenden. Andernfalls wird das Farbschema des Systems genutzt. Unabhängig davon"
+"kann man das Farbschema immer mit einer CSS Datei im Konfigurationsverzeichnis"
+"vorrangig bestimmen. Sie dazu die GnuCash FAQ."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:245
msgid "Superseded by \"use-gnucash-color-theme\""
@@ -10919,7 +10949,7 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:285
msgid "Show future transactions after the blank transaction in a register"
-msgstr ""
+msgstr "Zukünftige Buchungen unter der leeren Buchung am Ende des Kontos anzeigen"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:286
msgid ""
@@ -10928,13 +10958,17 @@ msgid ""
"bottom of the register after the blank transaction. Otherwise the blank "
"transaction will be at the bottom of the register after all transactions."
msgstr ""
+"Zukünftige Buchungen unter der leeren Buchung am Ende des Kontos anzeigen"
+"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
+"des Kontenblatts nach einer leeren Buchung angezeigt."
+"Andernfalls ist die leere Buchung die letzte Buchung.""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:290
#: gnucash/gtkbuilder/dialog-preferences.glade:2398
msgid "Show all transactions on one line. (Two in double line mode.)"
msgstr ""
"Alle Buchungssätze einzeilig anzeigen. (Zweizeilig, wenn die Bemerkung "
-"angezeigt werden soll.)"
+"angezeigt wird.)"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:291
#: gnucash/gschemas/org.gnucash.gschema.xml.in:296
@@ -12002,7 +12036,44 @@ msgid ""
"\n"
"Click on 'Forward' to proceed or 'Cancel' to Abort Import."
msgstr ""
-
+"Dieser Assistent hilft Ihnen beim Import von Preisen aus einer CSV Datei."
+"\n"
+"\n"
+"Für einen erfolgreichen Import müssen mindestens Spalten vorhanden sein für:"
+"Datum, Betrag, Herkunfts-Wertpapier und Zielwährung"
+"\n"
+"\n"
+"Falls alle Einträge für das gleiche Wertpapier und Währung sind,"
+"kann das vorausgewählt werden und die benötigten Spalten sind Datum und Betrag."
+"\n"
+"\n"
+"Es gibt verschiedene Optionen für Trennzeichen oder feste Breite."
+"Bei fester Breite bitte auf die Zeilen doppelklicken um eine Spaltenbreite"
+"zu wählen, ggf. mit der rechten Maustaste ändern."
+"Beispiele: \"RR.L\",\"21/11/2016\",5.345,\"GBP\" und \"USD\","
+"\"2016-11-21\",1.56,\"GBP\"\n"
+"\n"
+"\n"
+"Es gibt eine Option zur Auswahl der Startzeile, der Endzeile sowie zur Wahl,"
+"wieviele Zeilen wiederholt, ausgehend von der Startzeile, übersprungen werden"
+"sollen, für den Fall, dass Ihre Datei z. Bsp. Kopfzeilen enthält."
+"Es gibt eine Option, bereits vorhandene Preise für den Tag zu überschreiben."
+"\n"
+"\n"
+"Zu guter Letzt hat die Vorschauseite für wiederholte Importe Knöpfe zum "
+"Speichern und Laden der Einstellungen."
+"Justieren Sie Einstellungen nach Wunsch (ggf. ausgehend von einem vorherigen Zustand),"
+"geben Sie ggf. einen neuen Namen ein und drücken Sie den 'Einstellungen speichern' Knopf."
+"Bitte beachten Sie, dass Sie nicht unter dem Namen der vorgegebenen Einstellungen "
+"speichern können"
+"\n"
+"\n"
+"Diese Aktion kann nicht zurückgenommen werden,"
+"bitte erstellen Sie vorher eine Sicherungskopie.""
+"\n"
+"\n"
+"Klicken Sie jetzt auf "Weiter" um fortzufahren oder "Abbruch" zum Abbrechen.""
+"
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:69
msgid "Price Import Assistant"
msgstr "Preis-Import-Assistent"
@@ -15414,7 +15485,7 @@ msgstr "Die Firma, auf die sich diese Zahlung bezieht."
#: gnucash/gtkbuilder/dialog-payment.glade:186
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#: gnucash/gtkbuilder/dialog-payment.glade:231
msgid "Post To"
@@ -16043,6 +16114,9 @@ msgid ""
"bottom of the register after the blank transaction. If clear, the blank "
"transaction will be at the bottom of the register after all transactions."
msgstr ""
+"Wenn aktiviert, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende"
+"des Kontenblatts nach einer leeren Buchung angezeigt."
+"Andernfalls ist die leere Buchung die letzte Buchung.""
# H und C sind in diesem Dialog durch Hilfe und Schließen belegt
#: gnucash/gtkbuilder/dialog-preferences.glade:2234
@@ -16394,6 +16468,9 @@ msgid ""
"'One a month' is used for dates older than a year and 'One a week' is used "
"for dates older than six months to a year."
msgstr ""
+"Mit der Option «skaliert» werden Preise, relativ zum gewählten Datum, entfernt."
+"Für Daten, die älter als ein Jahr sind wird 'ein Mal im Monat' verwendet,"
+"für Daten, die älter als sechs Monate und bis zu einem Jahr alt sind 'ein Mal pro Woche'.""
#: gnucash/gtkbuilder/dialog-price.glade:582
msgid "First Date"
@@ -17828,6 +17905,8 @@ msgstr "Budget Perioden:"
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:395
msgid "Note: Use View->'Filter By...' to control visible accounts."
msgstr ""
+"Anmerkung: Benutzen Sie 'Ansicht->Filtern nach...'"
+"um zu wählen, welche Konten sichtbar sein sollen."
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:413
msgid "Budget List"
@@ -18032,7 +18111,7 @@ msgstr "_Buchungsnummer"
#: gnucash/gtkbuilder/gnc-plugin-page-register.glade:1098
msgid "Keep Associated Entry"
-msgstr ""
+msgstr "Verknüpften Eintrag behalten"
#: gnucash/gtkbuilder/gnc-recurrence.glade:12
msgid "day(s)"
@@ -19415,6 +19494,19 @@ msgid ""
"Select the settings you require for the file and then click 'Forward' to "
"proceed or 'Cancel' to Abort Export.\n"
msgstr ""
+"Dieser Assistent wird Ihnen helfen, die Buchungen mit einem zu wählenden"
+"Trennzeichen in eine Datei zu exportieren.\n"
+"\n"
+"Jeder Buchung wird mehrere Zeilen ergeben und Sie werden möglicherweise"
+"nacharbeiten müssen, um den Export in ein für Sie nützliches Format zu bringen."
+"Jede Buchung taucht nur ein Mal im Export auf und zwar in der Reihenfolge,"
+"in der die Kontenblätter verarbeitet werden.\n"
+"\n"
+"Wenn Sie das einfache Layout auswählen entspricht die Ausgabe einer einzeiligen"
+"Ansicht; damit können Details verloren gehen.\n"
+"\n"
+"Wählen Sie jetzt die Einstellungen und klicken Sie dann 'Weiter' für den Export"
+"oder klicken Sie 'Abbruch'".
#: gnucash/import-export/csv-exp/assistant-csv-export.c:732
msgid ""
@@ -19620,6 +19712,9 @@ msgid ""
"There were problems reading some saved settings, continuing to load.\n"
"Please review and save again."
msgstr ""
+"Beim Einlesen einiger gespeicherter Einstellungen gab es ein Problem."
+"Das Einlesen wird fortgesetzt."
+"Bitte prüfen Sie die Einstellungen und speichern Sie sie erneut."
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:853
#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:859
@@ -19738,6 +19833,8 @@ msgid ""
"To change mapping, double click on a row or select a row and press the "
"button..."
msgstr ""
+"Zum Ändern der Zuordnungen bitte auf ene Zeile doppelklicken"
+"oder eine Zeile auswählen und den Knopf drücken..."
#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2001
#, c-format
@@ -19821,24 +19918,29 @@ msgid ""
"Please select a 'Currency to' column or set a Currency in the 'Currency To' "
"field."
msgstr ""
+"Bitte wählen Sie eine Spalte der Zielwährung oder "
+"geben Sie eine Währung im Feld Zielwährung ein."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:448
msgid ""
"Please select a 'Commodity from' column or set a Commodity in the 'Commodity "
"From' field."
msgstr ""
+"Bitte wählen Sie eine Spalte für das Herkunfts-Wertpapier oder "
+"geben Sie ein Wertpapier im Feld Herkunfts-Wertpapier ein."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:456
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:237
msgid "'Commodity From' can not be the same as 'Currency To'."
-msgstr ""
+msgstr "'Herkunfts-Wertpapier' darf nicht identisch mit 'Zielwährung' sein."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:476
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:514
msgid ""
"No valid data found in the selected file. It may be empty or the selected "
"encoding is wrong."
-msgstr ""
+msgstr "In der gewählten Datei wurden keine gültigen Daten gefunden."
+"Entweder ist die Datei leer oder anders kodiert als erwartet."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:484
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:522
@@ -19846,6 +19948,8 @@ msgid ""
"No lines are selected for importing. Please reduce the number of lines to "
"skip."
msgstr ""
+"Keine Zeilen zum Import ausgewählt."
+"Bitte verringern Sie die Zahl der zu überspringenden Zeilen."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:503
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:541
@@ -19853,6 +19957,8 @@ msgid ""
"Not all fields could be parsed. Please correct the issues reported for each "
"line or adjust the lines to skip."
msgstr ""
+"Es konnten nicht alle Felder verarbeitet werden. Bitte korrigieren Sie zu jeder"
+"Zeile die angezeigten Fehler oder ändern Sie die Zahl der zu überspringenden Zeilen"
#. Oops - the user didn't select a 'currency to' column *and* we didn't get a selected value either!
#. Note if you get here this suggests a bug in the code!
@@ -19861,6 +19967,8 @@ msgid ""
"No 'Currency to' column selected and no selected Currency specified either.\n"
"This should never happen. Please report this as a bug."
msgstr ""
+"Ooops: Keine Zielwährungsspalte ausgewählt und auch keine Zeilwährung angegeben."
+"Das dürfte nicht passieren. Bitte melden Sie einen BugReport."
#. Oops - the user didn't select a 'commodity from' column *and* we didn't get a selected value either!
#. Note if you get here this suggests a bug in the code!
@@ -19870,6 +19978,8 @@ msgid ""
"either.\n"
"This should never happen. Please report this as a bug."
msgstr ""
+"Ooops: Keine Herkunfts-Wertpapier Spalte ausgewählt und auch kein Wertpapier angegeben."
+"Das dürfte nicht passieren. Bitte melden Sie einen BugReport."
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:470
msgid "Please select an account column."
@@ -19895,6 +20005,7 @@ msgid ""
"Please select a transfer account column or remove the other transfer related "
"columns."
msgstr ""
+"Bitte wählen Sie eine Transferkonto-Spalte oder entfernen Sie die anderen Spalten."
#. Oops - the user didn't select an Account column *and* we didn't get a default value either!
#. Note if you get here this suggests a bug in the code!
@@ -19904,7 +20015,7 @@ msgid ""
"This should never happen. Please report this as a bug."
msgstr ""
"Weder wurde eine Kontenspalte ausgewählt noch ein Standardkonto angegeben.\n"
-"Dies sollte nimald passieren. Bitte berichten Sie dies als Fehler."
+"Dies sollte niemals passieren. Bitte berichten Sie dies als Fehler."
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:49
msgid "Commodity From"
@@ -19933,7 +20044,7 @@ msgstr ""
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:133
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:192
msgid "Value can't be parsed into a valid commodity."
-msgstr ""
+msgstr "Der Wert kann nicht als gültiges Wertpapier erkannt werden."
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:147
msgid "Column value can not be empty."
@@ -19941,15 +20052,15 @@ msgstr "Der Spaltenwert darf nicht leer sein."
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:168
msgid "'Commodity From' can not be the same as 'Currency To' column type."
-msgstr ""
+msgstr "'Herkunfts-Wertpapier' kann nicht gleich sein mit 'Zielwährung'"
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:179
msgid "'Currency To' can not be the same as 'Commodity From' column type."
-msgstr ""
+msgstr "'Zielwährung' kann nicht gleich sein mit 'Herkunfts-Wertpapier'"
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:181
msgid "Value parsed into an invalid currency for a currency column type."
-msgstr ""
+msgstr "Wert ergibt keine gültige Währung für eine Währungsspalte"
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:195
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:203
@@ -19979,7 +20090,7 @@ msgstr "Keine »Von Währung/Wertpapier« Spalte."
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:328
msgid "Failed to create price from selected columns."
-msgstr ""
+msgstr "Konnte aus der gewählten Spalte keinen Preis entnehmen."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:56
msgid "Transaction Commodity"
@@ -20003,24 +20114,24 @@ msgstr "Buchung-Abgleichen-Datum"
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:154
msgid "Value can't be parsed into a valid reconcile state."
-msgstr ""
+msgstr "Wert kann nicht zu einem gültigen Abgleichszustand verarbeitet werden."
#. Declare two translatable error strings here as they will be used in several places
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:348
msgid "Account value can't be mapped back to an account."
-msgstr ""
+msgstr "Angabe zu Konto kann nicht mit einem existierenden Konto in Ãœbereinstimmung gebracht werden."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:349
msgid "Transfer account value can't be mapped back to an account."
-msgstr ""
+msgstr "Angabe zu Transferkonto kann nicht mit einem existierenden Konto in Ãœbereinstimmung gebracht werden."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:398
msgid "Account value can't be empty."
-msgstr ""
+msgstr "Angabe zu Konto darf nicht leer sein."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:409
msgid "Transfer account value can't be empty."
-msgstr ""
+msgstr "Angabe zu Transfer-Konto darf nicht leer sein."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:511
msgid "No deposit or withdrawal column."
@@ -20028,13 +20139,14 @@ msgstr "Keine Spalte für Gutschrift oder Belastung."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:517
msgid "Split is reconciled but reconcile date column is missing or invalid."
-msgstr ""
+msgstr "Teilbuchung ist abgeglichen, aber das Abgleichdatum fehlt oder ist ungültig."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:524
msgid ""
"Transfer split is reconciled but transfer reconcile date column is missing "
"or invalid."
msgstr ""
+"Transfer-Teilbuchung ist abgeglichen, aber das Transfer-Abgleichdatum fehlt oder ist ungültig"
#: gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp:45
msgid "No Settings"
@@ -20429,7 +20541,7 @@ msgstr "_Fortsetzen"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:1702
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2829
msgid "P_ause"
-msgstr ""
+msgstr "P_ause"
#. Inform the user.
#: gnucash/import-export/qif-imp/assistant-qif-import.c:1782
@@ -22242,7 +22354,7 @@ msgstr "Kein Kunde"
#: gnucash/report/business-reports/customer-summary.scm:623
#, scheme-format
msgid "~a ~a - ~a"
-msgstr ""
+msgstr "~a ~a - ~a"
#: gnucash/report/business-reports/customer-summary.scm:645
#: gnucash/report/business-reports/job-report.scm:627
@@ -22289,16 +22401,16 @@ msgstr "Betrag Steuern"
#. Translators: "Their details" refer to the invoice 'other party' details i.e. client/vendor name/address/ID
#: gnucash/report/business-reports/invoice.scm:114
msgid "Their details"
-msgstr ""
+msgstr "Kunden- oder Geschäftspartner-Details"
#: gnucash/report/business-reports/invoice.scm:115
msgid "Client or vendor name, address and ID"
-msgstr ""
+msgstr "Kunden- oder Geschäftspartner-Name, -Anschrift, -Kennung"
#. Translators: "Our details" refer to the book owner's details i.e. name/address/tax-ID
#: gnucash/report/business-reports/invoice.scm:118
msgid "Our details"
-msgstr "Ihre Detailangaben"
+msgstr "Unsere Detailangaben"
#: gnucash/report/business-reports/invoice.scm:119
msgid "Company name, address and tax-ID"
@@ -22310,7 +22422,7 @@ msgstr "Rechnungsdetails"
#: gnucash/report/business-reports/invoice.scm:122
msgid "Invoice date, due date, billing ID, terms, job details"
-msgstr ""
+msgstr "Rechnungsdatum, Fälligkeitsdatum, Rechnungsnummer, Zahlungsmodalitäten, Auftragsdetails"
#: gnucash/report/business-reports/invoice.scm:124
#: gnucash/report/business-reports/invoice.scm:125
@@ -22358,7 +22470,7 @@ msgstr "CSS"
#: gnucash/report/business-reports/invoice.scm:216
msgid "Picture Location"
-msgstr ""
+msgstr "Ort des Bildes"
#. Elements page options
#: gnucash/report/business-reports/invoice.scm:222
@@ -22499,13 +22611,14 @@ msgstr ""
#: gnucash/report/business-reports/invoice.scm:314
msgid "Use Detailed Tax Summary"
-msgstr ""
+msgstr "Detaillierte Steuerauflistung"
#: gnucash/report/business-reports/invoice.scm:315
msgid ""
"Display all tax categories separately (one per line) instead of one single "
"tax line.?"
msgstr ""
+"Alle Steuerangaben auf getrennten Zeilen (statt nur einer Summenzeile)?"
#: gnucash/report/business-reports/invoice.scm:321
msgid "References"
@@ -22529,7 +22642,7 @@ msgstr "Rechnungsnummer anzeigen?"
#: gnucash/report/business-reports/invoice.scm:336
msgid "Invoice owner ID"
-msgstr ""
+msgstr "Rechnungsausteller-Kennung"
#: gnucash/report/business-reports/invoice.scm:337
msgid "Display the customer/vendor id?"
@@ -22798,7 +22911,7 @@ msgstr "Rechnungsnummer"
#: gnucash/report/business-reports/receipt.eguile.scm:162
msgid "Descr."
-msgstr ""
+msgstr "Beschr."
#: gnucash/report/business-reports/receipt.eguile.scm:293
#: gnucash/report/business-reports/taxinvoice.eguile.scm:448
@@ -23298,7 +23411,7 @@ msgstr "Referenz: "
#: gnucash/report/business-reports/taxinvoice.scm:345
msgid "Engagement: "
-msgstr ""
+msgstr "Auftrag:"
#: gnucash/report/business-reports/taxinvoice.scm:351
#: gnucash/report/business-reports/taxinvoice.scm:353
@@ -23310,7 +23423,7 @@ msgstr "Australische Rechnung mit Steuerangaben"
msgid ""
"Display an Australian customer invoice with tax columns (using eguile "
"template)"
-msgstr "Kundenrechnung mit Spalten für Steuerangaben (mit »eguile«-Vorlage)"
+msgstr "Australische Kundenrechnung mit Spalten für Steuerangaben (mit »eguile«-Vorlage)"
# TXF (US) entspricht von der Bedeutung ElStEr (DE)
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:80
@@ -25386,7 +25499,7 @@ msgstr "Ziel-Linie anzeigen"
#: gnucash/report/standard-reports/balance-forecast.scm:62
msgid "Target amount above reserve"
-msgstr ""
+msgstr "Zielbetrag über Mindestbetrag (Reserve)"
#: gnucash/report/standard-reports/balance-forecast.scm:63
msgid ""
@@ -25405,6 +25518,8 @@ msgid ""
"The future minimum will add, for each date point, a projected minimum "
"balance including scheduled transactions."
msgstr ""
+"Als Zukunftsminimum wird, für jeden Zeitpunkt, eine vorhergesagter"
+"Mindestwert, einschließlich geplanter Buchungen, hinzugefügt."
#: gnucash/report/standard-reports/balance-forecast.scm:245
msgid "Target"
@@ -25933,7 +26048,7 @@ msgstr "Wählen Sie die Budgetperiode, mit welcher der Bereich endet."
#: gnucash/report/standard-reports/budget.scm:77
msgid "Exact start period"
-msgstr ""
+msgstr "Exakte Startperiode"
#: gnucash/report/standard-reports/budget.scm:79
#, fuzzy
@@ -25957,32 +26072,35 @@ msgstr "Wählen Sie die Budgetperiode, mit welcher der Bereich endet."
#: gnucash/report/standard-reports/budget.scm:88
msgid "Include collapsed periods before selected."
-msgstr ""
+msgstr "Zusammengefasste Perioden vor den gewählten einschließen."
#: gnucash/report/standard-reports/budget.scm:89
msgid ""
"Include in report previous periods as single collapsed column (one for all "
"periods before starting)"
msgstr ""
+"Im Bericht eine Summenspalte für alle Perioden vor der gewählten Startperiode voranstellen."
#: gnucash/report/standard-reports/budget.scm:90
msgid "Include collapsed periods after selected."
-msgstr ""
+msgstr "Zusammengefasste Perioden nach den gewählten einschließen."
#: gnucash/report/standard-reports/budget.scm:91
msgid ""
"Include in report further periods as single collapsed column (one for all "
"periods after ending and to the end of budget range)"
msgstr ""
+"Im Bericht eine Summenspalte für alle Perioden "
+"nach dem Ende der gewählten Perioden bis zum Budgetende anfügen."
#: gnucash/report/standard-reports/budget.scm:116
msgid "First"
-msgstr ""
+msgstr "Erste"
#: gnucash/report/standard-reports/budget.scm:117
#, fuzzy
msgid "The first period of the budget"
-msgstr "Der Titel des Berichts."
+msgstr "Die erste Periode des Budgets."
#: gnucash/report/standard-reports/budget.scm:119
msgid "Previous"
@@ -25992,10 +26110,11 @@ msgstr "Vorige"
msgid ""
"Budget period was before current period, according to report evaluation date"
msgstr ""
+"Laut Auswertungsdatum war die Budget-Periode vor der jetzigen."
#: gnucash/report/standard-reports/budget.scm:123
msgid "Current period, according to report evaluation date"
-msgstr ""
+msgstr "Derzeitige Periode, laut Auswertungsdatum."
#: gnucash/report/standard-reports/budget.scm:125
msgid "Next"
@@ -26003,19 +26122,19 @@ msgstr "Nächste"
#: gnucash/report/standard-reports/budget.scm:126
msgid "Next period, according to report evaluation date"
-msgstr ""
+msgstr "Nächste Periode, laut Auswertungsdatum."
#: gnucash/report/standard-reports/budget.scm:129
msgid "Last budget period"
-msgstr ""
+msgstr "Letzte Budget Periode"
#: gnucash/report/standard-reports/budget.scm:131
msgid "Manual period selection"
-msgstr ""
+msgstr "Manuelle Periodenauswahl"
#: gnucash/report/standard-reports/budget.scm:132
msgid "Explicitly select period value with spinner below"
-msgstr ""
+msgstr "Wählen Sie den Periodenwert mit dem Asuwahlrad"
#: gnucash/report/standard-reports/budget.scm:150
#: gnucash/report/standard-reports/cash-flow.scm:86
@@ -26528,6 +26647,12 @@ msgid ""
" a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -"
"$100, Asset:Bank $1100."
msgstr ""
+"Dieser Bericht ist nützlich zur Berechnung wiederkehrender geschäftlicher"
+"Steuerzahlungen und -einnahmen."
+"Wählen Sie unter 'Berichtsoptionen' Ihre Geschäftskonten für Einnahmen und Ausgaben."
+"Ihre Buchungen können --zusätzlich zu den Teilbuchungen nach Konten für Forderungen,"
+"Aussenstände und Bankkonten-- Teilbuchungen nach Steuerkonten enthalten, "
+"z. Bsp. 'Aktiva:OffFord:Verkäufe -1.000; Aufwendungen:Steuer -100; Erträge:Bank 1.100"
#: gnucash/report/standard-reports/income-gst-statement.scm:49
msgid ""
@@ -26536,6 +26661,9 @@ msgid ""
" which will require Tax Tables to be set up correctly. Please see the "
"documentation."
msgstr ""
+"Diese Steuerkonten können entweder von den Standardkonten gefüllt werden"
+"oder von Kunden- und Lieferantenrechnungen. Dazu müssen die Steuertabellen"
+"korrekt ausgefüllt sein. Siehe Dokumentation."
#: gnucash/report/standard-reports/income-gst-statement.scm:53
msgid ""
@@ -26546,6 +26674,11 @@ msgid ""
"ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on "
"sales."
msgstr ""
+"Unter Berichtsoptionen müssen Sie die Konten auswählen, die Steuern"
+"(Umsatzsteuer, Mehrwertsteuer) einnehmen oder auszahlen. Die Konten müssen"
+"Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
+"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
+"eingenommene Steuern bei Verkäufen von Typ Passive sein.""
#: gnucash/report/standard-reports/income-gst-statement.scm:93
msgid "Tax Accounts"
@@ -26559,7 +26692,12 @@ msgid ""
"These accounts must be of type ASSET for taxes paid on expenses, and type "
"LIABILITY for taxes collected on sales."
msgstr ""
-
+"Bitte wählen Sie die Konten aus, die die eingenommenen und gezahlten Steuern enthalten."
+"Die Konten müssen Teilbuchungen enthalten, die die regelmässigen Steuerzahlungen erfassen."
+"Die Konten für gezahlte Steuern bei Ausgaben müssen vom Typ Aktiva, die für"
+"eingenommene Steuern bei Verkäufen von Typ Passive sein.""
+"
+"
#: gnucash/report/standard-reports/income-gst-statement.scm:108
#: gnucash/report/standard-reports/income-gst-statement.scm:211
#, fuzzy
@@ -26568,7 +26706,7 @@ msgstr "Einzelne Steueranteile"
#: gnucash/report/standard-reports/income-gst-statement.scm:108
msgid "Display individual sales columns rather than their sum"
-msgstr ""
+msgstr "Einzelne Spalten für Verkäufe statt Summenspalte"
#: gnucash/report/standard-reports/income-gst-statement.scm:109
#: gnucash/report/standard-reports/income-gst-statement.scm:236
@@ -26578,7 +26716,7 @@ msgstr "Einzelne Steueranteile"
#: gnucash/report/standard-reports/income-gst-statement.scm:109
msgid "Display individual purchases columns rather than their sum"
-msgstr ""
+msgstr "Einzelne Spalten für Käufe statt Summenspalte"
#: gnucash/report/standard-reports/income-gst-statement.scm:110
#: gnucash/report/standard-reports/income-gst-statement.scm:221
@@ -26589,7 +26727,7 @@ msgstr "Einzelne Steueranteile"
#: gnucash/report/standard-reports/income-gst-statement.scm:110
msgid "Display individual tax columns rather than their sum"
-msgstr ""
+msgstr "Einzelne Spalten für Steuern statt Summenspalte"
#. Translators: "Gross Balance" refer to "Gross Sales - Gross Purchases" in GST Report
#: gnucash/report/standard-reports/income-gst-statement.scm:111
@@ -26597,11 +26735,11 @@ msgstr ""
#: gnucash/report/standard-reports/income-gst-statement.scm:258
#, fuzzy
msgid "Gross Balance"
-msgstr "_Saldenabfrage..."
+msgstr "_Summensaldenabfrage..."
#: gnucash/report/standard-reports/income-gst-statement.scm:111
msgid "Display the gross balance (gross sales - gross purchases)"
-msgstr ""
+msgstr "Nur Summensaldo anzeigen (Summe Verkäufe minus Summe Käufe)"
#. Note: Net income = net balance - other costs
#. Translators: "Net Balance" refer to Net Sales - Net Purchases in GST Report
@@ -26614,7 +26752,7 @@ msgstr "_Saldenabfrage..."
#: gnucash/report/standard-reports/income-gst-statement.scm:112
msgid "Display the net balance (sales without tax - purchases without tax)"
-msgstr ""
+msgstr "Nettosalden anzeigen (Verkäufe ohne Steueranteil minus Käufe ohne Steueranteil)"
#: gnucash/report/standard-reports/income-gst-statement.scm:113
#: gnucash/report/standard-reports/income-gst-statement.scm:271
@@ -26624,7 +26762,7 @@ msgstr "Steuertabelle"
#: gnucash/report/standard-reports/income-gst-statement.scm:113
msgid "Display the tax payable (tax on sales - tax on purchases)"
-msgstr ""
+msgstr "Zu zahlende Steuern anzeigen (Steuer auf Verkäufe minus Steuer auf Käufe)"
#. Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales
#: gnucash/report/standard-reports/income-gst-statement.scm:207
@@ -26645,12 +26783,12 @@ msgstr "Steuertabellen"
#. Translators: "Gross Purchases" refer to Net Purchase + GST/VAT on Purchase
#: gnucash/report/standard-reports/income-gst-statement.scm:232
msgid "Gross Purchases"
-msgstr ""
+msgstr "Einkaufsbrutto"
#: gnucash/report/standard-reports/income-gst-statement.scm:242
#, fuzzy
msgid "Net Purchases"
-msgstr "Nettobetrag"
+msgstr "Einkaufsnetto"
#: gnucash/report/standard-reports/income-gst-statement.scm:252
#, fuzzy
@@ -26661,7 +26799,7 @@ msgstr "Steuerklasse"
#: gnucash/report/standard-reports/income-gst-statement.scm:273
#, fuzzy
msgid "Tax Payable"
-msgstr "Steuertabelle"
+msgstr "Zu zahlende Steuer"
#: gnucash/report/standard-reports/income-statement.scm:96
msgid "Label the trading accounts section"
@@ -27322,6 +27460,9 @@ msgid ""
"specified in the options\n"
"will apply to the Reconciliation Date."
msgstr ""
+"Der Abgleichbericht sollte dem Aussehen des Abgleichwerkzeugs ähneln."
+"Bitte wählen Sie das Konto in den Berichtsoptionen.
+"Die bei den Optionen gewählten Datumsangaben werden das Abgleichdatum.""
#: gnucash/report/standard-reports/transaction.scm:515
msgid "Convert all transactions into a common currency."
@@ -27426,6 +27567,10 @@ msgid ""
"expense accounts to equity, and must usually be excluded from periodic "
"reporting."
msgstr ""
+"Standarmässig sollten normale Nutzer die Abschlussbuchungen nicht in"
+"einem Buchungsbericht aufführen. Abschlussbuchungen sind Buchungen von Einnahmen-"
+"und Ausgabenkonten ins Eigenkapital (Equity). Sie sind üblicherweise"
+"aus wiederkehrenden Berichten auszuschließen. "
#: gnucash/report/standard-reports/transaction.scm:637
msgid "Filter on these accounts."
@@ -27515,6 +27660,7 @@ msgstr "Kontonummer des Gegenkontos anzeigen?"
msgid ""
"Display a subtotal summary table. This requires Display/Amount being 'single"
msgstr ""
+"Anzeige einer Tabelle mit Zwischensummen. Voraussetzung ist, dass Anzeige/Betrag auf 'einzeln' steht.""
#: gnucash/report/standard-reports/transaction.scm:924
msgid "Display the trans number?"
@@ -27769,7 +27915,7 @@ msgstr "Name der Organisation oder Firma, für die der Bericht erstellt wird."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:66
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:262
msgid "Show preparer info"
-msgstr "Personen-Information anzeigen"
+msgstr "Berichterstatter-Information anzeigen"
#: gnucash/report/stylesheets/stylesheet-easy.scm:60
#: gnucash/report/stylesheets/stylesheet-fancy.scm:54
@@ -27842,7 +27988,7 @@ msgstr "Bilder"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:140
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:288
msgid "Background Tile"
-msgstr "Hintergrundbild"
+msgstr "Hintergrundkachel"
#: gnucash/report/stylesheets/stylesheet-easy.scm:72
#: gnucash/report/stylesheets/stylesheet-fancy.scm:66
@@ -27850,7 +27996,7 @@ msgstr "Hintergrundbild"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:140
#: gnucash/report/stylesheets/stylesheet-plain.scm:54
msgid "Background tile for reports."
-msgstr "Hintergrundbild für Berichte."
+msgstr "Hintergrundkachel für Berichte."
#. Translators: Banner is an image like Logo.
#: gnucash/report/stylesheets/stylesheet-easy.scm:77
@@ -28338,34 +28484,34 @@ msgstr "Zusätzliche Kommentare"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:104
msgid "String for additional report information."
-msgstr ""
+msgstr "Zeichenkette für zusätzliche Berichtsinformationen."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:109
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:267
msgid "Show preparer info at bottom"
-msgstr ""
+msgstr "Angaben zum Berichterstatter am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:110
msgid "Per default the preparer info will be shown before the report data."
-msgstr ""
+msgstr "Standardmässig werden die Angaben zum Berichterstatter vor den Berichtsdaten angezeigt. "
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:115
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:268
msgid "Show receiver info at bottom"
-msgstr ""
+msgstr "Empfängerdaten am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:116
msgid "Per default the receiver info will be shown before the report data."
-msgstr ""
+msgstr "Standardmässig werden die Angaben zum Empfänger vor den Berichtsdaten angezeigt. "
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:121
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:269
msgid "Show date/time at bottom"
-msgstr ""
+msgstr "Datum und Uhrzeit am Ende anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:122
msgid "Per default the date/time info will be shown before the report data."
-msgstr ""
+msgstr "Standardmässig werden Datum und Uhrzeit vor den Berichtsdaten angezeigt. "
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:127
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:270
@@ -28376,7 +28522,8 @@ msgstr "Kommentare in Fußzeile anzeigen"
msgid ""
"Per default the additional comments text will be shown before the report "
"data."
-msgstr ""
+msgstr "Standardmässig wird der Text der zusätzlichen Kommentare vor den Berichtsdaten angezeigt. "
+
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:133
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:271
@@ -28385,14 +28532,15 @@ msgstr "GnuCash Version in Fußzeile anzeigen"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:134
msgid "Per default the GnuCash version will be shown before the report data."
-msgstr ""
+msgstr "Standardmässig werden die GnuCash Version vor den Berichtsdaten angezeigt. "
+
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:463
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:472
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:588
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:597
msgid "Report Creation Date: "
-msgstr "Berichtserstellungsdatum: "
+msgstr "Erstellungsdatum des Berichts: "
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:609
msgid "GnuCash "
@@ -28401,7 +28549,7 @@ msgstr "GnuCash "
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:631
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:635
msgid "Head or Tail"
-msgstr ""
+msgstr "Vor- oder Nachspann"
#: gnucash/report/stylesheets/stylesheet-plain.scm:48
msgid "Background color for reports."
@@ -28562,7 +28710,7 @@ msgstr "Dies ist eine Kontenlisten-Option."
#: gnucash/report/utility-reports/hello-world.scm:197
msgid "A list option"
-msgstr "Eine Auflistungsoption"
+msgstr "Eine Listenoption"
#: gnucash/report/utility-reports/hello-world.scm:198
msgid "This is a list option."
@@ -28883,7 +29031,7 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:43
msgid "Bill number format"
-msgstr "Format Lieferantenrechnungsnummer"
+msgstr "Format der Lieferantenrechnungsnummer"
#: libgnucash/app-utils/business-prefs.scm:44
msgid "Bill number"
@@ -28907,7 +29055,7 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:47
msgid "Expense voucher number format"
-msgstr "Format Auslagenerstattungsnummer"
+msgstr "Format der Auslagenerstattungsnummer"
#: libgnucash/app-utils/business-prefs.scm:48
msgid "Expense voucher number"
@@ -29083,6 +29231,7 @@ msgstr ""
"Berichte, sowie den Im- und Export aus."
#: libgnucash/app-utils/business-prefs.scm:150
+;; Wieso wird hier eine Bewertung hinzugefügt, die im Original nicht vorhanden ist?
msgid ""
"Check to have trading accounts used for transactions involving more than one "
"currency or commodity."
@@ -29103,6 +29252,10 @@ msgid ""
"Tried to look up an undefined date symbol '~a'. This report was probably "
"saved by a later version of GnuCash. Defaulting to today."
msgstr ""
+"Versuch, ein undefiniertes Datumssymbol '~a' nachzuschauen."
+"Dieser Bericht wurde vermutlich mit einer neueren Version von GnuCash erstellt."
+"Als Ersatz wird das heutige Datum genommen."
+
#: libgnucash/app-utils/date-utilities.scm:822
msgid "First day of the current calendar year."
@@ -29353,23 +29506,23 @@ msgstr "Numerischer Fehler"
#: libgnucash/app-utils/gnc-sx-instance-model.c:989
#, c-format
msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
-msgstr ""
+msgstr "Unbekanntes Konto für GUID [%s], breche SX [%s] Erzeugung ab."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1042
#, c-format
msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
-msgstr ""
+msgstr "Fehler beim Bearbeiten von SX [%s] key [%s]=Formel [%s] bei [%s]: %s."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1096
#: libgnucash/app-utils/gnc-sx-instance-model.c:1757
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
-msgstr ""
+msgstr "Fehler %d in SX [%s] endgültiger gnc_numeric Wert, benutze stattdessen 0."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1766
#, c-format
msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
-msgstr ""
+msgstr "Kein Umtauschkurs verfügbar in SX [%s] für %s -> %s, Wert ist Null."
#. Translators: This and the following strings appear on
#. * the account tab if the Tax Info column is displayed,
@@ -29403,7 +29556,7 @@ msgstr ""
#: libgnucash/app-utils/gnc-ui-util.c:751
#, c-format
msgid "Invalid code %s for tax type %s"
-msgstr "ungültiger Schlüssel %s für Steuerart %s"
+msgstr "Ungültiger Schlüssel %s für Steuerart %s"
#: libgnucash/app-utils/gnc-ui-util.c:755
#, c-format
@@ -29484,6 +29637,8 @@ msgid ""
"This report was saved using a later version of GnuCash. One of the newer ~a "
"options '~a' is not available, fallback to the option '~a'."
msgstr ""
+"Dieser Bericht wurde von einer neueren Version von GnuCash gespeichert. Eine der neueren ~a"
+"Optionen '~a' ist nicht verfügbar, Ausweichen auf die Option '~a'."
#: libgnucash/app-utils/option-util.c:1697
#, c-format
@@ -29529,6 +29684,8 @@ msgid ""
"If you no longer intend to run {1} 2.6.x or older on this system you can "
"safely remove the old directory."
msgstr ""
+"Falls sie nicht beabsichtigen {1} 2.6.x oder älter auf diesem System laufen zu lassen"
+"entfernen Sie das alte Verzeichnis auf sicherem Weg."
#: libgnucash/core-utils/gnc-filepath-utils.cpp:688
msgid "In addition:"
@@ -29537,8 +29694,8 @@ msgstr "Außerdem:"
#: libgnucash/core-utils/gnc-filepath-utils.cpp:694
msgid "The following file has been copied to {1} instead:"
msgid_plural "The following files have been copied to {1} instead:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Die folgende Datei wurde stattdessen nach {1} kopiert."
+msgstr[1] "Die folgenden Dateien wurden stattdessen nach {1} kopiert."
#: libgnucash/core-utils/gnc-filepath-utils.cpp:698
msgid "The following file in {1} has been renamed:"
@@ -29547,8 +29704,8 @@ msgstr "Die folgende Datei in {1} wurde umbenannt:"
#: libgnucash/core-utils/gnc-filepath-utils.cpp:708
msgid "The following file has become obsolete and will be ignored:"
msgid_plural "The following files have become obsolete and will be ignored:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Die folgende Datei ist veraltet und wird ignoriert:"
+msgstr[1] "Die folgenden Dateien sind veraltet und werden ignoriert:"
#: libgnucash/core-utils/gnc-filepath-utils.cpp:718
msgid "The following file could not be moved to {1}:"
@@ -29669,8 +29826,8 @@ msgstr "Unbekanntes Datumsformat als Argument übergeben."
#: libgnucash/engine/gnc-datetime.cpp:559
msgid "Value can't be parsed into a date using the selected date format."
msgstr ""
-"Der Wert kann nicht in ein Datum unter Verwendung des ausgewählten "
-"Datumsformats umgewandelt werden."
+"Der Wert kann bei Verwendung des ausgewählten Datumsformats"
+"nicht in ein Datum umgewandelt werden."
#: libgnucash/engine/gnc-datetime.cpp:564
msgid "Value appears to contain a year while the selected format forbids this."
@@ -29684,10 +29841,9 @@ msgid ""
"must use a newer version of GnuCash in order to support the following "
"features:"
msgstr ""
-"Diese Datei oder Datenbank benutzt neuere Features von GnuCash, die in "
-"dieser Version noch nicht vorhanden sind. Sie brauchen eine neuere GnuCash "
-"Version, um die Datei lesen zu können. Folgende neuere Features werden "
-"verwendet:"
+"Diese Datei oder Datenbank benutzt Features von GnuCash, die in "
+"dieser Version nicht vorhanden sind. Sie brauchen eine neuere GnuCash "
+"Version, um die folgenden Features zu unterstützen: "
# Fixme: Source
#. Set memo.
@@ -29723,7 +29879,7 @@ msgstr "First in, First out"
#: libgnucash/engine/policy.c:53
msgid "Use oldest lots first."
-msgstr "Älteste Posten zuerst."
+msgstr "Älteste Posten zuerst benutzen."
#: libgnucash/engine/policy.c:55
msgid "Last In, First Out"
@@ -29731,7 +29887,7 @@ msgstr "Last in, First out"
#: libgnucash/engine/policy.c:56
msgid "Use newest lots first."
-msgstr "Neueste Posten zuerst."
+msgstr "Neueste Posten zuerst benutzen."
#: libgnucash/engine/policy.c:59
msgid "Average cost of open lots."
@@ -29739,7 +29895,7 @@ msgstr "Durchschnittspreis von offenen Posten."
#: libgnucash/engine/policy.c:62
msgid "Manually select lots."
-msgstr "Manuell gewählte Posten."
+msgstr "Posten manuell wählen."
# Fixme: Source qofbookslots: All accelerators missing
#: libgnucash/engine/qofbookslots.h:66
@@ -29827,28 +29983,28 @@ msgid ""
"Business_Features_Issues#I_can.27t_delete_a_transaction_of_type_.22I.22_from_the_AR.2FAP_account"
msgstr ""
"Bitte löschen sie diese Buchung. Die (englische) Erklärung befindet sich in "
-"https://wiki.gnucash.org/wiki/Business_Features_Issues#Double_posting"
+"https://wiki.gnucash.org/wiki/Business_Features_Issues#I_can.27t_delete_a_transaction_of_type_.22I.22_from_the_AR.2FAP_account"
# Fixme: Bessere Lösung für die nächsten 2?
#: libgnucash/engine/ScrubBusiness.c:614
#, c-format
msgid "Checking business lots in account %s: %u of %u"
-msgstr "Überprüfe geschäftliche Posten in Konto %s: %u von %u"
+msgstr "Überprüfe geschäftliche Posten im Konto %s: %u von %u"
#: libgnucash/engine/ScrubBusiness.c:664
#, c-format
msgid "Checking business splits in account %s: %u of %u"
-msgstr "Überprüfe geschäftliche Buchungsteile in Konto %s: %u von %u"
+msgstr "Überprüfe geschäftliche Buchungsteile im Konto %s: %u von %u"
#: libgnucash/engine/Scrub.c:108
#, c-format
msgid "Looking for orphans in account %s: %u of %u"
-msgstr "Suche nach verwaisten Buchungen in Konto %s: %u von %u"
+msgstr "Suche nach verwaisten Buchungen im Konto %s: %u von %u"
#: libgnucash/engine/Scrub.c:304
#, c-format
msgid "Looking for imbalances in account %s: %u of %u"
-msgstr "Suche nach unausgeglichenen Buchungen in Konto %s: %u von %u"
+msgstr "Suche nach unausgeglichenen Buchungen im Konto %s: %u von %u"
#. Translators: This string has a disambiguation prefix
#: libgnucash/engine/Split.c:1613
commit 20e2b6b5de513d4fa9362d51524f8cddb523f607
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Apr 19 15:51:29 2019 +0100
Bug 797175 - Opening a file from a gvfs mount point fails
When testing for a MS Windows path which has a ":", a gvfs path with the
format '/run/user/1000/gvfs/smb-share:server=192.168.1.11,share=public/
test-xml-file.gnucash' is recognised as a Windows path. To avoid this
expand the test to ":/" and also ":\"
diff --git a/libgnucash/engine/gnc-uri-utils.c b/libgnucash/engine/gnc-uri-utils.c
old mode 100644
new mode 100755
index 0158820e3..40ec6fef1
--- a/libgnucash/engine/gnc-uri-utils.c
+++ b/libgnucash/engine/gnc-uri-utils.c
@@ -177,8 +177,10 @@ void gnc_uri_get_components (const gchar *uri,
if ( gnc_uri_is_file_scheme ( *scheme ) )
{
/* a true file uri on windows can start file:///N:/
- so we come here with /N:/ */
- if (g_str_has_prefix (splituri[1], "/") && g_strstr_len (splituri[1], -1, ":") != NULL)
+ so we come here with /N:/, it could also be /N:\
+ */
+ if (g_str_has_prefix (splituri[1], "/") &&
+ ((g_strstr_len (splituri[1], -1, ":/") != NULL) || (g_strstr_len (splituri[1], -1, ":\\") != NULL)))
{
gchar *ptr = splituri[1];
*path = gnc_resolve_file_path ( ptr + 1 );
commit efbdab6f4de3f170f60a6b1149a12bcb898dccd8
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:57:00 2019 +0200
don't kill main process on closing of shell
diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index ce0b8aec9..d12f75392 100644
--- a/gnucash/python/pycons/console.py
+++ b/gnucash/python/pycons/console.py
@@ -434,7 +434,6 @@ class Console (Gtk.ScrolledWindow):
def quit(self):
""" Quit console """
- # Gtk.main_quit()
self.history_save()
try:
os.close (self.piperead)
commit 480aa4a57532bc4703903d0ad339d81a2542d4ce
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:55:49 2019 +0200
connect console quit event handler to window destroy-event and delete-event
diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index e54c6569d..74094e53f 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -102,10 +102,8 @@ if False:
window.set_position(Gtk.WindowPosition.CENTER)
window.set_default_size(800,600)
window.set_border_width(0)
- # Hm. Gtk.main_quit will kill gnucash without closing the file
- # properly. That's kinda bad.
- # window.connect('destroy-event', Gtk.main_quit)
- # window.connect('delete-event', Gtk.main_quit)
+ window.connect('destroy-event', console.quit_event)
+ window.connect('delete-event', console.quit_event)
window.add (console)
window.show_all()
console.grab_focus()
commit 239484854c1b55af2f72f710d845f41734eb0367
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:55:07 2019 +0200
add quit method to python console
diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index 8ea6360c8..e54c6569d 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -86,6 +86,12 @@ class Console (cons.Console):
canvas.draw()
return False
+ def quit (self):
+ """ quit """
+
+ self.write("\nHave a nice day !\n")
+ return super(Console, self).quit()
+
# Change this to "if True:" to switch on a python console at gnucash
# startup:
commit 4868e046c37a42c9ebf2bc9bed6820dbc11f33b0
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:54:44 2019 +0200
add quit event handler to python console
diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index 5b8f2791d..8ea6360c8 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -75,6 +75,10 @@ class Console (cons.Console):
""" Button press event """
return self.refresh()
+ def quit_event (self, widget, event):
+ """ Event handler for closing of console window """
+ return self.quit()
+
def refresh (self):
""" Refresh drawing """
for fig in self.figures:
commit ecab7968e27e256031daab12876c58408bba7951
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:20:39 2019 +0200
on quitting don't kill gtk main process
diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index 411dcdc05..ce0b8aec9 100644
--- a/gnucash/python/pycons/console.py
+++ b/gnucash/python/pycons/console.py
@@ -434,7 +434,7 @@ class Console (Gtk.ScrolledWindow):
def quit(self):
""" Quit console """
- Gtk.main_quit()
+ # Gtk.main_quit()
self.history_save()
try:
os.close (self.piperead)
commit e2fd241836682cec0c6fb7f1052f91f5a26ada63
Author: c-holtermann <mail at c-holtermann.net>
Date: Fri Apr 19 11:14:47 2019 +0200
stop closing shell window from closing gnucash
diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index ca96f1223..5b8f2791d 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -94,8 +94,8 @@ if False:
window.set_border_width(0)
# Hm. Gtk.main_quit will kill gnucash without closing the file
# properly. That's kinda bad.
- window.connect('destroy-event', Gtk.main_quit)
- window.connect('delete-event', Gtk.main_quit)
+ # window.connect('destroy-event', Gtk.main_quit)
+ # window.connect('delete-event', Gtk.main_quit)
window.add (console)
window.show_all()
console.grab_focus()
commit 9afc856c20a0ad835562a2f8b2abf11a35c390af
Author: thetedmunds <tedmunds at gmail.com>
Date: Mon Apr 15 13:16:32 2019 -0700
Changed gnc:computeInterestIncrement to directly calculate the amount of interest accrued in the specified compounding period. Bug 797195.
diff --git a/libgnucash/app-utils/fin.scm b/libgnucash/app-utils/fin.scm
index be56e543f..a8edf0506 100644
--- a/libgnucash/app-utils/fin.scm
+++ b/libgnucash/app-utils/fin.scm
@@ -63,12 +63,9 @@
;; formula from http://www.riskglossary.com/articles/compounding.htm
(* a (expt (+ 1 (/ r n)) (* n t))))
-(define (gnc:computeInterestIncrement amount interest periods i)
- (let ((thisVal (gnc:futureValue amount interest periods i))
- (prevVal (gnc:futureValue amount interest periods (- i 1))))
- (- thisVal prevVal)
- )
-)
+(define (gnc:computeInterestIncrement pv ann-rate compounds period)
+ (let ((rate (/ ann-rate compounds)))
+ (* rate (* pv (expt (+ 1 rate) (- period 1))))))
;;;;;
;; below: not-exposed/"private" functions, used by the "public" functions
commit 5f9020016a5f1be28b7673ddc2d5f3db8c68ee3f
Author: thetedmunds <tedmunds at gmail.com>
Date: Mon Apr 15 14:31:23 2019 -0700
Amended commit to address pull-request comments.
diff --git a/libgnucash/app-utils/fin.scm b/libgnucash/app-utils/fin.scm
index be56e543f..c3ee43ce6 100644
--- a/libgnucash/app-utils/fin.scm
+++ b/libgnucash/app-utils/fin.scm
@@ -185,3 +185,171 @@
)
)
)
+
+;; Further options to match what some (several? many?) lenders do (at
+;; least in Canada):
+;; The posted interest rate is an annual rate that has a specified
+;; compounding frequency per year (2 for mortgages in Canada).
+;; A payment frequency and amortization length are selected (e.g.
+;; monthly payments for 25 years).
+;; The posted nominal rate is converted from the specified compounding
+;; frequency to the equivalent rate at the payment frequency.
+;; The required payment is calculated.
+;; The payment is rounded up to the next dollar (or $10 dollars,
+;; or whatever...)
+;; Each payment period, interest is calculated on the outstanding
+;; balance.
+;; The interest is rounded to the nearest cent and added to the
+;; balance.
+;; The payment is subtracted from the balance.
+;; The final payment will be smaller because all the other payments
+;; were rounded up.
+;;
+;; For the purpose of creating scheduled transactions that properly
+;; debit a source account while crediting the loan account and the
+;; interest expense account, the first part (the calculation of the
+;; required payment) doesn't really matter. You have agreed
+;; with the lender what the payment terms (interest rate, payment
+;; frequency, payment amount) will be; you keep paying until the
+;; balance is zero.
+;;
+;; To create the scheduled transactions, we need to build an
+;; amortization table.
+;; If it weren't for the rounding of the interest to the nearest cent
+;; each period, we could calculate the ith row of the amortization
+;; table directly from the general annuity equation (as is done by
+;; gnc:ipmt and gnc:ppmt). But to deal with the intermediate
+;; rounding, the amortization table has to be constructed iteratively
+;; (as is done by the AMORT worksheet on the TI BA II Plus
+;; financial calculator).
+;;
+;; =================================
+;; EXAMPLE:
+;; Say you borrow $100,000 at 5%/yr, compounded semi-annually.
+;; You amortize the loan over 2 years with 24 monthly payments.
+;; This calls for payments of $4,384.8418 at the end of each month.
+;; The lender rounds this up to $4,385.
+;;
+;; If you calculate the balance at each period directly using the annuity
+;; formula (like calc-principal does), and then use the those values to calculate
+;; the principal and interest paid, the first 10 rows of the amortization table
+;; look like this (the values are rounded to the nearest cent for _display_, but
+;; not for calculating the next period):
+;;
+;; PERIOD | Open | Interest | Principal | End
+;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
+;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
+;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
+;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
+;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
+;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
+;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
+;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
+;; 9 | $67,756.61 | $279.43 | $4,105.57 | $63,651.04
+;; 10 | $63,651.04 | $262.49 | $4,122.51 | $59,528.53
+;;
+;; If you calculate each period sequentially (rounding the interest and balance
+;; at each step), you get:
+;;
+;; PERIOD | Open | Interest | Principal | End
+;; 1 |$100,000.00 | $412.39 | $3,972.61 | $96,027.39
+;; 2 | $96,027.39 | $396.01 | $3,988.99 | $92,038.40
+;; 3 | $92,038.40 | $379.56 | $4,005.44 | $88,032.96
+;; 4 | $88,032.96 | $363.04 | $4,021.96 | $84,011.00
+;; 5 | $84,011.00 | $346.45 | $4,038.55 | $79,972.45
+;; 6 | $79,972.45 | $329.80 | $4,055.20 | $75,917.25
+;; 7 | $75,917.25 | $313.08 | $4,071.92 | $71,845.33
+;; 8 | $71,845.33 | $296.28 | $4,088.72 | $67,756.61
+;; 9 | $67,756.61 | $279.42 | $4,105.58 | $63,651.03 <- Different
+;; 10 | $63,651.03 | $262.49 | $4,122.51 | $59,528.52 <- still $0.01 off
+;;
+;; =================================
+;;
+;; For the following functions the argument names are:
+;; py: payment frequency (number of payments per year)
+;; cy: compounding frequency of the nominal rate (per year)
+;; iy: nominal annual interest rate
+;; pv: the present value (opening balance)
+;; pmt: the size of the periodic payment
+;; n: the payment period we are asking about (the first payment is n=1)
+;; places: number of decimal places to round the interest amount to
+;; at each payment (999 does no rounding)
+;;
+;; Note: only ordinary annuities are supported (payments at the end of
+;; each period, not at the beginning of each period)
+;;
+;; Unlike the AMORT worksheet on the BA II Plus, these methods will
+;; handle the smaller payment (bringing the balance to zero, then
+;; zeroing future payments)
+;;
+;; The present value (pv) must be non-negative. If not, the balance will be
+;; treated as 0.
+;; The payment (pmt) can be positive (paying interest, and hopefully
+;; reducing the balance each payment), or negative (increasing the balance
+; each payment).
+;; The payment number (n) must be positive for amort_pmt, amort_ppmt, and
+;; amort_ipmt. I.e., the first payment is payment 1.
+;; The payment number (n) must be non-negative for amort_balance. (In this
+;; case, payment zero is at the _beginning_ of the first period, so
+;; amort_balance will just be the initial balance.)
+;; If the above conditions on n are violated, the functions return -1 (#f is
+;; not used, because it causes gnucash to crash).
+;;
+;; A negative interest rate works (if you can find a lender who charges
+;; negative rates), but negative compounding frequency, or negative payment
+;; frequency is a bad idea.
+
+;; Calculate the balance remaining after the nth payment
+;; (n must be greater than or equal to zero)
+(define (gnc:amort_pmt py cy iy pv pmt n places)
+ (if (< n 1) -1 ;; Returning #f here causes gnucash to crash on startup
+ (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+ (balBeforePayment
+ (amort_balanceAfterInterest prevBal py cy iy places))
+ (balAfterPayment (amort_balanceAfterPayment balBeforePayment pmt)))
+ (- balBeforePayment balAfterPayment))))
+
+;; Calculate the amount of the nth payment that is principal
+;; (n must be greater than zero)
+(define (gnc:amort_ppmt py cy iy pv pmt n places)
+ (if (< n 1) -1
+ (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+ (bal-after-int (amort_balanceAfterInterest prevBal py cy iy places))
+ (newBal (amort_balanceAfterPayment bal-after-int pmt)))
+ (- prevBal newBal))))
+
+;; Calculate the amount of the nth payment that is interest
+;; (n must be greater than zero)
+(define (gnc:amort_ipmt py cy iy pv pmt n places)
+ (if (< n 1) -1
+ (let* ((prevBal(gnc:amort_balance py cy iy pv pmt (- n 1) places)))
+ (amort_interest prevBal py cy iy places))))
+
+;; "Private" helper functions:
+
+;; Calculate the amount of interest on the current balance,
+;; rounded to the specified number of decimal places
+(define (amort_interest balance py cy iy places)
+ (roundToPlaces (* balance (gnc:periodic_rate iy py cy)) places)
+)
+
+;; Calculate the new balance after applying the interest, but before
+;; applying the payment
+(define (amort_balanceAfterInterest prevBalance py cy iy places)
+ (+ prevBalance (amort_interest prevBalance py cy iy places))
+)
+
+;; Apply the payment to the balance (after the interest has been
+;; added), without letting the balance go below zero.
+(define (amort_balanceAfterPayment balanceBeforePmt pmt)
+ (max 0 (- balanceBeforePmt pmt))
+)
+
+;; Round the value to the specified number of decimal places.
+;; 999 places means no rounding (#f is not used, because only numbers can be
+;; entered in the scheduled transaction editor)
+(define (roundToPlaces value places)
+ (if (= places 999) value
+ (/ (round (* value (expt 10 places))) (expt 10 places))
+ )
+)
commit e3e11afcb5eca4000f374b33605022cc5ecac99f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 16 20:06:02 2019 +0200
[L12N] Romanian is now maintained by Translation Project
https://lists.gnucash.org/pipermail/gnucash-devel/2019-April/043701.html
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index db518652e..fbba09b5b 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -2,9 +2,9 @@ add_subdirectory(glossary)
# Set of available languages:
# * managed at the Translation Project (TP):
-set (TP_LINGUAS az ca cs da eu fa ja nl rw sk sr sv tr uk zh_CN)
+set (TP_LINGUAS az ca cs da eu fa ja nl ro rw sk sr sv tr uk zh_CN)
# * already marked as external at TP:
-set (GC_LINGUAS ar bg de el en_GB es fi fr gu he hi hu it kn ko lt lv mr nb ne pl pt pt_BR ro ru ta te ur vi zh_TW)
+set (GC_LINGUAS ar bg de el en_GB es fi fr gu he hi hu it kn ko lt lv mr nb ne pl pt pt_BR ru ta te ur vi zh_TW)
# * New or unmarked: The release manager should announce them to TP
# and when listed there move in the respective group above.
set (NEW_LINGUAS as brx doi es_NI hr kok kok at latin ks mai mni mni at bengali)
commit 0ebb02e2433afb8bc64823dacf55624fc5011139
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 16 19:43:21 2019 +0200
[I18N] Unify placeholder warning
https://lists.gnucash.org/pipermail/gnucash-devel/2019-March/043624.html
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index d1af0d8c1..4b22bdefe 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -855,14 +855,12 @@ gnc_option_changed_gain_loss_account_widget_cb (GtkTreeSelection *selection,
}
else /* new account, but placeholder */
{
- const char *message = _("You have selected a placeholder " \
- "account, which is shown so that child accounts " \
- "are displayed, but is invalid. Please select " \
- "another account. (You can expand the tree below " \
- "the placeholder account by clicking on the arrow " \
- "to the left.)");
-
- gnc_error_dialog (gnc_ui_get_gtk_window (book_currency_data->default_gain_loss_account_widget), "%s", message);
+ const char *message = _("The account %s is a placeholder account " \
+ "and does not allow transactions. " \
+ "Please choose a different account.");
+
+ gnc_error_dialog (gnc_ui_get_gtk_window (book_currency_data->default_gain_loss_account_widget),
+ message, xaccAccountGetName (account));
if (book_currency_data->prior_gain_loss_account)
{
(gnc_tree_view_account_set_selected_account
commit 0251d044b5b4c3123752c0e85d80ee0f319bf72f
Merge: fc355958b 5a73b9afd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 15 14:25:49 2019 -0700
Merge Christoph Holtermann's 'Pr pycons2to3' into maint.
commit 5a73b9afd4010546c36c4761a098747bc7d8fd5c
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 13 18:16:12 2019 +0200
syntax change to exec
diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index d284e8b37..8458d343d 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -155,7 +155,7 @@ class Shell:
# Command output
print(repr(r))
except SyntaxError:
- exec(self.command in self.globals)
+ exec(str(self.command), self.globals)
except:
if hasattr (sys, 'last_type') and sys.last_type == SystemExit:
console.quit()
commit cc7673ccc89ebcdfa22dd223de1fd5a57c6f6764
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 13 18:15:51 2019 +0200
filter needs to be converted to list.
Method replace is missing. Needs to be fixed.
diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index b5196b015..d284e8b37 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -63,9 +63,9 @@ class Shell:
"""
s = line
- s = filter(lambda x: x in '()[]{}"\'', s)
- s = s.replace ("'''", "'")
- s = s.replace ('"""', '"')
+ s = list(filter(lambda x: x in '()[]{}"\'', s))
+ # s = s.replace ("'''", "'")
+ # s = s.replace ('"""', '"')
instring = False
brackets = {'(':')', '[':']', '{':'}', '"':'"', '\'':'\''}
stack = []
commit bf9ec70f27e3e86e5a901e2a86813369114c06de
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 13 18:16:32 2019 +0200
reflect syntax change to sys tracebacks
diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index 6797b5b39..b5196b015 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -163,10 +163,10 @@ class Shell:
console.quit()
else:
try:
- tb = sys.exc_traceback
+ tb = sys.exc_info()[2]
if tb:
tb=tb.tb_next
- traceback.print_exception(sys.exc_type, sys.exc_value, tb)
+ traceback.print_exception(sys.exc_info()[0], sys.exc_info()[1], tb)
except:
sys.stderr, console.stderr = console.stderr, sys.stderr
traceback.print_exc()
commit d93d4efd82df063a3baa868774c1c6f35da10aed
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 13 18:13:19 2019 +0200
Import necessary module gdk
diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index ea418344f..411dcdc05 100644
--- a/gnucash/python/pycons/console.py
+++ b/gnucash/python/pycons/console.py
@@ -35,6 +35,7 @@ import gi
gi.require_version('Gtk', '3.0')
from gi.repository import GObject
from gi.repository import Gtk
+from gi.repository import Gdk
from gi.repository import Pango
import io
import pycons.shell as shell
commit af3b9bf215d41216fd9f7578e678d3ddaefe344e
Author: c-holtermann <mail at c-holtermann.net>
Date: Mon Apr 15 22:00:27 2019 +0200
change shebang to python3
diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index 760c498c2..ea418344f 100644
--- a/gnucash/python/pycons/console.py
+++ b/gnucash/python/pycons/console.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
#
# Copyright (c) 2008, Nicolas Rougier
# All rights reserved.
diff --git a/gnucash/python/pycons/ishell.py b/gnucash/python/pycons/ishell.py
index 371f32c4a..30e6ea404 100644
--- a/gnucash/python/pycons/ishell.py
+++ b/gnucash/python/pycons/ishell.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
#
# Adapted from:
#
diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index 33cff5359..6797b5b39 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
#
# Copyright (c) 2008, Nicolas Rougier
# All rights reserved.
commit fc355958b8201e6cd63909654e1ddda4d59befff
Merge: b2f25408d c779bcb72
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 14 14:27:53 2019 -0700
Merge Christoph Holtermann's 'PR-python2to3-rest-api' into maint.
commit b2f25408d7464f35747ab34ea7bfe4fabb9ac1a9
Merge: 8823f7283 0c0286696
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 14 14:26:35 2019 -0700
Merge Christoff Holtermann's 'PR-python-time64-modifications' into maint
commit 8823f7283f78181533988e14f185662012e68853
Merge: f772b5054 b06801185
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 14 14:24:16 2019 -0700
Merge Christoph Holtermann's 'PR-python2to3' into maint.
commit f772b505429f7c416dd534f38906692379c30aff
Merge: 0f6465ca6 298797a9b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 14 14:23:37 2019 -0700
Merge Christoph Holterman's 'PR-python2to3-str_methods-gnc_jinja' into maint
commit 0f6465ca6ddfb882db15c54685ba218e5c59c430
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Fri Apr 12 11:46:59 2019 +0100
Bug 797175 - Gnucash will not open from UNC paths.
UNC paths were overlooked in a change I made, corrected and added some
notes to source file for reminder.
diff --git a/libgnucash/engine/gnc-uri-utils.c b/libgnucash/engine/gnc-uri-utils.c
index 56390041c..0158820e3 100644
--- a/libgnucash/engine/gnc-uri-utils.c
+++ b/libgnucash/engine/gnc-uri-utils.c
@@ -323,7 +323,22 @@ gchar *gnc_uri_create_uri (const gchar *scheme,
else
uri_scheme = g_strdup (scheme);
- if (g_str_has_prefix (abs_path, "/"))
+ /* Arrive here with...
+ *
+ * /my/path/to/file with space.txt
+ * becomes file:///my/path/to/file with space.txt
+ *
+ * c:\my\path\to\file with space.txt
+ * becomes file:///c:\my\path\to\file with space.txt
+ *
+ * \\myserver\share\path\to\file with space.txt
+ * becomes file://\\myserver\share\path\to\file with space.txt
+ *
+ * probably they should all be forward slashs and spaces escaped
+ * also with UNC it could be file://myserver/share/path/to/file with space.txt
+ */
+
+ if (g_str_has_prefix (abs_path, "/") || g_str_has_prefix (abs_path, "\\"))
uri = g_strdup_printf ( "%s://%s", uri_scheme, abs_path );
else // for windows add an extra "/"
uri = g_strdup_printf ( "%s:///%s", uri_scheme, abs_path );
commit c091197f572a701cb2ecc81c40fe47bbd41f59aa
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Apr 11 17:25:40 2019 -0700
Provide static strings for gnc_userdata_home and gnc_userconfig_home.
On Windows boost::filesystem::path's string() produces a string
that goes out of scope with the function in which it's called, so
returning its c_str() ptr yields freed memory, usually full of garbage.
This has an interesting side effect in gnc-file.c's check_file_path():
Since the memory is freed, g_path_get_dirname() reuses it after an
iteration or two, writing its result into the same address. The
following strcmp naturally returns 0 because it's comparing two
instances of the same ptr, so check_file_path falsely reports that
the proposed save path is in GNC_USERDATA_DIR.
diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index 29eedfcb9..ac46d4227 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -334,6 +334,12 @@ gnc_path_find_localized_html_file (const gchar *file_name)
static auto gnc_userdata_home = bfs::path();
static auto gnc_userconfig_home = bfs::path();
static auto build_dir = bfs::path();
+/*Provide static-stored strings for gnc_userdata_home and
+ * gnc_userconfig_home to ensure that the cstrings don't go out of
+ * scope when gnc_userdata_dir and gnc_userconfig_dir return them.
+ */
+static std::string gnc_userdata_home_str;
+static std::string gnc_userconfig_home_str;
static bool dir_is_descendant (const bfs::path& path, const bfs::path& base)
{
@@ -458,7 +464,7 @@ copy_recursive(const bfs::path& src, const bfs::path& dest)
{
g_warning("An error occured while trying to migrate the user configation from\n%s to\n%s"
"(Error: %s)",
- src.string().c_str(), gnc_userdata_home.string().c_str(),
+ src.string().c_str(), gnc_userdata_home_str.c_str(),
ex.what());
return false;
}
@@ -808,6 +814,7 @@ gnc_file_path_init_config_home (void)
"(Error: %s)", ex.what());
}
}
+ gnc_userconfig_home_str = gnc_userconfig_home.string();
}
// Initialize the user's config directory for gnucash
@@ -891,7 +898,7 @@ gnc_file_path_init_data_home (void)
"(Error: %s)", ex.what());
}
}
-
+ gnc_userdata_home_str = gnc_userdata_home.string();
return gnc_userdata_home_exists;
}
@@ -907,6 +914,7 @@ char *
gnc_filepath_init (void)
{
gnc_userconfig_home = get_userconfig_home() / path_package;
+ gnc_userconfig_home_str = gnc_userconfig_home.string();
gnc_file_path_init_config_home ();
auto gnc_userdata_home_exists = gnc_file_path_init_data_home ();
@@ -976,8 +984,7 @@ gnc_userdata_dir (void)
{
if (gnc_userdata_home.empty())
gnc_filepath_init();
-
- return gnc_userdata_home.string().c_str();
+ return g_strdup(gnc_userdata_home_str.c_str());
}
/** @fn const gchar * gnc_userconfig_dir ()
@@ -999,7 +1006,7 @@ gnc_userconfig_dir (void)
if (gnc_userdata_home.empty())
gnc_filepath_init();
- return gnc_userconfig_home.string().c_str();
+ return gnc_userconfig_home_str.c_str();
}
static const bfs::path&
commit 6e7a4ccc77972e94003b1040bde11a23c4429d83
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Apr 11 18:05:43 2019 +0800
Bug 797188 - Default invoice prints credit note as invoice
Error in guile code. Using (case var (datum ...)) means that datum are
symbols, so if datum is (GNC-INVOICE-VEND-INVOICE) it would try
(eqv? type 'GNC-INVOICE-VEND-INVOICE) which would never be true. We
need (eqv? type GNC-INVOICE-VEND-INVOICE). Using (cond) is more
appropriate here.
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index a020c600d..0a6db327f 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -787,15 +787,17 @@ for styling the invoice. Please see the exported report for the CSS class names.
(orders (if references? (delete-duplicates (map gncEntryGetOrder (gncInvoiceGetEntries invoice))) '()))
(cust-doc? (memv type (list GNC-INVOICE-CUST-INVOICE GNC-INVOICE-CUST-CREDIT-NOTE)))
(credit-note? (memv type (list GNC-INVOICE-CUST-CREDIT-NOTE GNC-INVOICE-VEND-CREDIT-NOTE GNC-INVOICE-EMPL-CREDIT-NOTE)))
- (default-title (case type
- ((GNC-INVOICE-VEND-INVOICE)
- (_ "Bill"))
- ((GNC-INVOICE-EMPL-INVOICE)
- (_ "Expense Voucher"))
- ((GNC-INVOICE-CUST-CREDIT-NOTE GNC-INVOICE-VEND-CREDIT-NOTE GNC-INVOICE-EMPL-CREDIT-NOTE)
- (_ "Credit Note"))
- (else
- (_ "Invoice"))))
+ (default-title (cond
+ ((eqv? type GNC-INVOICE-VEND-INVOICE)
+ (_ "Bill"))
+ ((eqv? type GNC-INVOICE-EMPL-INVOICE)
+ (_ "Expense Voucher"))
+ ((memv type (list GNC-INVOICE-CUST-CREDIT-NOTE
+ GNC-INVOICE-VEND-CREDIT-NOTE
+ GNC-INVOICE-EMPL-CREDIT-NOTE))
+ (_ "Credit Note"))
+ (else
+ (_ "Invoice"))))
(title (if (string-null? custom-title) default-title custom-title))
;; Translators: This is the format of the invoice title.
;; The first ~a is "Invoice", "Credit Note"... and the second the number.
commit 19bbeaa67ae6953603570a435fdcdf9ae3c6c44f
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 9 17:36:09 2019 +0100
Bug 797185 - Correct the sorting for the Transaction Association Dialog
Change the sort function to use the correct model column.
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
index f835e8664..d85998953 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-trans-assoc.c
@@ -100,8 +100,8 @@ sort_iter_compare_func (GtkTreeModel *model,
gint ret = 0;
gchar *uri1, *uri2;
- gtk_tree_model_get (model, a, URI, &uri1, -1);
- gtk_tree_model_get (model, b, URI, &uri2, -1);
+ gtk_tree_model_get (model, a, URI_U, &uri1, -1);
+ gtk_tree_model_get (model, b, URI_U, &uri2, -1);
ret = g_utf8_collate (uri1, uri2);
commit d44e0ee750dd8677ef6979324ef2edc62015f426
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 9 17:32:53 2019 +0100
When displaying paths on MS Windows, make them look normal
Change the forward slashes to back slashes as that is normal for paths
in MS Windows.
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
index fbb9a00ae..f835e8664 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-trans-assoc.c
@@ -170,7 +170,12 @@ convert_uri_to_unescaped (AssocDialog *assoc_dialog, const gchar *uri, gchar *sc
file_path = convert_uri_to_filename (assoc_dialog, uri, scheme);
if (file_path)
+ {
uri_u = g_uri_unescape_string (file_path, NULL);
+#ifdef G_OS_WIN32 // make path look like a traditional windows path
+ uri_u = g_strdelimit (uri_u, "/", '\\');
+#endif
+ }
else
uri_u = g_uri_unescape_string (uri, NULL);
@@ -489,7 +494,9 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog)
gchar *path_head_ue_str = g_uri_unescape_string (assoc_dialog->path_head, NULL);
gchar *path_head_str = gnc_uri_get_path (path_head_ue_str);
gchar *path_head_label;
-
+#ifdef G_OS_WIN32 // make path look like a traditional windows path
+ path_head_str = g_strdelimit (path_head_str, "/", '\\');
+#endif
// test for current folder being present
if (g_file_test (path_head_str, G_FILE_TEST_IS_DIR))
path_head_label = g_strconcat (_("Path head for files is, "), path_head_str, NULL);
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 84071323c..5f7f0767c 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -1083,7 +1083,13 @@ gsr_default_associate_handler_file (GNCSplitReg *gsr, Transaction *trans, gboole
GtkWidget *label;
gchar *file_uri_u = g_uri_unescape_string (file_uri, NULL);
gchar *filename = gnc_uri_get_path (file_uri_u);
- gchar *uri_label = g_strconcat (_("Existing Association is '"), filename, "'", NULL);
+ gchar *uri_label;
+
+#ifdef G_OS_WIN32 // make path look like a traditional windows path
+ filename = g_strdelimit (filename, "/", '\\');
+#endif
+ uri_label = g_strconcat (_("Existing Association is '"), filename, "'", NULL);
+
PINFO("Path head: '%s', URI: '%s', Filename: '%s'", path_head, uri, filename);
label = gtk_label_new (uri_label);
gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), label);
diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
index 287891f7d..f05dcd118 100644
--- a/gnucash/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -574,6 +574,11 @@ gnc_split_register_get_associate_tooltip (VirtualLocation virt_loc,
if (gnc_uri_is_file_scheme (scheme)) // absolute path
file_path = gnc_uri_get_path (uri);
+#ifdef G_OS_WIN32 // make path look like a traditional windows path
+ if (file_path)
+ file_path = g_strdelimit (file_path, "/", '\\');
+#endif
+
g_free (scheme);
if (!file_path)
@@ -583,6 +588,7 @@ gnc_split_register_get_associate_tooltip (VirtualLocation virt_loc,
gchar *file_uri_u = g_uri_unescape_string (file_path, NULL);
const gchar *filename = gnc_uri_get_path (file_uri_u);
g_free (file_uri_u);
+ g_free (file_path);
return g_strdup (filename);
}
}
commit e745f4cfeefefab92302678a0f8344e7d344ec3a
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 9 17:29:46 2019 +0100
Fix some transient parent warnings for gnc_launch_assoc
Add a Gtkwindow parent parameter to above function so it can be passed
to the error warning dialog.
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c
index 66900501e..b9066ab35 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.c
+++ b/gnucash/gnome-utils/gnc-gnome-utils.c
@@ -458,7 +458,7 @@ gnc_gnome_help (const char *file_name, const char *anchor)
* toolkit.
*/
void
-gnc_launch_assoc (const char *uri)
+gnc_launch_assoc (GtkWindow *parent, const char *uri)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *uri_str = [NSString stringWithUTF8String: uri];
@@ -473,14 +473,14 @@ gnc_launch_assoc (const char *uri)
return;
}
- gnc_error_dialog(NULL, "%s", message);
+ gnc_error_dialog(parent, "%s", message);
[pool release];
return;
}
#elif defined G_OS_WIN32 /* G_OS_WIN32 */
void
-gnc_launch_assoc (const char *uri)
+gnc_launch_assoc (GtkWindow *parent, const char *uri)
{
wchar_t *winuri = NULL;
gchar *filename = NULL;
@@ -506,7 +506,7 @@ gnc_launch_assoc (const char *uri)
{
const gchar *message =
_("GnuCash could not find the associated file");
- gnc_error_dialog(NULL, "%s:\n%s", message, filename);
+ gnc_error_dialog(parent, "%s:\n%s", message, filename);
}
g_free (wincmd);
g_free (winuri);
@@ -516,7 +516,7 @@ gnc_launch_assoc (const char *uri)
#else
void
-gnc_launch_assoc (const char *uri)
+gnc_launch_assoc (GtkWindow *parent, const char *uri)
{
GError *error = NULL;
gboolean success;
@@ -550,7 +550,7 @@ gnc_launch_assoc (const char *uri)
else
error_uri = g_strdup (uri);
- gnc_error_dialog(NULL, "%s\n%s", message, error_uri);
+ gnc_error_dialog(parent, "%s\n%s", message, error_uri);
g_free (error_uri);
}
PERR ("%s", error->message);
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.h b/gnucash/gnome-utils/gnc-gnome-utils.h
index d0ffe2e88..75fcf1226 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.h
+++ b/gnucash/gnome-utils/gnc-gnome-utils.h
@@ -58,13 +58,13 @@ void gnc_gnome_help (const char *file_name,
const char *anchor);
/** Launch the default gnome browser and open the provided URI.
*/
-void gnc_launch_assoc (const char *uri);
+void gnc_launch_assoc (GtkWindow *parent, const char *uri);
/** Set the help callback to 'gnc_book_options_help_cb' to open a help browser
* and point it to the Book Options link in the Help file.
*/
void gnc_options_dialog_set_book_options_help_cb (GNCOptionWin *win);
-
+
/** Set the initial values of new book options to values specified in user
* preferences.
*/
diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
index 6b1e69f05..bc9a38e36 100644
--- a/gnucash/gnome-utils/gnc-main-window.c
+++ b/gnucash/gnome-utils/gnc-main-window.c
@@ -4449,7 +4449,7 @@ get_file_strsplit (const gchar *partial)
static gboolean
url_signal_cb (GtkAboutDialog *dialog, gchar *uri, gpointer data)
{
- gnc_launch_assoc (uri);
+ gnc_launch_assoc (GTK_WINDOW(dialog), uri);
return TRUE;
}
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
index 5db3fc239..fbb9a00ae 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-trans-assoc.c
@@ -303,7 +303,7 @@ row_selected_cb (GtkTreeView *view, GtkTreePath *path,
if (uri_out_scheme) // make sure we have a scheme entry
{
- gnc_launch_assoc (uri_out);
+ gnc_launch_assoc (gnc_ui_get_gtk_window(GTK_WIDGET (view)), uri_out);
g_free (uri_out_scheme);
}
else
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 6a30ca880..84071323c 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -1368,7 +1368,7 @@ gsr_default_execassociated_handler (GNCSplitReg *gsr, gpointer data)
if (uri_scheme) // make sure we have a scheme entry
{
- gnc_launch_assoc (run_uri);
+ gnc_launch_assoc (GTK_WINDOW (gsr->window), run_uri);
g_free (uri_scheme);
}
else
commit 57eac14d82b6cb7acfa043546dedb63c3dc21f74
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Apr 9 17:23:20 2019 +0100
Bug 797183 - association head path with spaces displayed wrong
The Transaction Association path head was being displayed with '%20' as
the space as it was not being unescaped. Fixed by unescaping and also
noticed that the error message string were wrong also.
diff --git a/gnucash/gnome-utils/gnc-gnome-utils.c b/gnucash/gnome-utils/gnc-gnome-utils.c
index 008c9f62b..66900501e 100644
--- a/gnucash/gnome-utils/gnc-gnome-utils.c
+++ b/gnucash/gnome-utils/gnc-gnome-utils.c
@@ -483,14 +483,15 @@ void
gnc_launch_assoc (const char *uri)
{
wchar_t *winuri = NULL;
+ gchar *filename = NULL;
/* ShellExecuteW open doesn't decode http escapes if it's passed a
* file URI so we have to do it. */
if (gnc_uri_is_file_uri (uri))
{
gchar *uri_ue = g_uri_unescape_string (uri, NULL);
- gchar *filename = gnc_uri_get_path (uri_ue);
+ filename = gnc_uri_get_path (uri_ue);
+ filename = g_strdelimit (filename, "/", '\\'); // needed for unc paths
winuri = (wchar_t *)g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
- g_free (filename);
g_free (uri_ue);
}
else
@@ -505,10 +506,11 @@ gnc_launch_assoc (const char *uri)
{
const gchar *message =
_("GnuCash could not find the associated file");
- gnc_error_dialog(NULL, "%s: %s", message, uri);
+ gnc_error_dialog(NULL, "%s:\n%s", message, filename);
}
g_free (wincmd);
g_free (winuri);
+ g_free (filename);
}
}
@@ -533,9 +535,23 @@ gnc_launch_assoc (const char *uri)
g_assert(error != NULL);
{
+ gchar *error_uri = NULL;
const gchar *message =
_("GnuCash could not open the associated URI:");
- gnc_error_dialog(NULL, "%s\n%s", message, uri);
+
+ if (gnc_uri_is_file_uri (uri))
+ {
+ gchar *uri_ue = g_uri_unescape_string (uri, NULL);
+ gchar *filename = gnc_uri_get_path (uri_ue);
+ error_uri = g_strdup (filename);
+ g_free (uri_ue);
+ g_free (filename);
+ }
+ else
+ error_uri = g_strdup (uri);
+
+ gnc_error_dialog(NULL, "%s\n%s", message, error_uri);
+ g_free (error_uri);
}
PERR ("%s", error->message);
g_error_free(error);
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
index 8be470317..5db3fc239 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-trans-assoc.c
@@ -486,7 +486,8 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog)
if (assoc_dialog->path_head && g_strcmp0 (assoc_dialog->path_head, "") != 0) // not default entry
{
- gchar *path_head_str = gnc_uri_get_path (assoc_dialog->path_head);
+ gchar *path_head_ue_str = g_uri_unescape_string (assoc_dialog->path_head, NULL);
+ gchar *path_head_str = gnc_uri_get_path (path_head_ue_str);
gchar *path_head_label;
// test for current folder being present
@@ -499,6 +500,7 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog)
gtk_label_set_text (GTK_LABEL(path_head), path_head_label);
g_free (path_head_label);
g_free (path_head_str);
+ g_free (path_head_ue_str);
}
else
{
commit 0cce764e78a3ec32ced22fd82305a9153633f561
Merge: 58e79e5aa 1c9ad3af3
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Apr 9 21:19:11 2019 +0800
Merge branch 'maint' of https://github.com/Gnucash/gnucash into maint
commit 58e79e5aa75c35e12cd8efe903c77fd7997937f8
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Apr 9 19:56:47 2019 +0800
[test-commodity-utils] upgrade to 100% coverage of pricing funcs
and add optional coverage analysis
diff --git a/gnucash/report/report-system/test/test-commodity-utils.scm b/gnucash/report/report-system/test/test-commodity-utils.scm
index 6c61bab2a..3a17d62ab 100644
--- a/gnucash/report/report-system/test/test-commodity-utils.scm
+++ b/gnucash/report/report-system/test/test-commodity-utils.scm
@@ -30,10 +30,11 @@
(use-modules (sw_engine))
(use-modules (sw_app_utils))
(use-modules (gnucash report report-system))
+(use-modules (system vm coverage))
(setlocale LC_ALL "C")
-(define (run-test)
+(define (run-test-proper)
(test-runner-factory gnc:test-runner)
(test-begin "commodity-utils")
;; Tests go here
@@ -46,8 +47,26 @@
(test-exchange-by-pricedb-nearest)
(test-get-commodity-totalavg-prices)
(test-get-commodity-inst-prices)
+ (test-weighted-average)
(test-end "commodity-utils"))
+(define (coverage-test)
+ (let* ((currfile (dirname (current-filename)))
+ (path (string-take currfile (string-rindex currfile #\/))))
+ (add-to-load-path path))
+ (call-with-values
+ (lambda()
+ (with-code-coverage run-test-proper))
+ (lambda (data result)
+ (let ((port (open-output-file "/tmp/lcov.info")))
+ (coverage-data->lcov data port)
+ (close port)))))
+
+(define (run-test)
+ (if #f ;switch to #t to run coverage
+ (coverage-test)
+ (run-test-proper)))
+
(define test-accounts
(list "Root" (list (cons 'type ACCT-TYPE-ROOT))
(list "Assets"(list (cons 'type ACCT-TYPE-ASSET))
@@ -639,3 +658,94 @@
report-list))))
(test-end "Daimler-DEM"))
(teardown)))
+
+(define (test-weighted-average)
+ (test-group-with-cleanup "test-weighted-average"
+ (let* ((account-alist (setup #f))
+ (book (gnc-get-current-book))
+ (comm-table (gnc-commodity-table-get-table book))
+ (USD (gnc-commodity-table-lookup comm-table "CURRENCY" "USD"))
+ (GBP (gnc-commodity-table-lookup comm-table "CURRENCY" "GBP"))
+ (EUR (gnc-commodity-table-lookup comm-table "CURRENCY" "EUR"))
+ (DEM (gnc-commodity-table-lookup comm-table "CURRENCY" "DEM"))
+ (MSFT (gnc-commodity-table-lookup comm-table "NASDAQ" "MSFT"))
+ (IBM (gnc-commodity-table-lookup comm-table "NYSE" "IBM"))
+ (AAPL (gnc-commodity-table-lookup comm-table "NASDAQ" "AAPL"))
+ (RDSA (gnc-commodity-table-lookup comm-table "LSE" "RDSA"))
+ (DMLR (gnc-commodity-table-lookup comm-table "FSE" "DMLR")))
+
+ (let ((exchange-fn (gnc:case-exchange-time-fn
+ 'weighted-average USD
+ (list EUR USD GBP DEM AAPL)
+ (gnc-dmy2time64-neutral 20 02 2016)
+ #f #f)))
+ (test-equal "gnc:case-exchange-time-fn weighted-average 20/02/2012"
+ 307/5
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2012))))
+
+ (test-equal "gnc:case-exchange-time-fn weighted-average 20/02/2014"
+ 9366/125
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2014)))))
+
+ (let ((exchange-fn (gnc:case-exchange-time-fn
+ 'average-cost USD
+ (list EUR USD GBP DEM AAPL)
+ (gnc-dmy2time64-neutral 20 02 2016)
+ #f #f)))
+ (test-equal "gnc:case-exchange-time-fn average-cost 20/02/2012"
+ 8073/100
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2012)))))
+
+ (let ((exchange-fn (gnc:case-exchange-time-fn
+ 'pricedb-latest USD
+ (list EUR USD GBP DEM AAPL)
+ (gnc-dmy2time64-neutral 20 02 2016)
+ #f #f)))
+ (test-equal "gnc:case-exchange-time-fn pricedb-latest 20/02/2012"
+ 5791/50
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2012)))))
+
+ (let ((exchange-fn (gnc:case-exchange-time-fn
+ 'pricedb-nearest USD
+ (list EUR USD GBP DEM AAPL)
+ (gnc-dmy2time64-neutral 20 02 2016)
+ #f #f)))
+ (test-equal "gnc:case-exchange-time-fn pricedb-nearest 20/02/2012"
+ 307/5
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2012)))))
+
+ (let ((exchange-fn (gnc:case-exchange-time-fn
+ 'actual-transactions USD
+ (list EUR USD GBP DEM AAPL)
+ (gnc-dmy2time64-neutral 20 02 2016)
+ #f #f)))
+ (test-equal "gnc:case-exchange-time-fn actual-transactions 20/02/2012"
+ 307/5
+ (gnc:gnc-monetary-amount
+ (exchange-fn
+ (gnc:make-gnc-monetary AAPL 1)
+ USD
+ (gnc-dmy2time64-neutral 20 02 2012)))))
+
+ (teardown))))
+
commit e4d5e2c94d4029042a1a8bbb160416a12c3dded5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Apr 9 20:59:31 2019 +0800
[commodity-utils] fix issue-deprecation-warning typo
diff --git a/gnucash/report/report-system/commodity-utilities.scm b/gnucash/report/report-system/commodity-utilities.scm
index de8026f9e..972672717 100644
--- a/gnucash/report/report-system/commodity-utilities.scm
+++ b/gnucash/report/report-system/commodity-utilities.scm
@@ -319,7 +319,7 @@ construct with gnc:make-gnc-monetary and gnc:monetary->string instead.")
(define (gnc:get-commoditylist-inst-prices
commodity-list report-currency end-date
start-percent delta-percent)
- (issue-depcrecation-warning
+ (issue-deprecation-warning
"gnc:get-commoditylist-inst-prices is deprecated.")
(let ((currency-accounts
(gnc-account-get-descendants-sorted (gnc-get-current-root-account)))
commit eab53d44b3bc8cf1828c45a3134d85c0180b0e76
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Mon Apr 8 22:56:25 2019 +0800
[report] rewrite gnc:report-template-has-unique-name?
diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
index 30874460c..5d6f1e874 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-system/report.scm
@@ -489,16 +489,12 @@ not found.")))
;; to test if the new name is unique among the existting custom reports.
;; If not the calling function can prevent the name from being updated.
(define (gnc:report-template-has-unique-name? templ-guid new-name)
- (let* ((unique? #t))
- (if new-name
- (hash-for-each
- (lambda (id rec)
- (if (and (not (equal? templ-guid id))
- (gnc:report-template-is-custom/template-guid? id)
- (equal? new-name (gnc:report-template-name rec)))
- (set! unique? #f)))
- *gnc:_report-templates_*))
- unique?))
+ (or (not new-name)
+ (not (any
+ (lambda (tmpl)
+ (and (not (equal? (car tmpl) templ-guid))
+ (equal? (gnc:report-template-name (cdr tmpl)) new-name)))
+ (gnc:custom-report-templates-list)))))
;; Generate a unique custom template name using the given string as a base
;; If this string already exists as a custom template name, a
diff --git a/gnucash/report/report-system/test/test-report-system.scm b/gnucash/report/report-system/test/test-report-system.scm
index 22ba89b4c..a683e375f 100644
--- a/gnucash/report/report-system/test/test-report-system.scm
+++ b/gnucash/report/report-system/test/test-report-system.scm
@@ -196,6 +196,19 @@
(test-equal "(gnc:is-custom-report-type report) #f"
#f
(gnc:is-custom-report-type report))
+ (test-assert "gnc:report-template-has-unique-name? #t"
+ (gnc:report-template-has-unique-name?
+ "54c2fc051af64a08ba2334c2e9179e24"
+ "Test Report Templatx"))
+ (test-assert "gnc:report-template-has-unique-name? #f"
+ (not
+ (gnc:report-template-has-unique-name?
+ "54c2fc051af64a08ba2334c2e9179e24"
+ "Test Report Template")))
+ (test-assert "gnc:report-template-has-unique-name? #t"
+ (gnc:report-template-has-unique-name?
+ "54c2fc051af64a08ba2334c2e9179e24"
+ #f))
(test-assert "gnc:report-serialize = string"
(string?
(gnc:report-serialize report)))))
commit 1c9ad3af35f00285d6504da9c88d0841d1109322
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Apr 8 19:23:40 2019 +0200
Minor update of de.po
5113 übersetzte Meldungen, 42 ungenaue Übersetzungen, 105 unübersetzte
Meldungen.
diff --git a/po/de.po b/po/de.po
index 79086e4b1..06d7a8d12 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 3.4\n"
+"Project-Id-Version: GnuCash 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2019-04-08 17:37+0200\n"
@@ -5525,9 +5525,8 @@ msgid "_Remove"
msgstr "_Entfernen"
#: gnucash/gnome/gnc-split-reg.c:1086
-#, fuzzy
msgid "Existing Association is '"
-msgstr "Bestehende Zuordnung ist "
+msgstr "Bestehende Zuordnung ist '"
#: gnucash/gnome/gnc-split-reg.c:1170
msgid "Associate Location with Transaction"
@@ -16035,9 +16034,8 @@ msgid "<b>Layout</b>"
msgstr "<b>Layout</b>"
#: gnucash/gtkbuilder/dialog-preferences.glade:2215
-#, fuzzy
msgid "_Future transactions after blank transaction"
-msgstr "Mit »_Eingabe« gehen Sie zur leeren Buchung"
+msgstr "_Zukünftige Transaktinen nach leerer Buchung"
#: gnucash/gtkbuilder/dialog-preferences.glade:2221
msgid ""
@@ -16072,13 +16070,12 @@ msgid "_Use GnuCash built-in color theme"
msgstr "Benutzt die GnuCash-eigenen _Farben"
#: gnucash/gtkbuilder/dialog-preferences.glade:2278
-#, fuzzy
msgid ""
"GnuCash uses a yellow/green theme by default for register windows. Uncheck "
"this if you want to use the system color theme instead."
msgstr ""
"Gnucash verwendet in der Kontenansicht normalerweise ein gelb/grünes "
-"Farbthema. Wenn aktiviert, wird stattdessen das systemeigene Thema verwendet."
+"Farbthema. Wenn deaktiviert, wird stattdessen das systemeigene Thema verwendet."
#: gnucash/gtkbuilder/dialog-preferences.glade:2294
msgid "<b>Graphics</b>"
@@ -18708,7 +18705,7 @@ msgid "Online action \"Get Balance\" not available for this account."
msgstr "Die Online-Aktion »Saldenabruf« ist für dieses Konto nicht verfügbar."
#: gnucash/import-export/aqb/gnc-ab-getbalance.c:146
-#, fuzzy, c-format
+#, c-format
msgid ""
"Error on executing job.\n"
"\n"
@@ -18716,7 +18713,7 @@ msgid ""
msgstr ""
"Fehler beim Ausführen des Auftrags.\n"
"\n"
-"Status: %s - %s"
+"Status: %s"
#: gnucash/import-export/aqb/gnc-ab-getbalance.c:150
#: gnucash/import-export/aqb/gnc-ab-gettrans.c:234
@@ -18735,7 +18732,7 @@ msgid "Online action \"Get Transactions\" not available for this account."
msgstr "Die Online-Aktion »Umsatzabruf« ist für dieses Konto nicht verfügbar."
#: gnucash/import-export/aqb/gnc-ab-gettrans.c:229
-#, fuzzy, c-format
+#, c-format
msgid ""
"Error on executing job.\n"
"\n"
@@ -18743,7 +18740,7 @@ msgid ""
msgstr ""
"Fehler beim Ausführen des Auftrags.\n"
"\n"
-"Status: %s - %s"
+"Status: %s (%d)"
#: gnucash/import-export/aqb/gnc-ab-gettrans.c:253
msgid ""
@@ -18937,14 +18934,14 @@ msgid "Import module for DTAUS import not found."
msgstr "Importer-Modul für DTAUS nicht gefunden."
#: gnucash/import-export/aqb/gnc-file-aqb-import.c:289
-#, fuzzy, c-format
+#, c-format
msgid "Job %d status %d - %s\n"
-msgstr "Auftrag %d Status %d - %s: %s \n"
+msgstr "Auftrag %d Status %d - %s\n"
#: gnucash/import-export/aqb/gnc-file-aqb-import.c:291
-#, fuzzy, c-format
+#, c-format
msgid "Job %d status %d - %s: %s\n"
-msgstr "Auftrag %d Status %d - %s: %s \n"
+msgstr "Auftrag %d Status %d - %s: %s\n"
#. indicate that additional failures exist
#: gnucash/import-export/aqb/gnc-file-aqb-import.c:311
@@ -19050,7 +19047,6 @@ msgid ""
msgstr "Neue SEPA-Ãœberweisung mit HBCI/Onlinebanking online absenden"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:118
-#, fuzzy
msgid "_Internal Transaction..."
msgstr "_Interne Umbuchung..."
@@ -19060,7 +19056,6 @@ msgstr ""
"Neue bankinterne Einzelumbuchung mit HBCI/Onlinebanking online absenden"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:123
-#, fuzzy
msgid "Issue SEPA Direct _Debit..."
msgstr "SEPA Einzel_lastschrift..."
@@ -19079,7 +19074,7 @@ msgstr "_MT940 importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:134
msgid ""
"Import an end-of-day account statement in SWIFT MT940 format into GnuCash."
-msgstr ""
+msgstr "Importiert einen zum Tagesabschluß erstellten Kontoauszug im SWIFT MT940-Format in GnuCash."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:138
msgid "Import MT94_2"
@@ -19087,7 +19082,7 @@ msgstr "MT94_2 importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:139
msgid "Import an interim account statement in SWIFT MT942 format into GnuCash."
-msgstr ""
+msgstr "Importiert einen vorläufigen Kontoauszug im SWIFT MT942-Format in GnuCash."
#. Translators: DTAUS is a traditional german exchange format.
#. https://de.wikipedia.org/wiki/Datentr%C3%A4geraustauschverfahren
@@ -19096,16 +19091,14 @@ msgid "Import _DTAUS"
msgstr "_DTAUS importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:147
-#, fuzzy
msgid "Import a traditional german DTAUS file into GnuCash."
-msgstr "Buchungen aus einer DTAUS Datei importieren"
+msgstr "Buchungen aus einer traditionellen deuscen DTAUS Datei importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:159
msgid "Import DTAUS and _send..."
msgstr "DTAUS importieren und _senden..."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:160
-#, fuzzy
msgid ""
"Import a DTAUS file into GnuCash and transmit its orders by Online Banking."
msgstr ""
@@ -19311,13 +19304,12 @@ msgstr ""
"verarbeiten. Sie müssen diesen Ausdruck an ihr Dateiformat anpassen.\n"
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
-#, fuzzy
msgid "Import Bills & _Invoices..."
msgstr "_Rechnungen importieren..."
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
msgid "Import bills and invoices from a CSV text file"
-msgstr "Rechnungen oder Lieferantenrechnungen aus CSV-Datei importieren"
+msgstr "Importiert Kunden- oder Lieferantenrechnungen aus CSV-Datei."
#. Translators: %s is the file name string.
#: gnucash/import-export/csv-exp/assistant-csv-export.c:81
@@ -19352,7 +19344,7 @@ msgstr ""
#. Translators: %s is the file name string.
#: gnucash/import-export/csv-exp/assistant-csv-export.c:92
-#, fuzzy, c-format
+#, c-format
msgid ""
"When you click 'Apply', the transactions will be exported to the file '%s'.\n"
"\n"
@@ -19360,7 +19352,7 @@ msgid ""
"Abort Export.\n"
msgstr ""
"Wenn Sie »Anwenden« klicken, werden die Buchungen in die Datei »%s« "
-"exportiert. Es sind %u Konten zum Export ausgewählt.\n"
+"exportiert.\n"
"\n"
"Sie können auch zurückgehen und Ihre Auswahl überprüfen, indem Sie »Zurück« "
"klicken. Mit »Abbrechen« können Sie den Export abbrechen.\n"
@@ -19545,7 +19537,7 @@ msgid "Export the Transactions to a CSV file"
msgstr "Buchungen in eine CSV-Textdatei exportieren"
#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:64
-#, fuzzy
+#
msgid "Export A_ctive Register to CSV..."
msgstr "_Aktives Kontobuch nach CSV exportieren..."
@@ -19597,7 +19589,7 @@ msgstr ""
"nicht mehr angezeigt.\n"
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:528
-#, fuzzy, c-format
+#, c-format
msgid ""
"Import completed but with errors!\n"
"\n"
@@ -19707,7 +19699,7 @@ msgstr[0] ""
msgstr[1] ""
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1833
-#, fuzzy, c-format
+#, c-format
msgid ""
"The prices were imported from file '%s'.\n"
"\n"
@@ -19715,7 +19707,12 @@ msgid ""
"- %s\n"
"- %s\n"
"- %s"
-msgstr "Die Buchungen wurden aus der Datei »%s« importiert."
+msgstr "Die Kurse wurden aus der Datei »%s« importiert.\n"
+"\n"
+"Zusammenfassung des Imports:\n"
+"- %s\n"
+"- %s\n"
+"- %s"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1877
#, c-format
@@ -21412,7 +21409,7 @@ msgstr ""
"Buchung ändern, auch wenn diese einen abgeglichenem Buchungsteil enthält?"
#: gnucash/register/ledger-core/split-register-model.c:2177
-#, fuzzy, c-format
+#, c-format
msgid ""
"The transaction you are about to change is protected because it contains "
"reconciled splits in the following accounts:\n"
@@ -21422,18 +21419,22 @@ msgid ""
"unreconciled. This might make future reconciliation difficult! Continue with "
"this change?"
msgstr ""
-"Sie wollen einen abgeglichenen Buchungsteil verändern. Dies kann das nächste "
-"Abgleichen erschweren. Wollen Sie trotzdem fortsetzen?"
+"Die Buchung, welche Sie ändern wollen, ist geschützt, da sie abgeglichene "
+"Buchungsteile in den folgenden Konten enthält:\n"
+"%s\n"
+"\n"
+"Wenn sie fortfahren, werden diese wieder auf »Nicht abgeglichen« gesetzt. "
+"Dies kann das nächste Abgleichen erschweren. Wollen Sie trotzdem fortfahren?"
#: gnucash/register/ledger-core/split-register-model.c:2189
-#, fuzzy
msgid ""
"You are about to change a protected field of a reconciled split. If you "
"continue editing this split it will be unreconciled. This might make future "
"reconciliation difficult! Continue with this change?"
msgstr ""
-"Sie wollen einen abgeglichenen Buchungsteil verändern. Dies kann das nächste "
-"Abgleichen erschweren. Wollen Sie trotzdem fortsetzen?"
+"Sie wollen ein geschütztes Feld eines abgeglichenen Buchungsteils verändern. "
+"Wenn sie fortfahren, wird dieser wieder auf »Nicht abgeglichen« gesetzt. "
+"Wollen Sie trotzdem fortfahren?"
#: gnucash/register/ledger-core/split-register-model.c:2214
msgid "Chan_ge Transaction"
@@ -22200,7 +22201,7 @@ msgstr "Sortieren nach dem Betrag des Gewinns."
#: gnucash/report/business-reports/customer-summary.scm:151
#: gnucash/report/business-reports/customer-summary.scm:464
msgid "Markup"
-msgstr "Bruttogewinn"
+msgstr "Gewinn/Umsatz"
#: gnucash/report/business-reports/customer-summary.scm:152
msgid "Sort by markup (which is profit amount divided by sales)."
@@ -22251,9 +22252,8 @@ msgstr "Kein passender Kunde ausgewählt!"
#: gnucash/report/business-reports/customer-summary.scm:647
#: gnucash/report/business-reports/job-report.scm:631
-#, fuzzy
msgid "No valid vendor selected."
-msgstr "Kein passender Kunde ausgewählt!"
+msgstr "Kein passender Lieferant ausgewählt!"
#: gnucash/report/business-reports/customer-summary.scm:649
#: gnucash/report/business-reports/job-report.scm:633
@@ -22263,11 +22263,9 @@ msgstr "Kein passender Mitarbeiter gewählt!"
#: gnucash/report/business-reports/customer-summary.scm:651
#: gnucash/report/business-reports/job-report.scm:636
-#, fuzzy
msgid "Click on the \"Options\" button to select a company."
msgstr ""
-"Keine gültige ~a gewählt. Klicken Sie auf »Optionen«, um eine Firma zu "
-"wählen."
+"Klicken Sie auf »Optionen«, um eine Firma zu wählen."
# Fixme: Source Accelerator missing
#: gnucash/report/business-reports/customer-summary.scm:663
@@ -22592,9 +22590,8 @@ msgstr "Zeile 3 rechts"
#: gnucash/report/business-reports/invoice.scm:450
#: gnucash/report/business-reports/job-report.scm:242
-#, fuzzy
msgid "Payment, thank you!"
-msgstr "Betrag dankend erhalten"
+msgstr "Betrag dankend erhalten!"
#. Translators: This "T" is displayed in the taxable column, if this entry contains tax
#: gnucash/report/business-reports/invoice.scm:505
@@ -22724,9 +22721,8 @@ msgid "Job Report"
msgstr "Auftragsbericht"
#: gnucash/report/business-reports/job-report.scm:629
-#, fuzzy
msgid "No valid job selected."
-msgstr "Keine passende Firma gewählt!"
+msgstr "Kein passender Auftrag gewählt!"
#: gnucash/report/business-reports/owner-report.scm:56
msgid "Sale"
@@ -22765,9 +22761,8 @@ msgid "The company for this report."
msgstr "Der in diesem Bericht untersuchte Geschäftspartner."
#: gnucash/report/business-reports/owner-report.scm:584
-#, fuzzy
msgid "Display the sale amount column?"
-msgstr "Betrag anzeigen?"
+msgstr "Umsatz anzeigen?"
#: gnucash/report/business-reports/owner-report.scm:589
msgid "Display the tax column?"
@@ -22942,7 +22937,7 @@ msgid ""
"either be in your .gnucash directory, or else in its proper place within the "
"GnuCash installation directories."
msgstr ""
-"Der Dateiname der eguile-Vorlage für diesen Bericht. Sie sollte sich "
+"Der Dateiname der eguile-Vorlagenteil für diesen Bericht. Sie sollte sich "
"entweder in Ihrem .gnucash-Verzeichnis befinden oder an ihrem angestammten "
"Platz in den GnuCash-Installationsverzeichnissen."
@@ -22966,40 +22961,36 @@ msgid "Font to use for everything else"
msgstr "Zeichensatz für alles andere"
#: gnucash/report/business-reports/receipt.scm:146
-#, fuzzy
msgid "Name of a file containing a logo to be used on the header of the report"
msgstr ""
-"Name der Datei, welche das Logo enthält, das in diesem Bericht verwendet "
-"werden soll."
+"Name der Datei, welche das Logo enthält, das im Kopfbereich dieses Berichts "
+"verwendet werden soll."
#: gnucash/report/business-reports/receipt.scm:149
-#, fuzzy
msgid ""
"Width of the header logo in CSS format, e.g. 10% or 32px. Leave blank to "
"display the logo at its natural width. The height of the logo will be "
"scaled accordingly."
msgstr ""
-"Breite des Logos im CSS-Format, z.B.'10%' oder '32px'.\n"
+"Breite des Kopf-Logos im CSS-Format, z.B.'10%' oder '32px'.\n"
"Ohne Angabe wird das Logo in seiner natürlichen Breite angegeben.\n"
-"Die Höhe des Logos wird entsprechend angepaßt."
+"Die Höhe des Logos wird entsprechend skaliert."
#: gnucash/report/business-reports/receipt.scm:152
-#, fuzzy
msgid "Name of a file containing a logo to be used on the footer of the report"
msgstr ""
-"Name der Datei, welche das Logo enthält, das in diesem Bericht verwendet "
-"werden soll."
+"Name der Datei, welche das Logo enthält, das im Fußbereich dieses Berichts "
+"verwendet werden soll."
#: gnucash/report/business-reports/receipt.scm:155
-#, fuzzy
msgid ""
"Width of the footer logo in CSS format, e.g. 10% or 32px. Leave blank to "
"display the logo at its natural width. The height of the logo will be "
"scaled accordingly."
msgstr ""
-"Breite des Logos im CSS-Format, z.B.'10%' oder '32px'.\n"
+"Breite des Fuß-Logos im CSS-Format, z.B.'10%' oder '32px'.\n"
"Ohne Angabe wird das Logo in seiner natürlichen Breite angegeben.\n"
-"Die Höhe des Logos wird entsprechend angepaßt."
+"Die Höhe des Logos wird entsprechend skaliert."
#: gnucash/report/business-reports/receipt.scm:158
msgid "The format for the date->string conversion for today's date."
@@ -23009,19 +23000,16 @@ msgstr ""
#: gnucash/report/business-reports/receipt.scm:188
#: gnucash/report/business-reports/taxinvoice.scm:224
-#, fuzzy
msgid "Payment received, thank you!"
-msgstr "Betrag dankend erhalten."
+msgstr "Betrag dankend erhalten!"
#: gnucash/report/business-reports/receipt.scm:192
-#, fuzzy
msgid "Notes added at end of invoice -- may contain HTML markup"
msgstr "Zusätzlicher Text am Ende der Rechnung ─ darf HTML-Elemente enthalten."
#: gnucash/report/business-reports/receipt.scm:259
-#, fuzzy
msgid "Display a customer invoice as receipt, cash voucher"
-msgstr "Kundenrechnung mit Spalten für Steuerangaben (mit »eguile«-Vorlage)"
+msgstr "Kundenrechnung als Quittung anzeigen"
#: gnucash/report/business-reports/receivables.scm:39
msgid "Receivables Account"
@@ -23129,9 +23117,8 @@ msgid "Show Job number"
msgstr "Auftragsnummer zeigen?"
#: gnucash/report/business-reports/taxinvoice.scm:102
-#, fuzzy
msgid "Show net price"
-msgstr "Kurse anzeigen"
+msgstr "Nettopreis anzeigen"
#: gnucash/report/business-reports/taxinvoice.scm:103
msgid "Invoice number next to title"
@@ -23198,9 +23185,8 @@ msgid "Invoice Job number?"
msgstr "Auftragsnummer?"
#: gnucash/report/business-reports/taxinvoice.scm:171
-#, fuzzy
msgid "Show net price?"
-msgstr "Kurse anzeigen"
+msgstr "Den Nettopreis anzeigen?"
#: gnucash/report/business-reports/taxinvoice.scm:175
msgid ""
@@ -24447,14 +24433,13 @@ msgstr ""
"den gespeicherten Berichten mehr als ein Mal auftritt: "
#: gnucash/report/report-system/report.scm:93
-#, fuzzy
msgid ""
"The GnuCash report system has been upgraded. Your old saved reports have "
"been transferred into a new format. If you experience trouble with saved "
"reports, please contact the GnuCash development team."
msgstr ""
"Das System zum Erstellen von Berichten in GnuCash wurde erneuert. Ihre alten "
-"gespeicherten Berichte wurden ins neue System übernommen. Wenn es dabei "
+"gespeicherten Berichte wurden in ein neues Format übertragen. Wenn es dabei "
"Schwierigkeiten gibt, kontaktieren Sie bitte das GnuCash Entwicklerteam."
#: gnucash/report/report-system/report.scm:94
@@ -25354,9 +25339,8 @@ msgstr "Verlust"
#. Name definitions
#: gnucash/report/standard-reports/balance-forecast.scm:35
-#, fuzzy
msgid "Balance Forecast"
-msgstr "Saldo am ~a"
+msgstr "Saldo-Vorhersage"
#: gnucash/report/standard-reports/balance-forecast.scm:38
#: gnucash/report/standard-reports/budget-barchart.scm:76
@@ -25369,9 +25353,8 @@ msgid "Report on these accounts."
msgstr "Den Buchungsbericht für diese Konten erstellen."
#: gnucash/report/standard-reports/balance-forecast.scm:42
-#, fuzzy
msgid "Interval"
-msgstr "Intervall:"
+msgstr "Intervall"
#: gnucash/report/standard-reports/balance-forecast.scm:49
#: gnucash/report/standard-reports/net-charts.scm:60
@@ -25385,24 +25368,21 @@ msgstr "Einen Markierungspunkt für jeden Datenpunkt anzeigen."
#: gnucash/report/standard-reports/balance-forecast.scm:52
#: gnucash/report/standard-reports/balance-forecast.scm:53
-#, fuzzy
msgid "Show reserve line"
-msgstr "Empfänger Informationen anzeigen"
+msgstr "Reserve-Linie anzeigen"
#: gnucash/report/standard-reports/balance-forecast.scm:55
-#, fuzzy
msgid "Reserve amount"
-msgstr "Forderungen Konto"
+msgstr "Reservebetrag"
#: gnucash/report/standard-reports/balance-forecast.scm:56
msgid "The reserve amount is set to a minimum balance desired"
-msgstr ""
+msgstr "Der Reservebetrag wird auf das Minimum des gewünschten Saldos gesetzt."
#: gnucash/report/standard-reports/balance-forecast.scm:59
#: gnucash/report/standard-reports/balance-forecast.scm:60
-#, fuzzy
msgid "Show target line"
-msgstr "Tabelle anzeigen"
+msgstr "Ziel-Linie anzeigen"
#: gnucash/report/standard-reports/balance-forecast.scm:62
msgid "Target amount above reserve"
@@ -25413,11 +25393,12 @@ msgid ""
"The target is used to plan for a future large purchase, which will be added "
"as a line above the reserve amount."
msgstr ""
+"Das Ziel wird verwendet, um künftige größere Investitionen zu planen. Dieses "
+"wird als Linie über der Reserve zugefügt."
#: gnucash/report/standard-reports/balance-forecast.scm:67
-#, fuzzy
msgid "Show future minimum"
-msgstr "Zukünftiges Minimum"
+msgstr "Zukünftiges Minimum anzeigen"
#: gnucash/report/standard-reports/balance-forecast.scm:68
msgid ""
@@ -25426,13 +25407,12 @@ msgid ""
msgstr ""
#: gnucash/report/standard-reports/balance-forecast.scm:245
-#, fuzzy
msgid "Target"
-msgstr "Belastung"
+msgstr "Ziel"
#: gnucash/report/standard-reports/balance-forecast.scm:251
msgid "Reserve"
-msgstr ""
+msgstr "Reserve"
#: gnucash/report/standard-reports/balance-sheet.scm:72
#: gnucash/report/standard-reports/trial-balance.scm:710
@@ -29933,7 +29913,7 @@ msgstr "Ãœbrige benutzbare Kurse eintragen?"
#: libgnucash/scm/price-quotes.scm:631
#, scheme-format
msgid "Found Finance::Quote version ~A."
-msgstr ""
+msgstr "Finance::Quote Version ~A wurde gefunden."
#: libgnucash/tax/us/de_DE.scm:53
msgid "Tax Number"
commit 8d36079c59641758b3fedac738204d57c8c2bcf2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Apr 8 17:42:25 2019 +0200
Merge a fresh gnucash.pot into de.po
5067 übersetzte Meldungen, 82 ungenaue Übersetzungen, 111 unübersetzte
Meldungen.
diff --git a/po/de.po b/po/de.po
index 507b418d3..79086e4b1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,7 +17,7 @@ msgstr ""
"Project-Id-Version: GnuCash 3.4\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2019-03-05 21:42+0100\n"
+"POT-Creation-Date: 2019-04-08 17:37+0200\n"
"PO-Revision-Date: 2019-03-06 02:16+0100\n"
"Last-Translator: Christian Stimming <christian at cstimming.de>\n"
"Language-Team: GnuCash-de <gnucash-de at gnucash.org>\n"
@@ -728,8 +728,8 @@ msgstr ""
"GnuCash unterstützt auch Online-Banking mit dem deutschen Standard FinTS, "
"vormals HBCI. Im Menü Werkzeuge finden Sie den Menüpunkt zur Einrichtung des "
"Online-Banking-Zugangs. Nachdem ein Online-Banking-Zugang eingerichtet "
-"wurde, können die Menüpunkte im Kontofenster unter "
-"'Aktionen -> Online Aktionen' verwendet werden."
+"wurde, können die Menüpunkte im Kontofenster unter 'Aktionen -> Online "
+"Aktionen' verwendet werden."
#: gnucash/gnome/assistant-acct-period.c:188
msgid "The book was closed successfully."
@@ -818,7 +818,7 @@ msgid "Selected"
msgstr "Gewählt"
#: gnucash/gnome/assistant-hierarchy.c:462
-#: gnucash/gnome-utils/gnc-tree-view-account.c:2277
+#: gnucash/gnome-utils/gnc-tree-view-account.c:2249
msgid "Account Types"
msgstr "Kontoarten"
@@ -856,7 +856,7 @@ msgstr "Nein"
#: gnucash/gnome/assistant-hierarchy.c:1024
#: gnucash/gnome-utils/dialog-options.c:718
-#: gnucash/gnome-utils/gnc-tree-view-account.c:933
+#: gnucash/gnome-utils/gnc-tree-view-account.c:905
msgid "Placeholder"
msgstr "Platzhalter"
@@ -953,8 +953,8 @@ msgstr "Darlehensrechner-Option: \"%s\""
#. Translators: The following symbols will build the *
#. * header line of exported CSV files:
#: gnucash/gnome/assistant-loan.cpp:1867 gnucash/gnome/dialog-lot-viewer.c:908
-#: gnucash/gnome/gnc-split-reg.c:600 gnucash/gnome/reconcile-view.c:447
-#: gnucash/gnome-utils/gnc-tree-view-price.c:436
+#: gnucash/gnome/gnc-split-reg.c:602 gnucash/gnome/reconcile-view.c:447
+#: gnucash/gnome-utils/gnc-tree-view-price.c:408
#: gnucash/gtkbuilder/dialog-payment.glade:285
#: gnucash/gtkbuilder/dialog-payment.glade:417
#: gnucash/gtkbuilder/dialog-trans-assoc.glade:126
@@ -970,7 +970,7 @@ msgstr "Darlehensrechner-Option: \"%s\""
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3536
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3573
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:62
-#: gnucash/register/ledger-core/split-register-model.c:224
+#: gnucash/register/ledger-core/split-register-model.c:226
#: gnucash/report/business-reports/customer-summary.scm:70
#: gnucash/report/business-reports/invoice.scm:89
#: gnucash/report/business-reports/invoice.scm:221
@@ -1005,16 +1005,14 @@ msgstr "Datum"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2905
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2910
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3021
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3107
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2993
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3079
#: gnucash/gtkbuilder/dialog-payment.glade:479
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:132
#: gnucash/register/ledger-core/split-register.c:2551
#: gnucash/register/ledger-core/split-register.c:2592
#: gnucash/register/ledger-core/split-register.c:2597
#: gnucash/register/ledger-core/split-register.c:2608
-#: gnucash/report/business-reports/customer-summary.scm:218
-#: gnucash/report/business-reports/customer-summary.scm:219
#: gnucash/report/business-reports/owner-report.scm:358
#: libgnucash/app-utils/prefs.scm:66 libgnucash/app-utils/prefs.scm:74
#: libgnucash/app-utils/prefs.scm:92 libgnucash/engine/gncOwner.c:791
@@ -1066,12 +1064,12 @@ msgstr "Fehler beim Hinzufügen des Preises."
#: gnucash/gnome/assistant-stock-split.c:573
#: gnucash/gnome/dialog-find-transactions2.c:111
#: gnucash/gnome/dialog-find-transactions.c:109
-#: gnucash/import-export/aqb/gnc-ab-utils.c:471
+#: gnucash/import-export/aqb/gnc-ab-utils.c:474
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:59
#: gnucash/import-export/import-main-matcher.c:494
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:370
-#: gnucash/register/ledger-core/split-register-model.c:333
+#: gnucash/register/ledger-core/split-register-model.c:335
#: gnucash/report/business-reports/job-report.scm:38
#: gnucash/report/business-reports/owner-report.scm:49
#: gnucash/report/standard-reports/advanced-portfolio.scm:1056
@@ -1087,7 +1085,7 @@ msgid "Account"
msgstr "Konto"
#: gnucash/gnome/assistant-stock-split.c:579
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:390
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:362
#: gnucash/report/standard-reports/advanced-portfolio.scm:1068
#: gnucash/report/standard-reports/portfolio.scm:254
msgid "Symbol"
@@ -1095,7 +1093,7 @@ msgstr "Symbol"
#: gnucash/gnome/assistant-stock-split.c:585
#: gnucash/gnome/dialog-find-transactions.c:122
-#: gnucash/register/ledger-core/split-register-model.c:411
+#: gnucash/register/ledger-core/split-register-model.c:413
#: gnucash/report/standard-reports/advanced-portfolio.scm:1076
#: gnucash/report/standard-reports/general-journal.scm:113
#: gnucash/report/standard-reports/general-ledger.scm:85
@@ -1104,7 +1102,7 @@ msgstr "Symbol"
#: gnucash/report/standard-reports/register.scm:429
#: gnucash/report/standard-reports/transaction.scm:913
#: gnucash/report/standard-reports/transaction.scm:1033
-#: gnucash/report/standard-reports/transaction.scm:1170
+#: gnucash/report/standard-reports/transaction.scm:1174
msgid "Shares"
msgstr "Anteile"
@@ -1129,9 +1127,8 @@ msgstr "Bearbeiten..."
#: gnucash/gnome/dialog-invoice.c:2589 gnucash/gnome/dialog-invoice.c:2590
#: gnucash/gnome/dialog-invoice.c:3292
#: gnucash/gnome-search/dialog-search.c:1054
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3026
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2998
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:163
-#: gnucash/report/business-reports/customer-summary.scm:509
#: gnucash/report/business-reports/invoice.scm:792
#: gnucash/report/business-reports/job-report.scm:414
#: libgnucash/app-utils/prefs.scm:91 libgnucash/engine/gncInvoice.c:1059
@@ -1145,17 +1142,17 @@ msgstr "Auslagenerstattung"
#. page / name / orderkey / tooltip / default
#: gnucash/gnome/business-gnome-utils.c:225 gnucash/gnome/dialog-invoice.c:3306
-#: gnucash/gnome/gnc-plugin-page-invoice.c:385
+#: gnucash/gnome/gnc-plugin-page-invoice.c:357
#: gnucash/gnome-search/dialog-search.c:1070
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2909
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3101
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3073
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:183
#: gnucash/gtkbuilder/dialog-invoice.glade:8
#: gnucash/gtkbuilder/dialog-invoice.glade:151
#: gnucash/gtkbuilder/dialog-invoice.glade:837
#: gnucash/gtkbuilder/dialog-invoice.glade:851
#: gnucash/register/ledger-core/split-register.c:2596
-#: gnucash/report/business-reports/customer-summary.scm:505
+#: gnucash/report/business-reports/customer-summary.scm:199
#: gnucash/report/business-reports/invoice.scm:798
#: gnucash/report/business-reports/job-report.scm:406
#: gnucash/report/business-reports/job-report.scm:410
@@ -1163,12 +1160,12 @@ msgstr "Auslagenerstattung"
#: gnucash/report/business-reports/receipt.scm:163
#: gnucash/report/business-reports/taxinvoice.eguile.scm:131
#: gnucash/report/business-reports/taxinvoice.scm:199
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1823
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1795
#: libgnucash/app-utils/prefs.scm:75 libgnucash/engine/gncInvoice.c:1057
msgid "Invoice"
msgstr "Rechnung"
-#: gnucash/gnome/business-gnome-utils.c:448 gnucash/gnome/gnc-split-reg.c:594
+#: gnucash/gnome/business-gnome-utils.c:448 gnucash/gnome/gnc-split-reg.c:596
#: gnucash/gtkbuilder/gnc-frequency.glade:165
#: gnucash/gtkbuilder/gnc-frequency.glade:671
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:46
@@ -1258,10 +1255,9 @@ msgstr "Tage"
msgid "Proximo"
msgstr "Im nächsten Monat"
-#: gnucash/gnome/dialog-billterms.c:534 gnucash/gnome/dialog-trans-assoc.c:371
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:656
+#: gnucash/gnome/dialog-billterms.c:534 gnucash/gnome/dialog-trans-assoc.c:431
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:627
#: gnucash/gtkbuilder/dialog-price.glade:24
-#: gnucash/report/business-reports/customer-summary.scm:220
#: gnucash/report/business-reports/job-report.scm:243
#: gnucash/report/business-reports/owner-report.scm:354
#: gnucash/report/business-reports/owner-report.scm:359
@@ -1324,25 +1320,25 @@ msgstr "Devise/Wertpapier löschen?"
#. Add the Cancel button for the matcher
#: gnucash/gnome/dialog-commodities.c:190
#: gnucash/gnome/dialog-price-edit-db.c:202
-#: gnucash/gnome/dialog-tax-info.c:1166 gnucash/gnome/gnc-plugin-budget.c:329
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1600
+#: gnucash/gnome/dialog-tax-info.c:1166 gnucash/gnome/gnc-plugin-budget.c:303
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1571
#: gnucash/gnome/gnc-plugin-page-invoice.c:157
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1143
-#: gnucash/gnome/gnc-plugin-page-register2.c:1626
-#: gnucash/gnome/gnc-plugin-page-register.c:1723
-#: gnucash/gnome/gnc-split-reg.c:1006 gnucash/gnome/gnc-split-reg.c:1050
-#: gnucash/gnome/gnc-split-reg.c:1121 gnucash/gnome/gnc-split-reg.c:1392
-#: gnucash/gnome/gnc-split-reg.c:1432 gnucash/gnome/window-reconcile2.c:2195
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1114
+#: gnucash/gnome/gnc-plugin-page-register2.c:1598
+#: gnucash/gnome/gnc-plugin-page-register.c:1695
+#: gnucash/gnome/gnc-split-reg.c:1008 gnucash/gnome/gnc-split-reg.c:1052
+#: gnucash/gnome/gnc-split-reg.c:1174 gnucash/gnome/gnc-split-reg.c:1488
+#: gnucash/gnome/gnc-split-reg.c:1528 gnucash/gnome/window-reconcile2.c:2195
#: gnucash/gnome/window-reconcile.c:2279
-#: gnucash/gnome-search/search-account.c:266
+#: gnucash/gnome-search/search-account.c:237
#: gnucash/gnome-utils/dialog-account.c:657 gnucash/gnome-utils/gnc-file.c:131
#: gnucash/gnome-utils/gnc-file.c:314 gnucash/gnome-utils/gnc-file.c:612
#: gnucash/gnome-utils/gnc-gui-query.c:300
-#: gnucash/gnome-utils/gnc-main-window.c:1283
+#: gnucash/gnome-utils/gnc-main-window.c:1284
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2383
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2355
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:20
#: gnucash/gtkbuilder/dialog-account.glade:176
@@ -1404,7 +1400,7 @@ msgstr "Devise/Wertpapier löschen?"
#: gnucash/html/gnc-html-webkit1.c:1197
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:420
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:378
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2001
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2013
#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:384
#: gnucash/register/ledger-core/gncEntryLedger.c:930
#: gnucash/register/ledger-core/gncEntryLedgerControl.c:897
@@ -1414,9 +1410,9 @@ msgstr "_Abbrechen"
#: gnucash/gnome/dialog-commodities.c:191
#: gnucash/gnome/dialog-price-edit-db.c:203
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1601
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1572
#: gnucash/gnome/gnc-plugin-page-invoice.c:162
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1144
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1115
#: gnucash/gnome/gnc-plugin-page-sx-list.c:160
#: gnucash/gnome/window-reconcile2.c:2237 gnucash/gnome/window-reconcile.c:2321
#: gnucash/gtkbuilder/dialog-account.glade:191
@@ -1505,8 +1501,8 @@ msgid "Customer ID"
msgstr "Kundennummer"
#: gnucash/gnome/dialog-customer.c:928 gnucash/gnome/dialog-vendor.c:731
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:380
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:388
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:352
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:360
#: gnucash/report/business-reports/taxinvoice.eguile.scm:174
#: libgnucash/app-utils/app-utils.scm:293
msgid "Company Name"
@@ -1526,7 +1522,7 @@ msgstr "Firma"
#: gnucash/gnome/dialog-customer.c:939 gnucash/gnome/dialog-employee.c:714
#: gnucash/gnome/dialog-job.c:594 gnucash/gnome/dialog-vendor.c:742
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:377
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:349
msgid "ID #"
msgstr "Nummer"
@@ -1581,7 +1577,7 @@ msgid "Employee Username"
msgstr "Mitarbeiter Benutzername"
#: gnucash/gnome/dialog-employee.c:705 gnucash/gnome/dialog-invoice.c:3183
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:392
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:364
msgid "Employee Name"
msgstr "Mitarbeitername"
@@ -1594,9 +1590,9 @@ msgstr "Benutzername"
#: gnucash/gnome/dialog-sx-editor.c:1804 gnucash/gnome/dialog-tax-info.c:1177
#: gnucash/gnome-utils/gnc-dense-cal.c:356
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:396
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:376
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:163
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:348
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:135
#: gnucash/gtkbuilder/gnc-date-format.glade:129
#: gnucash/report/business-reports/aging.scm:367
msgid "Name"
@@ -1700,9 +1696,9 @@ msgstr "Wertpapier-/Anteilspreis"
#. note the "Amount" multichoice option here
#: gnucash/gnome/dialog-find-transactions2.c:124
#: gnucash/gnome/dialog-invoice.c:3350 gnucash/gnome/dialog-lot-viewer.c:930
-#: gnucash/gnome/gnc-split-reg.c:612 gnucash/gnome/reconcile-view.c:431
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2920
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2932
+#: gnucash/gnome/gnc-split-reg.c:614 gnucash/gnome/reconcile-view.c:431
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2892
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2904
#: gnucash/import-export/aqb/dialog-ab.glade:1071
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:48
#: gnucash/import-export/import-main-matcher.c:496
@@ -1722,9 +1718,9 @@ msgstr "Wertpapier-/Anteilspreis"
#: gnucash/report/standard-reports/transaction.scm:192
#: gnucash/report/standard-reports/transaction.scm:975
#: gnucash/report/standard-reports/transaction.scm:1023
-#: gnucash/report/standard-reports/transaction.scm:1257
-#: gnucash/report/standard-reports/transaction.scm:1273
-#: gnucash/report/standard-reports/transaction.scm:1903
+#: gnucash/report/standard-reports/transaction.scm:1261
+#: gnucash/report/standard-reports/transaction.scm:1277
+#: gnucash/report/standard-reports/transaction.scm:1907
msgid "Amount"
msgstr "Betrag"
@@ -1732,8 +1728,8 @@ msgstr "Betrag"
#: gnucash/gnome/dialog-find-transactions.c:124
#: gnucash/gnome/dialog-lot-viewer.c:936
#: gnucash/gnome/dialog-sx-since-last-run.c:1028
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2910
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2930
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2882
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2902
#: gnucash/report/standard-reports/advanced-portfolio.scm:1085
#: gnucash/report/standard-reports/portfolio.scm:258
#: gnucash/report/standard-reports/register.scm:157
@@ -1745,7 +1741,7 @@ msgstr "Wert"
#: gnucash/gnome/dialog-find-transactions.c:126
#: gnucash/gnome/dialog-invoice.c:3103 gnucash/gnome/dialog-invoice.c:3137
#: gnucash/gnome/dialog-invoice.c:3171
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2748
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2720
#: gnucash/gtkbuilder/dialog-invoice.glade:86
msgid "Date Posted"
msgstr "Buchungsdatum"
@@ -1756,8 +1752,8 @@ msgstr "Buchungsdatum"
#: gnucash/gnome/dialog-find-transactions.c:130
#: gnucash/gnome/dialog-find-transactions.c:169
#: gnucash/gnome/dialog-find-transactions.c:175
-#: gnucash/gnome/gnc-plugin-page-register.c:2243
-#: gnucash/gnome/gnc-plugin-page-register.c:3841
+#: gnucash/gnome/gnc-plugin-page-register.c:2215
+#: gnucash/gnome/gnc-plugin-page-register.c:3813
#: gnucash/gnome-search/dialog-search.c:866
#: gnucash/gnome-search/dialog-search.c:872
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
@@ -1771,17 +1767,17 @@ msgstr "Nummer/Aktion"
#: gnucash/gnome/dialog-find-transactions.c:131
#: gnucash/gnome/dialog-find-transactions.c:168
#: gnucash/gnome/dialog-find-transactions.c:176
-#: gnucash/gnome/gnc-plugin-page-register.c:2248
-#: gnucash/gnome/gnc-split-reg.c:621 gnucash/gnome-search/dialog-search.c:865
+#: gnucash/gnome/gnc-plugin-page-register.c:2220
+#: gnucash/gnome/gnc-split-reg.c:623 gnucash/gnome-search/dialog-search.c:865
#: gnucash/gnome-search/dialog-search.c:873
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2777
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2779
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2797
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2799
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2749
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2751
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2769
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2771
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:58
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:57
-#: gnucash/register/ledger-core/split-register-model.c:319
+#: gnucash/register/ledger-core/split-register-model.c:321
#: gnucash/report/business-reports/invoice.scm:93
#: gnucash/report/business-reports/invoice.scm:231
msgid "Action"
@@ -1793,8 +1789,8 @@ msgstr "Aktion"
#: gnucash/gnome/dialog-find-transactions.c:134
#: gnucash/gnome/dialog-find-transactions.c:171
#: gnucash/gnome/dialog-find-transactions.c:177
-#: gnucash/gnome/gnc-plugin-page-register.c:2242
-#: gnucash/gnome/gnc-plugin-page-register.c:3840
+#: gnucash/gnome/gnc-plugin-page-register.c:2214
+#: gnucash/gnome/gnc-plugin-page-register.c:3812
#: gnucash/gnome-search/dialog-search.c:868
#: gnucash/gnome-search/dialog-search.c:874
#: gnucash/import-export/csv-exp/csv-transactions-export.c:612
@@ -1809,10 +1805,10 @@ msgstr "Buchungsnummer"
#: gnucash/gnome/dialog-find-transactions.c:135
#: gnucash/gnome/dialog-find-transactions.c:170
#: gnucash/gnome/dialog-find-transactions.c:178
-#: gnucash/gnome/gnc-plugin-page-register.c:2247
-#: gnucash/gnome/gnc-split-reg.c:609 gnucash/gnome-search/dialog-search.c:867
+#: gnucash/gnome/gnc-plugin-page-register.c:2219
+#: gnucash/gnome/gnc-split-reg.c:611 gnucash/gnome-search/dialog-search.c:867
#: gnucash/gnome-search/dialog-search.c:875
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2793
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2765
#: gnucash/gtkbuilder/dialog-payment.glade:296
#: gnucash/gtkbuilder/gnc-date-format.glade:95
#: gnucash/import-export/csv-exp/csv-transactions-export.c:612
@@ -1828,19 +1824,19 @@ msgstr "Beschreibung / Notizen / Buchungstext"
#: gnucash/gnome/dialog-find-transactions2.c:153
#: gnucash/gnome/dialog-find-transactions.c:151
-#: gnucash/gnome/gnc-split-reg.c:615
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2813
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2815
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2824
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2826
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2844
+#: gnucash/gnome/gnc-split-reg.c:617
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2785
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2787
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2796
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2798
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2816
#: gnucash/gtkbuilder/dialog-payment.glade:529
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
#: gnucash/import-export/import-main-matcher.c:498
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
-#: gnucash/register/ledger-core/split-register-model.c:347
+#: gnucash/register/ledger-core/split-register-model.c:349
#: gnucash/report/standard-reports/general-ledger.scm:78
#: gnucash/report/standard-reports/general-ledger.scm:98
#: gnucash/report/standard-reports/register.scm:139
@@ -1856,10 +1852,10 @@ msgstr "Buchungstext"
#: gnucash/gnome/dialog-find-transactions2.c:155
#: gnucash/gnome/dialog-find-transactions.c:153
-#: gnucash/gnome/gnc-split-reg.c:624
-#: gnucash/gnome-utils/gnc-tree-view-account.c:914
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:501
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2842
+#: gnucash/gnome/gnc-split-reg.c:626
+#: gnucash/gnome-utils/gnc-tree-view-account.c:886
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:473
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2814
#: gnucash/gtkbuilder/dialog-customer.glade:553
#: gnucash/gtkbuilder/dialog-invoice.glade:488
#: gnucash/gtkbuilder/dialog-invoice.glade:1260
@@ -1868,11 +1864,11 @@ msgstr "Buchungstext"
#: gnucash/gtkbuilder/dialog-vendor.glade:548
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:55
-#: gnucash/register/ledger-core/split-register-model.c:483
+#: gnucash/register/ledger-core/split-register-model.c:485
#: gnucash/report/business-reports/balsheet-eg.scm:292
#: gnucash/report/business-reports/receipt.scm:75
#: gnucash/report/business-reports/taxinvoice.scm:82
-#: gnucash/report/standard-reports/account-summary.scm:485
+#: gnucash/report/standard-reports/account-summary.scm:483
#: gnucash/report/standard-reports/sx-summary.scm:486
#: gnucash/report/standard-reports/transaction.scm:229
#: gnucash/report/standard-reports/transaction.scm:889
@@ -1885,10 +1881,10 @@ msgstr "Bemerkung"
#: gnucash/gnome/dialog-find-transactions2.c:157
#: gnucash/gnome/dialog-find-transactions.c:155
#: gnucash/gnome/dialog-lot-viewer.c:924 gnucash/gnome/dialog-tax-info.c:1373
-#: gnucash/gnome/gnc-split-reg.c:618 gnucash/gnome/reconcile-view.c:435
+#: gnucash/gnome/gnc-split-reg.c:620 gnucash/gnome/reconcile-view.c:435
#: gnucash/gnome-utils/gnc-tree-model-budget.c:102
-#: gnucash/gnome-utils/gnc-tree-view-account.c:785
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2840
+#: gnucash/gnome-utils/gnc-tree-view-account.c:757
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2812
#: gnucash/gtkbuilder/dialog-choose-owner.glade:101
#: gnucash/gtkbuilder/dialog-date-close.glade:159
#: gnucash/gtkbuilder/dialog-trans-assoc.glade:139
@@ -1901,7 +1897,7 @@ msgstr "Bemerkung"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3544
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3581
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:67
-#: gnucash/register/ledger-core/split-register-model.c:287
+#: gnucash/register/ledger-core/split-register-model.c:289
#: gnucash/report/business-reports/customer-summary.scm:73
#: gnucash/report/business-reports/invoice.scm:91
#: gnucash/report/business-reports/invoice.scm:226
@@ -1978,8 +1974,8 @@ msgstr ""
#: gnucash/gnome/dialog-invoice.c:726 gnucash/gnome/dialog-invoice.c:3112
#: gnucash/gnome/dialog-invoice.c:3146 gnucash/gnome/dialog-invoice.c:3180
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2764
-#: gnucash/register/ledger-core/split-register-model.c:231
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2736
+#: gnucash/register/ledger-core/split-register-model.c:233
#: gnucash/report/business-reports/aging.scm:407
#: gnucash/report/business-reports/invoice.scm:271
#: gnucash/report/business-reports/invoice.scm:622
@@ -2250,14 +2246,14 @@ msgstr "Bemerkungen Auslagenerstattung"
#: gnucash/gnome/dialog-invoice.c:3196 gnucash/gnome/dialog-lot-viewer.c:835
#: gnucash/gnome/dialog-tax-info.c:1212
-#: gnucash/gnome-utils/gnc-tree-view-account.c:768
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:429
-#: gnucash/gnome-utils/gnc-tree-view-price.c:448
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2900
+#: gnucash/gnome-utils/gnc-tree-view-account.c:740
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:401
+#: gnucash/gnome-utils/gnc-tree-view-price.c:420
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2872
#: gnucash/gtkbuilder/dialog-invoice.glade:44
#: gnucash/gtkbuilder/dialog-invoice.glade:779
#: gnucash/gtkbuilder/dialog-payment.glade:312
-#: gnucash/register/ledger-core/split-register-model.c:354
+#: gnucash/register/ledger-core/split-register-model.c:356
#: gnucash/report/business-reports/customer-summary.scm:72
#: gnucash/report/business-reports/job-report.scm:45
#: gnucash/report/business-reports/owner-report.scm:54
@@ -2267,7 +2263,7 @@ msgid "Type"
msgstr "Kontoart"
#: gnucash/gnome/dialog-invoice.c:3198
-#: gnucash/register/ledger-core/split-register-model.c:301
+#: gnucash/register/ledger-core/split-register-model.c:303
msgid "Paid"
msgstr "Bezahlt"
@@ -2289,8 +2285,8 @@ msgstr "Geöffnet"
#: gnucash/gnome/reconcile-view.c:443
#: gnucash/gtkbuilder/dialog-payment.glade:516
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:53
-#: gnucash/register/ledger-core/split-register-model.c:247
-#: gnucash/register/ledger-core/split-register-model.c:267
+#: gnucash/register/ledger-core/split-register-model.c:249
+#: gnucash/register/ledger-core/split-register-model.c:269
#: gnucash/report/standard-reports/general-journal.scm:110
#: gnucash/report/standard-reports/general-ledger.scm:96
#: gnucash/report/standard-reports/register.scm:135
@@ -2384,19 +2380,19 @@ msgid "Only Active?"
msgstr "Nur aktive?"
#: gnucash/gnome/dialog-job.c:575 gnucash/gnome/dialog-job.c:588
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2954
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2926
#: gnucash/gtkbuilder/dialog-job.glade:252
-#: gnucash/register/ledger-core/split-register-model.c:361
+#: gnucash/register/ledger-core/split-register-model.c:363
msgid "Rate"
msgstr "Kurs"
-#: gnucash/gnome/dialog-job.c:577 gnucash/gnome-utils/gnc-tree-view-owner.c:385
+#: gnucash/gnome/dialog-job.c:577 gnucash/gnome-utils/gnc-tree-view-owner.c:357
#: gnucash/gtkbuilder/dialog-job.glade:106
msgid "Job Number"
msgstr "Auftragsnummer"
#: gnucash/gnome/dialog-job.c:579 gnucash/gnome/dialog-job.c:592
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:384
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:356
#: gnucash/gtkbuilder/dialog-job.glade:120
msgid "Job Name"
msgstr "Auftragsname"
@@ -2425,18 +2421,19 @@ msgstr "Geschlossen"
msgid "Title"
msgstr "Titel"
+#. Balance line (do this here so it draws over the minimum line)
#: gnucash/gnome/dialog-lot-viewer.c:867 gnucash/gnome/dialog-lot-viewer.c:948
-#: gnucash/gnome-utils/gnc-tree-view-account.c:811
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:485
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:493
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3140
-#: gnucash/register/ledger-core/split-register-model.c:312
-#: gnucash/register/ledger-core/split-register-model.c:476
-#: gnucash/report/business-reports/customer-summary.scm:180
+#: gnucash/gnome-utils/gnc-tree-view-account.c:783
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:457
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:465
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3112
+#: gnucash/register/ledger-core/split-register-model.c:314
+#: gnucash/register/ledger-core/split-register-model.c:478
#: gnucash/report/business-reports/job-report.scm:209
#: gnucash/report/business-reports/owner-report.scm:320
#: gnucash/report/report-system/html-utilities.scm:731
#: gnucash/report/standard-reports/account-summary.scm:462
+#: gnucash/report/standard-reports/balance-forecast.scm:240
#: gnucash/report/standard-reports/register.scm:163
#: gnucash/report/standard-reports/sx-summary.scm:463
msgid "Balance"
@@ -2539,40 +2536,40 @@ msgstr ""
"den Umrechnungskurs an."
# Fixme: Source Accelerator missing "assign payment"?
-#: gnucash/gnome/dialog-payment.c:1197 gnucash/gnome/search-owner.c:241
+#: gnucash/gnome/dialog-payment.c:1197 gnucash/gnome/search-owner.c:213
#: gnucash/gnome-search/dialog-search.c:1058
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2811
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2783
#: gnucash/gtkbuilder/dialog-customer.glade:569
#: gnucash/gtkbuilder/dialog-customer-import-gui.glade:163
#: gnucash/gtkbuilder/dialog-invoice.glade:1143
#: gnucash/gtkbuilder/dialog-payment.glade:40
-#: gnucash/register/ledger-core/split-register-model.c:283
-#: gnucash/report/business-reports/customer-summary.scm:722
-#: gnucash/report/business-reports/customer-summary.scm:832
+#: gnucash/register/ledger-core/split-register-model.c:285
+#: gnucash/report/business-reports/customer-summary.scm:352
+#: gnucash/report/business-reports/customer-summary.scm:462
#: gnucash/report/business-reports/job-report.scm:551
#: gnucash/report/business-reports/owner-report.scm:73
#: gnucash/report/business-reports/owner-report.scm:114
msgid "Customer"
msgstr "Kunde"
-#: gnucash/gnome/dialog-payment.c:1201 gnucash/gnome/search-owner.c:242
+#: gnucash/gnome/dialog-payment.c:1201 gnucash/gnome/search-owner.c:214
#: gnucash/gnome-search/dialog-search.c:1090
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2822
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2794
#: gnucash/gtkbuilder/dialog-customer-import-gui.glade:180
#: gnucash/gtkbuilder/dialog-payment.glade:44
#: gnucash/gtkbuilder/dialog-vendor.glade:564
-#: gnucash/register/ledger-core/split-register-model.c:285
-#: gnucash/report/business-reports/customer-summary.scm:724
+#: gnucash/register/ledger-core/split-register-model.c:287
+#: gnucash/report/business-reports/customer-summary.scm:354
#: gnucash/report/business-reports/job-report.scm:557
#: gnucash/report/business-reports/owner-report.scm:118
msgid "Vendor"
msgstr "Lieferant"
-#: gnucash/gnome/dialog-payment.c:1205 gnucash/gnome/search-owner.c:243
+#: gnucash/gnome/dialog-payment.c:1205 gnucash/gnome/search-owner.c:215
#: gnucash/gnome-search/dialog-search.c:1062
#: gnucash/gtkbuilder/dialog-employee.glade:600
#: gnucash/gtkbuilder/dialog-payment.glade:48
-#: gnucash/report/business-reports/customer-summary.scm:726
+#: gnucash/report/business-reports/customer-summary.scm:356
#: gnucash/report/business-reports/job-report.scm:560
#: gnucash/report/business-reports/owner-report.scm:74
#: gnucash/report/business-reports/owner-report.scm:115
@@ -2752,7 +2749,7 @@ msgstr "Komplett"
#: gnucash/gnome/dialog-sx-editor2.c:164 gnucash/gnome/dialog-sx-editor.c:166
#: gnucash/gnome/gnc-plugin-page-sx-list.c:148
#: gnucash/gnome/window-reconcile2.c:2232 gnucash/gnome/window-reconcile.c:2316
-#: gnucash/gnome-utils/gnc-main-window.c:265
+#: gnucash/gnome-utils/gnc-main-window.c:266
#: gnucash/gtkbuilder/dialog-billterms.glade:734
#: gnucash/gtkbuilder/dialog-commodities.glade:58
#: gnucash/gtkbuilder/dialog-price.glade:907
@@ -2768,12 +2765,12 @@ msgid "_Transaction"
msgstr "_Buchung"
#: gnucash/gnome/dialog-sx-editor2.c:166 gnucash/gnome/dialog-sx-editor.c:168
-#: gnucash/gnome-utils/gnc-main-window.c:266
+#: gnucash/gnome-utils/gnc-main-window.c:267
msgid "_View"
msgstr "_Ansicht"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:267
+#: gnucash/gnome-utils/gnc-main-window.c:268
msgid "_Actions"
msgstr "A_ktionen"
@@ -2878,8 +2875,8 @@ msgstr ""
"Die aktuelle Buchungsvorlage wurde verändert. Soll sie gespeichert werden?"
#: gnucash/gnome/dialog-sx-editor2.c:1780 gnucash/gnome/dialog-sx-editor.c:1831
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:288
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:294
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:257
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:263
msgid "Scheduled Transactions"
msgstr "Terminierte Buchungen"
@@ -3045,39 +3042,44 @@ msgstr ""
msgid "Form"
msgstr "Formular"
-#: gnucash/gnome/dialog-trans-assoc.c:206
+#: gnucash/gnome/dialog-trans-assoc.c:214
msgid "File Found"
msgstr "Datei gefunden"
-#: gnucash/gnome/dialog-trans-assoc.c:208
+#: gnucash/gnome/dialog-trans-assoc.c:216
msgid "File Not Found"
msgstr "Datei nicht gefunden"
-#: gnucash/gnome/dialog-trans-assoc.c:218
+#: gnucash/gnome/dialog-trans-assoc.c:227
msgid "Address Found"
msgstr "Adresse gefunden"
-#: gnucash/gnome/dialog-trans-assoc.c:220
+#: gnucash/gnome/dialog-trans-assoc.c:229
msgid "Address Not Found"
msgstr "Adresse nicht gefunden"
-#: gnucash/gnome/dialog-trans-assoc.c:281 gnucash/gnome/gnc-split-reg.c:1279
+#: gnucash/gnome/dialog-trans-assoc.c:311 gnucash/gnome/gnc-split-reg.c:1375
msgid "This transaction is not associated with a valid URI."
msgstr "Diesem Buchungssatz ist keine gültige URI zugeordnet."
-#: gnucash/gnome/dialog-trans-assoc.c:416
+#: gnucash/gnome/dialog-trans-assoc.c:477
msgid "Transaction Associations"
msgstr "Buchungsverknüpfungen"
-#: gnucash/gnome/dialog-trans-assoc.c:436
+#: gnucash/gnome/dialog-trans-assoc.c:494
msgid "Path head for files is, "
msgstr "Anfang des Pfades für Dateien ist, "
-#: gnucash/gnome/dialog-trans-assoc.c:438
+#: gnucash/gnome/dialog-trans-assoc.c:496
msgid "Path head does not exist, "
msgstr "Anfang des Pfades existiert nicht, "
-#: gnucash/gnome/dialog-trans-assoc.c:450
+#: gnucash/gnome/dialog-trans-assoc.c:514
+#, c-format
+msgid "Path head not set, using '%s' for relative paths"
+msgstr ""
+
+#: gnucash/gnome/dialog-trans-assoc.c:526
msgid "Relative"
msgstr "Relativ"
@@ -3130,9 +3132,9 @@ msgstr "Lieferantennummer"
msgid "Find Vendor"
msgstr "Lieferant suchen"
-#: gnucash/gnome/gnc-budget-view.c:450
+#: gnucash/gnome/gnc-budget-view.c:448
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2952
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3004
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2976
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:33
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:39
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:48
@@ -3144,12 +3146,12 @@ msgstr "Lieferant suchen"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1092
#: gnucash/report/standard-reports/net-charts.scm:409
#: gnucash/report/standard-reports/net-charts.scm:489
-#: libgnucash/app-utils/prefs.scm:89 libgnucash/engine/Account.cpp:4101
+#: libgnucash/app-utils/prefs.scm:89 libgnucash/engine/Account.cpp:4099
#: libgnucash/engine/Scrub.c:422
msgid "Income"
msgstr "Ertrag"
-#: gnucash/gnome/gnc-budget-view.c:452
+#: gnucash/gnome/gnc-budget-view.c:450
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:80
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:85
#: gnucash/report/report-system/report-utilities.scm:117
@@ -3158,21 +3160,16 @@ msgstr "Ertrag"
msgid "Expenses"
msgstr "Aufwand"
-#: gnucash/gnome/gnc-budget-view.c:454
+#: gnucash/gnome/gnc-budget-view.c:452
msgid "Transfers"
msgstr "Ãœberweisungen"
-#. (if (gnc-numeric-negative-p total)
-#. (_ "Total Credit")
-#. (_ "Total Due")))
-#. Display Grand Total
-#: gnucash/gnome/gnc-budget-view.c:456 gnucash/gnome/gnc-budget-view.c:1317
-#: gnucash/gnome-utils/gnc-tree-view-account.c:880
+#: gnucash/gnome/gnc-budget-view.c:454 gnucash/gnome/gnc-budget-view.c:1315
+#: gnucash/gnome-utils/gnc-tree-view-account.c:852
#: gnucash/report/business-reports/aging.scm:563
#: gnucash/report/business-reports/aging.scm:847
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:120
-#: gnucash/report/business-reports/customer-summary.scm:306
-#: gnucash/report/business-reports/customer-summary.scm:949
+#: gnucash/report/business-reports/customer-summary.scm:579
#: gnucash/report/business-reports/invoice.scm:105
#: gnucash/report/business-reports/invoice.scm:261
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:304
@@ -3180,10 +3177,10 @@ msgstr "Ãœberweisungen"
#: gnucash/report/report-system/html-utilities.scm:623
#: gnucash/report/standard-reports/advanced-portfolio.scm:1057
#: gnucash/report/standard-reports/budget-flow.scm:169
-#: gnucash/report/standard-reports/budget-flow.scm:251
+#: gnucash/report/standard-reports/budget-flow.scm:248
#: gnucash/report/standard-reports/budget.scm:462
#: gnucash/report/standard-reports/portfolio.scm:278
-#: gnucash/report/standard-reports/transaction.scm:1795
+#: gnucash/report/standard-reports/transaction.scm:1799
msgid "Total"
msgstr "Summe"
@@ -3213,7 +3210,7 @@ msgstr "Eine existierende GnuCash-Datei öffnen"
#: gnucash/gnome/gnc-plugin-basic-commands.c:121
#: gnucash/gnome-utils/gnc-file.c:113 gnucash/gnome-utils/gnc-file.c:614
-#: gnucash/gnome-utils/gnc-main-window.c:1284
+#: gnucash/gnome-utils/gnc-main-window.c:1285
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_Speichern"
@@ -3375,14 +3372,14 @@ msgstr "_Tipp des Tages"
msgid "View the Tips of the Day"
msgstr "»Tipp des Tages« anzeigen"
-#: gnucash/gnome/gnc-plugin-basic-commands.c:559
+#: gnucash/gnome/gnc-plugin-basic-commands.c:528
msgid "There are no Scheduled Transactions to be entered at this time."
msgstr ""
"Es gibt derzeit keine terminierten Buchungen, die gebucht werden sollten."
#. Translators: %d is the number of transactions. This is a
#. ngettext(3) message.
-#: gnucash/gnome/gnc-plugin-basic-commands.c:590
+#: gnucash/gnome/gnc-plugin-basic-commands.c:559
#, c-format
msgid ""
"There are no Scheduled Transactions to be entered at this time. (%d "
@@ -3421,12 +3418,12 @@ msgstr "Budget duplizieren"
msgid "Copy an existing Budget"
msgstr "Existierendes Budget duplizieren"
-#: gnucash/gnome/gnc-plugin-budget.c:327
+#: gnucash/gnome/gnc-plugin-budget.c:301
msgid "Select a Budget"
msgstr "Budget auswählen"
-#: gnucash/gnome/gnc-plugin-budget.c:328 gnucash/gnome/gnc-split-reg.c:1051
-#: gnucash/gnome/gnc-split-reg.c:1122 gnucash/gnome-search/search-account.c:267
+#: gnucash/gnome/gnc-plugin-budget.c:302 gnucash/gnome/gnc-split-reg.c:1053
+#: gnucash/gnome/gnc-split-reg.c:1178 gnucash/gnome-search/search-account.c:238
#: gnucash/gnome-utils/dialog-account.c:658
#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:211
@@ -3853,7 +3850,7 @@ msgstr "Die Unterkonten des gewählten Kontos neu nummerieren"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:181
#: gnucash/gnome/gnc-plugin-page-register2.c:326
#: gnucash/gnome/gnc-plugin-page-register.c:349
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "_Filter By..."
msgstr "_Filtern nach..."
@@ -4001,28 +3998,29 @@ msgstr "Löschen"
#. * The translated string appears as the tab name and as the
#. * text associated with the option selector on the tab
#.
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:458
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:464
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2857
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2859
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2861
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2863
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2874
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2878
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:429
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:435
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2829
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2831
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2833
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2835
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2846
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2850
#: gnucash/gtkbuilder/dialog-preferences.glade:864
#: gnucash/report/report-system/report.scm:68
#: gnucash/report/standard-reports/account-piecharts.scm:69
#: gnucash/report/standard-reports/account-summary.scm:75
#: gnucash/report/standard-reports/advanced-portfolio.scm:162
#: gnucash/report/standard-reports/average-balance.scm:90
-#: gnucash/report/standard-reports/average-balance.scm:336
+#: gnucash/report/standard-reports/average-balance.scm:178
+#: gnucash/report/standard-reports/balance-forecast.scm:37
#: gnucash/report/standard-reports/balance-sheet.scm:88
#: gnucash/report/standard-reports/budget-balance-sheet.scm:53
#: gnucash/report/standard-reports/budget-barchart.scm:39
#: gnucash/report/standard-reports/budget-income-statement.scm:76
#: gnucash/report/standard-reports/cashflow-barchart.scm:45
#: gnucash/report/standard-reports/category-barchart.scm:72
-#: gnucash/report/standard-reports/daily-reports.scm:58
+#: gnucash/report/standard-reports/daily-reports.scm:57
#: gnucash/report/standard-reports/equity-statement.scm:68
#: gnucash/report/standard-reports/income-gst-statement.scm:80
#: gnucash/report/standard-reports/income-gst-statement.scm:86
@@ -4036,7 +4034,7 @@ msgstr "Löschen"
msgid "Accounts"
msgstr "Konten"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1384
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1355
msgid ""
"The list below shows objects which make use of the account which you want to "
"delete.\n"
@@ -4050,49 +4048,49 @@ msgstr ""
"die Objekte ändern, damit diese\n"
"ein anderes Konto verwenden"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1395
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1126
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1366
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1097
msgid "(no name)"
msgstr "(unbenannt)"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1419
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1390
#, c-format
msgid "Deleting account %s"
msgstr "Konto %s löschen"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1534
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1505
#, c-format
msgid "The account %s will be deleted."
msgstr "Das Konto %s wird gelöscht."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1547
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1518
#, c-format
msgid "All transactions in this account will be moved to the account %s."
msgstr "Alle Buchungen in diesem Konto werden in das Konto %s verschoben."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1553
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1524
msgid "All transactions in this account will be deleted."
msgstr "Alle Buchungen in diesem Konto werden gelöscht."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1562
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1533
#, c-format
msgid "All of its sub-accounts will be moved to the account %s."
msgstr "Alle Unterkonten werden zum Konto %s verschoben."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1568
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1539
msgid "All of its subaccounts will be deleted."
msgstr "Alle Unterkonten werden ebenfalls gelöscht."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1573
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1544
#, c-format
msgid "All sub-account transactions will be moved to the account %s."
msgstr "Alle Buchungen in Unterkonten werden in das Konto %s verschoben."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1579
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1550
msgid "All sub-account transactions will be deleted."
msgstr "Alle Buchungen in Unterkonten werden ebenfalls gelöscht."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1584
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1555
msgid "Are you sure you want to do this?"
msgstr "Soll diese Aktion durchgeführt werden?"
@@ -4132,7 +4130,7 @@ msgstr ""
#: gnucash/gnome/gnc-plugin-page-budget.c:180
#: gnucash/gtkbuilder/assistant-csv-export.glade:105
#: gnucash/gtkbuilder/dialog-print-check.glade:617
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1125
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1097
msgid "Options"
msgstr "Optionen"
@@ -4140,9 +4138,9 @@ msgstr "Optionen"
msgid "Estimate"
msgstr "Abschätzen"
-#: gnucash/gnome/gnc-plugin-page-budget.c:274
-#: gnucash/gnome/gnc-plugin-page-budget.c:316
-#: gnucash/gnome/gnc-plugin-page-budget.c:826
+#: gnucash/gnome/gnc-plugin-page-budget.c:246
+#: gnucash/gnome/gnc-plugin-page-budget.c:286
+#: gnucash/gnome/gnc-plugin-page-budget.c:796
#: gnucash/report/standard-reports/budget-balance-sheet.scm:111
#: gnucash/report/standard-reports/budget-barchart.scm:40
#: gnucash/report/standard-reports/budget-barchart.scm:153
@@ -4153,16 +4151,16 @@ msgstr "Abschätzen"
msgid "Budget"
msgstr "Budget"
-#: gnucash/gnome/gnc-plugin-page-budget.c:863 libgnucash/engine/gnc-budget.c:94
+#: gnucash/gnome/gnc-plugin-page-budget.c:833 libgnucash/engine/gnc-budget.c:94
msgid "Unnamed Budget"
msgstr "Unbenanntes Budget"
-#: gnucash/gnome/gnc-plugin-page-budget.c:865
+#: gnucash/gnome/gnc-plugin-page-budget.c:835
#, c-format
msgid "Delete %s?"
msgstr "»%s« löschen?"
-#: gnucash/gnome/gnc-plugin-page-budget.c:936
+#: gnucash/gnome/gnc-plugin-page-budget.c:906
msgid "You must select at least one account to estimate."
msgstr "Sie müssen mindestens ein Konto auswählen, das geschätzt werden soll."
@@ -4193,8 +4191,8 @@ msgstr "Kopieren"
#: gnucash/gnome/gnc-plugin-page-invoice.c:125
#: gnucash/gnome/gnc-plugin-page-register2.c:238
#: gnucash/gnome/gnc-plugin-page-register.c:252
-#: gnucash/gnome-utils/gnc-main-window.c:320
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1213
+#: gnucash/gnome-utils/gnc-main-window.c:321
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1185
msgid "_Paste"
msgstr "E_infügen"
@@ -4453,7 +4451,7 @@ msgstr "Neuen Auslagenbeleg erfassen"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:202
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:277
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:960
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:931
msgid "Vendor Listing"
msgstr "Liste der Lieferanten"
@@ -4463,7 +4461,7 @@ msgstr "Entwicklung der Lieferanten anzeigen für alle Lieferanten"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:207
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:278
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:966
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:937
msgid "Customer Listing"
msgstr "Liste der Kunden"
@@ -4505,27 +4503,27 @@ msgstr "Mitarbeiterbericht anzeigen"
msgid "New Voucher"
msgstr "Neue Auslagenerstattung"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:478
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:449
msgid "Owners"
msgstr "Mandanten"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:660
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:631
msgid "Customers"
msgstr "Kunden"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:665
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:636
msgid "Jobs"
msgstr "Aufträge"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:670
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:641
msgid "Vendors"
msgstr "Lieferanten"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:675
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:646
msgid "Employees"
msgstr "Mitarbeiter"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1134
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1105
#, c-format
msgid ""
"The owner %s will be deleted.\n"
@@ -4559,7 +4557,7 @@ msgstr "Buchung dupli_zieren"
#: gnucash/gnome/gnc-plugin-page-register2.c:196
#: gnucash/gnome/gnc-plugin-page-register.c:207
-#: gnucash/gnome/gnc-split-reg.c:1433
+#: gnucash/gnome/gnc-split-reg.c:1529
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1064
msgid "_Delete Transaction"
msgstr "Buchung _löschen"
@@ -4586,7 +4584,7 @@ msgstr "Buchungsteil _duplizieren"
#: gnucash/gnome/gnc-plugin-page-register2.c:201
#: gnucash/gnome/gnc-plugin-page-register.c:215
-#: gnucash/gnome/gnc-split-reg.c:1393
+#: gnucash/gnome/gnc-split-reg.c:1489
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1024
msgid "_Delete Split"
msgstr "Buchungsteil _löschen"
@@ -4650,36 +4648,36 @@ msgstr "Scheck_s drucken..."
#: gnucash/gnome/gnc-plugin-page-register2.c:228
#: gnucash/gnome/gnc-plugin-page-register.c:242
-#: gnucash/gnome-utils/gnc-main-window.c:310
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1203
+#: gnucash/gnome-utils/gnc-main-window.c:311
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1175
msgid "Cu_t"
msgstr "_Ausschneiden"
#: gnucash/gnome/gnc-plugin-page-register2.c:229
#: gnucash/gnome/gnc-plugin-page-register.c:243
-#: gnucash/gnome-utils/gnc-main-window.c:311
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1204
+#: gnucash/gnome-utils/gnc-main-window.c:312
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1176
msgid "Cut the current selection and copy it to clipboard"
msgstr "Auswahl ausschneiden und in die Zwischenablage kopieren"
#: gnucash/gnome/gnc-plugin-page-register2.c:233
#: gnucash/gnome/gnc-plugin-page-register.c:247
-#: gnucash/gnome-utils/gnc-main-window.c:315
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1208
+#: gnucash/gnome-utils/gnc-main-window.c:316
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1180
msgid "_Copy"
msgstr "_Kopieren"
#: gnucash/gnome/gnc-plugin-page-register2.c:234
#: gnucash/gnome/gnc-plugin-page-register.c:248
-#: gnucash/gnome-utils/gnc-main-window.c:316
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1209
+#: gnucash/gnome-utils/gnc-main-window.c:317
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1181
msgid "Copy the current selection to clipboard"
msgstr "Auswahl in die Zwischenablage kopieren"
#: gnucash/gnome/gnc-plugin-page-register2.c:239
#: gnucash/gnome/gnc-plugin-page-register.c:253
-#: gnucash/gnome-utils/gnc-main-window.c:321
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1214
+#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1186
msgid "Paste the clipboard content at the cursor position"
msgstr "Zwischenablage an Cursor-Position einfügen"
@@ -4755,14 +4753,14 @@ msgstr ""
"Kontofenster nach Datum sortiert ist."
#: gnucash/gnome/gnc-plugin-page-register2.c:330
-#: gnucash/gnome-utils/gnc-main-window.c:341
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1218
+#: gnucash/gnome-utils/gnc-main-window.c:342
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1190
msgid "_Refresh"
msgstr "Aktualisie_ren"
#: gnucash/gnome/gnc-plugin-page-register2.c:331
-#: gnucash/gnome-utils/gnc-main-window.c:342
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1219
+#: gnucash/gnome-utils/gnc-main-window.c:343
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1191
msgid "Refresh this window"
msgstr "Dieses Fenster aktualisieren"
@@ -4919,7 +4917,7 @@ msgstr "Alle Buchungssätze vollständig mit allen Teilen anzeigen"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2877
#: gnucash/register/ledger-core/split-register.c:2564
#: gnucash/register/ledger-core/split-register-layout.c:727
-#: gnucash/register/ledger-core/split-register-model.c:340
+#: gnucash/register/ledger-core/split-register-model.c:342
#: gnucash/report/standard-reports/register.scm:143
msgid "Transfer"
msgstr "Buchen"
@@ -4941,7 +4939,7 @@ msgstr "Terminiert"
msgid "Auto-clear"
msgstr "Automatischer Abgleich"
-#: gnucash/gnome/gnc-plugin-page-register2.c:683
+#: gnucash/gnome/gnc-plugin-page-register2.c:655
msgid ""
"You have tried to open an account in the new register while it is open in "
"the old register."
@@ -4949,20 +4947,20 @@ msgstr ""
"Sie wollten gerade ein Konto in der neuen Kontoansicht (register2) öffnen, "
"obwohl es bereits in der alten Ansicht geöffnet ist."
-#: gnucash/gnome/gnc-plugin-page-register2.c:756
+#: gnucash/gnome/gnc-plugin-page-register2.c:728
msgid "General Journal2"
msgstr "Hauptbuch Journal2"
#. Translators: %s is the name
#. of the tab page
-#: gnucash/gnome/gnc-plugin-page-register2.c:1616
-#: gnucash/gnome/gnc-plugin-page-register.c:1713
+#: gnucash/gnome/gnc-plugin-page-register2.c:1588
+#: gnucash/gnome/gnc-plugin-page-register.c:1685
#, c-format
msgid "Save changes to %s?"
msgstr "Änderungen in %s speichern?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1620
-#: gnucash/gnome/gnc-plugin-page-register.c:1717
+#: gnucash/gnome/gnc-plugin-page-register2.c:1592
+#: gnucash/gnome/gnc-plugin-page-register.c:1689
msgid ""
"This register has pending changes to a transaction. Would you like to save "
"the changes to this transaction, discard the transaction, or cancel the "
@@ -4972,93 +4970,93 @@ msgstr ""
"Schließen der Seite die Änderungen in der Buchung speichern oder verwerfen "
"oder möchten Sie abbrechen?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1623
-#: gnucash/gnome/gnc-plugin-page-register.c:1720
+#: gnucash/gnome/gnc-plugin-page-register2.c:1595
+#: gnucash/gnome/gnc-plugin-page-register.c:1692
msgid "_Discard Transaction"
msgstr "Buchungsänderungen ver_werfen"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1627
-#: gnucash/gnome/gnc-plugin-page-register.c:1724
+#: gnucash/gnome/gnc-plugin-page-register2.c:1599
+#: gnucash/gnome/gnc-plugin-page-register.c:1696
msgid "_Save Transaction"
msgstr "Buchung _speichern"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1656
-#: gnucash/gnome/gnc-plugin-page-register2.c:1691
-#: gnucash/gnome/gnc-plugin-page-register2.c:1703
-#: gnucash/gnome/gnc-plugin-page-register2.c:1726
-#: gnucash/gnome/gnc-plugin-page-register2.c:1774
-#: gnucash/gnome/gnc-plugin-page-register.c:1756
-#: gnucash/gnome/gnc-plugin-page-register.c:1791
-#: gnucash/gnome/gnc-plugin-page-register.c:1803
-#: gnucash/gnome/gnc-plugin-page-register.c:1853
-#: gnucash/gnome/gnc-plugin-page-register.c:1970
-#: gnucash/gnome/gnc-plugin-page-register.c:2142
+#: gnucash/gnome/gnc-plugin-page-register2.c:1628
+#: gnucash/gnome/gnc-plugin-page-register2.c:1663
+#: gnucash/gnome/gnc-plugin-page-register2.c:1675
+#: gnucash/gnome/gnc-plugin-page-register2.c:1698
+#: gnucash/gnome/gnc-plugin-page-register2.c:1746
+#: gnucash/gnome/gnc-plugin-page-register.c:1728
+#: gnucash/gnome/gnc-plugin-page-register.c:1763
+#: gnucash/gnome/gnc-plugin-page-register.c:1775
+#: gnucash/gnome/gnc-plugin-page-register.c:1825
+#: gnucash/gnome/gnc-plugin-page-register.c:1942
+#: gnucash/gnome/gnc-plugin-page-register.c:2114
msgid "unknown"
msgstr "unbekannt"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1677
-#: gnucash/gnome/gnc-plugin-page-register2.c:2412
-#: gnucash/gnome/gnc-plugin-page-register.c:784
-#: gnucash/gnome/gnc-plugin-page-register.c:1777
-#: gnucash/gnome/gnc-plugin-page-register.c:3240
-#: gnucash/gnome/gnc-split-reg.c:717
+#: gnucash/gnome/gnc-plugin-page-register2.c:1649
+#: gnucash/gnome/gnc-plugin-page-register2.c:2384
+#: gnucash/gnome/gnc-plugin-page-register.c:756
+#: gnucash/gnome/gnc-plugin-page-register.c:1749
+#: gnucash/gnome/gnc-plugin-page-register.c:3212
+#: gnucash/gnome/gnc-split-reg.c:719
#: gnucash/report/standard-reports/general-journal.scm:37
msgid "General Journal"
msgstr "Hauptbuch Journal"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1679
-#: gnucash/gnome/gnc-plugin-page-register2.c:2418
-#: gnucash/gnome/gnc-plugin-page-register.c:1779
-#: gnucash/gnome/gnc-plugin-page-register.c:3246
+#: gnucash/gnome/gnc-plugin-page-register2.c:1651
+#: gnucash/gnome/gnc-plugin-page-register2.c:2390
+#: gnucash/gnome/gnc-plugin-page-register.c:1751
+#: gnucash/gnome/gnc-plugin-page-register.c:3218
msgid "Portfolio"
msgstr "Portfolio"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1681
-#: gnucash/gnome/gnc-plugin-page-register2.c:2424
-#: gnucash/gnome/gnc-plugin-page-register.c:1781
-#: gnucash/gnome/gnc-plugin-page-register.c:3252
+#: gnucash/gnome/gnc-plugin-page-register2.c:1653
+#: gnucash/gnome/gnc-plugin-page-register2.c:2396
+#: gnucash/gnome/gnc-plugin-page-register.c:1753
+#: gnucash/gnome/gnc-plugin-page-register.c:3224
msgid "Search Results"
msgstr "Suchergebnisse"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2414
+#: gnucash/gnome/gnc-plugin-page-register2.c:2386
msgid "General Journal Report"
msgstr "Hauptbuch Journal Bericht"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2420
-#: gnucash/gnome/gnc-plugin-page-register.c:3248
+#: gnucash/gnome/gnc-plugin-page-register2.c:2392
+#: gnucash/gnome/gnc-plugin-page-register.c:3220
msgid "Portfolio Report"
msgstr "Portfolio Bericht"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2426
-#: gnucash/gnome/gnc-plugin-page-register.c:3254
+#: gnucash/gnome/gnc-plugin-page-register2.c:2398
+#: gnucash/gnome/gnc-plugin-page-register.c:3226
msgid "Search Results Report"
msgstr "Suchergebnisse Bericht"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2430
-#: gnucash/gnome/gnc-plugin-page-register.c:3258
+#: gnucash/gnome/gnc-plugin-page-register2.c:2402
+#: gnucash/gnome/gnc-plugin-page-register.c:3230
#: gnucash/gtkbuilder/dialog-preferences.glade:2342
#: gnucash/report/standard-reports/general-journal.scm:38
#: gnucash/report/standard-reports/register.scm:718
msgid "Register"
msgstr "Kontobuch"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2432
+#: gnucash/gnome/gnc-plugin-page-register2.c:2404
#: gnucash/report/standard-reports/register.scm:395
msgid "Register Report"
msgstr "Bericht zum Kontobuch"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2448
-#: gnucash/gnome/gnc-plugin-page-register.c:3276
+#: gnucash/gnome/gnc-plugin-page-register2.c:2420
+#: gnucash/gnome/gnc-plugin-page-register.c:3248
msgid "and subaccounts"
msgstr "und Unterkonten"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2480
-#: gnucash/gnome/gnc-plugin-page-register.c:3304
+#: gnucash/gnome/gnc-plugin-page-register2.c:2452
+#: gnucash/gnome/gnc-plugin-page-register.c:3276
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2912
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3046
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3051
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3018
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3023
#: gnucash/gtkbuilder/dialog-payment.glade:344
#: gnucash/register/ledger-core/split-register.c:2465
#: gnucash/register/ledger-core/split-register.c:2562
@@ -5066,35 +5064,35 @@ msgstr "und Unterkonten"
#: gnucash/register/ledger-core/split-register.c:2599
#: gnucash/report/standard-reports/general-journal.scm:89
#: gnucash/report/standard-reports/register.scm:389
-#: gnucash/report/standard-reports/transaction.scm:1266
-#: gnucash/report/standard-reports/transaction.scm:1283
+#: gnucash/report/standard-reports/transaction.scm:1270
+#: gnucash/report/standard-reports/transaction.scm:1287
#: gnucash/report/standard-reports/trial-balance.scm:753
#: libgnucash/app-utils/guile-util.c:850
msgid "Credit"
msgstr "Haben"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2483
-#: gnucash/gnome/gnc-plugin-page-register.c:3308
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3127
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3132
+#: gnucash/gnome/gnc-plugin-page-register2.c:2455
+#: gnucash/gnome/gnc-plugin-page-register.c:3280
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3099
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3104
#: gnucash/gtkbuilder/dialog-payment.glade:328
#: gnucash/register/ledger-core/split-register.c:2442
#: gnucash/report/standard-reports/general-journal.scm:88
#: gnucash/report/standard-reports/register.scm:387
-#: gnucash/report/standard-reports/transaction.scm:1263
-#: gnucash/report/standard-reports/transaction.scm:1280
+#: gnucash/report/standard-reports/transaction.scm:1267
+#: gnucash/report/standard-reports/transaction.scm:1284
#: gnucash/report/standard-reports/trial-balance.scm:750
#: libgnucash/app-utils/guile-util.c:819
msgid "Debit"
msgstr "Soll"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2649
-#: gnucash/gnome/gnc-plugin-page-register.c:3441
+#: gnucash/gnome/gnc-plugin-page-register2.c:2621
+#: gnucash/gnome/gnc-plugin-page-register.c:3413
msgid "Print checks from multiple accounts?"
msgstr "Schecks aus mehreren Konten drucken?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2651
-#: gnucash/gnome/gnc-plugin-page-register.c:3443
+#: gnucash/gnome/gnc-plugin-page-register2.c:2623
+#: gnucash/gnome/gnc-plugin-page-register.c:3415
msgid ""
"This search result contains splits from more than one account. Do you want "
"to print the checks even though they are not all from the same account?"
@@ -5102,31 +5100,31 @@ msgstr ""
"Das Suchergebnis enthält Buchungsteile aus mehr als einem Konto. Wollen Sie "
"die Schecks wirklich drucken, obwohl sie nicht alle zum selben Konto gehören?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2661
-#: gnucash/gnome/gnc-plugin-page-register.c:3453
+#: gnucash/gnome/gnc-plugin-page-register2.c:2633
+#: gnucash/gnome/gnc-plugin-page-register.c:3425
msgid "_Print checks"
msgstr "Schec_ks drucken"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2680
-#: gnucash/gnome/gnc-plugin-page-register.c:3472
+#: gnucash/gnome/gnc-plugin-page-register2.c:2652
+#: gnucash/gnome/gnc-plugin-page-register.c:3444
msgid ""
"You can only print checks from a bank account register or search results."
msgstr ""
"Sie können »Schecks drucken« nur aus einem Bankkonto oder den "
"Suchergebnissen auswählen."
-#: gnucash/gnome/gnc-plugin-page-register2.c:2873
-#: gnucash/gnome/gnc-plugin-page-register.c:3650
+#: gnucash/gnome/gnc-plugin-page-register2.c:2845
+#: gnucash/gnome/gnc-plugin-page-register.c:3622
msgid "You cannot void a transaction with reconciled or cleared splits."
msgstr ""
"Sie können eine Buchung mit abgeglichenen oder bestätigten Buchungsteilen "
"nicht ungültig machen."
#. Translators: The %s is the name of the plugin page
-#: gnucash/gnome/gnc-plugin-page-register2.c:3016
-#: gnucash/gnome/gnc-plugin-page-register.c:3890
-#: gnucash/gnome-utils/gnc-tree-view-account.c:2238
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:1205
+#: gnucash/gnome/gnc-plugin-page-register2.c:2988
+#: gnucash/gnome/gnc-plugin-page-register.c:3862
+#: gnucash/gnome-utils/gnc-tree-view-account.c:2210
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:1177
#, c-format
msgid "Filter %s by..."
msgstr "%s filtern nach..."
@@ -5162,7 +5160,7 @@ msgid "Remo_ve Other Splits"
msgstr "Andere Buchungs_teile löschen"
#: gnucash/gnome/gnc-plugin-page-register.c:345
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "_Sort By..."
msgstr "Sortieren _nach..."
@@ -5178,7 +5176,7 @@ msgstr "Internetadresse zuordnen"
msgid "Open File/Location"
msgstr "Datei/Adresse öffnen"
-#: gnucash/gnome/gnc-plugin-page-register.c:711
+#: gnucash/gnome/gnc-plugin-page-register.c:685
msgid ""
"You have tried to open an account in the old register while it is open in "
"the new register."
@@ -5186,11 +5184,11 @@ msgstr ""
"Sie wollten gerade ein Konto in der alten Kontoansicht öffnen, obwohl es "
"bereits in der neuen Ansicht (register2) geöffnet ist."
-#: gnucash/gnome/gnc-plugin-page-register.c:3114
+#: gnucash/gnome/gnc-plugin-page-register.c:3086
msgid "Filter By:"
msgstr "Filtern nach:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3128
+#: gnucash/gnome/gnc-plugin-page-register.c:3100
#: gnucash/gtkbuilder/assistant-loan.glade:161
#: gnucash/gtkbuilder/assistant-loan.glade:1248
#: gnucash/gtkbuilder/dialog-sx.glade:257
@@ -5199,33 +5197,33 @@ msgstr "Filtern nach:"
msgid "Start Date:"
msgstr "Anfangsdatum:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3134
+#: gnucash/gnome/gnc-plugin-page-register.c:3106
msgid "Show previous number of days:"
msgstr "Anzahl der angezeigten vorherigen Tage:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3140
+#: gnucash/gnome/gnc-plugin-page-register.c:3112
#: gnucash/gtkbuilder/assistant-loan.glade:1260
#: gnucash/gtkbuilder/dialog-sx.glade:329
msgid "End Date:"
msgstr "Enddatum:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3150
+#: gnucash/gnome/gnc-plugin-page-register.c:3122
#: gnucash/report/standard-reports/transaction.scm:167
#: gnucash/report/standard-reports/transaction.scm:358
msgid "Unreconciled"
msgstr "Nicht abgeglichene"
-#: gnucash/gnome/gnc-plugin-page-register.c:3151
-#: gnucash/gnome-search/search-reconciled.c:246
-#: gnucash/gnome-utils/gnc-tree-view-account.c:832
+#: gnucash/gnome/gnc-plugin-page-register.c:3123
+#: gnucash/gnome-search/search-reconciled.c:218
+#: gnucash/gnome-utils/gnc-tree-view-account.c:804
#: gnucash/report/standard-reports/transaction.scm:166
#: gnucash/report/standard-reports/transaction.scm:364
msgid "Cleared"
msgstr "Bestätigt"
-#: gnucash/gnome/gnc-plugin-page-register.c:3152
-#: gnucash/gnome-search/search-reconciled.c:249
-#: gnucash/gnome-utils/gnc-tree-view-account.c:846
+#: gnucash/gnome/gnc-plugin-page-register.c:3124
+#: gnucash/gnome-search/search-reconciled.c:221
+#: gnucash/gnome-utils/gnc-tree-view-account.c:818
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:64
#: gnucash/import-export/import-match-picker.c:437
#: gnucash/report/standard-reports/transaction.scm:165
@@ -5233,55 +5231,55 @@ msgstr "Bestätigt"
msgid "Reconciled"
msgstr "Abgeglichen"
-#: gnucash/gnome/gnc-plugin-page-register.c:3153
-#: gnucash/gnome-search/search-reconciled.c:252
+#: gnucash/gnome/gnc-plugin-page-register.c:3125
+#: gnucash/gnome-search/search-reconciled.c:224
#: gnucash/report/standard-reports/transaction.scm:168
msgid "Frozen"
msgstr "Fixiert"
-#: gnucash/gnome/gnc-plugin-page-register.c:3154
-#: gnucash/gnome-search/search-reconciled.c:255
+#: gnucash/gnome/gnc-plugin-page-register.c:3126
+#: gnucash/gnome-search/search-reconciled.c:227
#: gnucash/report/standard-reports/transaction.scm:169
msgid "Voided"
msgstr "Storniert"
-#: gnucash/gnome/gnc-plugin-page-register.c:3157
-#: gnucash/gnome/gnc-plugin-page-register.c:3159
+#: gnucash/gnome/gnc-plugin-page-register.c:3129
+#: gnucash/gnome/gnc-plugin-page-register.c:3131
msgid "Hide:"
msgstr "Versteckt:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3159
+#: gnucash/gnome/gnc-plugin-page-register.c:3131
msgid "Show:"
msgstr "Angezeigt:"
#. Define the strings here to avoid typos and make changes easier.
-#: gnucash/gnome/gnc-plugin-page-register.c:3242
-#: gnucash/gnome/gnc-plugin-page-register.c:3260
+#: gnucash/gnome/gnc-plugin-page-register.c:3214
+#: gnucash/gnome/gnc-plugin-page-register.c:3232
#: gnucash/report/standard-reports/transaction.scm:55
msgid "Transaction Report"
msgstr "Buchungsbericht"
-#: gnucash/gnome/gnc-plugin-page-register.c:3656
-#: gnucash/gnome/gnc-split-reg.c:931
+#: gnucash/gnome/gnc-plugin-page-register.c:3628
+#: gnucash/gnome/gnc-split-reg.c:933
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:68
#, c-format
msgid "This transaction is marked read-only with the comment: '%s'"
msgstr ""
"Diese Buchung ist mit folgendem Kommentar als schreibgeschützt markiert: '%s'"
-#: gnucash/gnome/gnc-plugin-page-register.c:3729
-#: gnucash/gnome/gnc-split-reg.c:902
+#: gnucash/gnome/gnc-plugin-page-register.c:3701
+#: gnucash/gnome/gnc-split-reg.c:904
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1121
msgid "A reversing entry has already been created for this transaction."
msgstr "Zu dieser Buchung wurde bereits eine Stornierungsbuchung hinzugefügt."
#. Translations: The %s is the name of the plugin page
-#: gnucash/gnome/gnc-plugin-page-register.c:3807
+#: gnucash/gnome/gnc-plugin-page-register.c:3779
#, c-format
msgid "Sort %s by..."
msgstr "%s sortieren nach..."
-#: gnucash/gnome/gnc-plugin-page-register.c:4515
+#: gnucash/gnome/gnc-plugin-page-register.c:4487
#, c-format
msgid "Checking splits in current register: %u of %u"
msgstr "Überprüfe Buchungsteile im aktuellen Konto: %u von %u"
@@ -5328,12 +5326,12 @@ msgstr "Ausgewählte terminierte Buchung bearbeiten"
msgid "Delete the selected scheduled transaction"
msgstr "Ausgewählte terminierte Buchung löschen"
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:429
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:398
#, c-format
msgid "Transactions"
msgstr "Buchungen"
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:492
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:461
#, c-format
msgid "Upcoming Transactions"
msgstr "Bevorstehende Buchungen"
@@ -5342,7 +5340,7 @@ msgstr "Bevorstehende Buchungen"
#. multiple SXs be deleted as well? Ideally, the number of
#. to-be-deleted SXs should be mentioned here; see
#. dialog-sx-since-last-run.c:807
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:836
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:805
msgid "Do you really want to delete this scheduled transaction?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählte Terminierte Buchung löschen wollen?"
@@ -5379,35 +5377,35 @@ msgstr ""
"Journal-Fenster öffnen (Alle Buchungssätze aller Konten in einem einzigen "
"Journal)"
-#: gnucash/gnome/gnc-split-reg2.c:632 gnucash/gnome/gnc-split-reg.c:1721
+#: gnucash/gnome/gnc-split-reg2.c:632 gnucash/gnome/gnc-split-reg.c:1817
msgid "Balancing entry from reconciliation"
msgstr "Ausgleichsbuchung vom Abgleichen"
-#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2195
+#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2291
msgid "Present:"
msgstr "Aktueller Wert:"
-#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2196
+#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2292
msgid "Future:"
msgstr "Zukünftiger Wert:"
-#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2197
+#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2293
msgid "Cleared:"
msgstr "Bestätigt:"
-#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2198
+#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2294
msgid "Reconciled:"
msgstr "Abgeglichen:"
-#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2199
+#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2295
msgid "Projected Minimum:"
msgstr "Voraussichtliches Minimum:"
-#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2203
+#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2299
msgid "Shares:"
msgstr "Anteile:"
-#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2204
+#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2300
msgid "Current Value:"
msgstr "Aktueller Wert:"
@@ -5425,11 +5423,11 @@ msgstr ""
"Verbindlichkeiten. Die Einträge sollten nicht von Hand geändert werden, "
"sondern nur über die Menüpunkte im »Geschäft«-Menü."
-#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2286
+#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2382
msgid "This account register is read-only."
msgstr "Dieses Konto ist schreibgeschützt."
-#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2329
+#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2425
msgid ""
"This account may not be edited. If you want to edit transactions in this "
"register, please open the account options and turn off the placeholder "
@@ -5439,7 +5437,7 @@ msgstr ""
"Konto bearbeiten möchten, öffnen Sie bitte das Dialogfenster »Konto "
"Eigenschaften« und deaktivieren Sie die Option »Platzhalter-Konto«."
-#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2336
+#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2432
msgid ""
"One of the sub-accounts selected may not be edited. If you want to edit "
"transactions in this register, please open the sub-account options and turn "
@@ -5451,40 +5449,40 @@ msgstr ""
"Dialogfenster »Konto Eigenschaften« des Unterkontos und deaktivieren Sie die "
"Option »Platzhalter-Konto«."
-#: gnucash/gnome/gnc-split-reg.c:597
+#: gnucash/gnome/gnc-split-reg.c:599
msgid "Standard Order"
msgstr "Standardreihenfolge"
-#: gnucash/gnome/gnc-split-reg.c:603
+#: gnucash/gnome/gnc-split-reg.c:605
msgid "Date of Entry"
msgstr "Eingabe-Datum"
-#: gnucash/gnome/gnc-split-reg.c:606
+#: gnucash/gnome/gnc-split-reg.c:608
msgid "Statement Date"
msgstr "Datum des Kontoauszugs"
-#: gnucash/gnome/gnc-split-reg.c:629
-#: gnucash/report/business-reports/customer-summary.scm:471
+#: gnucash/gnome/gnc-split-reg.c:631
+#: gnucash/report/business-reports/customer-summary.scm:170
#: gnucash/report/standard-reports/transaction.scm:381
msgid "Descending"
msgstr "Absteigend"
-#: gnucash/gnome/gnc-split-reg.c:631
-#: gnucash/report/business-reports/customer-summary.scm:468
+#: gnucash/gnome/gnc-split-reg.c:633
+#: gnucash/report/business-reports/customer-summary.scm:167
#: gnucash/report/standard-reports/transaction.scm:378
msgid "Ascending"
msgstr "Aufsteigend"
-#: gnucash/gnome/gnc-split-reg.c:657
+#: gnucash/gnome/gnc-split-reg.c:659
msgid "Filtered"
msgstr "Gefiltert"
-#: gnucash/gnome/gnc-split-reg.c:929
+#: gnucash/gnome/gnc-split-reg.c:931
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:66
msgid "Cannot modify or delete this transaction."
msgstr "Buchung kann nicht geändert oder gelöscht werden."
-#: gnucash/gnome/gnc-split-reg.c:943
+#: gnucash/gnome/gnc-split-reg.c:945
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:83
msgid ""
"The date of this transaction is older than the \"Read-Only Threshold\" set "
@@ -5494,12 +5492,12 @@ msgstr ""
"dieses Buch eingestellt ist. Diese Einstellung kann geändert werden unter "
"Datei -> Eigenschaften -> Konten."
-#: gnucash/gnome/gnc-split-reg.c:979
+#: gnucash/gnome/gnc-split-reg.c:981
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:840
msgid "Remove the splits from this transaction?"
msgstr "Buchungsteile von dieser Buchung entfernen?"
-#: gnucash/gnome/gnc-split-reg.c:980
+#: gnucash/gnome/gnc-split-reg.c:982
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:841
msgid ""
"This transaction contains reconciled splits. Modifying it is not a good idea "
@@ -5509,16 +5507,16 @@ msgstr ""
"löschen würden. Dies bedeutet, dass ihr abgeglichener Saldo verändert wird."
#. Translators: This is the confirmation button in a warning dialog
-#: gnucash/gnome/gnc-split-reg.c:1009
+#: gnucash/gnome/gnc-split-reg.c:1011
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:887
msgid "_Remove Splits"
msgstr "Buchungsteile _entfernen"
-#: gnucash/gnome/gnc-split-reg.c:1046
+#: gnucash/gnome/gnc-split-reg.c:1048
msgid "Associate File with Transaction"
msgstr "_Datei zuordnen"
-#: gnucash/gnome/gnc-split-reg.c:1049 gnucash/gnome/gnc-split-reg.c:1120
+#: gnucash/gnome/gnc-split-reg.c:1051 gnucash/gnome/gnc-split-reg.c:1173
#: gnucash/gnome-search/dialog-search.c:693
#: gnucash/gnome-utils/gnc-recurrence.c:552
#: gnucash/gtkbuilder/dialog-commodities.glade:41
@@ -5526,34 +5524,35 @@ msgstr "_Datei zuordnen"
msgid "_Remove"
msgstr "_Entfernen"
-#: gnucash/gnome/gnc-split-reg.c:1076
-msgid "Existing Association is "
+#: gnucash/gnome/gnc-split-reg.c:1086
+#, fuzzy
+msgid "Existing Association is '"
msgstr "Bestehende Zuordnung ist "
-#: gnucash/gnome/gnc-split-reg.c:1117
+#: gnucash/gnome/gnc-split-reg.c:1170
msgid "Associate Location with Transaction"
msgstr "_Internetadresse zuordnen"
# Fixme I18N: ambiguous, append or correct?
-#: gnucash/gnome/gnc-split-reg.c:1135
+#: gnucash/gnome/gnc-split-reg.c:1194
msgid "Amend URL:"
msgstr "URL ergänzen:"
-#: gnucash/gnome/gnc-split-reg.c:1139
-msgid "Enter URL:"
-msgstr "URL eingeben:"
+#: gnucash/gnome/gnc-split-reg.c:1198
+msgid "Enter URL like http://www.gnucash.org:"
+msgstr ""
-#: gnucash/gnome/gnc-split-reg.c:1253
+#: gnucash/gnome/gnc-split-reg.c:1344
msgid "This transaction is not associated with a URI."
msgstr "Diesem Buchungssatz ist keine URI zugeordnet."
-#: gnucash/gnome/gnc-split-reg.c:1332
+#: gnucash/gnome/gnc-split-reg.c:1428
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:963
#, c-format
msgid "Delete the split '%s' from the transaction '%s'?"
msgstr "Den Buchungsteil »%s« von der Buchung »%s« entfernen?"
-#: gnucash/gnome/gnc-split-reg.c:1333
+#: gnucash/gnome/gnc-split-reg.c:1429
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:964
msgid ""
"You would be deleting a reconciled split! This is not a good idea as it will "
@@ -5562,12 +5561,12 @@ msgstr ""
"Sie würden einen abgeglichenen Buchungsteil löschen! Das würde bewirken, "
"dass Ihr Saldo nicht mehr abgeglichen ist."
-#: gnucash/gnome/gnc-split-reg.c:1336
+#: gnucash/gnome/gnc-split-reg.c:1432
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:967
msgid "You cannot delete this split."
msgstr "Sie können diesen Buchungsteil nicht löschen."
-#: gnucash/gnome/gnc-split-reg.c:1337
+#: gnucash/gnome/gnc-split-reg.c:1433
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:968
msgid ""
"This is the split anchoring this transaction to the register. You may not "
@@ -5582,22 +5581,22 @@ msgstr ""
"dem Knopf »Gegenbuchung«) und löschen diesen Buchungsteil von jenem anderen "
"Kontofenster."
-#: gnucash/gnome/gnc-split-reg.c:1365
+#: gnucash/gnome/gnc-split-reg.c:1461
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:996
msgid "(no memo)"
msgstr "(Kein Buchungstext)"
-#: gnucash/gnome/gnc-split-reg.c:1368
+#: gnucash/gnome/gnc-split-reg.c:1464
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:999
msgid "(no description)"
msgstr "(Keine Beschreibung)"
-#: gnucash/gnome/gnc-split-reg.c:1409
+#: gnucash/gnome/gnc-split-reg.c:1505
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1040
msgid "Delete the current transaction?"
msgstr "Aktuelle Buchung löschen?"
-#: gnucash/gnome/gnc-split-reg.c:1410
+#: gnucash/gnome/gnc-split-reg.c:1506
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1041
msgid ""
"You would be deleting a transaction with reconciled splits! This is not a "
@@ -5606,7 +5605,7 @@ msgstr ""
"Beachten Sie, dass Sie einen Buchungssatz mit abgeglichenen Buchungsteilen "
"löschen würden. Dies bedeutet, dass ihr abgeglichener Saldo verändert wird."
-#: gnucash/gnome/gnc-split-reg.c:2210
+#: gnucash/gnome/gnc-split-reg.c:2306
msgid "Sort By: "
msgstr "Sortiere nach: "
@@ -5666,10 +5665,11 @@ msgid "Set up scheduled transactions to avoid repeated data entry"
msgstr ""
"Terminierte Buchungen einrichten, um wiederholte Dateneingabe zu vermeiden"
-# Fixme: expand Source
#: gnucash/gnome/gnucash.appdata.xml.in:24
-msgid "QIF/OFX/HBCI Import, Transaction Matching"
-msgstr "Datenaustausch via FinTS(HBCI)/SWIFT-MT9xx/QIF/OFX und Abgleich"
+msgid ""
+"Exchange by CSV/FinTS(former HBCI) or import SWIFT-MT9xx/QIF/OFX data "
+"including Transaction Matching"
+msgstr ""
#: gnucash/gnome/gnucash.appdata.xml.in:25
msgid "Perform financial calculations, such as a loan repayment"
@@ -5690,15 +5690,15 @@ msgstr "gnucash-icon"
#. leave the rest ("Reconciled:") as is.
#: gnucash/gnome/reconcile-view.c:425
#: gnucash/register/ledger-core/split-register-layout.c:699
-#: gnucash/register/ledger-core/split-register-model.c:304
+#: gnucash/register/ledger-core/split-register-model.c:306
msgid "Reconciled:R"
msgstr "Reconciled:A"
-#: gnucash/gnome/search-owner.c:166
+#: gnucash/gnome/search-owner.c:138
msgid "You have not selected an owner"
msgstr "Sie haben keinen Mandanten ausgewählt"
-#: gnucash/gnome/search-owner.c:244 gnucash/gnome-search/dialog-search.c:1074
+#: gnucash/gnome/search-owner.c:216 gnucash/gnome-search/dialog-search.c:1074
#: gnucash/gtkbuilder/dialog-invoice.glade:304
#: gnucash/gtkbuilder/dialog-invoice.glade:987
#: gnucash/gtkbuilder/dialog-invoice.glade:1157
@@ -5707,13 +5707,13 @@ msgstr "Sie haben keinen Mandanten ausgewählt"
msgid "Job"
msgstr "Auftrag"
-#: gnucash/gnome/search-owner.c:261
-#: gnucash/gnome-search/search-reconciled.c:205
+#: gnucash/gnome/search-owner.c:233
+#: gnucash/gnome-search/search-reconciled.c:177
msgid "is"
msgstr "ist"
-#: gnucash/gnome/search-owner.c:262
-#: gnucash/gnome-search/search-reconciled.c:206
+#: gnucash/gnome/search-owner.c:234
+#: gnucash/gnome-search/search-reconciled.c:178
msgid "is not"
msgstr "ist nicht"
@@ -5874,7 +5874,7 @@ msgstr "_Konto"
#: gnucash/gnome/window-reconcile2.c:2174
#: gnucash/gnome/window-reconcile2.c:2255 gnucash/gnome/window-reconcile.c:2258
#: gnucash/gnome/window-reconcile.c:2339
-#: gnucash/gnome-utils/gnc-main-window.c:273
+#: gnucash/gnome-utils/gnc-main-window.c:274
#: gnucash/gtkbuilder/dialog-account.glade:940
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:23
@@ -5894,7 +5894,7 @@ msgstr "_Konto"
#: gnucash/gtkbuilder/dialog-search.glade:21
#: gnucash/gtkbuilder/dialog-sx.glade:766
#: gnucash/gtkbuilder/dialog-vendor.glade:47
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2037
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2049
msgid "_Help"
msgstr "_Hilfe"
@@ -5947,7 +5947,7 @@ msgstr "Bearbeiten des übergeordneten Kontos für dieses Kontobuch"
#. Actions menu
#: gnucash/gnome/window-reconcile2.c:2218 gnucash/gnome/window-reconcile.c:2302
-#: gnucash/gnome-utils/gnc-main-window.c:348
+#: gnucash/gnome-utils/gnc-main-window.c:349
msgid "_Check & Repair"
msgstr "Überprü_fen"
@@ -6038,147 +6038,147 @@ msgstr "Alle Kriterien werden erfüllt"
msgid "any criteria are met"
msgstr "Irgendeines der Kriterien wird erfüllt"
-#: gnucash/gnome-search/search-account.c:180
+#: gnucash/gnome-search/search-account.c:151
msgid "You have not selected any accounts"
msgstr "Sie haben keine Konten ausgewählt"
-#: gnucash/gnome-search/search-account.c:201
+#: gnucash/gnome-search/search-account.c:172
msgid "matches all accounts"
msgstr "entspricht allen Konten"
-#: gnucash/gnome-search/search-account.c:206
+#: gnucash/gnome-search/search-account.c:177
msgid "matches any account"
msgstr "entspricht irgendeinem Konto"
-#: gnucash/gnome-search/search-account.c:207
+#: gnucash/gnome-search/search-account.c:178
msgid "matches no accounts"
msgstr "entspricht keinem Konto"
-#: gnucash/gnome-search/search-account.c:224
-#: gnucash/report/standard-reports/cash-flow.scm:255
+#: gnucash/gnome-search/search-account.c:195
+#: gnucash/report/standard-reports/cash-flow.scm:263
msgid "Selected Accounts"
msgstr "Ausgewählte Konten"
-#: gnucash/gnome-search/search-account.c:225
+#: gnucash/gnome-search/search-account.c:196
msgid "Choose Accounts"
msgstr "Konten wählen"
#. Create the label
-#: gnucash/gnome-search/search-account.c:259
+#: gnucash/gnome-search/search-account.c:230
msgid "Select Accounts to Match"
msgstr "Konten wählen, die den Kriterien entsprechen"
-#: gnucash/gnome-search/search-account.c:263
+#: gnucash/gnome-search/search-account.c:234
msgid "Select the Accounts to Compare"
msgstr "Konten wählen, die verglichen werden sollen"
-#: gnucash/gnome-search/search-date.c:224
+#: gnucash/gnome-search/search-date.c:196
msgid "is before"
msgstr "vor"
-#: gnucash/gnome-search/search-date.c:225
+#: gnucash/gnome-search/search-date.c:197
msgid "is before or on"
msgstr "vor oder am"
-#: gnucash/gnome-search/search-date.c:226
+#: gnucash/gnome-search/search-date.c:198
msgid "is on"
msgstr "am"
-#: gnucash/gnome-search/search-date.c:227
+#: gnucash/gnome-search/search-date.c:199
msgid "is not on"
msgstr "nicht am"
-#: gnucash/gnome-search/search-date.c:228
+#: gnucash/gnome-search/search-date.c:200
msgid "is after"
msgstr "nach"
-#: gnucash/gnome-search/search-date.c:229
+#: gnucash/gnome-search/search-date.c:201
msgid "is on or after"
msgstr "nach oder am"
-#: gnucash/gnome-search/search-double.c:203
-#: gnucash/gnome-search/search-int64.c:205
-#: gnucash/gnome-search/search-numeric.c:236
+#: gnucash/gnome-search/search-double.c:175
+#: gnucash/gnome-search/search-int64.c:177
+#: gnucash/gnome-search/search-numeric.c:208
msgid "is less than"
msgstr "weniger als"
-#: gnucash/gnome-search/search-double.c:204
-#: gnucash/gnome-search/search-int64.c:206
-#: gnucash/gnome-search/search-numeric.c:240
+#: gnucash/gnome-search/search-double.c:176
+#: gnucash/gnome-search/search-int64.c:178
+#: gnucash/gnome-search/search-numeric.c:212
msgid "is less than or equal to"
msgstr "weniger als oder gleich"
-#: gnucash/gnome-search/search-double.c:205
-#: gnucash/gnome-search/search-int64.c:207
-#: gnucash/gnome-search/search-numeric.c:243
-#: gnucash/gnome-search/search-string.c:271
+#: gnucash/gnome-search/search-double.c:177
+#: gnucash/gnome-search/search-int64.c:179
+#: gnucash/gnome-search/search-numeric.c:215
+#: gnucash/gnome-search/search-string.c:243
msgid "equals"
msgstr "gleich"
-#: gnucash/gnome-search/search-double.c:206
-#: gnucash/gnome-search/search-int64.c:208
-#: gnucash/gnome-search/search-numeric.c:246
+#: gnucash/gnome-search/search-double.c:178
+#: gnucash/gnome-search/search-int64.c:180
+#: gnucash/gnome-search/search-numeric.c:218
msgid "does not equal"
msgstr "nicht gleich"
-#: gnucash/gnome-search/search-double.c:207
-#: gnucash/gnome-search/search-int64.c:209
-#: gnucash/gnome-search/search-numeric.c:249
+#: gnucash/gnome-search/search-double.c:179
+#: gnucash/gnome-search/search-int64.c:181
+#: gnucash/gnome-search/search-numeric.c:221
msgid "is greater than"
msgstr "größer als"
-#: gnucash/gnome-search/search-double.c:208
-#: gnucash/gnome-search/search-int64.c:210
-#: gnucash/gnome-search/search-numeric.c:253
+#: gnucash/gnome-search/search-double.c:180
+#: gnucash/gnome-search/search-int64.c:182
+#: gnucash/gnome-search/search-numeric.c:225
msgid "is greater than or equal to"
msgstr "größer als oder gleich"
-#: gnucash/gnome-search/search-numeric.c:236
+#: gnucash/gnome-search/search-numeric.c:208
msgid "less than"
msgstr "kleiner"
-#: gnucash/gnome-search/search-numeric.c:239
+#: gnucash/gnome-search/search-numeric.c:211
msgid "less than or equal to"
msgstr "kleiner oder gleich"
-#: gnucash/gnome-search/search-numeric.c:243
+#: gnucash/gnome-search/search-numeric.c:215
msgid "equal to"
msgstr "gleich"
-#: gnucash/gnome-search/search-numeric.c:246
+#: gnucash/gnome-search/search-numeric.c:218
msgid "not equal to"
msgstr "ungleich"
-#: gnucash/gnome-search/search-numeric.c:249
+#: gnucash/gnome-search/search-numeric.c:221
msgid "greater than"
msgstr "größer"
-#: gnucash/gnome-search/search-numeric.c:252
+#: gnucash/gnome-search/search-numeric.c:224
msgid "greater than or equal to"
msgstr "größer oder gleich"
-#: gnucash/gnome-search/search-numeric.c:269
+#: gnucash/gnome-search/search-numeric.c:241
msgid "has credits or debits"
msgstr "hat Haben oder Soll"
-#: gnucash/gnome-search/search-numeric.c:270
+#: gnucash/gnome-search/search-numeric.c:242
msgid "has debits"
msgstr "hat Soll"
-#: gnucash/gnome-search/search-numeric.c:271
+#: gnucash/gnome-search/search-numeric.c:243
msgid "has credits"
msgstr "hat Haben"
#. Build and connect the toggles
-#: gnucash/gnome-search/search-reconciled.c:243
+#: gnucash/gnome-search/search-reconciled.c:215
msgid "Not Cleared"
msgstr "Unbestätigt"
-#: gnucash/gnome-search/search-string.c:197
+#: gnucash/gnome-search/search-string.c:169
msgid "You need to enter some search text."
msgstr "Sie müssen einen Suchausdruck angeben"
-#: gnucash/gnome-search/search-string.c:226
+#: gnucash/gnome-search/search-string.c:198
#: gnucash/import-export/bi-import/dialog-bi-import.c:118
#: gnucash/import-export/csv-imp/csv-account-import.c:113
#: gnucash/import-export/customer-import/dialog-customer-import.c:102
@@ -6190,20 +6190,20 @@ msgstr ""
"Fehler im regulären Ausdruck '%s':\n"
"%s"
-#: gnucash/gnome-search/search-string.c:270
+#: gnucash/gnome-search/search-string.c:242
msgid "contains"
msgstr "enthält"
-#: gnucash/gnome-search/search-string.c:272
+#: gnucash/gnome-search/search-string.c:244
msgid "matches regex"
msgstr "entspricht regulärem Ausdruck"
-#: gnucash/gnome-search/search-string.c:274
+#: gnucash/gnome-search/search-string.c:246
msgid "does not match regex"
msgstr "entspricht nicht regulärem Ausdruck"
#. Build and connect the case-sensitive check button; defaults to off
-#: gnucash/gnome-search/search-string.c:350
+#: gnucash/gnome-search/search-string.c:322
msgid "Match case"
msgstr "Groß-/Kleinschreibung beachten"
@@ -6525,14 +6525,16 @@ msgstr ""
msgid ""
"\n"
"Please select a commodity to match:"
-msgstr "\n"
+msgstr ""
+"\n"
"Geben Sie eine Währung/Wertpapier an, die passt:"
#: gnucash/gnome-utils/dialog-commodity.c:181
msgid ""
"\n"
"Commodity: "
-msgstr "\n"
+msgstr ""
+"\n"
"Devise/Wertpapier: "
#. Translators: Replace here and later CUSIP by the name of your local
@@ -6543,14 +6545,16 @@ msgstr "\n"
msgid ""
"\n"
"Exchange code (ISIN, CUSIP or similar): "
-msgstr "\n"
+msgstr ""
+"\n"
"Wertpapierkennnummer (ISIN, WKN oder ähnliches): "
#: gnucash/gnome-utils/dialog-commodity.c:189
msgid ""
"\n"
"Mnemonic (Ticker symbol or similar): "
-msgstr "\n"
+msgstr ""
+"\n"
"Abkürzung (Tickersymbol oder ähnliches): "
#: gnucash/gnome-utils/dialog-commodity.c:287
@@ -6582,9 +6586,9 @@ msgstr "_Währung:"
#: gnucash/gnome-utils/dialog-commodity.c:772
#: gnucash/gnome-utils/dialog-options.c:702
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:440
-#: gnucash/gnome-utils/gnc-tree-view-price.c:430
-#: libgnucash/engine/Account.cpp:4100
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:412
+#: gnucash/gnome-utils/gnc-tree-view-price.c:402
+#: libgnucash/engine/Account.cpp:4098
msgid "Currency"
msgstr "Währung"
@@ -6664,7 +6668,7 @@ msgstr "Speichern _unter..."
#: gnucash/gnome-utils/dialog-file-access.c:318
#: gnucash/gnome-utils/gnc-file.c:122 gnucash/gnome-utils/gnc-file.c:299
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1124
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1096
msgid "Export"
msgstr "Exportieren"
@@ -6673,8 +6677,9 @@ msgid ""
"Because no accounts have been set up yet, you will need to return to this "
"dialog (via File->Properties), after account setup, if you want to set a "
"default gain/loss account."
-msgstr "Da noch keine Konten erstellt wurden, müssen sie nach dem Erstellen "
-"der Konten über Datei->Eigenschaften zu diesem Dialog zurückkehren, um ein "
+msgstr ""
+"Da noch keine Konten erstellt wurden, müssen sie nach dem Erstellen der "
+"Konten über Datei->Eigenschaften zu diesem Dialog zurückkehren, um ein "
"Erfolgskonto vorzuwählen,"
#: gnucash/gnome-utils/dialog-options.c:686
@@ -6687,11 +6692,11 @@ msgstr "Kein Konto gewählt"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
#: gnucash/gnome-utils/dialog-options.c:722
-#: gnucash/gnome-utils/gnc-tree-view-account.c:936
+#: gnucash/gnome-utils/gnc-tree-view-account.c:908
msgid "Column letter for 'Placeholder'|P"
msgstr "P"
-#Todo: sind die "\n" erforderlich?
+# Todo: sind die "\n" erforderlich?
#: gnucash/gnome-utils/dialog-options.c:789
msgid ""
"There are no income or expense accounts of the specified\n"
@@ -6700,8 +6705,8 @@ msgid ""
"default gain/loss account."
msgstr ""
"Es gibt kein Erfolgskonto in der festgelegten Buchwährung. Nach der "
-"Kontenteneinrchtung müssen sie über Datei->Eigenschaften zu diesem "
-"Dialog zurückkehren, um ein Erfolgskonto vorzuwählen."
+"Kontenteneinrchtung müssen sie über Datei->Eigenschaften zu diesem Dialog "
+"zurückkehren, um ein Erfolgskonto vorzuwählen."
#: gnucash/gnome-utils/dialog-options.c:858
msgid ""
@@ -6792,7 +6797,7 @@ msgid "Page"
msgstr "Seite"
#: gnucash/gnome-utils/dialog-options.c:2913
-#: gnucash/gnome-utils/dialog-preferences.c:1343
+#: gnucash/gnome-utils/dialog-preferences.c:1352
msgid "Clear"
msgstr "Zurücksetzen"
@@ -6827,12 +6832,12 @@ msgstr "Prozent"
msgid "Income%sSalary%sTaxable"
msgstr "Erträge%sEinkommen%szu versteuern"
-#: gnucash/gnome-utils/dialog-preferences.c:811
+#: gnucash/gnome-utils/dialog-preferences.c:820
msgid "Path does not exist, "
msgstr "Pfad existiert nicht, "
-#: gnucash/gnome-utils/dialog-preferences.c:861
-#: gnucash/gnome-utils/dialog-preferences.c:1340
+#: gnucash/gnome-utils/dialog-preferences.c:870
+#: gnucash/gnome-utils/dialog-preferences.c:1349
msgid "Select a folder"
msgstr "Verzeichnis auswählen"
@@ -7062,7 +7067,7 @@ msgstr "Diesmal _nicht"
#: gnucash/gnome-utils/gnc-cell-renderer-date.c:165
#: gnucash/gnome-utils/gnc-period-select.c:70
#: gnucash/gnome-utils/gnc-period-select.c:86
-#: libgnucash/app-utils/date-utilities.scm:947
+#: libgnucash/app-utils/date-utilities.scm:959
msgid "Today"
msgstr "Heute"
@@ -7132,7 +7137,7 @@ msgid "Date: "
msgstr "Datum:"
#: gnucash/gnome-utils/gnc-dense-cal.c:357
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:177
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:149
#: gnucash/gtkbuilder/dialog-sx.glade:1403
msgid "Frequency"
msgstr "Häufigkeit"
@@ -7143,7 +7148,7 @@ msgstr "(unbenannt)"
#. File menu
#. Menu Items
-#: gnucash/gnome-utils/gnc-file.c:107 gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-file.c:107 gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:56
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:56
msgid "_Import"
@@ -7158,7 +7163,7 @@ msgstr "Import"
msgid "Save"
msgstr "Speichern"
-#: gnucash/gnome-utils/gnc-file.c:119 gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-file.c:119 gnucash/gnome-utils/gnc-main-window.c:279
msgid "_Export"
msgstr "E_xportieren"
@@ -7471,7 +7476,7 @@ msgid "Save changes to the file?"
msgstr "Änderungen in Datei speichern?"
#: gnucash/gnome-utils/gnc-file.c:604
-#: gnucash/gnome-utils/gnc-main-window.c:1277
+#: gnucash/gnome-utils/gnc-main-window.c:1278
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
@@ -7535,7 +7540,7 @@ msgstr "_Neue Datei anlegen"
msgid "Open _Anyway"
msgstr "Tr_otzdem öffnen"
-#: gnucash/gnome-utils/gnc-file.c:802 gnucash/gnome-utils/gnc-main-window.c:302
+#: gnucash/gnome-utils/gnc-file.c:802 gnucash/gnome-utils/gnc-main-window.c:303
msgid "_Quit"
msgstr "_Beenden"
@@ -7550,7 +7555,7 @@ msgstr "Daten erneut speichern..."
#: gnucash/gnome-utils/gnc-file.c:1241 gnucash/gnome-utils/gnc-file.c:1479
#: gnucash/import-export/csv-exp/assistant-csv-export.c:711
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1597
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1569
#, c-format
msgid "The file %s already exists. Are you sure you want to overwrite it?"
msgstr ""
@@ -7592,7 +7597,7 @@ msgstr ""
"Sind Sie sicher, dass sie fortfahren wollen?"
#: gnucash/gnome-utils/gnc-file.c:1612
-#: gnucash/gnome-utils/gnc-main-window.c:1245
+#: gnucash/gnome-utils/gnc-main-window.c:1246
msgid "<unknown>"
msgstr "<unbekannt>"
@@ -7600,7 +7605,7 @@ msgstr "<unbekannt>"
msgid "View..."
msgstr "Ansicht..."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:283
+#: gnucash/gnome-utils/gnc-gnome-utils.c:284
msgid ""
"GnuCash could not find the files for the help documentation. This is likely "
"because the 'gnucash-docs' package is not installed"
@@ -7609,8 +7614,8 @@ msgstr ""
"liegt vermutlich daran, dass das Paket »gnucash-docs« noch nicht installiert "
"ist."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:376
-#: gnucash/gnome-utils/gnc-gnome-utils.c:442
+#: gnucash/gnome-utils/gnc-gnome-utils.c:377
+#: gnucash/gnome-utils/gnc-gnome-utils.c:443
msgid ""
"GnuCash could not find the files for the help documentation. This is likely "
"because the 'gnucash-docs' package is not installed."
@@ -7619,19 +7624,19 @@ msgstr ""
"liegt vermutlich daran, dass das Paket »gnucash-docs« noch nicht installiert "
"ist."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:407
+#: gnucash/gnome-utils/gnc-gnome-utils.c:408
msgid "GnuCash could not find the files for the help documentation."
msgstr "Die Dateien für die Hilfe-Dokumentation konnten nicht gefunden werden."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:466
+#: gnucash/gnome-utils/gnc-gnome-utils.c:467
msgid "GnuCash could not find the associated file."
msgstr "GnuCash konnte die dazugehörige Datei nicht finden."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:504
+#: gnucash/gnome-utils/gnc-gnome-utils.c:507
msgid "GnuCash could not find the associated file"
msgstr "GnuCash konnte die dazugehörige Datei nicht finden."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:535
+#: gnucash/gnome-utils/gnc-gnome-utils.c:537
msgid "GnuCash could not open the associated URI:"
msgstr "GnuCash konnte die dazugehörige URI nicht öffnen."
@@ -7648,55 +7653,55 @@ msgid "Changes will be saved automatically in %u seconds"
msgstr "Änderungen werden automatisch in %u Sekunden gespeichert"
#. Toplevel
-#: gnucash/gnome-utils/gnc-main-window.c:264
+#: gnucash/gnome-utils/gnc-main-window.c:265
msgid "_File"
msgstr "_Datei"
-#: gnucash/gnome-utils/gnc-main-window.c:268
+#: gnucash/gnome-utils/gnc-main-window.c:269
msgid "Tra_nsaction"
msgstr "B_uchung"
-#: gnucash/gnome-utils/gnc-main-window.c:269
+#: gnucash/gnome-utils/gnc-main-window.c:270
msgid "_Reports"
msgstr "Be_richte"
-#: gnucash/gnome-utils/gnc-main-window.c:270
+#: gnucash/gnome-utils/gnc-main-window.c:271
msgid "_Tools"
msgstr "_Werkzeuge"
-#: gnucash/gnome-utils/gnc-main-window.c:271
+#: gnucash/gnome-utils/gnc-main-window.c:272
msgid "E_xtensions"
msgstr "Er_weiterungen"
-#: gnucash/gnome-utils/gnc-main-window.c:272
+#: gnucash/gnome-utils/gnc-main-window.c:273
msgid "_Windows"
msgstr "_Fenster"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "_Print..."
msgstr "_Drucken..."
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "Print the currently active page"
msgstr "Aktuelle Seite drucken"
-#: gnucash/gnome-utils/gnc-main-window.c:287
+#: gnucash/gnome-utils/gnc-main-window.c:288
msgid "Pa_ge Setup..."
msgstr "Seite ein_richten"
-#: gnucash/gnome-utils/gnc-main-window.c:288
+#: gnucash/gnome-utils/gnc-main-window.c:289
msgid "Specify the page size and orientation for printing"
msgstr "Seitengröße und Orientierung zum Drucken angeben"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "Proper_ties"
msgstr "_Eigenschaften"
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Edit the properties of the current file"
msgstr "Eigenschaften dieser Datei anzeigen und bearbeiten."
-#: gnucash/gnome-utils/gnc-main-window.c:297
+#: gnucash/gnome-utils/gnc-main-window.c:298
#: gnucash/gtkbuilder/dialog-billterms.glade:460
#: gnucash/gtkbuilder/dialog-commodities.glade:75
#: gnucash/gtkbuilder/dialog-custom-report.glade:44
@@ -7717,158 +7722,158 @@ msgstr "Eigenschaften dieser Datei anzeigen und bearbeiten."
msgid "_Close"
msgstr "S_chließen"
-#: gnucash/gnome-utils/gnc-main-window.c:298
+#: gnucash/gnome-utils/gnc-main-window.c:299
msgid "Close the currently active page"
msgstr "Aktuelle Seite schließen"
-#: gnucash/gnome-utils/gnc-main-window.c:303
+#: gnucash/gnome-utils/gnc-main-window.c:304
msgid "Quit this application"
msgstr "GnuCash beenden"
-#: gnucash/gnome-utils/gnc-main-window.c:325
+#: gnucash/gnome-utils/gnc-main-window.c:326
msgid "Pr_eferences"
msgstr "_Einstellungen"
-#: gnucash/gnome-utils/gnc-main-window.c:326
+#: gnucash/gnome-utils/gnc-main-window.c:327
msgid "Edit the global preferences of GnuCash"
msgstr "Die globalen Einstellungen von GnuCash bearbeiten"
-#: gnucash/gnome-utils/gnc-main-window.c:334
+#: gnucash/gnome-utils/gnc-main-window.c:335
msgid "Select sorting criteria for this page view"
msgstr "Sortierungskriterien für die aktuelle Ansicht wählen"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Select the account types that should be displayed."
msgstr "Wählen Sie die Kontoarten, die in der Kontenansicht angezeigt werden."
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "Reset _Warnings..."
msgstr "_Warnungen zurücksetzen..."
-#: gnucash/gnome-utils/gnc-main-window.c:351
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Reset the state of all warning messages so they will be shown again."
msgstr ""
"Den gespeicherten Status aller Warnungsmeldungen zurücksetzen, so dass alle "
"wieder angezeigt werden."
-#: gnucash/gnome-utils/gnc-main-window.c:355
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Re_name Page"
msgstr "Seite umbe_nennen"
-#: gnucash/gnome-utils/gnc-main-window.c:356
+#: gnucash/gnome-utils/gnc-main-window.c:357
msgid "Rename this page."
msgstr "Diese Seite umbenennen."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "_New Window"
msgstr "_Neues Fenster"
-#: gnucash/gnome-utils/gnc-main-window.c:364
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Open a new top-level GnuCash window."
msgstr "Ein neues GnuCash Fenster öffnen."
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "New Window with _Page"
msgstr "Neues Fenster mit _Seite"
-#: gnucash/gnome-utils/gnc-main-window.c:369
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Move the current page to a new top-level GnuCash window."
msgstr "Aktuelle Seite in ein neues GnuCash Fenster verschieben."
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "Tutorial and Concepts _Guide"
msgstr "GnuCash-_Kurs und Konzepte"
-#: gnucash/gnome-utils/gnc-main-window.c:377
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open the GnuCash Tutorial"
msgstr "Den GnuCash-Online-Kurs öffnen"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "_Contents"
msgstr "I_nhalt"
-#: gnucash/gnome-utils/gnc-main-window.c:382
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Open the GnuCash Help"
msgstr "Die GnuCash-Hilfe öffnen"
-#: gnucash/gnome-utils/gnc-main-window.c:386
+#: gnucash/gnome-utils/gnc-main-window.c:387
msgid "_About"
msgstr "_Info"
-#: gnucash/gnome-utils/gnc-main-window.c:387
+#: gnucash/gnome-utils/gnc-main-window.c:388
msgid "About GnuCash"
msgstr "Info zu GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_Toolbar"
msgstr "_Werkzeugleiste"
-#: gnucash/gnome-utils/gnc-main-window.c:400
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "Show/hide the toolbar on this window"
msgstr "Die Werkzeugleiste in diesem Fenster anzeigen/verbergen"
-#: gnucash/gnome-utils/gnc-main-window.c:404
+#: gnucash/gnome-utils/gnc-main-window.c:405
msgid "Su_mmary Bar"
msgstr "_Zusammenfassungsleiste"
-#: gnucash/gnome-utils/gnc-main-window.c:405
+#: gnucash/gnome-utils/gnc-main-window.c:406
msgid "Show/hide the summary bar on this window"
msgstr "Die Zusammenfassungs-Leiste in diesem Fenster anzeigen/verbergen"
-#: gnucash/gnome-utils/gnc-main-window.c:409
+#: gnucash/gnome-utils/gnc-main-window.c:410
msgid "Stat_us Bar"
msgstr "_Statusleiste"
-#: gnucash/gnome-utils/gnc-main-window.c:410
+#: gnucash/gnome-utils/gnc-main-window.c:411
msgid "Show/hide the status bar on this window"
msgstr "Die Statusleiste in diesem Fenster anzeigen/verbergen"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Window _1"
msgstr "Fenster _1"
-#: gnucash/gnome-utils/gnc-main-window.c:423
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Window _2"
msgstr "Fenster _2"
-#: gnucash/gnome-utils/gnc-main-window.c:424
+#: gnucash/gnome-utils/gnc-main-window.c:425
msgid "Window _3"
msgstr "Fenster _3"
-#: gnucash/gnome-utils/gnc-main-window.c:425
+#: gnucash/gnome-utils/gnc-main-window.c:426
msgid "Window _4"
msgstr "Fenster _4"
-#: gnucash/gnome-utils/gnc-main-window.c:426
+#: gnucash/gnome-utils/gnc-main-window.c:427
msgid "Window _5"
msgstr "Fenster _5"
-#: gnucash/gnome-utils/gnc-main-window.c:427
+#: gnucash/gnome-utils/gnc-main-window.c:428
msgid "Window _6"
msgstr "Fenster _6"
-#: gnucash/gnome-utils/gnc-main-window.c:428
+#: gnucash/gnome-utils/gnc-main-window.c:429
msgid "Window _7"
msgstr "Fenster _7"
-#: gnucash/gnome-utils/gnc-main-window.c:429
+#: gnucash/gnome-utils/gnc-main-window.c:430
msgid "Window _8"
msgstr "Fenster _8"
-#: gnucash/gnome-utils/gnc-main-window.c:430
+#: gnucash/gnome-utils/gnc-main-window.c:431
msgid "Window _9"
msgstr "Fenster _9"
-#: gnucash/gnome-utils/gnc-main-window.c:431
+#: gnucash/gnome-utils/gnc-main-window.c:432
msgid "Window _0"
msgstr "Fenster _0"
-#: gnucash/gnome-utils/gnc-main-window.c:1229
+#: gnucash/gnome-utils/gnc-main-window.c:1230
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "Änderungen der Datei %s vor dem Schließen speichern?"
-#: gnucash/gnome-utils/gnc-main-window.c:1232
+#: gnucash/gnome-utils/gnc-main-window.c:1233
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
@@ -7877,7 +7882,7 @@ msgstr ""
"Wenn Sie nicht speichern, gehen die Änderungen der letzten %d Stunden und %d "
"Minuten verloren."
-#: gnucash/gnome-utils/gnc-main-window.c:1234
+#: gnucash/gnome-utils/gnc-main-window.c:1235
#, c-format
msgid ""
"If you don't save, changes from the past %d days and %d hours will be "
@@ -7886,61 +7891,61 @@ msgstr ""
"Wenn Sie nicht speichern, gehen die Änderungen der letzten %d Tage und %d "
"Stunden verloren."
-#: gnucash/gnome-utils/gnc-main-window.c:1282
+#: gnucash/gnome-utils/gnc-main-window.c:1283
msgid "Close _Without Saving"
msgstr "Schließen _ohne zu speichern"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1510
+#: gnucash/gnome-utils/gnc-main-window.c:1511
msgid "(read-only)"
msgstr "(schreibgeschützt)"
-#: gnucash/gnome-utils/gnc-main-window.c:1518
+#: gnucash/gnome-utils/gnc-main-window.c:1519
msgid "Unsaved Book"
msgstr "Nicht gespeicherte Daten"
-#: gnucash/gnome-utils/gnc-main-window.c:1678
+#: gnucash/gnome-utils/gnc-main-window.c:1679
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr "Zuletzt geändert am %a, %e.%b %Y um %I:%M%P"
#. g_warning("got time %ld, str=%s\n", mtime, time_string);
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1681
+#: gnucash/gnome-utils/gnc-main-window.c:1682
#, c-format
msgid "File %s opened. %s"
msgstr "Datei %s geöffnet. %s"
-#: gnucash/gnome-utils/gnc-main-window.c:2751
+#: gnucash/gnome-utils/gnc-main-window.c:2709
msgid "Unable to save to database."
msgstr "Datenbank konnte nicht gespeichert werden."
-#: gnucash/gnome-utils/gnc-main-window.c:2753
+#: gnucash/gnome-utils/gnc-main-window.c:2711
msgid "Unable to save to database: Book is marked read-only."
msgstr ""
"Datenbank konnte nicht gespeichert werden: Dieses Buch ist schreibgeschützt."
-#: gnucash/gnome-utils/gnc-main-window.c:4145
+#: gnucash/gnome-utils/gnc-main-window.c:4084
msgid "Book Options"
msgstr "Buch-Optionen"
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4533
+#: gnucash/gnome-utils/gnc-main-window.c:4466
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr "© 1997-%s GnuCash-Mitwirkende."
-#: gnucash/gnome-utils/gnc-main-window.c:4545
+#: gnucash/gnome-utils/gnc-main-window.c:4478
#: gnucash/gnome-utils/gnc-splash.c:97
msgid "Version"
msgstr "Version"
-#: gnucash/gnome-utils/gnc-main-window.c:4546
+#: gnucash/gnome-utils/gnc-main-window.c:4479
#: gnucash/gnome-utils/gnc-splash.c:98 gnucash/gnucash-bin.c:455
msgid "Build ID"
msgstr "Build ID"
-#: gnucash/gnome-utils/gnc-main-window.c:4554
+#: gnucash/gnome-utils/gnc-main-window.c:4487
msgid "Accounting for personal and small business finance."
msgstr "Finanzverwaltung für Privatanwender und Kleinbetriebe."
@@ -7948,7 +7953,7 @@ msgstr "Finanzverwaltung für Privatanwender und Kleinbetriebe."
#. * 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.
-#: gnucash/gnome-utils/gnc-main-window.c:4563
+#: gnucash/gnome-utils/gnc-main-window.c:4496
msgid "translator-credits"
msgstr ""
"Dmitriy Mangul, 2017-2018\n"
@@ -7963,17 +7968,17 @@ msgstr ""
"\n"
"Verbesserungsvorschläge zur Übersetzung an gnucash-de at gnucash.org"
-#: gnucash/gnome-utils/gnc-main-window.c:4566
+#: gnucash/gnome-utils/gnc-main-window.c:4499
msgid "Visit the GnuCash website."
msgstr "Besuchen Sie die GnuCash-Website."
#: gnucash/gnome-utils/gnc-period-select.c:71
-#: libgnucash/app-utils/date-utilities.scm:863
+#: libgnucash/app-utils/date-utilities.scm:875
msgid "Start of this month"
msgstr "Anfang dieses Monats"
#: gnucash/gnome-utils/gnc-period-select.c:72
-#: libgnucash/app-utils/date-utilities.scm:877
+#: libgnucash/app-utils/date-utilities.scm:889
msgid "Start of previous month"
msgstr "Anfang des vorherigen Monats"
@@ -7982,17 +7987,17 @@ msgid "Start of this quarter"
msgstr "Anfang dieses Quartals"
#: gnucash/gnome-utils/gnc-period-select.c:74
-#: libgnucash/app-utils/date-utilities.scm:919
+#: libgnucash/app-utils/date-utilities.scm:931
msgid "Start of previous quarter"
msgstr "Anfang des vorherigen Quartals"
#: gnucash/gnome-utils/gnc-period-select.c:75
-#: libgnucash/app-utils/date-utilities.scm:807
+#: libgnucash/app-utils/date-utilities.scm:819
msgid "Start of this year"
msgstr "Anfang dieses Jahres"
#: gnucash/gnome-utils/gnc-period-select.c:76
-#: libgnucash/app-utils/date-utilities.scm:821
+#: libgnucash/app-utils/date-utilities.scm:833
msgid "Start of previous year"
msgstr "Anfang des vorherigen Jahres"
@@ -8006,12 +8011,12 @@ msgid "Start of previous accounting period"
msgstr "Anfang der vorigen Buchführungsperiode"
#: gnucash/gnome-utils/gnc-period-select.c:87
-#: libgnucash/app-utils/date-utilities.scm:870
+#: libgnucash/app-utils/date-utilities.scm:882
msgid "End of this month"
msgstr "Ende dieses Monats"
#: gnucash/gnome-utils/gnc-period-select.c:88
-#: libgnucash/app-utils/date-utilities.scm:884
+#: libgnucash/app-utils/date-utilities.scm:896
msgid "End of previous month"
msgstr "Ende des vorherigen Monats"
@@ -8020,17 +8025,17 @@ msgid "End of this quarter"
msgstr "Ende dieses Quartals"
#: gnucash/gnome-utils/gnc-period-select.c:90
-#: libgnucash/app-utils/date-utilities.scm:926
+#: libgnucash/app-utils/date-utilities.scm:938
msgid "End of previous quarter"
msgstr "Ende des vorherigen Quartals"
#: gnucash/gnome-utils/gnc-period-select.c:91
-#: libgnucash/app-utils/date-utilities.scm:814
+#: libgnucash/app-utils/date-utilities.scm:826
msgid "End of this year"
msgstr "Ende dieses Jahres"
#: gnucash/gnome-utils/gnc-period-select.c:92
-#: libgnucash/app-utils/date-utilities.scm:828
+#: libgnucash/app-utils/date-utilities.scm:840
msgid "End of previous year"
msgstr "Ende des vorherigen Jahres"
@@ -8210,7 +8215,7 @@ msgid "_Unreconcile"
msgstr "_Nicht abgeglichen"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1911
-#: gnucash/register/ledger-core/split-register-model.c:2167
+#: gnucash/register/ledger-core/split-register-model.c:2187
msgid "Change reconciled split?"
msgstr "Abgeglichenen Buchungsteil ändern?"
@@ -8235,7 +8240,7 @@ msgstr ""
"Abgleichen erschweren. Wollen Sie trotzdem fortsetzen?"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1934
-#: gnucash/register/ledger-core/split-register-model.c:2191
+#: gnucash/register/ledger-core/split-register-model.c:2211
msgid "Chan_ge Split"
msgstr "Buchungs_teil ändern"
@@ -8250,7 +8255,7 @@ msgstr "Das Konto %s existiert nicht. Möchten Sie es erstellen?"
msgid "You can not paste from the general journal to a register."
msgstr "Sie können vom Journal nicht in ein Kontofenster einfügen."
-#: gnucash/gnome-utils/gnc-tree-model-account.c:629
+#: gnucash/gnome-utils/gnc-tree-model-account.c:593
msgid "New top level account"
msgstr "Neues Konto der obersten Ebene"
@@ -8290,8 +8295,8 @@ msgid "Teller"
msgstr "Bankschalter"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2863
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2998
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3084
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2970
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3056
#: gnucash/register/ledger-core/gncEntryLedgerLoad.c:135
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:529
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:1093
@@ -8314,8 +8319,8 @@ msgstr "Quittung"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2993
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3071
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2965
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3043
#: gnucash/register/ledger-core/split-register.c:2553
#: gnucash/register/ledger-core/split-register.c:2567
#: gnucash/register/ledger-core/split-register.c:2603
@@ -8331,8 +8336,8 @@ msgstr "Zunahme"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2961
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2986
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3078
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2958
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3050
#: gnucash/register/ledger-core/split-register.c:2554
#: gnucash/register/ledger-core/split-register.c:2568
#: gnucash/register/ledger-core/split-register.c:2604
@@ -8350,7 +8355,7 @@ msgid "POS"
msgstr "Karten-Terminal"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2870
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:470
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:442
#: gnucash/register/ledger-core/split-register.c:2557
#: gnucash/report/business-reports/aging.scm:708
#: gnucash/report/business-reports/taxinvoice.eguile.scm:200
@@ -8390,7 +8395,7 @@ msgstr "Lastschrift"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2962
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3096
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3068
#: gnucash/register/ledger-core/split-register.c:2569
#: gnucash/register/ledger-core/split-register.c:2573
#: gnucash/register/ledger-core/split-register.c:2580
@@ -8413,7 +8418,7 @@ msgstr "Kauf"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2935
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2963
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3016
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2988
#: gnucash/register/ledger-core/split-register.c:2570
#: gnucash/register/ledger-core/split-register.c:2574
#: gnucash/register/ledger-core/split-register.c:2585
@@ -8441,7 +8446,7 @@ msgid "ATM Withdraw"
msgstr "Belastung"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2922
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3009
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2981
#: gnucash/register/ledger-core/split-register.c:2609
#: libgnucash/app-utils/prefs.scm:90
msgid "Rebate"
@@ -8458,16 +8463,16 @@ msgstr "Gehalt"
#: gnucash/register/ledger-core/split-register.c:2623
#: gnucash/report/standard-reports/balance-sheet.scm:661
#: gnucash/report/standard-reports/budget-balance-sheet.scm:813
-#: libgnucash/app-utils/gnc-ui-util.c:1048 libgnucash/engine/Account.cpp:4103
+#: libgnucash/app-utils/gnc-ui-util.c:1048 libgnucash/engine/Account.cpp:4101
msgid "Equity"
msgstr "Eigenkapital"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2943
-#: gnucash/gnome-utils/gnc-tree-view-price.c:454
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2964
+#: gnucash/gnome-utils/gnc-tree-view-price.c:426
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2936
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:62
#: gnucash/register/ledger-core/split-register.c:2630
-#: gnucash/register/ledger-core/split-register-model.c:394
+#: gnucash/register/ledger-core/split-register-model.c:396
#: gnucash/report/business-reports/invoice.scm:241
#: gnucash/report/standard-reports/advanced-portfolio.scm:1080
#: gnucash/report/standard-reports/general-journal.scm:114
@@ -8480,7 +8485,7 @@ msgstr "Eigenkapital"
#: gnucash/report/standard-reports/register.scm:439
#: gnucash/report/standard-reports/transaction.scm:914
#: gnucash/report/standard-reports/transaction.scm:1034
-#: gnucash/report/standard-reports/transaction.scm:1177
+#: gnucash/report/standard-reports/transaction.scm:1181
msgid "Price"
msgstr "Preis"
@@ -8520,7 +8525,7 @@ msgstr "-- Aktienteilung --"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:436
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:576
-#: gnucash/register/ledger-core/split-register-model.c:980
+#: gnucash/register/ledger-core/split-register-model.c:1000
msgid "%A %d %B %Y"
msgstr "%A, %d. %B %Y"
@@ -8584,7 +8589,7 @@ msgstr "_Wert"
msgid "_Recalculate"
msgstr "_Berechnen"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:762
+#: gnucash/gnome-utils/gnc-tree-view-account.c:734
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:1010
#: gnucash/import-export/csv-exp/csv-transactions-export.c:611
#: gnucash/import-export/csv-exp/csv-transactions-export.c:625
@@ -8598,13 +8603,13 @@ msgstr "_Berechnen"
msgid "Account Name"
msgstr "Kontobezeichnung"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:773
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2944
+#: gnucash/gnome-utils/gnc-tree-view-account.c:745
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2916
#: gnucash/gtkbuilder/dialog-price.glade:571
msgid "Commodity"
msgstr "Devise/Wertpapier"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:779
+#: gnucash/gnome-utils/gnc-tree-view-account.c:751
#: gnucash/report/report-system/options-utilities.scm:245
#: gnucash/report/standard-reports/account-summary.scm:104
#: gnucash/report/standard-reports/general-ledger.scm:81
@@ -8616,202 +8621,202 @@ msgstr "Devise/Wertpapier"
msgid "Account Code"
msgstr "Kontonummer"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:791
+#: gnucash/gnome-utils/gnc-tree-view-account.c:763
msgid "Last Num"
msgstr "Letzte Nummer"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:797
+#: gnucash/gnome-utils/gnc-tree-view-account.c:769
msgid "Present"
msgstr "Aktuell"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:804
+#: gnucash/gnome-utils/gnc-tree-view-account.c:776
msgid "Present (Report)"
msgstr "Aktuell (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:818
+#: gnucash/gnome-utils/gnc-tree-view-account.c:790
msgid "Balance (Report)"
msgstr "Bilanz (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:825
+#: gnucash/gnome-utils/gnc-tree-view-account.c:797
msgid "Balance (Period)"
msgstr "Bilanz (Periodenbezogen)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:839
+#: gnucash/gnome-utils/gnc-tree-view-account.c:811
msgid "Cleared (Report)"
msgstr "Bestätigt (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:853
+#: gnucash/gnome-utils/gnc-tree-view-account.c:825
msgid "Reconciled (Report)"
msgstr "Abgeglichen (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:860
+#: gnucash/gnome-utils/gnc-tree-view-account.c:832
msgid "Last Reconcile Date"
msgstr "Letztes Abgleichen-Datum"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:866
+#: gnucash/gnome-utils/gnc-tree-view-account.c:838
msgid "Future Minimum"
msgstr "Zukünftiges Minimum"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:873
+#: gnucash/gnome-utils/gnc-tree-view-account.c:845
msgid "Future Minimum (Report)"
msgstr "Zukünftiges Minimum (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:887
+#: gnucash/gnome-utils/gnc-tree-view-account.c:859
msgid "Total (Report)"
msgstr "Saldo (als Bericht)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:894
+#: gnucash/gnome-utils/gnc-tree-view-account.c:866
msgid "Total (Period)"
msgstr "Saldo (Periodenbezogen)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:903
+#: gnucash/gnome-utils/gnc-tree-view-account.c:875
msgid "C"
msgstr "Farbe"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:911
+#: gnucash/gnome-utils/gnc-tree-view-account.c:883
msgid "Account Color"
msgstr "Kontofarbe"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:920
+#: gnucash/gnome-utils/gnc-tree-view-account.c:892
msgid "Tax Info"
msgstr "Steuerrelevante Information"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1746
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1718
#, c-format
msgid "Present (%s)"
msgstr "Aktuell (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1749
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:954
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1721
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:926
#, c-format
msgid "Balance (%s)"
msgstr "Saldo (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1752
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1724
#, c-format
msgid "Cleared (%s)"
msgstr "Bestätigt (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1755
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1727
#, c-format
msgid "Reconciled (%s)"
msgstr "Abgeglichen (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1758
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1730
#, c-format
msgid "Future Minimum (%s)"
msgstr "Zukünftiges Minimum (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1761
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1733
#, c-format
msgid "Total (%s)"
msgstr "Gesamt (%s)"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:385
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:357
msgid "Namespace"
msgstr "Namensraum"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:402
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:374
msgid "Print Name"
msgstr "Gedruckter Name"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:408
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:380
msgid "Display symbol"
msgstr "Anzeigesymbol"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:414
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:386
msgid "Unique Name"
msgstr "Eindeutiger Name"
#. Translators: Again replace CUSIP by the name of your
#. National Securities Identifying Number.
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:421
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:393
msgid "ISIN/CUSIP"
msgstr "ISIN/WKN"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:427
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:399
msgid "Fraction"
msgstr "Stückelung"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:434
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:406
msgid "Get Quotes"
msgstr "Kurse abrufen"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:437
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:409
msgid "Column letter for 'Get Quotes'|Q"
msgstr "K"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:443
-#: gnucash/gnome-utils/gnc-tree-view-price.c:442
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:415
+#: gnucash/gnome-utils/gnc-tree-view-price.c:414
msgid "Source"
msgstr "Quelle"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:448
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:420
msgid "Timezone"
msgstr "Zeitzone"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:381
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:353
msgid "Customer Number"
msgstr "Kundennummer"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:389
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:361
msgid "Vendor Number"
msgstr "Lieferantennummer"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:393
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:365
msgid "Employee Number"
msgstr "Mitarbeiternummer"
#. Billing or Shipping addresses
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:445
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:417
#: gnucash/report/business-reports/aging.scm:49
#: gnucash/report/business-reports/aging.scm:698
msgid "Address Name"
msgstr "Adressbezeichnung"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:450
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:422
#: gnucash/report/business-reports/aging.scm:50
#: gnucash/report/business-reports/aging.scm:700
msgid "Address 1"
msgstr "Adresse 1 "
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:455
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:427
#: gnucash/report/business-reports/aging.scm:51
#: gnucash/report/business-reports/aging.scm:702
msgid "Address 2"
msgstr "Adresse 2 "
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:460
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:432
#: gnucash/report/business-reports/aging.scm:52
#: gnucash/report/business-reports/aging.scm:704
msgid "Address 3"
msgstr "Adresse 3 "
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:465
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:437
#: gnucash/report/business-reports/aging.scm:53
#: gnucash/report/business-reports/aging.scm:706
msgid "Address 4"
msgstr "Adresse 4 "
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:475
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:447
#: gnucash/report/business-reports/aging.scm:710
#: gnucash/report/business-reports/taxinvoice.eguile.scm:206
msgid "Fax"
msgstr "Fax"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:480
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:452
msgid "E-mail"
msgstr "E-Mail"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:506
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:478
#: gnucash/gtkbuilder/dialog-customer.glade:162
#: gnucash/gtkbuilder/dialog-employee.glade:138
#: gnucash/gtkbuilder/dialog-invoice.glade:217
@@ -8825,34 +8830,34 @@ msgstr "Aktiv"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:509
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:481
msgid "Column letter for 'Active'|A"
msgstr "A"
-#: gnucash/gnome-utils/gnc-tree-view-price.c:424
+#: gnucash/gnome-utils/gnc-tree-view-price.c:396
msgid "Security"
msgstr "Wertpapier"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:790
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:762
msgid "Status Bar"
msgstr "Statusleiste"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1275
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1247
#: gnucash/report/business-reports/balsheet-eg.scm:499
#: libgnucash/engine/Scrub.c:365
msgid "Imbalance"
msgstr "Ausgleichskonto"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1515
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1487
msgid " Scheduled "
msgstr " Terminiert "
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2342
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2314
#: gnucash/register/ledger-core/split-register-control.c:1527
msgid "Save the changed transaction?"
msgstr "Geänderte Buchung speichern?"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2344
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2316
msgid ""
"The current transaction has changed. Would you like to record the changes, "
"or discard the changes?"
@@ -8860,29 +8865,29 @@ msgstr ""
"Die aktuelle Buchung wurde verändert. Wollen Sie die Änderungen erfassen "
"oder verwerfen"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2382
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2354
#: gnucash/register/ledger-core/split-register-control.c:1542
msgid "_Discard Changes"
msgstr "Änderungen ver_werfen"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2384
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2356
#: gnucash/register/ledger-core/split-register-control.c:1544
msgid "_Record Changes"
msgstr "Änderungen _speichern"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2750
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2722
msgid "Date Entered"
msgstr "Datum Eingabe"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2752
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2724
msgid "Date Reconciled"
msgstr "Datum Abgeglichen"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2754
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2726
msgid "Date Posted / Entered / Reconciled"
msgstr "Datum Buchung / Eingegeben / Abgeglichen"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2775
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2747
#: gnucash/gtkbuilder/dialog-order.glade:308
#: gnucash/gtkbuilder/dialog-order.glade:756
#: gnucash/report/business-reports/customer-summary.scm:71
@@ -8891,212 +8896,212 @@ msgstr "Datum Buchung / Eingegeben / Abgeglichen"
msgid "Reference"
msgstr "Referenz"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2781
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2753
msgid "Reference / Action"
msgstr "Referenz / Aktion"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2795
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2767
msgid "T-Number"
msgstr "Buchungsnummer"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2801
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2773
msgid "Number / Action"
msgstr "Nummer / Aktion"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2817
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2789
msgid "Customer / Memo"
msgstr "Kunde / Buchungstext"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2828
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2800
msgid "Vendor / Memo"
msgstr "Lieferant / Buchungstext"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2846
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2818
msgid "Description / Notes / Memo"
msgstr "Beschreibung / Notizen / Buchungstext"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2876
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2848
#: gnucash/import-export/csv-exp/csv-transactions-export.c:623
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:57
msgid "Void Reason"
msgstr "Stornierungsbegründung"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2880
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2852
msgid "Accounts / Void Reason"
msgstr "Konten / Stornierungsbegründung"
#. toggle column: mark existing transaction reconciled
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2890
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2862
#: gnucash/import-export/import-main-matcher.c:510
msgid "R"
msgstr "Abgl"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2934
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2906
msgid "Amount / Value"
msgstr "Betrag / Wert"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2976
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2948
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:61
#: libgnucash/app-utils/prefs.scm:81
msgid "Withdrawal"
msgstr "Abhebung"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2981
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2953
#: libgnucash/app-utils/prefs.scm:82
msgid "Spend"
msgstr "Ausgabe"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3031
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3038
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3003
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3010
#: gnucash/report/standard-reports/transaction.scm:485
#: libgnucash/app-utils/prefs.scm:80
msgid "Funds Out"
msgstr "Belastung"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3040
-#: gnucash/register/ledger-core/split-register-model.c:497
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3012
+#: gnucash/register/ledger-core/split-register-model.c:499
msgid "Credit Formula"
msgstr "Soll-Formel"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3061
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3033
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:60
#: libgnucash/app-utils/prefs.scm:64
msgid "Deposit"
msgstr "Einzahlung"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3066
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3038
#: libgnucash/app-utils/prefs.scm:65
msgid "Receive"
msgstr "Empfangen"
# should be prefixed: "employee|Auslagen" "Aufwendungen" sonst?
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3089
-#: gnucash/report/business-reports/customer-summary.scm:458
-#: gnucash/report/business-reports/customer-summary.scm:842
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3061
+#: gnucash/report/business-reports/customer-summary.scm:157
+#: gnucash/report/business-reports/customer-summary.scm:472
#: gnucash/report/standard-reports/net-charts.scm:409
#: gnucash/report/standard-reports/net-charts.scm:489
-#: libgnucash/app-utils/prefs.scm:73 libgnucash/engine/Account.cpp:4102
+#: libgnucash/app-utils/prefs.scm:73 libgnucash/engine/Account.cpp:4100
#: libgnucash/engine/gncInvoice.c:1061
msgid "Expense"
msgstr "Aufwand"
#. similar to default-calculated-cells but disable dual-subtotals.
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3112
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3119
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3084
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3091
#: gnucash/report/standard-reports/transaction.scm:482
#: libgnucash/app-utils/prefs.scm:63
msgid "Funds In"
msgstr "Gutschrift"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3121
-#: gnucash/register/ledger-core/split-register-model.c:490
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3093
+#: gnucash/register/ledger-core/split-register-model.c:492
msgid "Debit Formula"
msgstr "Haben-Formel"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3191
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3163
msgid "Enter Due Date"
msgstr "Fälligkeitsdatum eingeben"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3202
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3174
msgid "Enter the transaction reference, such as the invoice or check number"
msgstr ""
"Geben Sie die Buchungsreferenz ein, z.B. die Rechnungs- oder Scheck-Nummer"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3204
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3211
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3176
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3183
msgid "Enter the type of transaction, or choose one from the list"
msgstr "Geben Sie den Buchungstyp ein, oder wählen Sie einen aus der Liste"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3209
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3181
msgid "Enter the transaction number, such as the check number"
msgstr "Geben Sie die Nummer des Buchungssatzes ein, z.B. die Scheck-Nummer."
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3221
-#: gnucash/register/ledger-core/split-register-model.c:1112
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3193
+#: gnucash/register/ledger-core/split-register-model.c:1132
msgid "Enter the name of the Customer"
msgstr "Bitte geben Sie einen Namen für den Kunden ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3223
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3232
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3241
-#: gnucash/register/ledger-core/split-register-model.c:1149
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3195
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3204
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3213
+#: gnucash/register/ledger-core/split-register-model.c:1169
msgid "Enter notes for the transaction"
msgstr "Geben Sie Bemerkungen zum Buchungssatz ein"
# FIXME: DON'T use the noun 'description' here.
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3225
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3234
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3243
-#: gnucash/register/ledger-core/split-register-model.c:1309
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3197
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3206
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3215
+#: gnucash/register/ledger-core/split-register-model.c:1329
msgid "Enter a description of the split"
msgstr "Geben Sie einen Buchungstext der Buchung ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3230
-#: gnucash/register/ledger-core/split-register-model.c:1115
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3202
+#: gnucash/register/ledger-core/split-register-model.c:1135
msgid "Enter the name of the Vendor"
msgstr "Geben Sie den Namen des Lieferanten ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3239
-#: gnucash/register/ledger-core/split-register-model.c:1118
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3211
+#: gnucash/register/ledger-core/split-register-model.c:1138
msgid "Enter a description of the transaction"
msgstr "Geben Sie eine Beschreibung des Buchungssatzes ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3253
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3257
-#: gnucash/register/ledger-core/split-register-model.c:1471
-#: gnucash/register/ledger-core/split-register-model.c:1538
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3225
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3229
+#: gnucash/register/ledger-core/split-register-model.c:1491
+#: gnucash/register/ledger-core/split-register-model.c:1558
msgid "Enter the account to transfer from, or choose one from the list"
msgstr "Wählen Sie das Konto aus, von dem Sie buchen wollen"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3255
-#: gnucash/register/ledger-core/split-register-model.c:1182
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3227
+#: gnucash/register/ledger-core/split-register-model.c:1202
msgid "Reason the transaction was voided"
msgstr "Grund für Buchungsstornierung"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3267
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3239
msgid "Enter the reconcile type"
msgstr "Abgleich-Typ eingeben"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3277
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3249
msgid "Enter the type of transaction"
msgstr "Geben Sie die Art der Buchung ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3287
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3307
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3259
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3279
msgid "Enter the value of shares bought or sold"
msgstr "Geben Sie den Wert der ge- oder verkauften Aktien ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3297
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3309
-#: gnucash/register/ledger-core/split-register-model.c:1419
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3269
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3281
+#: gnucash/register/ledger-core/split-register-model.c:1439
msgid "Enter the number of shares bought or sold"
msgstr "Geben Sie die verkaufte Anzahl von Aktien ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3319
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3291
msgid "* Indicates the transaction Commodity."
msgstr "* Zeigt die Buchungswährung."
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3329
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3301
msgid "Enter the rate"
msgstr "Geben Sie den Wechselkurs an"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3339
-#: gnucash/register/ledger-core/split-register-model.c:1383
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3311
+#: gnucash/register/ledger-core/split-register-model.c:1403
msgid "Enter the effective share price"
msgstr "Geben Sie den effektiven Aktienkurs ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3349
-#: gnucash/register/ledger-core/split-register-model.c:2332
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3321
+#: gnucash/register/ledger-core/split-register-model.c:2352
msgid "Enter credit formula for real transaction"
msgstr "Geben Sie die Formel zur Soll-Berechnung der tatsächlichen Buchung ein"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3359
-#: gnucash/register/ledger-core/split-register-model.c:2298
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3331
+#: gnucash/register/ledger-core/split-register-model.c:2318
msgid "Enter debit formula for real transaction"
msgstr ""
"Geben Sie die Formel zur Haben-Berechnung der tatsächlichen Buchung ein"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:168
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:140
#: gnucash/gtkbuilder/dialog-sx.glade:1075
#: gnucash/report/report-system/html-utilities.scm:802
msgid "Enabled"
@@ -9104,15 +9109,15 @@ msgstr "Aktiv"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:171
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:143
msgid "Single-character short column-title form of 'Enabled'|E"
msgstr "A"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:182
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:154
msgid "Last Occur"
msgstr "Letztes Auftreten"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:187
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:159
msgid "Next Occur"
msgstr "Nächstes Auftreten"
@@ -13391,7 +13396,7 @@ msgstr "<b>Gewählte _Zeichenkodierungen</b>"
#: gnucash/gtkbuilder/business-prefs.glade:26
#: gnucash/report/business-reports/invoice.scm:906
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1815
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1787
msgid "Printable Invoice"
msgstr "Druckbare Rechnung..."
@@ -13400,19 +13405,19 @@ msgstr "Druckbare Rechnung..."
#: gnucash/report/business-reports/taxinvoice.scm:322
#: gnucash/report/business-reports/taxinvoice.scm:324
#: gnucash/report/business-reports/taxinvoice.scm:336
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1816
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1788
msgid "Tax Invoice"
msgstr "Rechnung mit Steuerangaben"
#: gnucash/gtkbuilder/business-prefs.glade:32
#: gnucash/report/business-reports/invoice.scm:915
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1817
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1789
msgid "Easy Invoice"
msgstr "Einfache Rechnung"
#: gnucash/gtkbuilder/business-prefs.glade:35
#: gnucash/report/business-reports/invoice.scm:924
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1818
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1790
msgid "Fancy Invoice"
msgstr "Elegante Rechnung"
@@ -13545,7 +13550,7 @@ msgstr "Kontofarbe übernehmen"
#. instantiate a default style sheet
#: gnucash/gtkbuilder/dialog-account.glade:92
#: gnucash/gtkbuilder/dialog-account.glade:1123
-#: gnucash/report/report-system/html-style-sheet.scm:291
+#: gnucash/report/report-system/html-style-sheet.scm:281
#: gnucash/report/report-system/report.scm:264
#: gnucash/report/stylesheets/stylesheet-plain.scm:243
msgid "Default"
@@ -16426,7 +16431,7 @@ msgid "If activated, include manually entered prices."
msgstr ""
"Wenn aktiviert, werden auch manuell eingegebene Kurswerte eingeschlossen."
-#Todo: Hier 'Include' hinzufügen oder bei den vorigen Optionen entfernen
+# Todo: Hier 'Include' hinzufügen oder bei den vorigen Optionen entfernen
#: gnucash/gtkbuilder/dialog-price.glade:695
msgid "_Added by the application"
msgstr "_Automatisch erzeugte"
@@ -16461,7 +16466,7 @@ msgstr "Kurs-Datenbank"
msgid "_Get Quotes"
msgstr "_Kurse abrufen"
-#Todo: 'stock accounts' ist viel zu eng
+# Todo: 'stock accounts' ist viel zu eng
#: gnucash/gtkbuilder/dialog-price.glade:860
msgid "Get new online quotes for stock accounts."
msgstr "Neue Kurse für Aktien, Fonds etc. online abrufen."
@@ -17151,11 +17156,11 @@ msgstr "Verknüpfung _prüfen"
msgid "Association"
msgstr "Verknüpfung"
-#: gnucash/gtkbuilder/dialog-trans-assoc.glade:165
+#: gnucash/gtkbuilder/dialog-trans-assoc.glade:167
msgid "Available ?"
msgstr "Verfügbar ?"
-#: gnucash/gtkbuilder/dialog-trans-assoc.glade:190
+#: gnucash/gtkbuilder/dialog-trans-assoc.glade:192
msgid ""
" To jump to the Transaction, double click on the entry in the\n"
"Description column or Association column to open the Association"
@@ -17712,22 +17717,22 @@ msgid "weeks."
msgstr "Wochen."
#: gnucash/gtkbuilder/gnc-frequency.glade:869
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Saturday"
msgstr "Samstag"
#: gnucash/gtkbuilder/gnc-frequency.glade:884
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Friday"
msgstr "Freitag"
#: gnucash/gtkbuilder/gnc-frequency.glade:899
-#: gnucash/report/standard-reports/daily-reports.scm:345
+#: gnucash/report/standard-reports/daily-reports.scm:194
msgid "Wednesday"
msgstr "Mittwoch"
#: gnucash/gtkbuilder/gnc-frequency.glade:914
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Thursday"
msgstr "Donnerstag"
@@ -17738,17 +17743,17 @@ msgstr "Donnerstag"
#. the normal translations, which show up in the glade
#. file src/gnome-utils/gtkbuilder/gnc-frequency.glade anyway.
#: gnucash/gtkbuilder/gnc-frequency.glade:929
-#: gnucash/report/standard-reports/daily-reports.scm:344
+#: gnucash/report/standard-reports/daily-reports.scm:193
msgid "Sunday"
msgstr "Sonntag"
#: gnucash/gtkbuilder/gnc-frequency.glade:944
-#: gnucash/report/standard-reports/daily-reports.scm:344
+#: gnucash/report/standard-reports/daily-reports.scm:193
msgid "Monday"
msgstr "Montag"
#: gnucash/gtkbuilder/gnc-frequency.glade:959
-#: gnucash/report/standard-reports/daily-reports.scm:345
+#: gnucash/report/standard-reports/daily-reports.scm:194
msgid "Tuesday"
msgstr "Dienstag"
@@ -18162,78 +18167,22 @@ msgstr "Beim Zugriff auf %s ist ein Fehler aufgetreten."
msgid "Export to PDF File"
msgstr "Export in eine PDF-Datei"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:381
-#, c-format
-msgid ""
-"The external program \"AqBanking Setup Wizard\" has not been found. \n"
-"\n"
-"The %s package should include the program \"qt3-wizard\". Please check your "
-"installation to ensure this program is present. On some distributions this "
-"may require installing additional packages."
-msgstr ""
-"Das externe Programm »AqBanking Einrichtungs-Assistent« konnte nicht "
-"gefunden werden. \n"
-"\n"
-"Dieses soll normalerweise vom %s-Paket installiert werden, so dass dann ein "
-"Programm namens »qt3-wizard« installiert ist. Bitte kontrollieren Sie Ihre "
-"Installation der Bibliothek AqBanking."
-
-#: gnucash/import-export/aqb/assistant-ab-initial.c:538
-msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully "
-"because the additional software \"Qt\" was not found. Please install the "
-"\"Qt/Windows Open Source Edition\" from Trolltech by downloading it from www."
-"trolltech.com\n"
-"\n"
-"If you have installed Qt already, you will have to adapt the PATH variable "
-"of your system appropriately. Contact the GnuCash developers if you need "
-"further assistance on how to install Qt correctly.\n"
-"\n"
-"Online Banking cannot be setup without Qt. Press \"Close\" now, then \"Cancel"
-"\" to cancel the Online Banking setup."
-msgstr ""
-"Das externe Programm »AqBanking Einrichtungsassistent« konnte nicht "
-"gestartet werden, da die benötigte Programmbibliothek »Qt« nicht gefunden "
-"wurde. Bitte installieren Sie »Qt/Windows Open Source Edition« der Firma "
-"Trolltech, indem Sie dies herunterladen von www.trolltech.com.\n"
-"\n"
-"Wenn Sie Qt bereits installiert haben, müssen Sie die Variable PATH in Ihrem "
-"System noch anpassen. Fragen Sie bei den GnuCash-Entwicklern nach, wenn Sie "
-"weitere Hilfe dabei benötigen.\n"
-"\n"
-"Online-Banking kann ohne Qt nicht eingerichtet werden. Drücken Sie jetzt "
-"»Schließen« und dann »Abbrechen«, um die Einrichtung des Online-Banking "
-"wieder abzubrechen."
-
-#: gnucash/import-export/aqb/assistant-ab-initial.c:559
-msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully. "
-"Online Banking can only be setup if this wizard has run successfully. Please "
-"try running the \"AqBanking Setup Wizard\" again."
-msgstr ""
-"Das externe Programm »AqBanking Einrichtungs-Assistent« konnte nicht "
-"erfolgreich ausgeführt werden, was bedeutet, dass die Einrichtung nicht "
-"erfolgreich abgeschlossen worden ist. Die weitere Einrichtung von "
-"Onlinebanking/HBCI in GnuCash kann nur fortgesetzt werden, wenn der "
-"»AqBanking Assistent« erfolgreich aufgerufen worden ist. Bitte versuchen Sie "
-"erneut, den »AqBanking Einrichtungs-Assistent« korrekt auszuführen."
-
#. Translators: Strings are 1. Bank code, 2. Bank name,
#. * 3. Account Number, 4. Subaccount ID
-#: gnucash/import-export/aqb/assistant-ab-initial.c:591
+#: gnucash/import-export/aqb/assistant-ab-initial.c:408
#, c-format
msgid "Bank code %s (%s), Account %s (%s)"
msgstr "Bankleitzahl %s (%s), Kontonummer %s (%s)"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:883
+#: gnucash/import-export/aqb/assistant-ab-initial.c:719
msgid "Online Banking Account Name"
msgstr "Online-Banking Kontoname"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:888
+#: gnucash/import-export/aqb/assistant-ab-initial.c:724
msgid "GnuCash Account Name"
msgstr "GnuCash Kontoname"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:894
+#: gnucash/import-export/aqb/assistant-ab-initial.c:730
#: gnucash/import-export/qif-imp/assistant-qif-import.c:553
#: gnucash/import-export/qif-imp/dialog-account-picker.c:380
msgid "New?"
@@ -18602,7 +18551,8 @@ msgstr ""
"Aktivierung dieser Option wird der »transaction text« zur "
"Buchungsbeschreibung hinzugefügt."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:285
+#: gnucash/import-export/aqb/dialog-ab-trans.c:293
+#: gnucash/import-export/aqb/dialog-ab-trans.c:302
msgid "(unknown)"
msgstr "(unbekannt)"
@@ -18616,55 +18566,55 @@ msgstr "(unbekannt)"
#. * country, you may safely ignore strings
#. * from the import-export/hbci
#. * subdirectory.
-#: gnucash/import-export/aqb/dialog-ab-trans.c:358
+#: gnucash/import-export/aqb/dialog-ab-trans.c:376
msgid "Enter a SEPA Online Transfer"
msgstr "SEPA Online-Ãœberweisung eingeben"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:360
+#: gnucash/import-export/aqb/dialog-ab-trans.c:378
msgid "Recipient IBAN (International Account Number)"
msgstr "IBAN des Empfängers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:362
+#: gnucash/import-export/aqb/dialog-ab-trans.c:380
msgid "Recipient BIC (Bank Code)"
msgstr "BIC des Empfängers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:365
+#: gnucash/import-export/aqb/dialog-ab-trans.c:383
msgid "Originator IBAN (International Account Number)"
msgstr "IBAN des Auftraggebers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:367
+#: gnucash/import-export/aqb/dialog-ab-trans.c:385
msgid "Originator BIC (Bank Code)"
msgstr "BIC des Auftraggebers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:376
+#: gnucash/import-export/aqb/dialog-ab-trans.c:394
msgid "Enter a SEPA Online Direct Debit Note"
msgstr "SEPA Online-Lastschrift eingeben"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:379
+#: gnucash/import-export/aqb/dialog-ab-trans.c:397
msgid "Debited Account Owner"
msgstr "Zahlungspflichtiger"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:381
+#: gnucash/import-export/aqb/dialog-ab-trans.c:399
msgid "Debited IBAN (International Account Number)"
msgstr "IBAN (International Account Number) des Zahlungspflichtigen"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:383
+#: gnucash/import-export/aqb/dialog-ab-trans.c:401
msgid "Debited BIC (Bank Code)"
msgstr "BIC (SWIFT Bankkennzahl) des Zahlungspflichtigen"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:386
+#: gnucash/import-export/aqb/dialog-ab-trans.c:404
msgid "Credited Account Owner"
msgstr "Auftraggeber"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:388
+#: gnucash/import-export/aqb/dialog-ab-trans.c:406
msgid "Credited IBAN (International Account Number)"
msgstr "IBAN (International Account Number) des Zahlungsempfängers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:390
+#: gnucash/import-export/aqb/dialog-ab-trans.c:408
msgid "Credited BIC (Bank Code)"
msgstr "BIC (SWIFT Bankkennzahl) des Zahlungsempfängers"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:470
+#: gnucash/import-export/aqb/dialog-ab-trans.c:493
#, c-format
msgid ""
"The internal check of the destination IBAN '%s' failed. This means the "
@@ -18673,7 +18623,7 @@ msgstr ""
"Die interne Überprüfung der angegebenen IBAN »%s« ist fehlgeschlagen. Die "
"Kontonummer enthält wahrscheinlich einen Fehler enthält."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:525
+#: gnucash/import-export/aqb/dialog-ab-trans.c:548
#, c-format
msgid ""
"Your local bank account does not yet have the SEPA account information "
@@ -18688,7 +18638,7 @@ msgstr ""
"führen Sie das Kommandozeilenprogramm \"aqhbci-tool\" für Ihr Konto wie "
"folgt aus: aqhbci-tool4 getaccsepa -b %s -a %s"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:540
+#: gnucash/import-export/aqb/dialog-ab-trans.c:563
msgid ""
"You did not enter a recipient name. A recipient name is required for an "
"online transfer.\n"
@@ -18696,7 +18646,7 @@ msgstr ""
"Sie haben keinen Empfängernamen eingegeben. Für einen Überweisungsauftrag "
"ist die Eingabe eines Empfängernamens erforderlich.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:560
+#: gnucash/import-export/aqb/dialog-ab-trans.c:583
msgid ""
"You did not enter a recipient account. A recipient account is required for "
"an online transfer.\n"
@@ -18704,7 +18654,7 @@ msgstr ""
"Sie haben kein Empfängerkonto eingegeben. Für einen Überweisungsauftrag ist "
"die Eingabe eines Empfängerkontos erforderlich.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:576
+#: gnucash/import-export/aqb/dialog-ab-trans.c:599
msgid ""
"You did not enter a recipient bank. A recipient bank is required for an "
"online transfer.\n"
@@ -18712,7 +18662,7 @@ msgstr ""
"Sie haben keine Bank des Empfängers eingegeben. Für einen "
"Ãœberweisungsauftrag ist die Eingabe einer Bank erforderlich.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:594
+#: gnucash/import-export/aqb/dialog-ab-trans.c:617
msgid ""
"The amount is zero or the amount field could not be interpreted correctly. "
"You might have mixed up decimal point and comma, compared to your locale "
@@ -18725,7 +18675,7 @@ msgstr ""
"eingeben, andernfalls einen Punkt. Dies ergibt keinen zulässigen "
"Zahlungsauftrag."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:611
+#: gnucash/import-export/aqb/dialog-ab-trans.c:634
msgid ""
"You did not enter any transaction purpose. A purpose is required for an "
"online transfer.\n"
@@ -18733,51 +18683,43 @@ msgstr ""
"Sie haben keinen Verwendungszweck eingegeben. Für einen Überweisungsauftrag "
"ist die Eingabe eines Verwendungszwecks erforderlich.\n"
-# Fixme: aktuellen Stand prüfen.
-#: gnucash/import-export/aqb/dialog-ab-trans.c:633
-msgid ""
-"The text you entered contained at least one character that is invalid for a "
-"SEPA transaction. In SEPA, unfortunately only exactly the following "
-"characters are allowed: a...z, A...Z, 0...9, and the following punctuations: "
-"' : ? , - ( + . ) / \n"
-"\n"
-"In particular, neither Umlauts nor an ampersand (&) is allowed, neither in "
-"the recipient or sender name nor in any purpose line."
-msgstr ""
-"Ihr eingegebener Text enthält mindestens ein Zeichen, das in einer SEPA-"
-"Überweisung ungültig sein kann. In der Basisversion unterstützt SEPA leider "
-"nur: a...z, A...Z, 0...9, und die folgenden Satzzeichen: ' : ? , - "
-"( + . ) / \n"
-"\n"
-"Insbesondere sind weder Umlaute, noch Et-Zeichen »&« erlaubt, weder im "
-"Sender- noch im Empfängernamen, geschweige denn im Verwendungszweck."
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1025
+#: gnucash/import-export/aqb/dialog-ab-trans.c:1047
msgid ""
"A template with the given name already exists. Please enter another name."
msgstr ""
"Eine Vorlage mit diesem Namen existiert bereits. Bitte geben Sie einen "
"anderen Namen ein."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1160
+#: gnucash/import-export/aqb/dialog-ab-trans.c:1182
#, c-format
msgid "Do you really want to delete the template with the name \"%s\"?"
msgstr ""
"Sind Sie sicher, dass Sie die ausgewählte Vorlage mit dem Namen »%s« löschen "
"wollen?"
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:83
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:136
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:116
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:86
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:137
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:113
msgid "No valid online banking account assigned."
msgstr "Kein gültiges Online-Banking-Konto zugewiesen."
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:97
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:100
msgid "Online action \"Get Balance\" not available for this account."
msgstr "Die Online-Aktion »Saldenabruf« ist für dieses Konto nicht verfügbar."
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:130
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:194
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:146
+#, fuzzy, c-format
+msgid ""
+"Error on executing job.\n"
+"\n"
+"Status: %s"
+msgstr ""
+"Fehler beim Ausführen des Auftrags.\n"
+"\n"
+"Status: %s - %s"
+
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:150
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:234
#, c-format
msgid ""
"Error on executing job.\n"
@@ -18788,11 +18730,22 @@ msgstr ""
"\n"
"Status: %s - %s"
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:159
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:160
msgid "Online action \"Get Transactions\" not available for this account."
msgstr "Die Online-Aktion »Umsatzabruf« ist für dieses Konto nicht verfügbar."
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:212
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:229
+#, fuzzy, c-format
+msgid ""
+"Error on executing job.\n"
+"\n"
+"Status: %s (%d)"
+msgstr ""
+"Fehler beim Ausführen des Auftrags.\n"
+"\n"
+"Status: %s - %s"
+
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:253
msgid ""
"The Online Banking import returned no transactions for the selected time "
"period."
@@ -18807,7 +18760,7 @@ msgstr ""
"Überweisungsdialog abgebrochen. Möchten Sie die Liste der "
"Ãœberweisungsvorlagen trotzdem speichern?"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:185
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:182
msgid ""
"The backend found an error during the preparation of the job. It is not "
"possible to execute this job. \n"
@@ -18827,27 +18780,27 @@ msgstr ""
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:207
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:208
msgid "Online Banking Direct Debit Note"
msgstr "Online-Auftrag Einzellastschrift"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:212
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:213
msgid "Online Banking Bank-Internal Transfer"
msgstr "Online-Auftrag Einzelumbuchung"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:217
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:218
msgid "Online Banking European (SEPA) Transfer"
msgstr "Online-Auftrag SEPA-Ãœberweisung"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:222
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:223
msgid "Online Banking European (SEPA) Debit Note"
msgstr "Online-Auftrag SEPA-Einzellastschrift"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:228
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:229
msgid "Online Banking Transaction"
msgstr "Online-Auftrag Einzelüberweisung"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:294
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:300
msgid ""
"An error occurred while executing the job. Please check the log window for "
"the exact error message.\n"
@@ -18859,18 +18812,18 @@ msgstr ""
"\n"
"Wollen Sie den Auftrag erneut abschicken?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:422
+#: gnucash/import-export/aqb/gnc-ab-utils.c:425
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:90
msgid "Unspecified"
msgstr "Nicht spezifiziert"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:473
+#: gnucash/import-export/aqb/gnc-ab-utils.c:476
#: gnucash/report/report-system/report-utilities.scm:108
-#: libgnucash/engine/Account.cpp:4093
+#: libgnucash/engine/Account.cpp:4091
msgid "Bank"
msgstr "Bank"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:720
+#: gnucash/import-export/aqb/gnc-ab-utils.c:738
msgid ""
"The backend found an error during the preparation of the job. It is not "
"possible to execute this job. \n"
@@ -18890,7 +18843,7 @@ msgstr ""
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:813
+#: gnucash/import-export/aqb/gnc-ab-utils.c:852
msgid ""
"The bank has sent transaction information in its response.\n"
"Do you want to import it?"
@@ -18898,7 +18851,7 @@ msgstr ""
"Der Bank-Server hat Kontoumsätze (Buchungen) in der Antwort mitgeschickt. \n"
"Wollen Sie diese jetzt importieren?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:840
+#: gnucash/import-export/aqb/gnc-ab-utils.c:879
msgid ""
"No Online Banking account found for this gnucash account. These transactions "
"will not be executed by Online Banking."
@@ -18907,7 +18860,7 @@ msgstr ""
"zugeordnet ist. Die Buchungen werden nicht als Online-Banking Aufträge "
"abgeschickt."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:917
+#: gnucash/import-export/aqb/gnc-ab-utils.c:974
msgid ""
"The bank has sent balance information in its response.\n"
"Do you want to import it?"
@@ -18922,7 +18875,7 @@ msgstr ""
#. * (Switzerland). If none of these techniques are available
#. * in your country, you may safely ignore strings from the
#. * import-export/hbci subdirectory.
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1005
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1072
msgid ""
"The downloaded Online Banking Balance was zero.\n"
"\n"
@@ -18939,7 +18892,7 @@ msgstr ""
"können Sie im Onlinebanking-Einrichtungs-Assistent eine höhere HBCI-Version "
"auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1022
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1089
#, c-format
msgid ""
"Result of Online Banking job: \n"
@@ -18948,14 +18901,14 @@ msgstr ""
"Ergebnis der Saldenabfrage: \n"
"Gebuchter Saldo des Kontos ist %s"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1028
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1095
#, c-format
msgid "For your information: This account also has a noted balance of %s\n"
msgstr ""
"Zu Ihrer Information: Dieses Konto hat außerdem folgenden Saldo an zur "
"Ausführung vorgemerkten Aufträgen: %s\n"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1035
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1102
msgid ""
"The booked balance is identical to the current reconciled balance of the "
"account."
@@ -18963,37 +18916,42 @@ msgstr ""
"Dieser gebuchte Saldo stimmt mit dem aktuellen abgeglichenen Saldo Ihres "
"Kontos überein."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1050
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1117
msgid "Reconcile account now?"
msgstr "Konto jetzt abgleichen?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1116
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1204
msgid "The bank has sent a message in its response."
msgstr "Die Bank hat eine Nachricht in ihrer Antwort mitgeschickt"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1117
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1205
msgid "Subject:"
msgstr "Betreff:"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:100
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:94
msgid "Select a file to import"
msgstr "Wählen Sie eine Datei, die importiert werden soll"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:146
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:138
msgid "Import module for DTAUS import not found."
msgstr "Importer-Modul für DTAUS nicht gefunden."
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:299
-#, c-format
-msgid "Job %d status %d - %s: %s \n"
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:289
+#, fuzzy, c-format
+msgid "Job %d status %d - %s\n"
+msgstr "Auftrag %d Status %d - %s: %s \n"
+
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:291
+#, fuzzy, c-format
+msgid "Job %d status %d - %s: %s\n"
msgstr "Auftrag %d Status %d - %s: %s \n"
#. indicate that additional failures exist
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:310
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:311
msgid "...\n"
msgstr "...\n"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:324
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:332
#, c-format
msgid ""
"An error occurred while executing jobs: %d of %d failed. Please check the "
@@ -19007,11 +18965,11 @@ msgstr ""
"\n"
"%s"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:334
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:342
msgid "No jobs to be sent."
msgstr "Keine Aufträge zu senden."
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:340
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:348
#, c-format
msgid ""
"The job was executed successfully, but as a precaution please check the log "
@@ -19026,7 +18984,7 @@ msgstr[1] ""
"Alle %d Aufträge wurden erfolgreich erstellt. Prüfen Sie bitte trotzdem die "
"Ausgaben im Verlaufsfenster für mögliche Fehlermeldungen."
-#: gnucash/import-export/aqb/gnc-gwen-gui.c:1095
+#: gnucash/import-export/aqb/gnc-gwen-gui.c:1087
#, c-format
msgid ""
"The PIN needs to be at least %d characters \n"
@@ -19035,7 +18993,7 @@ msgstr ""
"Die PIN muss mindestens %d Zeichen lang \n"
"sein. Erneut versuchen?"
-#: gnucash/import-export/aqb/gnc-gwen-gui.c:1597
+#: gnucash/import-export/aqb/gnc-gwen-gui.c:1589
msgid ""
"The Online Banking job is still running; are you sure you want to cancel?"
msgstr ""
@@ -19044,7 +19002,7 @@ msgstr ""
#: gnucash/import-export/aqb/gncmod-aqbanking.c:79
#: gnucash/import-export/gncmod-generic-import.c:79
-#: gnucash/import-export/qif-imp/gnc-plugin-qif-import.c:162
+#: gnucash/import-export/qif-imp/gnc-plugin-qif-import.c:134
msgid "Online Banking"
msgstr "Onlinebanking"
@@ -19081,7 +19039,8 @@ msgstr "Kontoumsätze online abfragen via HBCI/Onlinebanking"
#. Translators: https://en.wikipedia.org/wiki/Single_Euro_Payments_Area
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:113
-msgid "_Issue SEPA Transaction..."
+#, fuzzy
+msgid "Issue _SEPA Transaction..."
msgstr "SE_PA Einzelüberweisung..."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:114
@@ -19091,7 +19050,8 @@ msgid ""
msgstr "Neue SEPA-Ãœberweisung mit HBCI/Onlinebanking online absenden"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:118
-msgid "I_nternal Transaction..."
+#, fuzzy
+msgid "_Internal Transaction..."
msgstr "_Interne Umbuchung..."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:119
@@ -19100,7 +19060,8 @@ msgstr ""
"Neue bankinterne Einzelumbuchung mit HBCI/Onlinebanking online absenden"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:123
-msgid "_Issue SEPA Direct Debit..."
+#, fuzzy
+msgid "Issue SEPA Direct _Debit..."
msgstr "SEPA Einzel_lastschrift..."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:124
@@ -19116,16 +19077,17 @@ msgid "Import _MT940"
msgstr "_MT940 importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:134
-msgid "Import a MT940 file into GnuCash"
-msgstr "Buchungen aus einer MT940 Datei importieren"
+msgid ""
+"Import an end-of-day account statement in SWIFT MT940 format into GnuCash."
+msgstr ""
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:138
msgid "Import MT94_2"
msgstr "MT94_2 importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:139
-msgid "Import a MT942 file into GnuCash"
-msgstr "Buchungen aus einer MT942 Datei importieren"
+msgid "Import an interim account statement in SWIFT MT942 format into GnuCash."
+msgstr ""
#. Translators: DTAUS is a traditional german exchange format.
#. https://de.wikipedia.org/wiki/Datentr%C3%A4geraustauschverfahren
@@ -19134,7 +19096,8 @@ msgid "Import _DTAUS"
msgstr "_DTAUS importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:147
-msgid "Import a DTAUS file into GnuCash"
+#, fuzzy
+msgid "Import a traditional german DTAUS file into GnuCash."
msgstr "Buchungen aus einer DTAUS Datei importieren"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:159
@@ -19142,9 +19105,9 @@ msgid "Import DTAUS and _send..."
msgstr "DTAUS importieren und _senden..."
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:160
+#, fuzzy
msgid ""
-"Import a DTAUS file into GnuCash and send the transfers online through "
-"Online Banking"
+"Import a DTAUS file into GnuCash and transmit its orders by Online Banking."
msgstr ""
"Buchungen aus einer DTAUS Datei importieren und als Online-Banking Aufträge "
"an die Bank schicken"
@@ -19348,7 +19311,8 @@ msgstr ""
"verarbeiten. Sie müssen diesen Ausdruck an ihr Dateiformat anpassen.\n"
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
-msgid "Import Bills & Invoices..."
+#, fuzzy
+msgid "Import Bills & _Invoices..."
msgstr "_Rechnungen importieren..."
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
@@ -19581,10 +19545,12 @@ msgid "Export the Transactions to a CSV file"
msgstr "Buchungen in eine CSV-Textdatei exportieren"
#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:64
-msgid "Export _Active Register to CSV..."
+#, fuzzy
+msgid "Export A_ctive Register to CSV..."
msgstr "_Aktives Kontobuch nach CSV exportieren..."
-#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:65
+#. _A is already used by Export Accounts
+#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:66
msgid "Export the Active Register to a CSV file"
msgstr "Exportiert das Kontobuch des aktuellen Fensters in eine CSV Datei"
@@ -19766,17 +19732,17 @@ msgstr ""
"Fehlermeldung:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1723
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1735
msgid "No Linked Account"
msgstr "Kein verbundenes Konto"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1945
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1957
msgid ""
"To change mapping, double click on a row or select a row and press the "
"button..."
msgstr ""
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1989
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2001
#, c-format
msgid ""
"An unexpected error has occurred while mapping accounts. Please report this "
@@ -19791,7 +19757,7 @@ msgstr ""
"Fehlermeldung:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2023
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2035
#, c-format
msgid ""
"An unexpected error has occurred while creating transactions. Please report "
@@ -19806,14 +19772,14 @@ msgstr ""
"Fehlermeldung:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2032
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2044
msgid "Double click on rows to change, then click on Apply to Import"
msgstr ""
"Doppelklicken Sie auf Zeilen für Änderungen, danach klicken Sie »Anwenden« "
"zum Import."
#. Translators: {1} will be replaced with a filename
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2072
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2084
msgid "The transactions were imported from file '{1}'."
msgstr "Die Buchungen wurden aus der Datei »{1}« importiert."
@@ -20989,7 +20955,7 @@ msgstr ">"
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:527
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:1091
#: gnucash/report/report-system/report-utilities.scm:109
-#: libgnucash/engine/Account.cpp:4094
+#: libgnucash/engine/Account.cpp:4092
msgid "Cash"
msgstr "Bargeld"
@@ -21256,7 +21222,7 @@ msgstr "sample:Beschreibungsbeispiel einer Buchung"
#. translate the portion after the ':' and
#. leave the rest ("Associate:") as is.
#: gnucash/register/ledger-core/split-register-layout.c:711
-#: gnucash/register/ledger-core/split-register-model.c:326
+#: gnucash/register/ledger-core/split-register-model.c:328
msgid "Associate:A"
msgstr "Associate:Z"
@@ -21307,57 +21273,57 @@ msgstr ""
"voreingestellte Systemwährung verwendet."
#. Column label for Invoice IDs in A/P & A/R accounts
-#: gnucash/register/ledger-core/split-register-model.c:245
+#: gnucash/register/ledger-core/split-register-model.c:247
msgid "Ref"
msgstr "Ref"
-#: gnucash/register/ledger-core/split-register-model.c:261
+#: gnucash/register/ledger-core/split-register-model.c:263
msgid "T-Ref"
msgstr "B.-Ref."
-#: gnucash/register/ledger-core/split-register-model.c:270
+#: gnucash/register/ledger-core/split-register-model.c:272
#: gnucash/report/standard-reports/register.scm:133
msgid "T-Num"
msgstr "B.-Nr."
-#: gnucash/register/ledger-core/split-register-model.c:396
+#: gnucash/register/ledger-core/split-register-model.c:398
msgid "Exch. Rate"
msgstr "Wechselkurs:"
-#: gnucash/register/ledger-core/split-register-model.c:413
+#: gnucash/register/ledger-core/split-register-model.c:415
msgid "Oth. Curr."
msgstr "Andere Währung"
-#: gnucash/register/ledger-core/split-register-model.c:430
-#: gnucash/register/ledger-core/split-register-model.c:454
+#: gnucash/register/ledger-core/split-register-model.c:432
+#: gnucash/register/ledger-core/split-register-model.c:456
#, c-format
msgid "Tot %s"
msgstr "Gesamt %s"
-#: gnucash/register/ledger-core/split-register-model.c:436
+#: gnucash/register/ledger-core/split-register-model.c:438
msgid "Tot Credit"
msgstr "Gesamt Haben"
-#: gnucash/register/ledger-core/split-register-model.c:460
+#: gnucash/register/ledger-core/split-register-model.c:462
msgid "Tot Debit"
msgstr "Gesamt Soll"
-#: gnucash/register/ledger-core/split-register-model.c:469
+#: gnucash/register/ledger-core/split-register-model.c:471
msgid "Tot Shares"
msgstr "Anzahl Anteile gesamt"
-#: gnucash/register/ledger-core/split-register-model.c:528
+#: gnucash/register/ledger-core/split-register-model.c:530
#, c-format
msgid "Reconciled on %s"
msgstr "Abgeglichen am %s"
#. This seems to be the one that initially gets used, the InactiveDateCell
#. is set to, and subsequently displayed.
-#: gnucash/register/ledger-core/split-register-model.c:993
+#: gnucash/register/ledger-core/split-register-model.c:1013
msgid "Scheduled"
msgstr "Terminiert"
-#: gnucash/register/ledger-core/split-register-model.c:1042
+#: gnucash/register/ledger-core/split-register-model.c:1062
msgid ""
"Enter a reference, such as an invoice or check number, common to all entry "
"lines (splits)"
@@ -21365,7 +21331,7 @@ msgstr ""
"Geben Sie die Buchungsreferenz, z.B. die Rechnungs- oder Scheck-Nummer, "
"welche für die gesamte Buchung gilt, ein."
-#: gnucash/register/ledger-core/split-register-model.c:1044
+#: gnucash/register/ledger-core/split-register-model.c:1064
msgid ""
"Enter a reference, such as an invoice or check number, unique to each entry "
"line (split)"
@@ -21373,21 +21339,21 @@ msgstr ""
"Geben Sie die Buchungsreferenz, z.B. die Rechnungs- oder Scheck-Nummer, für "
"diesen Buchungsteil ein."
-#: gnucash/register/ledger-core/split-register-model.c:1049
+#: gnucash/register/ledger-core/split-register-model.c:1069
msgid ""
"Enter a reference, such as a check number, common to all entry lines (splits)"
msgstr ""
"Geben Sie eine für alle Teilbuchungen geltende Referenz ein, z.B. die "
"Rechnungs- oder Scheck-Nummer"
-#: gnucash/register/ledger-core/split-register-model.c:1051
+#: gnucash/register/ledger-core/split-register-model.c:1071
msgid ""
"Enter a reference, such as a check number, unique to each entry line (split)"
msgstr ""
"Geben Sie eine für jede Teilbuchung eindeutige Referenz ein, z.B. die "
"Rechnungs- oder Scheck-Nummer."
-#: gnucash/register/ledger-core/split-register-model.c:1072
+#: gnucash/register/ledger-core/split-register-model.c:1092
msgid ""
"Enter a transaction reference, such as an invoice or check number, common to "
"all entry lines (splits)"
@@ -21395,17 +21361,17 @@ msgstr ""
"Geben Sie eine für alle Teilbuchungen geltende Buchungsreferenz ein, z.B. "
"die Rechnungs- oder Scheck-Nummer."
-#: gnucash/register/ledger-core/split-register-model.c:1076
+#: gnucash/register/ledger-core/split-register-model.c:1096
msgid ""
"Enter a transaction reference that will be common to all entry lines (splits)"
msgstr ""
"Geben Sie eine Buchungsreferenz an, welche für alle Teilbuchungen gilt."
-#: gnucash/register/ledger-core/split-register-model.c:1280
+#: gnucash/register/ledger-core/split-register-model.c:1300
msgid "Enter an action type, or choose one from the list"
msgstr "Geben Sie die Aktion ein, oder wählen Sie eine aus der Liste"
-#: gnucash/register/ledger-core/split-register-model.c:1281
+#: gnucash/register/ledger-core/split-register-model.c:1301
msgid ""
"Enter a reference number, such as the next check number, or choose an action "
"type from the list"
@@ -21413,21 +21379,21 @@ msgstr ""
"Geben Sie eine Referenznummer wie etwa die nächste Schecknummer ein oder "
"wählen sie eine Aktion aus der Liste."
-#: gnucash/register/ledger-core/split-register-model.c:1548
+#: gnucash/register/ledger-core/split-register-model.c:1568
msgid ""
"This transaction has multiple splits; press the Split button to see them all"
msgstr ""
"Dieser Buchungssatz hat mehrere Buchungsteile. Klicken Sie auf "
"»Vollständig«, um alle sehen zu können."
-#: gnucash/register/ledger-core/split-register-model.c:1551
+#: gnucash/register/ledger-core/split-register-model.c:1571
msgid ""
"This transaction is a stock split; press the Split button to see details"
msgstr ""
"Dieser Buchungssatz ist eine Aktienteilung. Klicken Sie auf »Vollständig«, "
"um Einzelheiten sehen zu können."
-#: gnucash/register/ledger-core/split-register-model.c:2038
+#: gnucash/register/ledger-core/split-register-model.c:2058
#, c-format
msgid ""
"Cannot modify or delete this transaction. This transaction is marked read-"
@@ -21440,12 +21406,12 @@ msgstr ""
"\n"
"»%s«"
-#: gnucash/register/ledger-core/split-register-model.c:2155
+#: gnucash/register/ledger-core/split-register-model.c:2175
msgid "Change transaction containing a reconciled split?"
msgstr ""
"Buchung ändern, auch wenn diese einen abgeglichenem Buchungsteil enthält?"
-#: gnucash/register/ledger-core/split-register-model.c:2157
+#: gnucash/register/ledger-core/split-register-model.c:2177
#, fuzzy, c-format
msgid ""
"The transaction you are about to change is protected because it contains "
@@ -21459,7 +21425,7 @@ msgstr ""
"Sie wollen einen abgeglichenen Buchungsteil verändern. Dies kann das nächste "
"Abgleichen erschweren. Wollen Sie trotzdem fortsetzen?"
-#: gnucash/register/ledger-core/split-register-model.c:2169
+#: gnucash/register/ledger-core/split-register-model.c:2189
#, fuzzy
msgid ""
"You are about to change a protected field of a reconciled split. If you "
@@ -21469,7 +21435,7 @@ msgstr ""
"Sie wollen einen abgeglichenen Buchungsteil verändern. Dies kann das nächste "
"Abgleichen erschweren. Wollen Sie trotzdem fortsetzen?"
-#: gnucash/register/ledger-core/split-register-model.c:2194
+#: gnucash/register/ledger-core/split-register-model.c:2214
msgid "Chan_ge Transaction"
msgstr "Buchung _ändern"
@@ -21502,7 +21468,7 @@ msgid "Sort By"
msgstr "Sortiere nach"
#: gnucash/report/business-reports/aging.scm:40
-#: gnucash/report/business-reports/customer-summary.scm:95
+#: gnucash/report/business-reports/customer-summary.scm:86
msgid "Sort Order"
msgstr "Sortierreihenfolge"
@@ -21512,6 +21478,7 @@ msgstr "Sortierreihenfolge"
#: gnucash/report/standard-reports/account-summary.scm:114
#: gnucash/report/standard-reports/advanced-portfolio.scm:75
#: gnucash/report/standard-reports/average-balance.scm:41
+#: gnucash/report/standard-reports/balance-forecast.scm:44
#: gnucash/report/standard-reports/balance-sheet.scm:138
#: gnucash/report/standard-reports/budget-balance-sheet.scm:103
#: gnucash/report/standard-reports/budget-flow.scm:46
@@ -21519,7 +21486,7 @@ msgstr "Sortierreihenfolge"
#: gnucash/report/standard-reports/cashflow-barchart.scm:58
#: gnucash/report/standard-reports/cash-flow.scm:52
#: gnucash/report/standard-reports/category-barchart.scm:69
-#: gnucash/report/standard-reports/daily-reports.scm:55
+#: gnucash/report/standard-reports/daily-reports.scm:54
#: gnucash/report/standard-reports/equity-statement.scm:77
#: gnucash/report/standard-reports/income-statement.scm:110
#: gnucash/report/standard-reports/net-charts.scm:43
@@ -21537,6 +21504,7 @@ msgstr "Währung des Berichts"
#: gnucash/report/standard-reports/account-summary.scm:115
#: gnucash/report/standard-reports/advanced-portfolio.scm:39
#: gnucash/report/standard-reports/average-balance.scm:42
+#: gnucash/report/standard-reports/balance-forecast.scm:45
#: gnucash/report/standard-reports/balance-sheet.scm:139
#: gnucash/report/standard-reports/budget-balance-sheet.scm:104
#: gnucash/report/standard-reports/budget-flow.scm:43
@@ -21545,7 +21513,7 @@ msgstr "Währung des Berichts"
#: gnucash/report/standard-reports/cashflow-barchart.scm:59
#: gnucash/report/standard-reports/cash-flow.scm:53
#: gnucash/report/standard-reports/category-barchart.scm:70
-#: gnucash/report/standard-reports/daily-reports.scm:56
+#: gnucash/report/standard-reports/daily-reports.scm:55
#: gnucash/report/standard-reports/equity-statement.scm:78
#: gnucash/report/standard-reports/income-statement.scm:111
#: gnucash/report/standard-reports/net-charts.scm:44
@@ -22176,11 +22144,11 @@ msgstr "Ihre eigene Geschäftsadresse und das Druckdatum anzeigen."
msgid "Display Columns"
msgstr "Spalten anzeigen"
-#: gnucash/report/business-reports/customer-summary.scm:88
+#: gnucash/report/business-reports/customer-summary.scm:79
msgid "Show Lines with All Zeros"
msgstr "Zeilen mit ausschließlich Nullen anzeigen"
-#: gnucash/report/business-reports/customer-summary.scm:89
+#: gnucash/report/business-reports/customer-summary.scm:80
msgid ""
"Show the table lines with customers which did not have any transactions in "
"the reporting period, hence would show all zeros in the columns."
@@ -22188,108 +22156,121 @@ msgstr ""
"Tabellenzeilen auch für Kunden anzeigen, die im Berichtszeitraum keine "
"Buchungen hatten, so dass alle Zahlen Null betragen."
-#: gnucash/report/business-reports/customer-summary.scm:90
+#: gnucash/report/business-reports/customer-summary.scm:81
msgid "Show Inactive Customers"
msgstr "_Inaktive Kunden zeigen"
-#: gnucash/report/business-reports/customer-summary.scm:91
+#: gnucash/report/business-reports/customer-summary.scm:82
msgid "Include customers that have been marked inactive."
msgstr "Kunden einschließen, die als »Inaktiv« markiert sind."
-#: gnucash/report/business-reports/customer-summary.scm:93
+#: gnucash/report/business-reports/customer-summary.scm:84
msgid "Sort Column"
msgstr "Sortierspalte"
-#: gnucash/report/business-reports/customer-summary.scm:94
+#: gnucash/report/business-reports/customer-summary.scm:85
msgid "Choose the column by which the result table is sorted."
msgstr "Wählen Sie die Spalte, nach der die Tabelle sortiert werden soll."
-#: gnucash/report/business-reports/customer-summary.scm:96
+#: gnucash/report/business-reports/customer-summary.scm:87
msgid "Choose the ordering of the column sort: Either ascending or descending."
msgstr ""
"Die Sortierreihenfolge für die Spalten wählen: Aufsteigend oder absteigend."
-#: gnucash/report/business-reports/customer-summary.scm:445
+#: gnucash/report/business-reports/customer-summary.scm:144
msgid "Customer Name"
msgstr "Kundenname"
-#: gnucash/report/business-reports/customer-summary.scm:446
+#: gnucash/report/business-reports/customer-summary.scm:145
msgid "Sort alphabetically by customer name."
msgstr "Alphabetisch nach Kundennamen sortieren."
-#: gnucash/report/business-reports/customer-summary.scm:448
-#: gnucash/report/business-reports/customer-summary.scm:832
+#: gnucash/report/business-reports/customer-summary.scm:147
+#: gnucash/report/business-reports/customer-summary.scm:462
#: gnucash/report/standard-reports/average-balance.scm:128
#: gnucash/report/standard-reports/average-balance.scm:149
msgid "Profit"
msgstr "Gewinn"
-#: gnucash/report/business-reports/customer-summary.scm:449
+#: gnucash/report/business-reports/customer-summary.scm:148
msgid "Sort by profit amount."
msgstr "Sortieren nach dem Betrag des Gewinns."
#. Translators: "Markup" is profit amount divided by sales amount
-#: gnucash/report/business-reports/customer-summary.scm:452
-#: gnucash/report/business-reports/customer-summary.scm:834
+#: gnucash/report/business-reports/customer-summary.scm:151
+#: gnucash/report/business-reports/customer-summary.scm:464
msgid "Markup"
msgstr "Bruttogewinn"
-#: gnucash/report/business-reports/customer-summary.scm:453
+#: gnucash/report/business-reports/customer-summary.scm:152
msgid "Sort by markup (which is profit amount divided by sales)."
msgstr "Sortieren nach Bruttogewinn (Gewinn pro Umsatz)."
-#: gnucash/report/business-reports/customer-summary.scm:455
-#: gnucash/report/business-reports/customer-summary.scm:834
+#: gnucash/report/business-reports/customer-summary.scm:154
+#: gnucash/report/business-reports/customer-summary.scm:464
msgid "Sales"
msgstr "Umsatz"
-#: gnucash/report/business-reports/customer-summary.scm:456
+#: gnucash/report/business-reports/customer-summary.scm:155
msgid "Sort by sales amount."
msgstr "Sortieren nach Umsatz."
-#: gnucash/report/business-reports/customer-summary.scm:459
+#: gnucash/report/business-reports/customer-summary.scm:158
msgid "Sort by expense amount."
msgstr "Sortieren nach Kosten."
-#: gnucash/report/business-reports/customer-summary.scm:469
+#: gnucash/report/business-reports/customer-summary.scm:168
msgid "A to Z, smallest to largest."
msgstr "Von A bis Z, von klein nach groß."
-#: gnucash/report/business-reports/customer-summary.scm:472
+#: gnucash/report/business-reports/customer-summary.scm:171
msgid "Z to A, largest to smallest."
msgstr "Von Z bis A, von groß nach klein."
-#: gnucash/report/business-reports/customer-summary.scm:513
-#: gnucash/report/business-reports/job-report.scm:418
-msgid "Expense Report"
-msgstr "Bericht Aufwendungen"
-
-#: gnucash/report/business-reports/customer-summary.scm:729
+#: gnucash/report/business-reports/customer-summary.scm:359
#: gnucash/report/business-reports/owner-report.scm:759
#: gnucash/report/report-gnome/dialog-report-column-view.c:412
#: gnucash/report/report-gnome/report-gnome.scm:51
msgid "Report"
msgstr "Bericht"
-#: gnucash/report/business-reports/customer-summary.scm:918
+#: gnucash/report/business-reports/customer-summary.scm:548
msgid "No Customer"
msgstr "Kein Kunde"
-#: gnucash/report/business-reports/customer-summary.scm:993
+#: gnucash/report/business-reports/customer-summary.scm:623
#, scheme-format
msgid "~a ~a - ~a"
msgstr ""
-#: gnucash/report/business-reports/customer-summary.scm:1013
-#: gnucash/report/business-reports/job-report.scm:625
-#, scheme-format
-msgid "No valid ~a selected. Click on the Options button to select a company."
+#: gnucash/report/business-reports/customer-summary.scm:645
+#: gnucash/report/business-reports/job-report.scm:627
+#: gnucash/report/business-reports/owner-report.scm:81
+msgid "No valid customer selected."
+msgstr "Kein passender Kunde ausgewählt!"
+
+#: gnucash/report/business-reports/customer-summary.scm:647
+#: gnucash/report/business-reports/job-report.scm:631
+#, fuzzy
+msgid "No valid vendor selected."
+msgstr "Kein passender Kunde ausgewählt!"
+
+#: gnucash/report/business-reports/customer-summary.scm:649
+#: gnucash/report/business-reports/job-report.scm:633
+#: gnucash/report/business-reports/owner-report.scm:82
+msgid "No valid employee selected."
+msgstr "Kein passender Mitarbeiter gewählt!"
+
+#: gnucash/report/business-reports/customer-summary.scm:651
+#: gnucash/report/business-reports/job-report.scm:636
+#, fuzzy
+msgid "Click on the \"Options\" button to select a company."
msgstr ""
"Keine gültige ~a gewählt. Klicken Sie auf »Optionen«, um eine Firma zu "
"wählen."
# Fixme: Source Accelerator missing
-#: gnucash/report/business-reports/customer-summary.scm:1026
+#: gnucash/report/business-reports/customer-summary.scm:663
msgid "Customer Summary"
msgstr "Kundenüber_sicht"
@@ -22733,23 +22714,24 @@ msgstr "Anzeigen der Buchungsbeschreibung?"
msgid "Display the transaction amount?"
msgstr "Anzeigen des Buchungsbetrags?"
+#: gnucash/report/business-reports/job-report.scm:418
+msgid "Expense Report"
+msgstr "Bericht Aufwendungen"
+
#: gnucash/report/business-reports/job-report.scm:555
-#: gnucash/report/business-reports/job-report.scm:667
+#: gnucash/report/business-reports/job-report.scm:677
msgid "Job Report"
msgstr "Auftragsbericht"
+#: gnucash/report/business-reports/job-report.scm:629
+#, fuzzy
+msgid "No valid job selected."
+msgstr "Keine passende Firma gewählt!"
+
#: gnucash/report/business-reports/owner-report.scm:56
msgid "Sale"
msgstr "Verkauf"
-#: gnucash/report/business-reports/owner-report.scm:81
-msgid "No valid customer selected."
-msgstr "Kein passender Kunde ausgewählt!"
-
-#: gnucash/report/business-reports/owner-report.scm:82
-msgid "No valid employee selected."
-msgstr "Kein passender Mitarbeiter gewählt!"
-
#: gnucash/report/business-reports/owner-report.scm:85
msgid "No valid company selected."
msgstr "Keine passende Firma gewählt!"
@@ -23719,32 +23701,32 @@ msgstr "Sie müssen einen Namen für diese Stilvorlage angeben."
msgid "Style Sheet Name"
msgstr "Name der Stilvorlage"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:335
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:336
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:307
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:308
msgid "The numeric ID of the report."
msgstr "Die Nummer des Berichts."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1123
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1095
msgid "Print"
msgstr "Drucken"
#. Translators: This string is meant to be a short alternative for "Save Report Configuration"
#. * to be used as toolbar button label.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1128
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1100
msgid "Save Config"
msgstr "Konf. speichern"
#. Translators: This string is meant to be a short alternative for "Save Report Configuration As..."
#. * to be used as toolbar button label.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1131
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1103
msgid "Save Config As..."
msgstr "Konfiguration speichern unter..."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1132
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1104
msgid "Make Pdf"
msgstr "PDF erstellen"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1184
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1156
#, c-format
msgid ""
"Update the current report's saved configuration. The report will be saved in "
@@ -23753,7 +23735,7 @@ msgstr ""
"Berichtskonfiguration im Menü »Benutzerdefiniert« aktualisieren. Der Bericht "
"wird in der Datei %s gespeichert."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1187
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1159
#, c-format
msgid ""
"Add the current report's configuration to the `Saved Report Configurations' "
@@ -23762,100 +23744,100 @@ msgstr ""
"Berichtskonfiguration zum Menü »Benutzerdefiniert« hinzufügen. Der Bericht "
"wird in der Datei %s gespeichert."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1193
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1165
msgid "_Print Report..."
msgstr "Bericht _drucken..."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1194
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1166
msgid "Print the current report"
msgstr "Aktuellen Bericht drucken"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1198
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1170
msgid "Export as P_DF..."
msgstr "Exportieren als _PDF..."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1199
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1171
msgid "Export the current report as a PDF document"
msgstr "Aktuellen Bericht in eine PDF-Datei exportieren"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1223
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1195
msgid "Save _Report Configuration"
msgstr "Berichtskonfiguration _speichern"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1227
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1199
msgid "Save Report Configuration As..."
msgstr "Berichtskonfiguration speichern _unter..."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1231
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1203
msgid "Export _Report"
msgstr "_Bericht exportieren"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1232
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1204
msgid "Export HTML-formatted report to file"
msgstr "HTML-formatierten Bericht in Datei exportieren"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1236
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1208
msgid "_Report Options"
msgstr "Berichts_optionen"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1237
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1209
#: gnucash/report/report-system/html-utilities.scm:786
msgid "Edit report options"
msgstr "Berichtsoptionen ändern"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1242
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1214
msgid "Back"
msgstr "Zurück"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1243
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1215
msgid "Move back one step in the history"
msgstr "Einen Schritt zurück im Verlauf"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1247
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1219
msgid "Forward"
msgstr "Vorwärts"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1248
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1220
msgid "Move forward one step in the history"
msgstr "Einen Schritt vorwärts im Verlauf"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1252
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1224
msgid "Reload"
msgstr "Erneut laden"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1253
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1225
msgid "Reload the current page"
msgstr "Aktuelle Seite neu laden"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1257
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1229
msgid "Stop"
msgstr "Abbrechen"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1258
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1230
msgid "Cancel outstanding HTML requests"
msgstr "Unbeantwortete HTML-Anfragen abbrechen "
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1505
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1538
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1477
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1510
msgid "HTML"
msgstr "HTML"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1508
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1480
msgid "Choose export format"
msgstr "Wählen Sie das Export-Format"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1509
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1481
msgid "Choose the export format for this report:"
msgstr "Wählen Sie das Export-Format für diesen Bericht:"
#. %s is the type of what is about to be saved, e.g. "HTML".
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1549
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1521
#, c-format
msgid "Save %s To File"
msgstr "%s in Datei speichern"
#. %s is the strerror(3) string of the error that occurred.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1578
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1550
#, c-format
msgid ""
"You cannot save to that filename.\n"
@@ -23866,16 +23848,16 @@ msgstr ""
"\n"
"%s"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1588
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1560
msgid "You cannot save to that file."
msgstr "Sie können nicht in diese Datei speichern."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1718
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1690
#, c-format
msgid "Could not open the file %s. The error is: %s"
msgstr "Kann Datei %s nicht öffnen. Fehlermeldung: %s"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1758
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1730
msgid "GnuCash-Report"
msgstr "GnuCash-Bericht"
@@ -24562,12 +24544,12 @@ msgstr "Verbindlichkeiten Konten"
msgid "Credit Lines"
msgstr "Kreditrahmen"
-#: gnucash/report/report-system/report-utilities.scm:677
+#: gnucash/report/report-system/report-utilities.scm:681
#, scheme-format
msgid "Building '~a' report ..."
msgstr "Bericht »~a« berechnen..."
-#: gnucash/report/report-system/report-utilities.scm:683
+#: gnucash/report/report-system/report-utilities.scm:687
#, scheme-format
msgid "Rendering '~a' report ..."
msgstr "Bericht »~a« darstellen..."
@@ -24620,11 +24602,12 @@ msgstr "Tortendiagramm der Verbindlichkeiten eines Zeitpunkts anzeigen"
#. General
#: gnucash/report/standard-reports/account-piecharts.scm:64
#: gnucash/report/standard-reports/average-balance.scm:38
+#: gnucash/report/standard-reports/balance-forecast.scm:40
#: gnucash/report/standard-reports/budget-barchart.scm:46
#: gnucash/report/standard-reports/cashflow-barchart.scm:55
#: gnucash/report/standard-reports/cash-flow.scm:45
#: gnucash/report/standard-reports/category-barchart.scm:66
-#: gnucash/report/standard-reports/daily-reports.scm:53
+#: gnucash/report/standard-reports/daily-reports.scm:52
#: gnucash/report/standard-reports/equity-statement.scm:65
#: gnucash/report/standard-reports/income-statement.scm:59
#: gnucash/report/standard-reports/net-charts.scm:40
@@ -24636,11 +24619,12 @@ msgstr "Anfangsdatum"
#: gnucash/report/standard-reports/account-piecharts.scm:65
#: gnucash/report/standard-reports/average-balance.scm:39
+#: gnucash/report/standard-reports/balance-forecast.scm:41
#: gnucash/report/standard-reports/budget-barchart.scm:47
#: gnucash/report/standard-reports/cashflow-barchart.scm:56
#: gnucash/report/standard-reports/cash-flow.scm:46
#: gnucash/report/standard-reports/category-barchart.scm:67
-#: gnucash/report/standard-reports/daily-reports.scm:54
+#: gnucash/report/standard-reports/daily-reports.scm:53
#: gnucash/report/standard-reports/equity-statement.scm:66
#: gnucash/report/standard-reports/income-statement.scm:60
#: gnucash/report/standard-reports/net-charts.scm:41
@@ -24652,7 +24636,7 @@ msgstr "Enddatum"
#: gnucash/report/standard-reports/account-piecharts.scm:70
#: gnucash/report/standard-reports/category-barchart.scm:73
-#: gnucash/report/standard-reports/daily-reports.scm:59
+#: gnucash/report/standard-reports/daily-reports.scm:58
msgid "Show Accounts until level"
msgstr "Verschachtelungstiefe der angezeigten Konten"
@@ -24661,7 +24645,7 @@ msgid "Show long names"
msgstr "Lange Kontennamen anzeigen"
#: gnucash/report/standard-reports/account-piecharts.scm:73
-#: gnucash/report/standard-reports/daily-reports.scm:63
+#: gnucash/report/standard-reports/daily-reports.scm:62
msgid "Show Totals"
msgstr "Beträge anzeigen"
@@ -24670,16 +24654,17 @@ msgid "Show Percents"
msgstr "Prozent anzeigen"
#: gnucash/report/standard-reports/account-piecharts.scm:75
-#: gnucash/report/standard-reports/daily-reports.scm:64
+#: gnucash/report/standard-reports/daily-reports.scm:63
msgid "Maximum Slices"
msgstr "Maximale Anzahl Segmente"
#: gnucash/report/standard-reports/account-piecharts.scm:76
#: gnucash/report/standard-reports/average-balance.scm:45
+#: gnucash/report/standard-reports/balance-forecast.scm:47
#: gnucash/report/standard-reports/budget-barchart.scm:44
#: gnucash/report/standard-reports/cashflow-barchart.scm:52
#: gnucash/report/standard-reports/category-barchart.scm:81
-#: gnucash/report/standard-reports/daily-reports.scm:65
+#: gnucash/report/standard-reports/daily-reports.scm:64
#: gnucash/report/standard-reports/net-charts.scm:54
#: gnucash/report/standard-reports/price-scatter.scm:57
msgid "Plot Width"
@@ -24687,10 +24672,11 @@ msgstr "Diagrammbreite"
#: gnucash/report/standard-reports/account-piecharts.scm:77
#: gnucash/report/standard-reports/average-balance.scm:46
+#: gnucash/report/standard-reports/balance-forecast.scm:48
#: gnucash/report/standard-reports/budget-barchart.scm:45
#: gnucash/report/standard-reports/cashflow-barchart.scm:53
#: gnucash/report/standard-reports/category-barchart.scm:82
-#: gnucash/report/standard-reports/daily-reports.scm:66
+#: gnucash/report/standard-reports/daily-reports.scm:65
#: gnucash/report/standard-reports/net-charts.scm:55
#: gnucash/report/standard-reports/price-scatter.scm:58
msgid "Plot Height"
@@ -24698,7 +24684,7 @@ msgstr "Diagrammhöhe"
#: gnucash/report/standard-reports/account-piecharts.scm:78
#: gnucash/report/standard-reports/category-barchart.scm:84
-#: gnucash/report/standard-reports/daily-reports.scm:67
+#: gnucash/report/standard-reports/daily-reports.scm:66
msgid "Sort Method"
msgstr "Sortierreihenfolge"
@@ -24742,7 +24728,7 @@ msgstr "Zeige den wöchentlichen Durchschnitt im Berichtszeitraum an."
#: gnucash/report/standard-reports/account-piecharts.scm:136
#: gnucash/report/standard-reports/category-barchart.scm:139
-#: gnucash/report/standard-reports/daily-reports.scm:98
+#: gnucash/report/standard-reports/daily-reports.scm:97
#: gnucash/report/standard-reports/net-charts.scm:93
msgid "Report on these accounts, if chosen account level allows."
msgstr ""
@@ -24750,7 +24736,7 @@ msgstr ""
#: gnucash/report/standard-reports/account-piecharts.scm:151
#: gnucash/report/standard-reports/category-barchart.scm:151
-#: gnucash/report/standard-reports/daily-reports.scm:112
+#: gnucash/report/standard-reports/daily-reports.scm:111
msgid "Show accounts to this depth and not further."
msgstr "Konten nur bis zu dieser Verschachtelungstiefe anzeigen."
@@ -24764,7 +24750,7 @@ msgid "Show the full security name in the legend?"
msgstr "Lange Wertpapierbezeichung in der Legende anzeigen?"
#: gnucash/report/standard-reports/account-piecharts.scm:166
-#: gnucash/report/standard-reports/daily-reports.scm:118
+#: gnucash/report/standard-reports/daily-reports.scm:117
msgid "Show the total balance in legend?"
msgstr "Gesamtbeträge in der Legende anzeigen?"
@@ -24791,11 +24777,13 @@ msgid "Weekly Average"
msgstr "Durchschnitt pro Woche"
#: gnucash/report/standard-reports/account-piecharts.scm:565
+#: gnucash/report/standard-reports/balance-forecast.scm:258
+#: gnucash/report/standard-reports/budget.scm:464
#: gnucash/report/standard-reports/cashflow-barchart.scm:294
-#: gnucash/report/standard-reports/cash-flow.scm:166
+#: gnucash/report/standard-reports/cash-flow.scm:193
#: gnucash/report/standard-reports/category-barchart.scm:535
#: gnucash/report/standard-reports/category-barchart.scm:561
-#: gnucash/report/standard-reports/daily-reports.scm:475
+#: gnucash/report/standard-reports/daily-reports.scm:305
#: gnucash/report/standard-reports/equity-statement.scm:363
#: gnucash/report/standard-reports/income-statement.scm:474
#: gnucash/report/standard-reports/net-charts.scm:371
@@ -25081,7 +25069,7 @@ msgstr "Die Methode zur Berechnung der Basis."
#: gnucash/report/standard-reports/advanced-portfolio.scm:94
#: gnucash/report/standard-reports/average-balance.scm:127
#: gnucash/report/standard-reports/average-balance.scm:147
-#: gnucash/report/standard-reports/transaction.scm:1796
+#: gnucash/report/standard-reports/transaction.scm:1800
#: libgnucash/engine/policy.c:58
msgid "Average"
msgstr "Durchschnitt"
@@ -25193,14 +25181,14 @@ msgstr "Basis"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1086
#: gnucash/report/standard-reports/cashflow-barchart.scm:313
#: gnucash/report/standard-reports/cashflow-barchart.scm:338
-#: gnucash/report/standard-reports/cash-flow.scm:301
+#: gnucash/report/standard-reports/cash-flow.scm:286
msgid "Money In"
msgstr "Einzahlung"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1087
#: gnucash/report/standard-reports/cashflow-barchart.scm:314
#: gnucash/report/standard-reports/cashflow-barchart.scm:339
-#: gnucash/report/standard-reports/cash-flow.scm:343
+#: gnucash/report/standard-reports/cash-flow.scm:307
msgid "Money Out"
msgstr "Auszahlung"
@@ -25266,7 +25254,7 @@ msgid "Step Size"
msgstr "Schrittgröße"
#: gnucash/report/standard-reports/average-balance.scm:43
-#: gnucash/report/standard-reports/daily-reports.scm:60
+#: gnucash/report/standard-reports/daily-reports.scm:59
msgid "Include Sub-Accounts"
msgstr "Unterkonten einschließen"
@@ -25275,7 +25263,7 @@ msgid "Exclude transactions between selected accounts"
msgstr "Buchungen zwischen gewählten Konten ausschließen"
#: gnucash/report/standard-reports/average-balance.scm:78
-#: gnucash/report/standard-reports/daily-reports.scm:92
+#: gnucash/report/standard-reports/daily-reports.scm:91
msgid "Include sub-accounts of all selected accounts."
msgstr "Schließe Unterkonten der ausgewählten Konten ein."
@@ -25292,7 +25280,7 @@ msgid "Do transaction report on this account."
msgstr "Erstelle den Buchungsbericht zu diesem Konto."
#: gnucash/report/standard-reports/average-balance.scm:114
-#: gnucash/report/standard-reports/average-balance.scm:341
+#: gnucash/report/standard-reports/average-balance.scm:187
#: gnucash/report/standard-reports/category-barchart.scm:188
#: gnucash/report/standard-reports/category-barchart.scm:260
#: gnucash/report/standard-reports/net-charts.scm:134
@@ -25308,7 +25296,7 @@ msgid "Display a table of the selected data."
msgstr "Daten als Tabelle anzeigen."
#: gnucash/report/standard-reports/average-balance.scm:119
-#: gnucash/report/standard-reports/average-balance.scm:340
+#: gnucash/report/standard-reports/average-balance.scm:186
msgid "Show plot"
msgstr "Diagramm anzeigen"
@@ -25317,7 +25305,7 @@ msgid "Display a graph of the selected data."
msgstr "Daten als Diagramm anzeigen."
#: gnucash/report/standard-reports/average-balance.scm:124
-#: gnucash/report/standard-reports/average-balance.scm:339
+#: gnucash/report/standard-reports/average-balance.scm:185
msgid "Plot Type"
msgstr "Diagrammtyp"
@@ -25352,6 +25340,7 @@ msgid "Maximum"
msgstr "Maximum"
#: gnucash/report/standard-reports/average-balance.scm:148
+#: gnucash/report/standard-reports/balance-forecast.scm:233
msgid "Minimum"
msgstr "Minimum"
@@ -25363,6 +25352,88 @@ msgstr "Wertzuwachs"
msgid "Loss"
msgstr "Verlust"
+#. Name definitions
+#: gnucash/report/standard-reports/balance-forecast.scm:35
+#, fuzzy
+msgid "Balance Forecast"
+msgstr "Saldo am ~a"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:38
+#: gnucash/report/standard-reports/budget-barchart.scm:76
+#: gnucash/report/standard-reports/budget-flow.scm:88
+#: gnucash/report/standard-reports/cashflow-barchart.scm:88
+#: gnucash/report/standard-reports/income-gst-statement.scm:86
+#: gnucash/report/standard-reports/transaction.scm:624
+#: gnucash/report/standard-reports/trial-balance.scm:78
+msgid "Report on these accounts."
+msgstr "Den Buchungsbericht für diese Konten erstellen."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:42
+#, fuzzy
+msgid "Interval"
+msgstr "Intervall:"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:49
+#: gnucash/report/standard-reports/net-charts.scm:60
+msgid "Data markers?"
+msgstr "Markierungspunkte?"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:50
+#: gnucash/report/standard-reports/net-charts.scm:166
+msgid "Display a mark for each data point."
+msgstr "Einen Markierungspunkt für jeden Datenpunkt anzeigen."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:52
+#: gnucash/report/standard-reports/balance-forecast.scm:53
+#, fuzzy
+msgid "Show reserve line"
+msgstr "Empfänger Informationen anzeigen"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:55
+#, fuzzy
+msgid "Reserve amount"
+msgstr "Forderungen Konto"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:56
+msgid "The reserve amount is set to a minimum balance desired"
+msgstr ""
+
+#: gnucash/report/standard-reports/balance-forecast.scm:59
+#: gnucash/report/standard-reports/balance-forecast.scm:60
+#, fuzzy
+msgid "Show target line"
+msgstr "Tabelle anzeigen"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:62
+msgid "Target amount above reserve"
+msgstr ""
+
+#: gnucash/report/standard-reports/balance-forecast.scm:63
+msgid ""
+"The target is used to plan for a future large purchase, which will be added "
+"as a line above the reserve amount."
+msgstr ""
+
+#: gnucash/report/standard-reports/balance-forecast.scm:67
+#, fuzzy
+msgid "Show future minimum"
+msgstr "Zukünftiges Minimum"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:68
+msgid ""
+"The future minimum will add, for each date point, a projected minimum "
+"balance including scheduled transactions."
+msgstr ""
+
+#: gnucash/report/standard-reports/balance-forecast.scm:245
+#, fuzzy
+msgid "Target"
+msgstr "Belastung"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:251
+msgid "Reserve"
+msgstr ""
+
#: gnucash/report/standard-reports/balance-sheet.scm:72
#: gnucash/report/standard-reports/trial-balance.scm:710
msgid "Balance Sheet"
@@ -25586,15 +25657,6 @@ msgstr "Laufender Saldo"
msgid "Chart Type"
msgstr "Diagrammtyp"
-#: gnucash/report/standard-reports/budget-barchart.scm:76
-#: gnucash/report/standard-reports/budget-flow.scm:88
-#: gnucash/report/standard-reports/cashflow-barchart.scm:88
-#: gnucash/report/standard-reports/income-gst-statement.scm:86
-#: gnucash/report/standard-reports/transaction.scm:624
-#: gnucash/report/standard-reports/trial-balance.scm:78
-msgid "Report on these accounts."
-msgstr "Den Buchungsbericht für diese Konten erstellen."
-
#: gnucash/report/standard-reports/budget-barchart.scm:93
msgid "Calculate as running sum?"
msgstr "Als laufende Summe erstellen?"
@@ -25647,7 +25709,7 @@ msgstr "Periode"
msgid "Period number."
msgstr "Die Nummer der Periode."
-#: gnucash/report/standard-reports/budget-flow.scm:319
+#: gnucash/report/standard-reports/budget-flow.scm:306
#, scheme-format
msgid "~a: ~a - ~a"
msgstr "~a: ~a - ~a"
@@ -26058,25 +26120,25 @@ msgstr "Balkendiagramm des Kapitalflusses pro Zeit anzeigen"
msgid "Cash Flow"
msgstr "Kapitalfluss"
-#: gnucash/report/standard-reports/cash-flow.scm:240
+#: gnucash/report/standard-reports/cash-flow.scm:210
#, scheme-format
msgid "~a and subaccounts"
msgstr "~a und Unterkonten"
-#: gnucash/report/standard-reports/cash-flow.scm:241
+#: gnucash/report/standard-reports/cash-flow.scm:211
#, scheme-format
msgid "~a and selected subaccounts"
msgstr "~a und ausgewählte Unterkonten"
-#: gnucash/report/standard-reports/cash-flow.scm:269
+#: gnucash/report/standard-reports/cash-flow.scm:277
msgid "Money into selected accounts comes from"
msgstr "Zahlung in gewählte Konten kommen aus"
-#: gnucash/report/standard-reports/cash-flow.scm:311
+#: gnucash/report/standard-reports/cash-flow.scm:298
msgid "Money out of selected accounts goes to"
msgstr "Zahlung von gewählten Konten gehen nach"
-#: gnucash/report/standard-reports/cash-flow.scm:353
+#: gnucash/report/standard-reports/cash-flow.scm:319
msgid "Difference"
msgstr "Differenz"
@@ -26141,7 +26203,7 @@ msgid "Liabilities Over Time"
msgstr "Entwicklung der Verbindlichkeiten"
#: gnucash/report/standard-reports/category-barchart.scm:75
-#: gnucash/report/standard-reports/daily-reports.scm:62
+#: gnucash/report/standard-reports/daily-reports.scm:61
msgid "Show long account names"
msgstr "Lange Kontennamen anzeigen"
@@ -26192,31 +26254,31 @@ msgid "Balances ~a to ~a"
msgstr "Salden ~a bis ~a"
#: gnucash/report/standard-reports/category-barchart.scm:743
-#: gnucash/report/standard-reports/transaction.scm:1528
-#: gnucash/report/standard-reports/transaction.scm:1785
+#: gnucash/report/standard-reports/transaction.scm:1532
+#: gnucash/report/standard-reports/transaction.scm:1789
msgid "Grand Total"
msgstr "Gesamtbetrag"
#. The names here are used 1. for internal identification, 2. as
#. tab labels, 3. as default for the 'Report name' option which
#. in turn is used for the printed report title.
-#: gnucash/report/standard-reports/daily-reports.scm:38
-#: gnucash/report/standard-reports/daily-reports.scm:50
+#: gnucash/report/standard-reports/daily-reports.scm:37
+#: gnucash/report/standard-reports/daily-reports.scm:49
msgid "Income vs. Day of Week"
msgstr "Erträge pro Wochentag"
-#: gnucash/report/standard-reports/daily-reports.scm:39
-#: gnucash/report/standard-reports/daily-reports.scm:51
+#: gnucash/report/standard-reports/daily-reports.scm:38
+#: gnucash/report/standard-reports/daily-reports.scm:50
msgid "Expenses vs. Day of Week"
msgstr "Aufwendungen pro Wochentag"
-#: gnucash/report/standard-reports/daily-reports.scm:43
+#: gnucash/report/standard-reports/daily-reports.scm:42
msgid "Shows a piechart with the total income for each day of the week"
msgstr ""
"Tortendiagramm mit Erträgen eines Zeitraums nach Wochentag aufgeschlüsselt "
"anzeigen"
-#: gnucash/report/standard-reports/daily-reports.scm:45
+#: gnucash/report/standard-reports/daily-reports.scm:44
msgid "Shows a piechart with the total expenses for each day of the week"
msgstr ""
"Tortendiagramm mit Aufwendungen eines Zeitraums nach Wochentag "
@@ -26321,7 +26383,7 @@ msgstr "Nummer/Aktion"
#: gnucash/report/standard-reports/transaction.scm:450
#: gnucash/report/standard-reports/transaction.scm:917
#: gnucash/report/standard-reports/transaction.scm:1045
-#: gnucash/report/standard-reports/transaction.scm:1289
+#: gnucash/report/standard-reports/transaction.scm:1293
msgid "Running Balance"
msgstr "Laufender Saldo"
@@ -26519,7 +26581,7 @@ msgid ""
msgstr ""
#: gnucash/report/standard-reports/income-gst-statement.scm:108
-#: gnucash/report/standard-reports/income-gst-statement.scm:210
+#: gnucash/report/standard-reports/income-gst-statement.scm:211
#, fuzzy
msgid "Individual sales columns"
msgstr "Einzelne Steueranteile"
@@ -26529,7 +26591,7 @@ msgid "Display individual sales columns rather than their sum"
msgstr ""
#: gnucash/report/standard-reports/income-gst-statement.scm:109
-#: gnucash/report/standard-reports/income-gst-statement.scm:235
+#: gnucash/report/standard-reports/income-gst-statement.scm:236
#, fuzzy
msgid "Individual purchases columns"
msgstr "Einzelne Steueranteile"
@@ -26539,8 +26601,8 @@ msgid "Display individual purchases columns rather than their sum"
msgstr ""
#: gnucash/report/standard-reports/income-gst-statement.scm:110
-#: gnucash/report/standard-reports/income-gst-statement.scm:220
-#: gnucash/report/standard-reports/income-gst-statement.scm:245
+#: gnucash/report/standard-reports/income-gst-statement.scm:221
+#: gnucash/report/standard-reports/income-gst-statement.scm:246
#, fuzzy
msgid "Individual tax columns"
msgstr "Einzelne Steueranteile"
@@ -26551,8 +26613,8 @@ msgstr ""
#. Translators: "Gross Balance" refer to "Gross Sales - Gross Purchases" in GST Report
#: gnucash/report/standard-reports/income-gst-statement.scm:111
-#: gnucash/report/standard-reports/income-gst-statement.scm:255
-#: gnucash/report/standard-reports/income-gst-statement.scm:257
+#: gnucash/report/standard-reports/income-gst-statement.scm:256
+#: gnucash/report/standard-reports/income-gst-statement.scm:258
#, fuzzy
msgid "Gross Balance"
msgstr "_Saldenabfrage..."
@@ -26564,8 +26626,8 @@ msgstr ""
#. Note: Net income = net balance - other costs
#. Translators: "Net Balance" refer to Net Sales - Net Purchases in GST Report
#: gnucash/report/standard-reports/income-gst-statement.scm:112
-#: gnucash/report/standard-reports/income-gst-statement.scm:263
-#: gnucash/report/standard-reports/income-gst-statement.scm:265
+#: gnucash/report/standard-reports/income-gst-statement.scm:264
+#: gnucash/report/standard-reports/income-gst-statement.scm:266
#, fuzzy
msgid "Net Balance"
msgstr "_Saldenabfrage..."
@@ -26575,7 +26637,7 @@ msgid "Display the net balance (sales without tax - purchases without tax)"
msgstr ""
#: gnucash/report/standard-reports/income-gst-statement.scm:113
-#: gnucash/report/standard-reports/income-gst-statement.scm:270
+#: gnucash/report/standard-reports/income-gst-statement.scm:271
#, fuzzy
msgid "Tax payable"
msgstr "Steuertabelle"
@@ -26584,46 +26646,39 @@ msgstr "Steuertabelle"
msgid "Display the tax payable (tax on sales - tax on purchases)"
msgstr ""
-#. each column will be a vector
-#. (vector heading ;; string
-#. calculator-function ;; (calculator-function split) to obtain amount
-#. reverse-column? ;; #t for sales, #f for purchases
-#. subtotal? ;; #t - all columns need subtotals
-#. start-dual-column? ;; unused in GST report
-#. friendly-heading-fn ;; unused in GST report
#. Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales
-#: gnucash/report/standard-reports/income-gst-statement.scm:206
+#: gnucash/report/standard-reports/income-gst-statement.scm:207
#, fuzzy
msgid "Gross Sales"
msgstr "Umsatz"
-#: gnucash/report/standard-reports/income-gst-statement.scm:216
+#: gnucash/report/standard-reports/income-gst-statement.scm:217
#, fuzzy
msgid "Net Sales"
msgstr "Umsatz"
-#: gnucash/report/standard-reports/income-gst-statement.scm:226
+#: gnucash/report/standard-reports/income-gst-statement.scm:227
#, fuzzy
msgid "Tax on Sales"
msgstr "Steuertabellen"
#. Translators: "Gross Purchases" refer to Net Purchase + GST/VAT on Purchase
-#: gnucash/report/standard-reports/income-gst-statement.scm:231
+#: gnucash/report/standard-reports/income-gst-statement.scm:232
msgid "Gross Purchases"
msgstr ""
-#: gnucash/report/standard-reports/income-gst-statement.scm:241
+#: gnucash/report/standard-reports/income-gst-statement.scm:242
#, fuzzy
msgid "Net Purchases"
msgstr "Nettobetrag"
-#: gnucash/report/standard-reports/income-gst-statement.scm:251
+#: gnucash/report/standard-reports/income-gst-statement.scm:252
#, fuzzy
msgid "Tax on Purchases"
msgstr "Steuerklasse"
#. Translators: "Tax Payable" refer to the difference GST Sales - GST Purchases
-#: gnucash/report/standard-reports/income-gst-statement.scm:272
+#: gnucash/report/standard-reports/income-gst-statement.scm:273
#, fuzzy
msgid "Tax Payable"
msgstr "Steuertabelle"
@@ -26646,7 +26701,7 @@ msgid ""
msgstr "Summenzeile für die Devisenhandel-Konten anzeigen."
#: gnucash/report/standard-reports/income-statement.scm:621
-#: libgnucash/engine/Account.cpp:4107 libgnucash/engine/Scrub.c:430
+#: libgnucash/engine/Account.cpp:4105 libgnucash/engine/Scrub.c:430
#: libgnucash/engine/Scrub.c:495
msgid "Trading"
msgstr "Devisenhandel"
@@ -26685,10 +26740,6 @@ msgstr "Linienbreite"
msgid "Set line width in pixels."
msgstr "Linienbreite in Pixeln setzen."
-#: gnucash/report/standard-reports/net-charts.scm:60
-msgid "Data markers?"
-msgstr "Markierungspunkte?"
-
#. (define optname-x-grid (N_ "X grid"))
#: gnucash/report/standard-reports/net-charts.scm:63
msgid "Grid"
@@ -26714,10 +26765,6 @@ msgstr "Reinvermögen-Balken anzeigen?"
msgid "Add grid lines."
msgstr "Gitterlinien anzeigen."
-#: gnucash/report/standard-reports/net-charts.scm:166
-msgid "Display a mark for each data point."
-msgstr "Einen Markierungspunkt für jeden Datenpunkt anzeigen."
-
#: gnucash/report/standard-reports/net-charts.scm:414
#: gnucash/report/standard-reports/net-charts.scm:494
msgid "Net Profit"
@@ -26873,7 +26920,7 @@ msgstr "Kursdiagramm"
#: gnucash/report/standard-reports/register.scm:147
#: gnucash/report/standard-reports/register.scm:434
-#: libgnucash/engine/gnc-lot.c:765
+#: libgnucash/engine/gnc-lot.c:763
msgid "Lot"
msgstr "Posten"
@@ -27545,24 +27592,24 @@ msgstr "Vorzeichen für bestimmte Kontenarten umkehren."
msgid "Num/T-Num"
msgstr "Nr."
-#: gnucash/report/standard-reports/transaction.scm:1161
+#: gnucash/report/standard-reports/transaction.scm:1162
msgid "Transfer from/to"
msgstr "Umbuchen von/nach"
-#: gnucash/report/standard-reports/transaction.scm:1458
+#: gnucash/report/standard-reports/transaction.scm:1462
msgid "Total For "
msgstr "Gesamtsumme für "
-#: gnucash/report/standard-reports/transaction.scm:1470
+#: gnucash/report/standard-reports/transaction.scm:1474
msgid "Split Transaction"
msgstr "Mehrteilige Buchung"
-#: gnucash/report/standard-reports/transaction.scm:2056
+#: gnucash/report/standard-reports/transaction.scm:2060
#, scheme-format
msgid "From ~a to ~a"
msgstr "Von ~a bis ~a"
-#: gnucash/report/standard-reports/transaction.scm:2091
+#: gnucash/report/standard-reports/transaction.scm:2095
msgid "Reconciliation Report"
msgstr "Abgleichungsbericht"
@@ -29070,218 +29117,218 @@ msgstr ""
"Das Budget, welches verwendet werden soll, wenn anderweitig keins angegeben "
"wurde."
-#: libgnucash/app-utils/date-utilities.scm:434
+#: libgnucash/app-utils/date-utilities.scm:446
#, scheme-format
msgid ""
"Tried to look up an undefined date symbol '~a'. This report was probably "
"saved by a later version of GnuCash. Defaulting to today."
msgstr ""
-#: libgnucash/app-utils/date-utilities.scm:810
+#: libgnucash/app-utils/date-utilities.scm:822
msgid "First day of the current calendar year."
msgstr "Anfang des aktuellen Kalenderjahres"
-#: libgnucash/app-utils/date-utilities.scm:817
+#: libgnucash/app-utils/date-utilities.scm:829
msgid "Last day of the current calendar year."
msgstr "Ende des aktuellen Kalenderjahres."
-#: libgnucash/app-utils/date-utilities.scm:824
+#: libgnucash/app-utils/date-utilities.scm:836
msgid "First day of the previous calendar year."
msgstr "Anfang des vorigen Kalenderjahres."
-#: libgnucash/app-utils/date-utilities.scm:831
+#: libgnucash/app-utils/date-utilities.scm:843
msgid "Last day of the previous calendar year."
msgstr "Ende des vorigen Kalenderjahres."
-#: libgnucash/app-utils/date-utilities.scm:835
+#: libgnucash/app-utils/date-utilities.scm:847
msgid "Start of next year"
msgstr "Anfang nächsten Jahres"
-#: libgnucash/app-utils/date-utilities.scm:838
+#: libgnucash/app-utils/date-utilities.scm:850
msgid "First day of the next calendar year."
msgstr "Der erste Tag des nächsten Kalenderjahres."
-#: libgnucash/app-utils/date-utilities.scm:842
+#: libgnucash/app-utils/date-utilities.scm:854
msgid "End of next year"
msgstr "Ende nächsten Jahres"
-#: libgnucash/app-utils/date-utilities.scm:845
+#: libgnucash/app-utils/date-utilities.scm:857
msgid "Last day of the next calendar year."
msgstr "Der letzte Tag des nächsten Kalenderjahres."
-#: libgnucash/app-utils/date-utilities.scm:849
+#: libgnucash/app-utils/date-utilities.scm:861
msgid "Start of accounting period"
msgstr "Anfang der Buchführungsperiode"
-#: libgnucash/app-utils/date-utilities.scm:852
+#: libgnucash/app-utils/date-utilities.scm:864
msgid "First day of the accounting period, as set in the global preferences."
msgstr ""
"Anfang der Buchführungsperiode, wie in den programmweiten Einstellungen "
"festgelegt."
-#: libgnucash/app-utils/date-utilities.scm:856
+#: libgnucash/app-utils/date-utilities.scm:868
msgid "End of accounting period"
msgstr "Ende der Buchführungsperiode"
-#: libgnucash/app-utils/date-utilities.scm:859
+#: libgnucash/app-utils/date-utilities.scm:871
msgid "Last day of the accounting period, as set in the global preferences."
msgstr ""
"Ende der Buchführungsperiode, wie in den programmweiten Einstellungen "
"festgelegt."
-#: libgnucash/app-utils/date-utilities.scm:866
+#: libgnucash/app-utils/date-utilities.scm:878
msgid "First day of the current month."
msgstr "Anfang dieses Monats."
-#: libgnucash/app-utils/date-utilities.scm:873
+#: libgnucash/app-utils/date-utilities.scm:885
msgid "Last day of the current month."
msgstr "Ende dieses Monats."
-#: libgnucash/app-utils/date-utilities.scm:880
+#: libgnucash/app-utils/date-utilities.scm:892
msgid "First day of the previous month."
msgstr "Anfang des vorigen Monats."
-#: libgnucash/app-utils/date-utilities.scm:887
+#: libgnucash/app-utils/date-utilities.scm:899
msgid "Last day of previous month."
msgstr "Ende des vorigen Monats."
-#: libgnucash/app-utils/date-utilities.scm:891
+#: libgnucash/app-utils/date-utilities.scm:903
msgid "Start of next month"
msgstr "Anfang nächsten Monats"
-#: libgnucash/app-utils/date-utilities.scm:894
+#: libgnucash/app-utils/date-utilities.scm:906
msgid "First day of the next month."
msgstr "Der erste Tag des nächsten Monats."
-#: libgnucash/app-utils/date-utilities.scm:898
+#: libgnucash/app-utils/date-utilities.scm:910
msgid "End of next month"
msgstr "Ende nächsten Monats"
-#: libgnucash/app-utils/date-utilities.scm:901
+#: libgnucash/app-utils/date-utilities.scm:913
msgid "Last day of next month."
msgstr "Der letzte Tag (Ultimo) des nächsten Monats."
-#: libgnucash/app-utils/date-utilities.scm:905
+#: libgnucash/app-utils/date-utilities.scm:917
msgid "Start of current quarter"
msgstr "Anfang des Quartals"
-#: libgnucash/app-utils/date-utilities.scm:908
+#: libgnucash/app-utils/date-utilities.scm:920
msgid "First day of the current quarterly accounting period."
msgstr "Anfang des momentanen Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:912
+#: libgnucash/app-utils/date-utilities.scm:924
msgid "End of current quarter"
msgstr "Ende des Quartals"
-#: libgnucash/app-utils/date-utilities.scm:915
+#: libgnucash/app-utils/date-utilities.scm:927
msgid "Last day of the current quarterly accounting period."
msgstr "Ende des momentanen Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:922
+#: libgnucash/app-utils/date-utilities.scm:934
msgid "First day of the previous quarterly accounting period."
msgstr "Anfang des vorigen Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:929
+#: libgnucash/app-utils/date-utilities.scm:941
msgid "Last day of previous quarterly accounting period."
msgstr "Ende des vorigen Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:933
+#: libgnucash/app-utils/date-utilities.scm:945
msgid "Start of next quarter"
msgstr "Anfang nächsten Quartals"
-#: libgnucash/app-utils/date-utilities.scm:936
+#: libgnucash/app-utils/date-utilities.scm:948
msgid "First day of the next quarterly accounting period."
msgstr "Der erste Tag des nächsten Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:940
+#: libgnucash/app-utils/date-utilities.scm:952
msgid "End of next quarter"
msgstr "Ende nächsten Quartals"
-#: libgnucash/app-utils/date-utilities.scm:943
+#: libgnucash/app-utils/date-utilities.scm:955
msgid "Last day of next quarterly accounting period."
msgstr "Der letzte Tag des nächsten Buchführungs-Quartals."
-#: libgnucash/app-utils/date-utilities.scm:949
+#: libgnucash/app-utils/date-utilities.scm:961
msgid "The current date."
msgstr "Das aktuelle Datum."
-#: libgnucash/app-utils/date-utilities.scm:953
+#: libgnucash/app-utils/date-utilities.scm:965
msgid "One Month Ago"
msgstr "Einen Monat zuvor"
-#: libgnucash/app-utils/date-utilities.scm:955
+#: libgnucash/app-utils/date-utilities.scm:967
msgid "One Month Ago."
msgstr "Einen Monat zuvor."
-#: libgnucash/app-utils/date-utilities.scm:959
+#: libgnucash/app-utils/date-utilities.scm:971
msgid "One Week Ago"
msgstr "Eine Woche zuvor"
-#: libgnucash/app-utils/date-utilities.scm:961
+#: libgnucash/app-utils/date-utilities.scm:973
msgid "One Week Ago."
msgstr "Eine Woche zuvor."
-#: libgnucash/app-utils/date-utilities.scm:965
+#: libgnucash/app-utils/date-utilities.scm:977
msgid "Three Months Ago"
msgstr "Drei Monate zuvor"
-#: libgnucash/app-utils/date-utilities.scm:967
+#: libgnucash/app-utils/date-utilities.scm:979
msgid "Three Months Ago."
msgstr "Drei Monate zuvor."
-#: libgnucash/app-utils/date-utilities.scm:971
+#: libgnucash/app-utils/date-utilities.scm:983
msgid "Six Months Ago"
msgstr "Sechs Monate zuvor"
-#: libgnucash/app-utils/date-utilities.scm:973
+#: libgnucash/app-utils/date-utilities.scm:985
msgid "Six Months Ago."
msgstr "Sechs Monate zuvor."
-#: libgnucash/app-utils/date-utilities.scm:976
+#: libgnucash/app-utils/date-utilities.scm:988
msgid "One Year Ago"
msgstr "Ein Jahr zuvor"
-#: libgnucash/app-utils/date-utilities.scm:978
+#: libgnucash/app-utils/date-utilities.scm:990
msgid "One Year Ago."
msgstr "Ein Jahr zuvor."
-#: libgnucash/app-utils/date-utilities.scm:982
+#: libgnucash/app-utils/date-utilities.scm:994
msgid "One Month Ahead"
msgstr "Einen Monat voraus"
-#: libgnucash/app-utils/date-utilities.scm:984
+#: libgnucash/app-utils/date-utilities.scm:996
msgid "One Month Ahead."
msgstr "Einen Monat voraus."
-#: libgnucash/app-utils/date-utilities.scm:988
+#: libgnucash/app-utils/date-utilities.scm:1000
msgid "One Week Ahead"
msgstr "Eine Woche voraus"
-#: libgnucash/app-utils/date-utilities.scm:990
+#: libgnucash/app-utils/date-utilities.scm:1002
msgid "One Week Ahead."
msgstr "Eine Woche voraus."
-#: libgnucash/app-utils/date-utilities.scm:994
+#: libgnucash/app-utils/date-utilities.scm:1006
msgid "Three Months Ahead"
msgstr "Drei Monate voraus"
-#: libgnucash/app-utils/date-utilities.scm:996
+#: libgnucash/app-utils/date-utilities.scm:1008
msgid "Three Months Ahead."
msgstr "Drei Monate voraus."
-#: libgnucash/app-utils/date-utilities.scm:1000
+#: libgnucash/app-utils/date-utilities.scm:1012
msgid "Six Months Ahead"
msgstr "Sechs Monate voraus"
-#: libgnucash/app-utils/date-utilities.scm:1002
+#: libgnucash/app-utils/date-utilities.scm:1014
msgid "Six Months Ahead."
msgstr "Sechs Monate voraus."
-#: libgnucash/app-utils/date-utilities.scm:1005
+#: libgnucash/app-utils/date-utilities.scm:1017
msgid "One Year Ahead"
msgstr "Ein Jahr voraus"
-#: libgnucash/app-utils/date-utilities.scm:1007
+#: libgnucash/app-utils/date-utilities.scm:1019
msgid "One Year Ahead."
msgstr "Ein Jahr voraus."
@@ -29472,58 +29519,58 @@ msgid "Invalid option value"
msgstr "Ungültiger Wert einer Option"
#. Translators: this string refers to a file name that gets renamed
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:646
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:645
msgid "Renamed to:"
msgstr "Umbenannt nach:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:671
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:670
msgid "Notice"
msgstr "Hinweis"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:676
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:675
msgid "Your gnucash metadata has been migrated."
msgstr ""
"Die internen Daten (Metadaten) von GnuCash wurden von einer alten Version "
"auf die neueste Version aktualisiert."
#. Translators: this refers to a directory name.
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:678
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:677
msgid "Old location:"
msgstr "Alter Speicher-Ordner:"
#. Translators: this refers to a directory name.
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:680
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:679
msgid "New location:"
msgstr "Neuer Speicher-Ordner:"
#. Translators {1} will be replaced with the package name (typically Gnucash) at runtime
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:682
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:681
msgid ""
"If you no longer intend to run {1} 2.6.x or older on this system you can "
"safely remove the old directory."
msgstr ""
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:689
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:688
msgid "In addition:"
msgstr "Außerdem:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:695
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:694
msgid "The following file has been copied to {1} instead:"
msgid_plural "The following files have been copied to {1} instead:"
msgstr[0] ""
msgstr[1] ""
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:699
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:698
msgid "The following file in {1} has been renamed:"
msgstr "Die folgende Datei in {1} wurde umbenannt:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:709
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:708
msgid "The following file has become obsolete and will be ignored:"
msgid_plural "The following files have become obsolete and will be ignored:"
msgstr[0] ""
msgstr[1] ""
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:719
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:718
msgid "The following file could not be moved to {1}:"
msgid_plural "The following files could not be moved to {1}:"
msgstr[0] "Die folgende Datei konnte nicht nach {1} verschoben werden:"
@@ -29550,48 +29597,48 @@ msgstr ""
"Folgende Kontennamen sind betroffen:\n"
"%s"
-#: libgnucash/engine/Account.cpp:4095
+#: libgnucash/engine/Account.cpp:4093
msgid "Asset"
msgstr "Aktiva"
-#: libgnucash/engine/Account.cpp:4096
+#: libgnucash/engine/Account.cpp:4094
msgid "Credit Card"
msgstr "Kreditkarte"
-#: libgnucash/engine/Account.cpp:4097
+#: libgnucash/engine/Account.cpp:4095
msgid "Liability"
msgstr "Fremdkapital"
-#: libgnucash/engine/Account.cpp:4098
+#: libgnucash/engine/Account.cpp:4096
msgid "Stock"
msgstr "Aktienkonto"
-#: libgnucash/engine/Account.cpp:4099
+#: libgnucash/engine/Account.cpp:4097
msgid "Mutual Fund"
msgstr "Investmentfonds"
-#: libgnucash/engine/Account.cpp:4104
+#: libgnucash/engine/Account.cpp:4102
msgid "A/Receivable"
msgstr "Offene Forderungen"
-#: libgnucash/engine/Account.cpp:4105
+#: libgnucash/engine/Account.cpp:4103
msgid "A/Payable"
msgstr "Offene Verbindlichkeiten"
-#: libgnucash/engine/Account.cpp:4106
+#: libgnucash/engine/Account.cpp:4104
msgid "Root"
msgstr "Oberkonto"
-#: libgnucash/engine/Account.cpp:4537
+#: libgnucash/engine/Account.cpp:4535
msgid "Orphaned Gains"
msgstr "Unverknüpfte Gewinne"
-#: libgnucash/engine/Account.cpp:4551 libgnucash/engine/cap-gains.c:806
+#: libgnucash/engine/Account.cpp:4549 libgnucash/engine/cap-gains.c:806
#: libgnucash/engine/cap-gains.c:811 libgnucash/engine/cap-gains.c:812
msgid "Realized Gain/Loss"
msgstr "Realisierter Gewinn/Verlust"
-#: libgnucash/engine/Account.cpp:4553
+#: libgnucash/engine/Account.cpp:4551
msgid ""
"Realized Gains or Losses from Commodity or Trading Accounts that haven't "
"been recorded elsewhere."
@@ -29839,18 +29886,17 @@ msgstr "Ungültige Buchung"
msgid "Transaction Voided"
msgstr "Buchung ungültig gemacht"
-#: libgnucash/scm/price-quotes.scm:509 libgnucash/scm/price-quotes.scm:510
+#: libgnucash/scm/price-quotes.scm:509
msgid "No commodities marked for quote retrieval."
msgstr "Keine Devisen/Wertpapiere zum Börsenkurs-Abruf markiert."
-#: libgnucash/scm/price-quotes.scm:514 libgnucash/scm/price-quotes.scm:515
-#: libgnucash/scm/price-quotes.scm:538 libgnucash/scm/price-quotes.scm:541
+#: libgnucash/scm/price-quotes.scm:514 libgnucash/scm/price-quotes.scm:538
msgid "Unable to get quotes or diagnose the problem."
msgstr ""
"Abrufen der Börsenkurse fehlgeschlagen. Genauere Diagnose ebenfalls "
"fehlgeschlagen."
-#: libgnucash/scm/price-quotes.scm:520 libgnucash/scm/price-quotes.scm:522
+#: libgnucash/scm/price-quotes.scm:520
msgid ""
"You are missing some needed Perl libraries.\n"
"Run 'gnc-fq-update' as root to install them."
@@ -29858,17 +29904,16 @@ msgstr ""
"Ihnen fehlen einige benötigte Perl Bibliotheken.\n"
"Führen Sie 'gnc-fq-update' als root aus, um diese zu installieren."
-#: libgnucash/scm/price-quotes.scm:528 libgnucash/scm/price-quotes.scm:529
+#: libgnucash/scm/price-quotes.scm:528
msgid "There was a system error while retrieving the price quotes."
msgstr "Beim Herunterladen der Börsenkurse ist ein Systemfehler aufgetreten."
-#: libgnucash/scm/price-quotes.scm:534 libgnucash/scm/price-quotes.scm:535
+#: libgnucash/scm/price-quotes.scm:534
msgid "There was an unknown error while retrieving the price quotes."
msgstr ""
"Beim Herunterladen der Börsenkurse ist ein unbekannter Fehler aufgetreten."
#: libgnucash/scm/price-quotes.scm:551 libgnucash/scm/price-quotes.scm:562
-#: libgnucash/scm/price-quotes.scm:570
msgid "Unable to retrieve quotes for these items:"
msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
@@ -29876,11 +29921,7 @@ msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
msgid "Continue using only the good quotes?"
msgstr "Mit den benutzbaren Kursen fortsetzen?"
-#: libgnucash/scm/price-quotes.scm:575
-msgid "Continuing with good quotes."
-msgstr "Es wird mit den benutzbaren Kursen fortgesetzt."
-
-#: libgnucash/scm/price-quotes.scm:590 libgnucash/scm/price-quotes.scm:599
+#: libgnucash/scm/price-quotes.scm:590
msgid "Unable to create prices for these items:"
msgstr "Preis-Eintrag für folgende Werte fehlgeschlagen:"
@@ -29888,9 +29929,11 @@ msgstr "Preis-Eintrag für folgende Werte fehlgeschlagen:"
msgid "Add remaining good quotes?"
msgstr "Ãœbrige benutzbare Kurse eintragen?"
-#: libgnucash/scm/price-quotes.scm:604
-msgid "Adding remaining good quotes."
-msgstr "Benutzbare Kurse werden eingetragen."
+#. Translators: ~A is the version string
+#: libgnucash/scm/price-quotes.scm:631
+#, scheme-format
+msgid "Found Finance::Quote version ~A."
+msgstr ""
#: libgnucash/tax/us/de_DE.scm:53
msgid "Tax Number"
@@ -29903,3 +29946,92 @@ msgstr "Die Elster-Steuernummer Ihrer Unternehmung"
#: libgnucash/tax/us/txf.scm:108
msgid "No help available."
msgstr "Keine Hilfe verfügbar."
+
+#~ msgid "Enter URL:"
+#~ msgstr "URL eingeben:"
+
+# Fixme: expand Source
+#~ msgid "QIF/OFX/HBCI Import, Transaction Matching"
+#~ msgstr "Datenaustausch via FinTS(HBCI)/SWIFT-MT9xx/QIF/OFX und Abgleich"
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" has not been found. \n"
+#~ "\n"
+#~ "The %s package should include the program \"qt3-wizard\". Please check "
+#~ "your installation to ensure this program is present. On some "
+#~ "distributions this may require installing additional packages."
+#~ msgstr ""
+#~ "Das externe Programm »AqBanking Einrichtungs-Assistent« konnte nicht "
+#~ "gefunden werden. \n"
+#~ "\n"
+#~ "Dieses soll normalerweise vom %s-Paket installiert werden, so dass dann "
+#~ "ein Programm namens »qt3-wizard« installiert ist. Bitte kontrollieren Sie "
+#~ "Ihre Installation der Bibliothek AqBanking."
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" failed to run "
+#~ "successfully because the additional software \"Qt\" was not found. Please "
+#~ "install the \"Qt/Windows Open Source Edition\" from Trolltech by "
+#~ "downloading it from www.trolltech.com\n"
+#~ "\n"
+#~ "If you have installed Qt already, you will have to adapt the PATH "
+#~ "variable of your system appropriately. Contact the GnuCash developers if "
+#~ "you need further assistance on how to install Qt correctly.\n"
+#~ "\n"
+#~ "Online Banking cannot be setup without Qt. Press \"Close\" now, then "
+#~ "\"Cancel\" to cancel the Online Banking setup."
+#~ msgstr ""
+#~ "Das externe Programm »AqBanking Einrichtungsassistent« konnte nicht "
+#~ "gestartet werden, da die benötigte Programmbibliothek »Qt« nicht gefunden "
+#~ "wurde. Bitte installieren Sie »Qt/Windows Open Source Edition« der Firma "
+#~ "Trolltech, indem Sie dies herunterladen von www.trolltech.com.\n"
+#~ "\n"
+#~ "Wenn Sie Qt bereits installiert haben, müssen Sie die Variable PATH in "
+#~ "Ihrem System noch anpassen. Fragen Sie bei den GnuCash-Entwicklern nach, "
+#~ "wenn Sie weitere Hilfe dabei benötigen.\n"
+#~ "\n"
+#~ "Online-Banking kann ohne Qt nicht eingerichtet werden. Drücken Sie jetzt "
+#~ "»Schließen« und dann »Abbrechen«, um die Einrichtung des Online-Banking "
+#~ "wieder abzubrechen."
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" failed to run "
+#~ "successfully. Online Banking can only be setup if this wizard has run "
+#~ "successfully. Please try running the \"AqBanking Setup Wizard\" again."
+#~ msgstr ""
+#~ "Das externe Programm »AqBanking Einrichtungs-Assistent« konnte nicht "
+#~ "erfolgreich ausgeführt werden, was bedeutet, dass die Einrichtung nicht "
+#~ "erfolgreich abgeschlossen worden ist. Die weitere Einrichtung von "
+#~ "Onlinebanking/HBCI in GnuCash kann nur fortgesetzt werden, wenn der "
+#~ "»AqBanking Assistent« erfolgreich aufgerufen worden ist. Bitte versuchen "
+#~ "Sie erneut, den »AqBanking Einrichtungs-Assistent« korrekt auszuführen."
+
+# Fixme: aktuellen Stand prüfen.
+#~ msgid ""
+#~ "The text you entered contained at least one character that is invalid for "
+#~ "a SEPA transaction. In SEPA, unfortunately only exactly the following "
+#~ "characters are allowed: a...z, A...Z, 0...9, and the following "
+#~ "punctuations: ' : ? , - ( + . ) / \n"
+#~ "\n"
+#~ "In particular, neither Umlauts nor an ampersand (&) is allowed, neither "
+#~ "in the recipient or sender name nor in any purpose line."
+#~ msgstr ""
+#~ "Ihr eingegebener Text enthält mindestens ein Zeichen, das in einer SEPA-"
+#~ "Überweisung ungültig sein kann. In der Basisversion unterstützt SEPA "
+#~ "leider nur: a...z, A...Z, 0...9, und die folgenden Satzzeichen: ' : ? , - "
+#~ "( + . ) / \n"
+#~ "\n"
+#~ "Insbesondere sind weder Umlaute, noch Et-Zeichen »&« erlaubt, weder im "
+#~ "Sender- noch im Empfängernamen, geschweige denn im Verwendungszweck."
+
+#~ msgid "Import a MT940 file into GnuCash"
+#~ msgstr "Buchungen aus einer MT940 Datei importieren"
+
+#~ msgid "Import a MT942 file into GnuCash"
+#~ msgstr "Buchungen aus einer MT942 Datei importieren"
+
+#~ msgid "Continuing with good quotes."
+#~ msgstr "Es wird mit den benutzbaren Kursen fortgesetzt."
+
+#~ msgid "Adding remaining good quotes."
+#~ msgstr "Benutzbare Kurse werden eingetragen."
commit 833decc03e5f938f75a01010e6b458e5c88e34de
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Apr 8 17:35:01 2019 +0200
I18N: Review of price-quotes.scm
Mark "Found FQ version" translatable, but remove translation from log
file entries.
diff --git a/libgnucash/scm/price-quotes.scm b/libgnucash/scm/price-quotes.scm
index d0f938ef4..812fcbb07 100644
--- a/libgnucash/scm/price-quotes.scm
+++ b/libgnucash/scm/price-quotes.scm
@@ -507,38 +507,38 @@
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window (_ "No commodities marked for quote retrieval."))
- (gnc:warn (_ "No commodities marked for quote retrieval."))))
+ (gnc:warn "No commodities marked for quote retrieval.")))
((eq? fq-results #f)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window (_ "Unable to get quotes or diagnose the problem."))
- (gnc:warn (_ "Unable to get quotes or diagnose the problem."))))
+ (gnc:warn "Unable to get quotes or diagnose the problem.")))
((member 'missing-lib fq-results)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "You are missing some needed Perl libraries.
Run 'gnc-fq-update' as root to install them."))
- (gnc:warn (_ "You are missing some needed Perl libraries.
-Run 'gnc-fq-update' as root to install them.") "\n")))
+ (gnc:warn "You are missing some needed Perl libraries.
+Run 'gnc-fq-update' as root to install them." "\n")))
((member 'system-error fq-results)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "There was a system error while retrieving the price quotes."))
- (gnc:warn (_ "There was a system error while retrieving the price quotes.") "\n")))
+ (gnc:warn "There was a system error while retrieving the price quotes." "\n")))
((not (list? (car fq-results)))
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "There was an unknown error while retrieving the price quotes."))
- (gnc:warn (_ "There was an unknown error while retrieving the price quotes.") "\n")))
+ (gnc:warn "There was an unknown error while retrieving the price quotes." "\n")))
((and (not commod-tz-quote-triples) (gnucash-ui-is-running))
(gnc-error-dialog window
(_ "Unable to get quotes or diagnose the problem."))
(set! keep-going? #f))
((not commod-tz-quote-triples)
- (gnc:warn (_ "Unable to get quotes or diagnose the problem."))
+ (gnc:warn "Unable to get quotes or diagnose the problem.")
(set! keep-going? #f))
((not (null? problem-syms))
(if (gnucash-ui-is-running)
@@ -567,12 +567,12 @@ Run 'gnc-fq-update' as root to install them.") "\n")))
(gnc:warn
(call-with-output-string
(lambda (p)
- (display (_ "Unable to retrieve quotes for these items:") p)
+ (display "Unable to retrieve quotes for these items:" p)
(newline p)
(display " " p)
(display (string-join problem-syms "\n ") p)
(newline p)
- (display (_ "Continuing with good quotes.") p)
+ (display "Continuing with good quotes." p)
(newline p)))))))
(if
@@ -596,12 +596,12 @@ Run 'gnc-fq-update' as root to install them.") "\n")))
(gnc:warn
(call-with-output-string
(lambda (p)
- (display (_ "Unable to create prices for these items:") p)
+ (display "Unable to create prices for these items:" p)
(newline p)
(display " " p)
(display (string-join (filter string? prices) "\n ") p)
(newline p)
- (display (_ "Adding remaining good quotes.") p)
+ (display "Adding remaining good quotes." p)
(newline p))))))
(if keep-going?
@@ -627,7 +627,8 @@ Run 'gnc-fq-update' as root to install them.") "\n")))
(let ((sources (gnc:fq-check-sources)))
(if (list? sources)
(begin
- (format #t "Found Finance::Quote version ~A" (car sources))
+;; Translators: ~A is the version string
+ (format #t (_ "Found Finance::Quote version ~A.") (car sources))
(newline)
(gnc:msg "Found Finance::Quote version " (car sources))
(gnc-quote-source-set-fq-installed (car sources) (cdr sources))))))
commit ad51c5e00a0d000fb108d9ca7b376737a5772f2c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sun Apr 7 10:23:55 2019 +0800
[report] rewrite gnc:report-template-make-unique-name
diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
index 6e300c28a..30874460c 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-system/report.scm
@@ -504,15 +504,12 @@ not found.")))
;; If this string already exists as a custom template name, a
;; number will be appended to it.
(define (gnc:report-template-make-unique-name new-name)
- (let* ((unique-name new-name)
- (counter 0)
- (unique? (gnc:report-template-has-unique-name? #f unique-name)))
- (while (not unique?)
- (begin
- (set! counter (+ counter 1))
- (set! unique-name (string-append new-name (number->string counter)))
- (set! unique? (gnc:report-template-has-unique-name? #f unique-name))))
- unique-name))
+ (let loop ((name new-name)
+ (counter 1))
+ (if (gnc:report-template-has-unique-name? #f name)
+ name
+ (loop (string-append new-name (number->string counter))
+ (1+ counter)))))
;; Load and save functions
commit 3352b5349113dfb875d2a1179b21163a3b5bad15
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Mon Apr 8 00:04:48 2019 +0200
Correction of updated hr.po
Correction of the first commited file, for the following error:
hr.po:19067: msgstr lacks the keyboard accelerator mark ''
diff --git a/po/hr.po b/po/hr.po
index 46f1634e9..5527a848f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,7 +9,7 @@ msgstr ""
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2019-03-30 14:44-0700\n"
-"PO-Revision-Date: 2019-04-03 20:53+0200\n"
+"PO-Revision-Date: 2019-04-07 23:27+0200\n"
"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: \n"
"Language: hr\n"
@@ -19064,7 +19064,7 @@ msgstr ""
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
msgid "Import Bills & _Invoices..."
-msgstr "Uvezi ulazne i izlazne raÄune …"
+msgstr "Uvezi ulazne i _izlazne raÄune …"
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
msgid "Import bills and invoices from a CSV text file"
commit 1fcd05dfd65be9baf59296fdffe3ad59758cd75b
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Sat Apr 6 19:16:53 2019 +0200
Update hr.po with pot 3.5
diff --git a/po/hr.po b/po/hr.po
index 2152c25c0..46f1634e9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,20 +5,20 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GnuCash 3.4\n"
+"Project-Id-Version: GnuCash 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
-"POT-Creation-Date: 2018-12-29 16:40-0800\n"
-"PO-Revision-Date: 2019-03-24 13:16+0100\n"
+"POT-Creation-Date: 2019-03-30 14:44-0700\n"
+"PO-Revision-Date: 2019-04-03 20:53+0200\n"
+"Last-Translator: Milo Ivir <mail at milotype.de>\n"
"Language-Team: \n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 "
-"&& (n%100<12 || n%100>14) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: Milo Ivir <mail at milotype.de>\n"
-"Language: hr\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@@ -82,7 +82,7 @@ msgstr "Zapadnoeuropski"
#: gnucash/gtkbuilder/assistant-loan.glade:1038
#: gnucash/gtkbuilder/dialog-account.glade:827
#: gnucash/report/standard-reports/account-piecharts.scm:529
-#: gnucash/report/standard-reports/category-barchart.scm:589
+#: gnucash/report/standard-reports/category-barchart.scm:595
msgid "Other"
msgstr "Ostalo"
@@ -436,69 +436,73 @@ msgstr "Izbornik opcija"
#: doc/tip_of_the_day.list.c:1
msgid ""
-"The GnuCash online manual has lots of helpful information. You can access the "
-"manual under the Help menu."
+"The GnuCash online manual has lots of helpful information. You can access "
+"the manual under the Help menu."
msgstr ""
-"GnuCashov internetski priruÄnik sadrži mnoge korisne podatke. MožeÅ¡ ih naći u "
-"izborniku pod „Pomoćâ€."
+"GnuCashov internetski priruÄnik sadrži mnoge korisne podatke. MožeÅ¡ ih naći "
+"u izborniku pod „Pomoćâ€."
#: doc/tip_of_the_day.list.c:4
msgid ""
-"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"
+"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"
msgstr ""
-"S GnuCash programerima možeÅ¡ lako stupiti u kontakt. Kako putem pretplatniÄkih "
-"lista, tako i putem razgovora uživo na IRC-u! Pridruži im se na „#gnucash†u "
-"„irc.gnome.org“"
+"S GnuCash programerima možeš lako stupiti u kontakt. Kako putem "
+"pretplatniÄkih lista, tako i putem razgovora uživo na IRC-u! Pridruži im se "
+"na „#gnucash†u „irc.gnome.org“"
#: doc/tip_of_the_day.list.c:8
msgid ""
"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, respectively. Then, follow the "
-"instructions provided."
+"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, respectively. Then, "
+"follow the instructions provided."
msgstr ""
-"Bez problema možeš uvesti postojeće financijske podatke iz Quicken, MS Money ili "
-"drugih programa koji izvoze QIF ili OFX datoteke. U izborniku „Datoteka“, klikni "
-"na pod-izbornik „Uvezi“ i klikni na QIF ili OFX datoteku. Zatim slijedi upute."
+"Bez problema možeš uvesti postojeće financijske podatke iz Quicken, MS Money "
+"ili drugih programa koji izvoze QIF ili OFX datoteke. U izborniku "
+"„Datoteka“, klikni na pod-izbornik „Uvezi“ i klikni na QIF ili OFX datoteku. "
+"Zatim slijedi upute."
#: doc/tip_of_the_day.list.c:13
msgid ""
"If you are familiar with other financial programs such as Quicken, note that "
-"GnuCash uses accounts instead of categories to track income and expenses. For "
-"more information on income and expense accounts, please see the GnuCash online "
-"manual."
+"GnuCash uses accounts instead of categories to track income and expenses. "
+"For more information on income and expense accounts, please see the GnuCash "
+"online manual."
msgstr ""
-"Ako su ti poznati drugi financijski programi kao što su Quicken, obrati pažnju, "
-"da GnuCash koristi konta umjesto kategorija za praćenje prihoda i rashoda. Za "
-"daljnje informacije o kontima prihoda i rashoda, pogledaj GnuCashov internetski "
-"priruÄnik."
+"Ako su ti poznati drugi financijski programi kao Å¡to su Quicken, obrati "
+"pažnju, da GnuCash koristi konta umjesto kategorija za praćenje prihoda i "
+"rashoda. Za daljnje informacije o kontima prihoda i rashoda, pogledaj "
+"GnuCashov internetski priruÄnik."
#: doc/tip_of_the_day.list.c:18
msgid ""
-"It is possible to change which columns display in the Chart of Accounts. Just "
-"locate the triangle at the far right of the column headings, and click it to see "
-"the different columns available."
+"It is possible to change which columns display in the Chart of Accounts. "
+"Just locate the triangle at the far right of the column headings, and click "
+"it to see the different columns available."
msgstr ""
-"Moguće je odrediti stupce, koji se prikazuju u kontnom planu. Na krajnjoj desnoj "
-"strani zaglavnog reda klikni strelicu/trokutić i odaberi željene stupce."
+"Moguće je odrediti stupce, koji se prikazuju u kontnom planu. Na krajnjoj "
+"desnoj strani zaglavnog reda klikni strelicu/trokutić i odaberi željene "
+"stupce."
#: doc/tip_of_the_day.list.c:22
msgid ""
-"Click the right mouse button (control-click in Mac OS X) in the Accounts tab of "
-"the main window to bring up the account menu options. Within each register, "
-"clicking the right mouse button brings up the transaction menu options."
+"Click the right mouse button (control-click in Mac OS X) in the Accounts tab "
+"of the main window to bring up the account menu options. Within each "
+"register, clicking the right mouse button brings up the transaction menu "
+"options."
msgstr ""
-"Klikni desni gumb miša (kontrol-klik na Mac OS X) u glavnom prozoru za prikaz "
-"izbornika opcija konta. U svakom registru se pritiskom na desni gumb miša "
-"prikazuje izbornik opcija za transakcije."
+"Klikni desni gumb miša (kontrol-klik na Mac OS X) u glavnom prozoru za "
+"prikaz izbornika opcija konta. U svakom registru se pritiskom na desni gumb "
+"miša prikazuje izbornik opcija za transakcije."
#: doc/tip_of_the_day.list.c:27
msgid ""
-"Create new accounts by clicking the New button in the main window tool bar. This "
-"will bring up a dialog box where you can enter account details. For more "
-"information on choosing an account type or setting up a chart of accounts, "
-"please see the GnuCash online manual."
+"Create new accounts by clicking the New button in the main window tool bar. "
+"This will bring up a dialog box where you can enter account details. For "
+"more information on choosing an account type or setting up a chart of "
+"accounts, please see the GnuCash online manual."
msgstr ""
"Stvori nova konta pritiskom na gumb „Novi“ u traci alata glavnog prozora. "
"Otvorit će se dijalog, u koji možeš unijeti detalje o kontu. Za daljnje "
@@ -508,91 +512,96 @@ msgstr ""
#: doc/tip_of_the_day.list.c:33
msgid ""
"To enter multiple-split transactions such as a paycheck with multiple "
-"deductions, click the Split button in the tool bar. Alternatively, in the View "
-"menu, you can choose the register style Auto-Split Ledger or Transaction Journal."
+"deductions, click the Split button in the tool bar. Alternatively, in the "
+"View menu, you can choose the register style Auto-Split Ledger or "
+"Transaction Journal."
msgstr ""
-"Za unos višedjelne transakcije poput plaće s višestrukim odbicima, klikni gumb "
-"„Podjela“ na traci alata. Alternativno, u izborniku „Pogled“, možeš odabrati "
-"stil registra „Podjela aktivne transakcije“ ili „Dnevnik transakcija“."
+"Za unos višedjelne transakcije poput plaće s višestrukim odbicima, klikni "
+"gumb „Podjela“ na traci alata. Alternativno, u izborniku „Pogled“, možeš "
+"odabrati stil registra „Podjela aktivne transakcije“ ili „Dnevnik "
+"transakcija“."
#: doc/tip_of_the_day.list.c:38
msgid ""
-"As you enter amounts in the register, you can use the GnuCash calculator to add, "
-"subtract, multiply and divide. Simply type the first value, then select '+', "
-"'-','*', or '/'. Type the second value and press Enter to record the calculated "
-"amount."
+"As you enter amounts in the register, you can use the GnuCash calculator to "
+"add, subtract, multiply and divide. Simply type the first value, then select "
+"'+', '-','*', or '/'. Type the second value and press Enter to record the "
+"calculated amount."
msgstr ""
-"Čim uneseš iznose u registar, možeš koristiti GnuCash kalkulator za zbrajanje, "
-"oduzimanje, množenje i dijeljenje. Jednostavno utipkaj prvu vrijednost, a zatim "
-"odaberi +, -, * ili /. Utipkaj drugu vrijednost i pritisni tipku „Enter“, za "
-"izraÄunavanje iznosa."
+"Čim uneseš iznose u registar, možeš koristiti GnuCash kalkulator za "
+"zbrajanje, oduzimanje, množenje i dijeljenje. Jednostavno utipkaj prvu "
+"vrijednost, a zatim odaberi +, -, * ili /. Utipkaj drugu vrijednost i "
+"pritisni tipku „Enter“, za izraÄunavanje iznosa."
#: doc/tip_of_the_day.list.c:43
msgid ""
-"Quick-fill makes it easy to enter common transactions. When you type the first "
-"letter(s) of a common transaction description, then press the Tab key, GnuCash "
-"will automatically complete the remainder of the transaction as it was last "
-"entered."
+"Quick-fill makes it easy to enter common transactions. When you type the "
+"first letter(s) of a common transaction description, then press the Tab key, "
+"GnuCash will automatically complete the remainder of the transaction as it "
+"was last entered."
msgstr ""
-"Brzo-popunjavanje olakÅ¡ava unos uobiÄajenih transakcija. Nakon tipkanja prvih "
-"par slova za uobiÄajenu transakciju, pritisni tabulatorsku tipku, a GnuCash će "
-"automatski dovršiti ostatak naziva transakcije, kako je posljednji put unijet."
+"Brzo-popunjavanje olakÅ¡ava unos uobiÄajenih transakcija. Nakon tipkanja "
+"prvih par slova za uobiÄajenu transakciju, pritisni tabulatorsku tipku, a "
+"GnuCash će automatski dovršiti ostatak naziva transakcije, kako je "
+"posljednji put unijet."
#: doc/tip_of_the_day.list.c:48
msgid ""
-"Type the first letter(s) of an existing account name in the Transfer register "
-"column, and GnuCash will complete the name from your list of accounts. For "
-"subaccounts, type the first letter(s) of the parent account, followed by ':' and "
-"the first letter(s) of the subaccount (e.g. A:C for Assets:Cash.)"
+"Type the first letter(s) of an existing account name in the Transfer "
+"register column, and GnuCash will complete the name from your list of "
+"accounts. For subaccounts, type the first letter(s) of the parent account, "
+"followed by ':' and the first letter(s) of the subaccount (e.g. A:C for "
+"Assets:Cash.)"
msgstr ""
"Utipkaj prvo slovo(a) imena postojećeg konta u stupcu registra prijenosa, a "
"GnuCash će dovršiti ime s popisa tvojih konta. Za podkonta, utipkaj prvo "
-"slovo(a) matiÄnog konta, zatim „:â€, i onda prvo slovo(a) podkonta (npr. I:G za "
-"Imovina:Gotovina.)"
+"slovo(a) matiÄnog konta, zatim „:â€, i onda prvo slovo(a) podkonta (npr. I:G "
+"za Imovina:Gotovina.)"
#: doc/tip_of_the_day.list.c:54
msgid ""
-"Want to see all your subaccount transactions in one register? From the Accounts "
-"tab in the main window, highlight the parent account and select Edit -> Open "
-"Subaccounts from the menu."
+"Want to see all your subaccount transactions in one register? From the "
+"Accounts tab in the main window, highlight the parent account and select "
+"Edit -> Open Subaccounts from the menu."
msgstr ""
-"Želiš vidjeti sve tvoje transakcije podkonta u jednom registru? U kartici konta "
-"u glavnom prozoru, oznaÄi matiÄni konto i odaberi „Uredi → Otvori podkonta“ iz "
-"izbornika."
+"Želiš vidjeti sve tvoje transakcije podkonta u jednom registru? U kartici "
+"konta u glavnom prozoru, oznaÄi matiÄni konto i odaberi „Uredi → Otvori "
+"podkonta“ iz izbornika."
#: doc/tip_of_the_day.list.c:58
msgid ""
"When entering dates, you can type '+' or '-' to increment or decrement the "
-"selected date. You can use '+' and '-' to increment and decrement check numbers "
-"as well."
+"selected date. You can use '+' and '-' to increment and decrement check "
+"numbers as well."
msgstr ""
"Prilikom unosa datuma, možeš utipkati + ili - za povećavanje ili smanjivanje "
-"odabranog datuma. Isto tako možeš koristiti + i - za povećavanje i smanjivanje "
-"brojeva Äeka."
+"odabranog datuma. Isto tako možeš koristiti + i - za povećavanje i "
+"smanjivanje brojeva Äeka."
#: doc/tip_of_the_day.list.c:62
msgid ""
-"To switch between multiple tabs in the main window, press Control+Page Up/Down."
+"To switch between multiple tabs in the main window, press Control+Page Up/"
+"Down."
msgstr ""
-"Za prebacivanje između više kartica u glavnom prozoru, pritisni tipke „Ctrl+Page "
-"gore/dolje“."
+"Za prebacivanje između više kartica u glavnom prozoru, pritisni tipke „Ctrl"
+"+Page gore/dolje“."
#: doc/tip_of_the_day.list.c:65
msgid ""
"In the reconcile window, you can press the spacebar to mark transactions as "
-"reconciled. You can also press Tab and Shift-Tab to move between deposits and "
-"withdrawals."
+"reconciled. You can also press Tab and Shift-Tab to move between deposits "
+"and withdrawals."
msgstr ""
-"U prozoru usklađivanja možeš pritisnuti razmaknicu, za obilježavanje transakcije "
-"kao usklađene. Također možeš pritisnuti Tab i Shift-Tab za kretanje između "
-"uplata i isplata."
+"U prozoru usklađivanja možeš pritisnuti razmaknicu, za obilježavanje "
+"transakcije kao usklađene. Također možeš pritisnuti Tab i Shift-Tab za "
+"kretanje između uplata i isplata."
#: doc/tip_of_the_day.list.c:69
msgid ""
"To transfer funds between accounts with different currencies, click on the "
-"Transfer button in the register toolbar, select the accounts, and the Currency "
-"Transfer options for entering the exchange rate or the other currency's amount "
-"will be available."
+"Transfer button in the register toolbar, select the accounts, and the "
+"Currency Transfer options for entering the exchange rate or the other "
+"currency's amount will be available."
msgstr ""
"Za prijenos sredstva izmeÄ‘u konta s razliÄitim valutama, klikni na gumb "
"„Prenesi“ na traci alata registra, zatim odaberi konta i opcije za prijenos "
@@ -601,19 +610,20 @@ msgstr ""
#: doc/tip_of_the_day.list.c:74
msgid ""
"You can set the Security Editor screen to display the Quote Source of a "
-"security, which makes it easy to see which online sources your securities use. "
-"Click the triangle at the far right of the column headings to change the display."
+"security, which makes it easy to see which online sources your securities "
+"use. Click the triangle at the far right of the column headings to change "
+"the display."
msgstr ""
-"UreÄ‘ivaÄki prozor vrijednosnih papira možeÅ¡ postaviti tako, da prikazuje izvor "
-"teÄajeva. Time lako vidiÅ¡, koje internetske izvore koristiÅ¡ za tvoje vrijednosne "
-"papire. Na krajnjoj desnoj strani zaglavnog reda klikni strelicu/trokutić i "
-"promijeni prikaz."
+"UreÄ‘ivaÄki prozor vrijednosnih papira možeÅ¡ postaviti tako, da prikazuje "
+"izvor teÄajeva. Time lako vidiÅ¡, koje internetske izvore koristiÅ¡ za tvoje "
+"vrijednosne papire. Na krajnjoj desnoj strani zaglavnog reda klikni strelicu/"
+"trokutić i promijeni prikaz."
#: doc/tip_of_the_day.list.c:79
msgid ""
-"You can pack multiple reports into a single window, providing all the financial "
-"information you want at a glance. To do so, use the Sample & Custom -> \"Custom "
-"Multicolumn Report\" report."
+"You can pack multiple reports into a single window, providing all the "
+"financial information you want at a glance. To do so, use the Sample & "
+"Custom -> \"Custom Multicolumn Report\" report."
msgstr ""
"Možeš prikazati višestruke izvještaje u jednom prozoru, prikazujući sve "
"financijske podatke koje želiš najednom. Za to koristi izvještaj „Uzorak i "
@@ -622,32 +632,33 @@ msgstr ""
#: doc/tip_of_the_day.list.c:84
msgid ""
"Style Sheets affect how reports are displayed. Choose a style sheet for your "
-"report as a report option, and use the Edit -> Style Sheets menu to customize "
-"style sheets."
+"report as a report option, and use the Edit -> Style Sheets menu to "
+"customize style sheets."
msgstr ""
"Stilski predložak utjeÄe na naÄin prikazivanja izvjeÅ¡taja. Odaberi stilski "
-"predložak za tvoj izvještaj kao opciju za izvještaj, te koristi izbornik „Uredi "
-"→ Stilski predlošci“ za prilagođivanje stilskih predložaka."
+"predložak za tvoj izvještaj kao opciju za izvještaj, te koristi izbornik "
+"„Uredi → Stilski predlošci“ za prilagođivanje stilskih predložaka."
#: doc/tip_of_the_day.list.c:88
msgid ""
-"To raise the accounts menu in the transfer field of a register page, press the "
-"Menu key or the Ctrl-Down key combination."
+"To raise the accounts menu in the transfer field of a register page, press "
+"the Menu key or the Ctrl-Down key combination."
msgstr ""
-"Za izdizanje izbornika konta u polju prijenosa na stranici registra, pritisni "
-"tipku „Menu†ili kombinaciju „Ctrl-Dolje“."
+"Za izdizanje izbornika konta u polju prijenosa na stranici registra, "
+"pritisni tipku „Menu†ili kombinaciju „Ctrl-Dolje“."
#: doc/tip_of_the_day.list.c:91
msgid ""
"The scheduled transaction editor comes with a very flexible frequency "
-"configurator. Basic frequencies to schedule a transaction include daily, weekly "
-"and monthly. But more advanced schemes can be set up as well. Some examples:\n"
+"configurator. Basic frequencies to schedule a transaction include daily, "
+"weekly and monthly. But more advanced schemes can be set up as well. Some "
+"examples:\n"
"\n"
"To schedule a transaction every three weeks, you can choose the weekly basic "
"frequency and then set 'Every 3 weeks'.\n"
"\n"
-"To schedule a transaction every year you can choose the monthly basic frequency "
-"and then set 'Every 12 months'."
+"To schedule a transaction every year you can choose the monthly basic "
+"frequency and then set 'Every 12 months'."
msgstr ""
"UreÄ‘ivaÄ terminirane transakcije dolazi s vrlo prilagodljivim podeÅ¡avaÄem "
"uÄestalosti. Osnovna uÄestalost terminiranih transakcija može biti dnevna, "
@@ -657,14 +668,14 @@ msgstr ""
"Za terminiranje transakcije svakog trećeg tjedna, možeš odabrati tjednu "
"uÄestalost i onda postaviti „Svakih 3 tjedna“.\n"
"\n"
-"Za terminiranje transakcije svake godine, možeÅ¡ odabrati mjeseÄnu uÄestalost i "
-"onda postaviti „Svakih 12 mjeseci“."
+"Za terminiranje transakcije svake godine, možeÅ¡ odabrati mjeseÄnu uÄestalost "
+"i onda postaviti „Svakih 12 mjeseci“."
#: doc/tip_of_the_day.list.c:100
msgid ""
-"If you work overnight, you should close and reopen your working registers after "
-"midnight, to get the new date as default for new transactions. It is not "
-"necessary to restart GnuCash."
+"If you work overnight, you should close and reopen your working registers "
+"after midnight, to get the new date as default for new transactions. It is "
+"not necessary to restart GnuCash."
msgstr ""
"Ako radiš preko noći, moraš zatvoriti i ponovo otvoriti tvoj radni registar "
"poslije ponoći, kako bi se dobio novi datum kao standardni datum za nove "
@@ -672,29 +683,29 @@ msgstr ""
#: doc/tip_of_the_day.list.c:104
msgid ""
-"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."
+"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."
msgstr ""
-"Za pretraživanje svih tvojih transakcija, zapoÄni pretragu (Uredi → NaÄ‘i …) na "
-"glavnoj stranici kontnog plana. Za ograniÄavanje tvoje pretrage na jedan konto, "
-"zapoÄni pretragu u registru tog konta."
+"Za pretraživanje svih tvojih transakcija, zapoÄni pretragu (Uredi → NaÄ‘i …) "
+"na glavnoj stranici kontnog plana. Za ograniÄavanje tvoje pretrage na jedan "
+"konto, zapoÄni pretragu u registru tog konta."
#: doc/tip_of_the_day.list.c:108
msgid ""
-"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."
+"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."
msgstr ""
-"Kako bi se na ekranu usporedio sadržaj dviju kartica, u jednoj od tih kartica "
-"odaberi iz izbornika „Prozor → Novi prozor sa stranicom“, za dupliciranje te "
-"kartice u novom prozoru."
+"Kako bi se na ekranu usporedio sadržaj dviju kartica, u jednoj od tih "
+"kartica odaberi iz izbornika „Prozor → Novi prozor sa stranicom“, za "
+"dupliciranje te kartice u novom prozoru."
#: doc/tip_of_the_day.list.c:112
msgid ""
-"There is a theory that if ever anyone discovers what the Universe is for and why "
-"it is here, it will instantly disappear and be replaced with something even more "
-"bizarre and inexplicable.\n"
+"There is a theory that if ever anyone discovers what the Universe is for and "
+"why it is here, it will instantly disappear and be replaced with something "
+"even more bizarre and inexplicable.\n"
"There is another theory that this has already happened.\n"
"\n"
"Douglas Adams, \"The Restaurant at the End of the Universe\""
@@ -716,11 +727,11 @@ msgstr "Knjiga je uspjeÅ¡no zakljuÄana."
#: gnucash/gnome/assistant-acct-period.c:313
#, c-format
msgid ""
-"The earliest transaction date found in this book is %s. Based on the selection "
-"made above, this book will be split into %d book."
+"The earliest transaction date found in this book is %s. Based on the "
+"selection made above, this book will be split into %d book."
msgid_plural ""
-"The earliest transaction date found in this book is %s. Based on the selection "
-"made above, this book will be split into %d books."
+"The earliest transaction date found in this book is %s. Based on the "
+"selection made above, this book will be split into %d books."
msgstr[0] ""
"Najraniji datum transakcije pronađen u ovoj knjizi je %s. Na osnovi gornjeg "
"izbora, ova knjiga će biti podijeljena u %d knjigu."
@@ -734,14 +745,15 @@ msgstr[2] ""
#: gnucash/gnome/assistant-acct-period.c:367
#, c-format
msgid ""
-"You have asked for a book to be created. This book will contain all transactions "
-"up to midnight %s (for a total of %d transactions spread over %d accounts).\n"
+"You have asked for a book to be created. This book will contain all "
+"transactions up to midnight %s (for a total of %d transactions spread over "
+"%d accounts).\n"
"\n"
" Amend the Title and Notes or Click on 'Forward' to proceed.\n"
" Click on 'Back' to adjust the dates or 'Cancel'."
msgstr ""
-"Pokušavaš stvoriti knjigu. Knjiga će sadržati sve transakcije sve do ponoći %s "
-"(za ukupno %d transakcija iz %d konta).\n"
+"Pokušavaš stvoriti knjigu. Knjiga će sadržati sve transakcije sve do ponoći "
+"%s (za ukupno %d transakcija iz %d konta).\n"
"\n"
"Dopuni naslov i napomene ili klikni na „Sljedeće†za nastavak.\n"
"Klikni „Natrag†za dopunjavanje datuma ili „Odustaniâ€."
@@ -754,8 +766,8 @@ msgstr "Razdoblje: %s – %s"
#: gnucash/gnome/assistant-acct-period.c:402
#, c-format
msgid ""
-"The book will be created with the title %s when you click on 'Apply'. Click on "
-"'Back' to adjust, or 'Cancel' to not create any book."
+"The book will be created with the title %s when you click on 'Apply'. Click "
+"on 'Back' to adjust, or 'Cancel' to not create any book."
msgstr ""
"Knjiga će biti stvorena s naslovom „%s“, kad klikneš „Primijeni“. Klikni "
"„Natrag“ za podešavanje ili „Odustani“, kako se knjiga ne bi stvorila."
@@ -788,7 +800,7 @@ msgid "Selected"
msgstr "Odabrano"
#: gnucash/gnome/assistant-hierarchy.c:462
-#: gnucash/gnome-utils/gnc-tree-view-account.c:2277
+#: gnucash/gnome-utils/gnc-tree-view-account.c:2249
msgid "Account Types"
msgstr "Vrste konta"
@@ -814,24 +826,26 @@ msgstr "nula"
msgid "existing account"
msgstr "postojeći konto"
-#: gnucash/gnome/assistant-hierarchy.c:944 gnucash/gnome/business-gnome-utils.c:564
+#: gnucash/gnome/assistant-hierarchy.c:944
+#: gnucash/gnome/business-gnome-utils.c:564
msgid "Yes"
msgstr "Da"
-#: gnucash/gnome/assistant-hierarchy.c:947 gnucash/gnome/business-gnome-utils.c:566
+#: gnucash/gnome/assistant-hierarchy.c:947
+#: gnucash/gnome/business-gnome-utils.c:566
msgid "No"
msgstr "Ne"
#: gnucash/gnome/assistant-hierarchy.c:1024
#: gnucash/gnome-utils/dialog-options.c:718
-#: gnucash/gnome-utils/gnc-tree-view-account.c:933
+#: gnucash/gnome-utils/gnc-tree-view-account.c:905
msgid "Placeholder"
msgstr "Rezervirano mjesto"
#: gnucash/gnome/assistant-hierarchy.c:1041
#: gnucash/gnome-utils/dialog-account.c:307
#: gnucash/gtkbuilder/dialog-account.glade:1597
-#: libgnucash/app-utils/gnc-ui-util.c:943
+#: libgnucash/app-utils/gnc-ui-util.c:1103
msgid "Opening Balance"
msgstr "PoÄetni saldo"
@@ -855,73 +869,74 @@ msgstr "Odaberi valutu za nova konta."
#. The options dialog gets added to the notebook so it doesn't need a parent.
#: gnucash/gnome/assistant-hierarchy.c:1224
-#: gnucash/gnome/assistant-hierarchy.c:1243 gnucash/gnome-utils/dialog-utils.c:807
+#: gnucash/gnome/assistant-hierarchy.c:1243
+#: gnucash/gnome-utils/dialog-utils.c:807
msgid "New Book Options"
msgstr "Opcije za nove knjige"
#. { name, default txn memo, throughEscrowP, specSrcAcctP }
-#: gnucash/gnome/assistant-loan.cpp:119
+#: gnucash/gnome/assistant-loan.cpp:126
msgid "Taxes"
msgstr "Porez"
-#: gnucash/gnome/assistant-loan.cpp:119
+#: gnucash/gnome/assistant-loan.cpp:126
msgid "Tax Payment"
msgstr "Plaćanje poreza"
-#: gnucash/gnome/assistant-loan.cpp:120
+#: gnucash/gnome/assistant-loan.cpp:127
msgid "Insurance"
msgstr "Osiguranje"
-#: gnucash/gnome/assistant-loan.cpp:120
+#: gnucash/gnome/assistant-loan.cpp:127
msgid "Insurance Payment"
msgstr "Plaćanje osiguranja"
#. Translators: PMI stands for Private Mortgage Insurance.
-#: gnucash/gnome/assistant-loan.cpp:122
+#: gnucash/gnome/assistant-loan.cpp:129
msgid "PMI"
msgstr "Privatno hipotekarno osiguranje"
-#: gnucash/gnome/assistant-loan.cpp:122
+#: gnucash/gnome/assistant-loan.cpp:129
msgid "PMI Payment"
msgstr "Plaćanje privatnog hipotekarnog kredita"
-#: gnucash/gnome/assistant-loan.cpp:123
+#: gnucash/gnome/assistant-loan.cpp:130
msgid "Other Expense"
msgstr "Ostali rashod"
-#: gnucash/gnome/assistant-loan.cpp:123
+#: gnucash/gnome/assistant-loan.cpp:130
msgid "Miscellaneous Payment"
msgstr "Razno plaćanje"
#. Add payment checkbox.
#. Translators: %s is "Taxes",
#. * "Insurance", or similar.
-#: gnucash/gnome/assistant-loan.cpp:760
+#: gnucash/gnome/assistant-loan.cpp:767
#, c-format
msgid "... pay \"%s\"?"
msgstr "… platiti „%s“?"
-#: gnucash/gnome/assistant-loan.cpp:772
+#: gnucash/gnome/assistant-loan.cpp:779
msgid "via Escrow account?"
msgstr "putem založnog konta?"
-#: gnucash/gnome/assistant-loan.cpp:923
+#: gnucash/gnome/assistant-loan.cpp:930
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2903
#: gnucash/register/ledger-core/split-register.c:2590
msgid "Loan"
msgstr "Kredit"
#. Translators: %s is "Taxes", or "Insurance", or similar
-#: gnucash/gnome/assistant-loan.cpp:1458
+#: gnucash/gnome/assistant-loan.cpp:1465
#, c-format
msgid "Loan Repayment Option: \"%s\""
msgstr "Opcija za otplaćivanje kredita: „%s“"
#. Translators: The following symbols will build the *
#. * header line of exported CSV files:
-#: gnucash/gnome/assistant-loan.cpp:1860 gnucash/gnome/dialog-lot-viewer.c:908
-#: gnucash/gnome/gnc-split-reg.c:600 gnucash/gnome/reconcile-view.c:447
-#: gnucash/gnome-utils/gnc-tree-view-price.c:436
+#: gnucash/gnome/assistant-loan.cpp:1867 gnucash/gnome/dialog-lot-viewer.c:908
+#: gnucash/gnome/gnc-split-reg.c:602 gnucash/gnome/reconcile-view.c:447
+#: gnucash/gnome-utils/gnc-tree-view-price.c:408
#: gnucash/gtkbuilder/dialog-payment.glade:285
#: gnucash/gtkbuilder/dialog-payment.glade:417
#: gnucash/gtkbuilder/dialog-trans-assoc.glade:126
@@ -937,7 +952,7 @@ msgstr "Opcija za otplaćivanje kredita: „%s“"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3536
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3573
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:62
-#: gnucash/register/ledger-core/split-register-model.c:224
+#: gnucash/register/ledger-core/split-register-model.c:226
#: gnucash/report/business-reports/customer-summary.scm:70
#: gnucash/report/business-reports/invoice.scm:89
#: gnucash/report/business-reports/invoice.scm:221
@@ -948,41 +963,38 @@ msgstr "Opcija za otplaćivanje kredita: „%s“"
#: gnucash/report/business-reports/taxinvoice.eguile.scm:295
#: gnucash/report/standard-reports/account-summary.scm:72
#: gnucash/report/standard-reports/advanced-portfolio.scm:72
-#: gnucash/report/standard-reports/cashflow-barchart.scm:340
-#: gnucash/report/standard-reports/category-barchart.scm:724
+#: gnucash/report/standard-reports/cashflow-barchart.scm:337
+#: gnucash/report/standard-reports/category-barchart.scm:734
#: gnucash/report/standard-reports/general-journal.scm:107
-#: gnucash/report/standard-reports/general-ledger.scm:76
-#: gnucash/report/standard-reports/general-ledger.scm:97
-#: gnucash/report/standard-reports/net-charts.scm:480
+#: gnucash/report/standard-reports/general-ledger.scm:73
+#: gnucash/report/standard-reports/general-ledger.scm:94
+#: gnucash/report/standard-reports/net-charts.scm:486
#: gnucash/report/standard-reports/portfolio.scm:51
-#: gnucash/report/standard-reports/register.scm:130
-#: gnucash/report/standard-reports/register.scm:400
-#: gnucash/report/standard-reports/register.scm:802
+#: gnucash/report/standard-reports/register.scm:129
+#: gnucash/report/standard-reports/register.scm:399
#: gnucash/report/standard-reports/transaction.scm:149
-#: gnucash/report/standard-reports/transaction.scm:890
-#: gnucash/report/standard-reports/transaction.scm:1014
-#: gnucash/report/standard-reports/transaction.scm:1084
+#: gnucash/report/standard-reports/transaction.scm:900
+#: gnucash/report/standard-reports/transaction.scm:1024
+#: gnucash/report/standard-reports/transaction.scm:1094
msgid "Date"
msgstr "Datum"
#. set per book option
#. Mark the transaction as a payment
-#: gnucash/gnome/assistant-loan.cpp:1866 gnucash/gnome/assistant-loan.cpp:2807
-#: gnucash/gnome/assistant-loan.cpp:2869 gnucash/gnome/assistant-loan.cpp:2882
+#: gnucash/gnome/assistant-loan.cpp:1873 gnucash/gnome/assistant-loan.cpp:2852
+#: gnucash/gnome/assistant-loan.cpp:2914 gnucash/gnome/assistant-loan.cpp:2927
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2864
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2905
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2910
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3021
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3107
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2993
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3079
#: gnucash/gtkbuilder/dialog-payment.glade:479
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:132
#: gnucash/register/ledger-core/split-register.c:2551
#: gnucash/register/ledger-core/split-register.c:2592
#: gnucash/register/ledger-core/split-register.c:2597
#: gnucash/register/ledger-core/split-register.c:2608
-#: gnucash/report/business-reports/customer-summary.scm:218
-#: gnucash/report/business-reports/customer-summary.scm:219
#: gnucash/report/business-reports/owner-report.scm:358
#: libgnucash/app-utils/prefs.scm:66 libgnucash/app-utils/prefs.scm:74
#: libgnucash/app-utils/prefs.scm:92 libgnucash/engine/gncOwner.c:791
@@ -991,11 +1003,11 @@ msgstr "Datum"
msgid "Payment"
msgstr "Plaćanje"
-#: gnucash/gnome/assistant-loan.cpp:1872 gnucash/gnome/assistant-loan.cpp:2902
+#: gnucash/gnome/assistant-loan.cpp:1879 gnucash/gnome/assistant-loan.cpp:2947
msgid "Principal"
msgstr "Glavnica"
-#: gnucash/gnome/assistant-loan.cpp:1878 gnucash/gnome/assistant-loan.cpp:2922
+#: gnucash/gnome/assistant-loan.cpp:1885 gnucash/gnome/assistant-loan.cpp:2967
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2859
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2896
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2904
@@ -1012,7 +1024,7 @@ msgstr "Glavnica"
msgid "Interest"
msgstr "Kamata"
-#: gnucash/gnome/assistant-loan.cpp:2808
+#: gnucash/gnome/assistant-loan.cpp:2853
msgid "Escrow Payment"
msgstr "Plaćanje zaloga"
@@ -1034,28 +1046,28 @@ msgstr "Greška prilikom dodavanja cijene."
#: gnucash/gnome/assistant-stock-split.c:573
#: gnucash/gnome/dialog-find-transactions2.c:111
#: gnucash/gnome/dialog-find-transactions.c:109
-#: gnucash/import-export/aqb/gnc-ab-utils.c:471
+#: gnucash/import-export/aqb/gnc-ab-utils.c:474
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:59
#: gnucash/import-export/import-main-matcher.c:494
#: gnucash/import-export/import-match-picker.c:392
#: gnucash/import-export/qif-imp/dialog-account-picker.c:370
-#: gnucash/register/ledger-core/split-register-model.c:333
+#: gnucash/register/ledger-core/split-register-model.c:335
#: gnucash/report/business-reports/job-report.scm:38
#: gnucash/report/business-reports/owner-report.scm:49
#: gnucash/report/standard-reports/advanced-portfolio.scm:1056
#: gnucash/report/standard-reports/budget-flow.scm:42
-#: gnucash/report/standard-reports/budget.scm:51
+#: gnucash/report/standard-reports/budget.scm:49
#: gnucash/report/standard-reports/cash-flow.scm:50
#: gnucash/report/standard-reports/general-journal.scm:112
#: gnucash/report/standard-reports/portfolio.scm:253
-#: gnucash/report/standard-reports/register.scm:143
-#: gnucash/report/standard-reports/register.scm:425
-#: gnucash/report/standard-reports/transaction.scm:1142
+#: gnucash/report/standard-reports/register.scm:142
+#: gnucash/report/standard-reports/register.scm:424
+#: gnucash/report/standard-reports/transaction.scm:1152
msgid "Account"
msgstr "Konto"
#: gnucash/gnome/assistant-stock-split.c:579
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:390
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:362
#: gnucash/report/standard-reports/advanced-portfolio.scm:1068
#: gnucash/report/standard-reports/portfolio.scm:254
msgid "Symbol"
@@ -1063,16 +1075,16 @@ msgstr "Oznaka"
#: gnucash/gnome/assistant-stock-split.c:585
#: gnucash/gnome/dialog-find-transactions.c:122
-#: gnucash/register/ledger-core/split-register-model.c:411
+#: gnucash/register/ledger-core/split-register-model.c:413
#: gnucash/report/standard-reports/advanced-portfolio.scm:1076
#: gnucash/report/standard-reports/general-journal.scm:113
-#: gnucash/report/standard-reports/general-ledger.scm:88
-#: gnucash/report/standard-reports/general-ledger.scm:108
-#: gnucash/report/standard-reports/register.scm:146
-#: gnucash/report/standard-reports/register.scm:430
-#: gnucash/report/standard-reports/transaction.scm:903
-#: gnucash/report/standard-reports/transaction.scm:1023
-#: gnucash/report/standard-reports/transaction.scm:1160
+#: gnucash/report/standard-reports/general-ledger.scm:85
+#: gnucash/report/standard-reports/general-ledger.scm:105
+#: gnucash/report/standard-reports/register.scm:145
+#: gnucash/report/standard-reports/register.scm:429
+#: gnucash/report/standard-reports/transaction.scm:913
+#: gnucash/report/standard-reports/transaction.scm:1033
+#: gnucash/report/standard-reports/transaction.scm:1174
msgid "Shares"
msgstr "Dionice"
@@ -1080,8 +1092,9 @@ msgstr "Dionice"
msgid "You don't have any stock accounts with balances!"
msgstr "Nemaš nijedan konto dionica sa saldima!"
-#: gnucash/gnome/business-gnome-utils.c:73 gnucash/gnome/business-gnome-utils.c:260
-#: gnucash/gnome/dialog-invoice.c:1353 gnucash/gnome/dialog-invoice.c:1431
+#: gnucash/gnome/business-gnome-utils.c:73
+#: gnucash/gnome/business-gnome-utils.c:260 gnucash/gnome/dialog-invoice.c:1353
+#: gnucash/gnome/dialog-invoice.c:1431
#: gnucash/gnome-utils/gnc-general-select.c:220
msgid "Select..."
msgstr "Odaberi …"
@@ -1093,10 +1106,10 @@ msgstr "Uredi …"
#: gnucash/gnome/business-gnome-utils.c:219 gnucash/gnome/dialog-invoice.c:2410
#: gnucash/gnome/dialog-invoice.c:2589 gnucash/gnome/dialog-invoice.c:2590
-#: gnucash/gnome/dialog-invoice.c:3292 gnucash/gnome-search/dialog-search.c:1054
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3026
+#: gnucash/gnome/dialog-invoice.c:3292
+#: gnucash/gnome-search/dialog-search.c:1054
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2998
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:163
-#: gnucash/report/business-reports/customer-summary.scm:509
#: gnucash/report/business-reports/invoice.scm:792
#: gnucash/report/business-reports/job-report.scm:414
#: libgnucash/app-utils/prefs.scm:91 libgnucash/engine/gncInvoice.c:1059
@@ -1110,17 +1123,17 @@ msgstr "VauÄer"
#. page / name / orderkey / tooltip / default
#: gnucash/gnome/business-gnome-utils.c:225 gnucash/gnome/dialog-invoice.c:3306
-#: gnucash/gnome/gnc-plugin-page-invoice.c:385
+#: gnucash/gnome/gnc-plugin-page-invoice.c:357
#: gnucash/gnome-search/dialog-search.c:1070
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2909
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3101
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3073
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:183
#: gnucash/gtkbuilder/dialog-invoice.glade:8
#: gnucash/gtkbuilder/dialog-invoice.glade:151
#: gnucash/gtkbuilder/dialog-invoice.glade:837
#: gnucash/gtkbuilder/dialog-invoice.glade:851
#: gnucash/register/ledger-core/split-register.c:2596
-#: gnucash/report/business-reports/customer-summary.scm:505
+#: gnucash/report/business-reports/customer-summary.scm:199
#: gnucash/report/business-reports/invoice.scm:798
#: gnucash/report/business-reports/job-report.scm:406
#: gnucash/report/business-reports/job-report.scm:410
@@ -1128,13 +1141,12 @@ msgstr "VauÄer"
#: gnucash/report/business-reports/receipt.scm:163
#: gnucash/report/business-reports/taxinvoice.eguile.scm:131
#: gnucash/report/business-reports/taxinvoice.scm:199
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1823
-#: gnucash/report/standard-reports/register.scm:828
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1795
#: libgnucash/app-utils/prefs.scm:75 libgnucash/engine/gncInvoice.c:1057
msgid "Invoice"
msgstr "RaÄun"
-#: gnucash/gnome/business-gnome-utils.c:448 gnucash/gnome/gnc-split-reg.c:594
+#: gnucash/gnome/business-gnome-utils.c:448 gnucash/gnome/gnc-split-reg.c:596
#: gnucash/gtkbuilder/gnc-frequency.glade:165
#: gnucash/gtkbuilder/gnc-frequency.glade:671
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:46
@@ -1144,7 +1156,7 @@ msgstr "RaÄun"
#: gnucash/report/standard-reports/transaction.scm:260
#: gnucash/report/standard-reports/transaction.scm:302
#: gnucash/report/standard-reports/transaction.scm:393
-#: gnucash/report/standard-reports/transaction.scm:969
+#: gnucash/report/standard-reports/transaction.scm:979
#: libgnucash/engine/Recurrence.c:495 libgnucash/engine/Recurrence.c:683
msgid "None"
msgstr "Ništa"
@@ -1209,7 +1221,8 @@ msgstr ""
"Moraš zadati jedinstveno ime za ovaj uvjet plaćanja. Tvoj izbor „%s†se već "
"upotrebljava."
-#: gnucash/gnome/dialog-billterms.c:528 gnucash/gnome-utils/gnc-date-delta.c:222
+#: gnucash/gnome/dialog-billterms.c:528
+#: gnucash/gnome-utils/gnc-date-delta.c:222
#: gnucash/gtkbuilder/dialog-billterms.glade:208
#: gnucash/gtkbuilder/dialog-billterms.glade:792
#: gnucash/gtkbuilder/gnc-frequency.glade:986
@@ -1223,10 +1236,9 @@ msgstr "Dani"
msgid "Proximo"
msgstr "Sljedećeg mjeseca"
-#: gnucash/gnome/dialog-billterms.c:534 gnucash/gnome/dialog-trans-assoc.c:371
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:656
+#: gnucash/gnome/dialog-billterms.c:534 gnucash/gnome/dialog-trans-assoc.c:431
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:627
#: gnucash/gtkbuilder/dialog-price.glade:24
-#: gnucash/report/business-reports/customer-summary.scm:220
#: gnucash/report/business-reports/job-report.scm:243
#: gnucash/report/business-reports/owner-report.scm:354
#: gnucash/report/business-reports/owner-report.scm:359
@@ -1239,34 +1251,37 @@ msgstr "Nepoznato"
msgid "Term \"%s\" is in use. You cannot delete it."
msgstr "Uvjet „%s“ je u upotrebi. Ne možeš ga izbrisati."
-#: gnucash/gnome/dialog-billterms.c:669 gnucash/gnome-utils/dialog-tax-table.c:572
+#: gnucash/gnome/dialog-billterms.c:669
+#: gnucash/gnome-utils/dialog-tax-table.c:572
#, c-format
msgid "Are you sure you want to delete \"%s\"?"
msgstr "Sigurno želiš izbrisati „%s“?"
#: gnucash/gnome/dialog-choose-owner.c:78
msgid ""
-"This transaction needs to be assigned to a Customer. Please choose the Customer "
-"below."
+"This transaction needs to be assigned to a Customer. Please choose the "
+"Customer below."
msgstr "Ova transakcija mora biti dodijeljena kupcu. Odaberi jednog ispod."
#: gnucash/gnome/dialog-choose-owner.c:85
msgid ""
"This transaction needs to be assigned to a Vendor. Please choose the Vendor "
"below."
-msgstr "Ova transakcija mora biti dodijeljena dobavljaÄu. Odaberi jednog ispod."
+msgstr ""
+"Ova transakcija mora biti dodijeljena dobavljaÄu. Odaberi jednog ispod."
#: gnucash/gnome/dialog-commodities.c:156
msgid ""
-"That commodity is currently used by at least one of your accounts. You may not "
-"delete it."
+"That commodity is currently used by at least one of your accounts. You may "
+"not delete it."
msgstr ""
-"Tu robu trenutaÄno koristi barem jedan od tvojih konta. Ne možeÅ¡ je izbrisati."
+"Tu robu trenutaÄno koristi barem jedan od tvojih konta. Ne možeÅ¡ je "
+"izbrisati."
#: gnucash/gnome/dialog-commodities.c:170
msgid ""
-"This commodity has price quotes. Are you sure you want to delete the selected "
-"commodity and its price quotes?"
+"This commodity has price quotes. Are you sure you want to delete the "
+"selected commodity and its price quotes?"
msgstr ""
"Ova roba ima teÄajeve cijena. Sigurno želiÅ¡ izbrisati odabranu robu i njene "
"teÄajeve cijena?"
@@ -1280,25 +1295,27 @@ msgid "Delete commodity?"
msgstr "Izbrisati robu?"
#. Add the Cancel button for the matcher
-#: gnucash/gnome/dialog-commodities.c:190 gnucash/gnome/dialog-price-edit-db.c:202
-#: gnucash/gnome/dialog-tax-info.c:1146 gnucash/gnome/gnc-plugin-budget.c:329
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1592
+#: gnucash/gnome/dialog-commodities.c:190
+#: gnucash/gnome/dialog-price-edit-db.c:202
+#: gnucash/gnome/dialog-tax-info.c:1166 gnucash/gnome/gnc-plugin-budget.c:303
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1571
#: gnucash/gnome/gnc-plugin-page-invoice.c:157
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1143
-#: gnucash/gnome/gnc-plugin-page-register2.c:1626
-#: gnucash/gnome/gnc-plugin-page-register.c:1723 gnucash/gnome/gnc-split-reg.c:1006
-#: gnucash/gnome/gnc-split-reg.c:1050 gnucash/gnome/gnc-split-reg.c:1121
-#: gnucash/gnome/gnc-split-reg.c:1392 gnucash/gnome/gnc-split-reg.c:1432
-#: gnucash/gnome/window-reconcile2.c:2195 gnucash/gnome/window-reconcile.c:2279
-#: gnucash/gnome-search/search-account.c:266
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1114
+#: gnucash/gnome/gnc-plugin-page-register2.c:1598
+#: gnucash/gnome/gnc-plugin-page-register.c:1695
+#: gnucash/gnome/gnc-split-reg.c:1008 gnucash/gnome/gnc-split-reg.c:1052
+#: gnucash/gnome/gnc-split-reg.c:1174 gnucash/gnome/gnc-split-reg.c:1488
+#: gnucash/gnome/gnc-split-reg.c:1528 gnucash/gnome/window-reconcile2.c:2195
+#: gnucash/gnome/window-reconcile.c:2279
+#: gnucash/gnome-search/search-account.c:237
#: gnucash/gnome-utils/dialog-account.c:657 gnucash/gnome-utils/gnc-file.c:131
#: gnucash/gnome-utils/gnc-file.c:314 gnucash/gnome-utils/gnc-file.c:612
#: gnucash/gnome-utils/gnc-gui-query.c:300
-#: gnucash/gnome-utils/gnc-main-window.c:1283
+#: gnucash/gnome-utils/gnc-main-window.c:1284
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:886
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1023
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1063
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2383
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2355
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:196
#: gnucash/gtkbuilder/dialog-account.glade:20
#: gnucash/gtkbuilder/dialog-account.glade:176
@@ -1337,8 +1354,10 @@ msgstr "Izbrisati robu?"
#: gnucash/gtkbuilder/dialog-report.glade:455
#: gnucash/gtkbuilder/dialog-report.glade:739
#: gnucash/gtkbuilder/dialog-reset-warnings.glade:24
-#: gnucash/gtkbuilder/dialog-search.glade:66 gnucash/gtkbuilder/dialog-sx.glade:174
-#: gnucash/gtkbuilder/dialog-sx.glade:781 gnucash/gtkbuilder/dialog-sx.glade:1477
+#: gnucash/gtkbuilder/dialog-search.glade:66
+#: gnucash/gtkbuilder/dialog-sx.glade:174
+#: gnucash/gtkbuilder/dialog-sx.glade:781
+#: gnucash/gtkbuilder/dialog-sx.glade:1477
#: gnucash/gtkbuilder/dialog-tax-info.glade:28
#: gnucash/gtkbuilder/dialog-tax-table.glade:327
#: gnucash/gtkbuilder/dialog-userpass.glade:23
@@ -1358,19 +1377,19 @@ msgstr "Izbrisati robu?"
#: gnucash/html/gnc-html-webkit1.c:1197
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:420
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:378
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2000
-#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:386
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2013
+#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:384
#: gnucash/register/ledger-core/gncEntryLedger.c:930
#: gnucash/register/ledger-core/gncEntryLedgerControl.c:897
#: gnucash/register/ledger-core/split-register-control.c:1543
msgid "_Cancel"
msgstr "_Odustani"
-#: gnucash/gnome/dialog-commodities.c:191 gnucash/gnome/dialog-imap-editor.c:127
+#: gnucash/gnome/dialog-commodities.c:191
#: gnucash/gnome/dialog-price-edit-db.c:203
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1593
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1572
#: gnucash/gnome/gnc-plugin-page-invoice.c:162
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1144
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1115
#: gnucash/gnome/gnc-plugin-page-sx-list.c:160
#: gnucash/gnome/window-reconcile2.c:2237 gnucash/gnome/window-reconcile.c:2321
#: gnucash/gtkbuilder/dialog-account.glade:191
@@ -1391,8 +1410,8 @@ msgid ""
"Identification - Company Name, and\n"
"Payment Address - Name."
msgstr ""
-"Moraš unijeti ime poduzeća. Ako je ovaj kupac pojedinac (a ne poduzeće), moraš "
-"unijeti iste vrijednosti za:\n"
+"Moraš unijeti ime poduzeća. Ako je ovaj kupac pojedinac (a ne poduzeće), "
+"moraš unijeti iste vrijednosti za:\n"
"Identifikacija – Ime poduzeća, i\n"
"Adresa plaćanja – Ime."
@@ -1403,7 +1422,8 @@ msgstr "MoraÅ¡ unijeti adresu za raÄun."
#: gnucash/gnome/dialog-customer.c:351
msgid "Discount percentage must be between 0-100 or you must leave it blank."
msgstr ""
-"Postotak popusta mora biti u rasponu od 0 – 100 ili ga moraš ostaviti praznim."
+"Postotak popusta mora biti u rasponu od 0 – 100 ili ga moraš ostaviti "
+"praznim."
#: gnucash/gnome/dialog-customer.c:356
msgid "Credit must be a positive amount or you must leave it blank."
@@ -1419,7 +1439,8 @@ msgstr "<Bez imena>"
msgid "Edit Customer"
msgstr "Uredi kupca"
-#: gnucash/gnome/dialog-customer.c:441 gnucash/gnome-search/dialog-search.c:1060
+#: gnucash/gnome/dialog-customer.c:441
+#: gnucash/gnome-search/dialog-search.c:1060
#: gnucash/gtkbuilder/dialog-customer.glade:31
msgid "New Customer"
msgstr "Novi kupac"
@@ -1458,10 +1479,10 @@ msgid "Customer ID"
msgstr "Broj kupca"
#: gnucash/gnome/dialog-customer.c:928 gnucash/gnome/dialog-vendor.c:731
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:380
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:388
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:352
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:360
#: gnucash/report/business-reports/taxinvoice.eguile.scm:174
-#: libgnucash/app-utils/app-utils.scm:306
+#: libgnucash/app-utils/app-utils.scm:293
msgid "Company Name"
msgstr "Ime poduzeća"
@@ -1479,9 +1500,9 @@ msgstr "Poduzeće"
#: gnucash/gnome/dialog-customer.c:939 gnucash/gnome/dialog-employee.c:714
#: gnucash/gnome/dialog-job.c:594 gnucash/gnome/dialog-vendor.c:742
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:377
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:349
msgid "ID #"
-msgstr "Identifikacijski broj"
+msgstr "ID broj"
#: gnucash/gnome/dialog-customer.c:962
msgid "Find Customer"
@@ -1511,7 +1532,8 @@ msgstr "Moraš unijeti adresu."
msgid "Edit Employee"
msgstr "Uredi radnika"
-#: gnucash/gnome/dialog-employee.c:296 gnucash/gnome-search/dialog-search.c:1064
+#: gnucash/gnome/dialog-employee.c:296
+#: gnucash/gnome-search/dialog-search.c:1064
#: gnucash/gtkbuilder/dialog-employee.glade:7
msgid "New Employee"
msgstr "Novi radnik"
@@ -1533,7 +1555,7 @@ msgid "Employee Username"
msgstr "KorisniÄko ime radnika"
#: gnucash/gnome/dialog-employee.c:705 gnucash/gnome/dialog-invoice.c:3183
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:392
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:364
msgid "Employee Name"
msgstr "Ime radnika"
@@ -1543,12 +1565,12 @@ msgid "Username"
msgstr "KorisniÄko ime"
#: gnucash/gnome/dialog-employee.c:716 gnucash/gnome/dialog-sx-editor2.c:1753
-#: gnucash/gnome/dialog-sx-editor.c:1804 gnucash/gnome/dialog-tax-info.c:1157
+#: gnucash/gnome/dialog-sx-editor.c:1804 gnucash/gnome/dialog-tax-info.c:1177
#: gnucash/gnome-utils/gnc-dense-cal.c:356
#: gnucash/gnome-utils/gnc-tree-model-budget.c:96
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:396
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:376
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:163
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:368
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:348
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:135
#: gnucash/gtkbuilder/gnc-date-format.glade:129
#: gnucash/report/business-reports/aging.scm:367
msgid "Name"
@@ -1560,16 +1582,16 @@ msgstr "Nađi radnika"
#: gnucash/gnome/dialog-fincalc.c:312
msgid ""
-"This program can only calculate one value at a time. You must enter values for "
-"all but one quantity."
+"This program can only calculate one value at a time. You must enter values "
+"for all but one quantity."
msgstr ""
-"Ovaj program može istovremeno izraÄunati samo jednu vrijednost. MoraÅ¡ unijeti "
-"vrijednosti za sve, osim jedne koliÄine."
+"Ovaj program može istovremeno izraÄunati samo jednu vrijednost. MoraÅ¡ "
+"unijeti vrijednosti za sve, osim jedne koliÄine."
#: gnucash/gnome/dialog-fincalc.c:314
msgid ""
-"GnuCash cannot determine the value in one of the fields. You must enter a valid "
-"expression."
+"GnuCash cannot determine the value in one of the fields. You must enter a "
+"valid expression."
msgstr ""
"GnuCash ne može odrediti vrijednost u jednom od polja. Moraš unijeti valjani "
"izraz."
@@ -1652,10 +1674,10 @@ msgstr "Cijena dionice"
#. note the "Amount" multichoice option here
#: gnucash/gnome/dialog-find-transactions2.c:124
#: gnucash/gnome/dialog-invoice.c:3350 gnucash/gnome/dialog-lot-viewer.c:930
-#: gnucash/gnome/gnc-split-reg.c:612 gnucash/gnome/reconcile-view.c:431
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2920
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2932
-#: gnucash/import-export/aqb/dialog-ab.glade:1072
+#: gnucash/gnome/gnc-split-reg.c:614 gnucash/gnome/reconcile-view.c:431
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2892
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2904
+#: gnucash/import-export/aqb/dialog-ab.glade:1071
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:48
#: gnucash/import-export/import-main-matcher.c:496
#: gnucash/import-export/import-match-picker.c:394
@@ -1667,16 +1689,16 @@ msgstr "Cijena dionice"
#: gnucash/report/business-reports/owner-report.scm:60
#: gnucash/report/report-system/options-utilities.scm:247
#: gnucash/report/standard-reports/general-journal.scm:116
-#: gnucash/report/standard-reports/general-ledger.scm:91
-#: gnucash/report/standard-reports/general-ledger.scm:111
-#: gnucash/report/standard-reports/register.scm:445
-#: gnucash/report/standard-reports/register.scm:841
+#: gnucash/report/standard-reports/general-ledger.scm:88
+#: gnucash/report/standard-reports/general-ledger.scm:108
+#: gnucash/report/standard-reports/register.scm:444
+#: gnucash/report/standard-reports/register.scm:700
#: gnucash/report/standard-reports/transaction.scm:192
-#: gnucash/report/standard-reports/transaction.scm:965
-#: gnucash/report/standard-reports/transaction.scm:1013
-#: gnucash/report/standard-reports/transaction.scm:1247
-#: gnucash/report/standard-reports/transaction.scm:1263
-#: gnucash/report/standard-reports/transaction.scm:2056
+#: gnucash/report/standard-reports/transaction.scm:975
+#: gnucash/report/standard-reports/transaction.scm:1023
+#: gnucash/report/standard-reports/transaction.scm:1261
+#: gnucash/report/standard-reports/transaction.scm:1277
+#: gnucash/report/standard-reports/transaction.scm:1907
msgid "Amount"
msgstr "Iznos"
@@ -1684,19 +1706,20 @@ msgstr "Iznos"
#: gnucash/gnome/dialog-find-transactions.c:124
#: gnucash/gnome/dialog-lot-viewer.c:936
#: gnucash/gnome/dialog-sx-since-last-run.c:1028
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2910
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2930
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2882
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2902
#: gnucash/report/standard-reports/advanced-portfolio.scm:1085
#: gnucash/report/standard-reports/portfolio.scm:258
-#: gnucash/report/standard-reports/register.scm:158
-#: gnucash/report/standard-reports/register.scm:454
+#: gnucash/report/standard-reports/register.scm:157
+#: gnucash/report/standard-reports/register.scm:453
msgid "Value"
msgstr "Vrijednost"
#: gnucash/gnome/dialog-find-transactions2.c:128
-#: gnucash/gnome/dialog-find-transactions.c:126 gnucash/gnome/dialog-invoice.c:3103
-#: gnucash/gnome/dialog-invoice.c:3137 gnucash/gnome/dialog-invoice.c:3171
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2748
+#: gnucash/gnome/dialog-find-transactions.c:126
+#: gnucash/gnome/dialog-invoice.c:3103 gnucash/gnome/dialog-invoice.c:3137
+#: gnucash/gnome/dialog-invoice.c:3171
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2720
#: gnucash/gtkbuilder/dialog-invoice.glade:86
msgid "Date Posted"
msgstr "Datum uknjiženja"
@@ -1707,8 +1730,8 @@ msgstr "Datum uknjiženja"
#: gnucash/gnome/dialog-find-transactions.c:130
#: gnucash/gnome/dialog-find-transactions.c:169
#: gnucash/gnome/dialog-find-transactions.c:175
-#: gnucash/gnome/gnc-plugin-page-register.c:2243
-#: gnucash/gnome/gnc-plugin-page-register.c:3841
+#: gnucash/gnome/gnc-plugin-page-register.c:2215
+#: gnucash/gnome/gnc-plugin-page-register.c:3813
#: gnucash/gnome-search/dialog-search.c:866
#: gnucash/gnome-search/dialog-search.c:872
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
@@ -1722,17 +1745,17 @@ msgstr "Broj/Radnja"
#: gnucash/gnome/dialog-find-transactions.c:131
#: gnucash/gnome/dialog-find-transactions.c:168
#: gnucash/gnome/dialog-find-transactions.c:176
-#: gnucash/gnome/gnc-plugin-page-register.c:2248 gnucash/gnome/gnc-split-reg.c:621
-#: gnucash/gnome-search/dialog-search.c:865
+#: gnucash/gnome/gnc-plugin-page-register.c:2220
+#: gnucash/gnome/gnc-split-reg.c:623 gnucash/gnome-search/dialog-search.c:865
#: gnucash/gnome-search/dialog-search.c:873
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2777
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2779
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2797
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2799
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2749
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2751
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2769
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2771
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:58
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:57
-#: gnucash/register/ledger-core/split-register-model.c:319
+#: gnucash/register/ledger-core/split-register-model.c:321
#: gnucash/report/business-reports/invoice.scm:93
#: gnucash/report/business-reports/invoice.scm:231
msgid "Action"
@@ -1744,8 +1767,8 @@ msgstr "Radnja"
#: gnucash/gnome/dialog-find-transactions.c:134
#: gnucash/gnome/dialog-find-transactions.c:171
#: gnucash/gnome/dialog-find-transactions.c:177
-#: gnucash/gnome/gnc-plugin-page-register.c:2242
-#: gnucash/gnome/gnc-plugin-page-register.c:3840
+#: gnucash/gnome/gnc-plugin-page-register.c:2214
+#: gnucash/gnome/gnc-plugin-page-register.c:3812
#: gnucash/gnome-search/dialog-search.c:868
#: gnucash/gnome-search/dialog-search.c:874
#: gnucash/import-export/csv-exp/csv-transactions-export.c:612
@@ -1760,10 +1783,10 @@ msgstr "Broj transakcije"
#: gnucash/gnome/dialog-find-transactions.c:135
#: gnucash/gnome/dialog-find-transactions.c:170
#: gnucash/gnome/dialog-find-transactions.c:178
-#: gnucash/gnome/gnc-plugin-page-register.c:2247 gnucash/gnome/gnc-split-reg.c:609
-#: gnucash/gnome-search/dialog-search.c:867
+#: gnucash/gnome/gnc-plugin-page-register.c:2219
+#: gnucash/gnome/gnc-split-reg.c:611 gnucash/gnome-search/dialog-search.c:867
#: gnucash/gnome-search/dialog-search.c:875
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2793
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2765
#: gnucash/gtkbuilder/dialog-payment.glade:296
#: gnucash/gtkbuilder/gnc-date-format.glade:95
#: gnucash/import-export/csv-exp/csv-transactions-export.c:612
@@ -1778,37 +1801,39 @@ msgid "Description, Notes, or Memo"
msgstr "Opis, napomene ili zabilješka"
#: gnucash/gnome/dialog-find-transactions2.c:153
-#: gnucash/gnome/dialog-find-transactions.c:151 gnucash/gnome/gnc-split-reg.c:615
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2813
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2815
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2824
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2826
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2844
+#: gnucash/gnome/dialog-find-transactions.c:151
+#: gnucash/gnome/gnc-split-reg.c:617
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2785
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2787
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2796
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2798
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2816
#: gnucash/gtkbuilder/dialog-payment.glade:529
#: gnucash/import-export/csv-exp/csv-transactions-export.c:624
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:63
#: gnucash/import-export/import-main-matcher.c:498
#: gnucash/import-export/import-match-picker.c:396
#: gnucash/import-export/import-match-picker.c:436
-#: gnucash/register/ledger-core/split-register-model.c:347
-#: gnucash/report/standard-reports/general-ledger.scm:81
-#: gnucash/report/standard-reports/general-ledger.scm:101
-#: gnucash/report/standard-reports/register.scm:140
-#: gnucash/report/standard-reports/register.scm:420
+#: gnucash/register/ledger-core/split-register-model.c:349
+#: gnucash/report/standard-reports/general-ledger.scm:78
+#: gnucash/report/standard-reports/general-ledger.scm:98
+#: gnucash/report/standard-reports/register.scm:139
+#: gnucash/report/standard-reports/register.scm:419
#: gnucash/report/standard-reports/transaction.scm:223
#: gnucash/report/standard-reports/transaction.scm:451
-#: gnucash/report/standard-reports/transaction.scm:920
-#: gnucash/report/standard-reports/transaction.scm:1037
-#: gnucash/report/standard-reports/transaction.scm:1132
-#: gnucash/report/standard-reports/transaction.scm:1133
+#: gnucash/report/standard-reports/transaction.scm:930
+#: gnucash/report/standard-reports/transaction.scm:1047
+#: gnucash/report/standard-reports/transaction.scm:1142
+#: gnucash/report/standard-reports/transaction.scm:1143
msgid "Memo"
msgstr "Zabilješka"
#: gnucash/gnome/dialog-find-transactions2.c:155
-#: gnucash/gnome/dialog-find-transactions.c:153 gnucash/gnome/gnc-split-reg.c:624
-#: gnucash/gnome-utils/gnc-tree-view-account.c:914
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:501
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2842
+#: gnucash/gnome/dialog-find-transactions.c:153
+#: gnucash/gnome/gnc-split-reg.c:626
+#: gnucash/gnome-utils/gnc-tree-view-account.c:886
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:473
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2814
#: gnucash/gtkbuilder/dialog-customer.glade:553
#: gnucash/gtkbuilder/dialog-invoice.glade:488
#: gnucash/gtkbuilder/dialog-invoice.glade:1260
@@ -1817,27 +1842,27 @@ msgstr "Zabilješka"
#: gnucash/gtkbuilder/dialog-vendor.glade:548
#: gnucash/import-export/csv-exp/csv-transactions-export.c:622
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:55
-#: gnucash/register/ledger-core/split-register-model.c:483
+#: gnucash/register/ledger-core/split-register-model.c:485
#: gnucash/report/business-reports/balsheet-eg.scm:292
#: gnucash/report/business-reports/receipt.scm:75
#: gnucash/report/business-reports/taxinvoice.scm:82
-#: gnucash/report/standard-reports/account-summary.scm:485
+#: gnucash/report/standard-reports/account-summary.scm:483
#: gnucash/report/standard-reports/sx-summary.scm:486
#: gnucash/report/standard-reports/transaction.scm:229
-#: gnucash/report/standard-reports/transaction.scm:879
-#: gnucash/report/standard-reports/transaction.scm:896
-#: gnucash/report/standard-reports/transaction.scm:1046
-#: gnucash/report/standard-reports/transaction.scm:1132
+#: gnucash/report/standard-reports/transaction.scm:889
+#: gnucash/report/standard-reports/transaction.scm:906
+#: gnucash/report/standard-reports/transaction.scm:1056
+#: gnucash/report/standard-reports/transaction.scm:1142
msgid "Notes"
msgstr "Napomene"
#: gnucash/gnome/dialog-find-transactions2.c:157
#: gnucash/gnome/dialog-find-transactions.c:155
-#: gnucash/gnome/dialog-lot-viewer.c:924 gnucash/gnome/dialog-tax-info.c:1353
-#: gnucash/gnome/gnc-split-reg.c:618 gnucash/gnome/reconcile-view.c:435
+#: gnucash/gnome/dialog-lot-viewer.c:924 gnucash/gnome/dialog-tax-info.c:1373
+#: gnucash/gnome/gnc-split-reg.c:620 gnucash/gnome/reconcile-view.c:435
#: gnucash/gnome-utils/gnc-tree-model-budget.c:102
-#: gnucash/gnome-utils/gnc-tree-view-account.c:785
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2840
+#: gnucash/gnome-utils/gnc-tree-view-account.c:757
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2812
#: gnucash/gtkbuilder/dialog-choose-owner.glade:101
#: gnucash/gtkbuilder/dialog-date-close.glade:159
#: gnucash/gtkbuilder/dialog-trans-assoc.glade:139
@@ -1850,7 +1875,7 @@ msgstr "Napomene"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3544
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3581
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:67
-#: gnucash/register/ledger-core/split-register-model.c:287
+#: gnucash/register/ledger-core/split-register-model.c:289
#: gnucash/report/business-reports/customer-summary.scm:73
#: gnucash/report/business-reports/invoice.scm:91
#: gnucash/report/business-reports/invoice.scm:226
@@ -1859,15 +1884,15 @@ msgstr "Napomene"
#: gnucash/report/business-reports/taxinvoice.eguile.scm:297
#: gnucash/report/standard-reports/account-summary.scm:444
#: gnucash/report/standard-reports/general-journal.scm:111
-#: gnucash/report/standard-reports/general-ledger.scm:80
-#: gnucash/report/standard-reports/general-ledger.scm:100
-#: gnucash/report/standard-reports/register.scm:138
-#: gnucash/report/standard-reports/register.scm:415
+#: gnucash/report/standard-reports/general-ledger.scm:77
+#: gnucash/report/standard-reports/general-ledger.scm:97
+#: gnucash/report/standard-reports/register.scm:137
+#: gnucash/report/standard-reports/register.scm:414
#: gnucash/report/standard-reports/sx-summary.scm:445
#: gnucash/report/standard-reports/transaction.scm:198
-#: gnucash/report/standard-reports/transaction.scm:895
-#: gnucash/report/standard-reports/transaction.scm:1019
-#: gnucash/report/standard-reports/transaction.scm:1121
+#: gnucash/report/standard-reports/transaction.scm:905
+#: gnucash/report/standard-reports/transaction.scm:1029
+#: gnucash/report/standard-reports/transaction.scm:1131
msgid "Description"
msgstr "Opis"
@@ -1877,35 +1902,31 @@ msgstr "Opis"
msgid "Find Transaction"
msgstr "Nađi transakciju"
-#: gnucash/gnome/dialog-imap-editor.c:119
-msgid "Are you sure you want to delete the entries ?"
-msgstr "Sigurno želiš izbrisati unose?"
-
-#: gnucash/gnome/dialog-imap-editor.c:406
+#: gnucash/gnome/dialog-imap-editor.c:381
msgid "Map Account NOT found"
msgstr "Mapirani konto NIJE nađen"
-#: gnucash/gnome/dialog-imap-editor.c:505
+#: gnucash/gnome/dialog-imap-editor.c:480
#: gnucash/gtkbuilder/dialog-imap-editor.glade:109
msgid "Bayesian"
msgstr "Bajesovo"
#. Description
-#: gnucash/gnome/dialog-imap-editor.c:520
+#: gnucash/gnome/dialog-imap-editor.c:495
msgid "Description Field"
msgstr "Polje opisa"
#. Memo
-#: gnucash/gnome/dialog-imap-editor.c:523
+#: gnucash/gnome/dialog-imap-editor.c:498
msgid "Memo Field"
msgstr "Polje zabilješke"
#. CSV Account Map
-#: gnucash/gnome/dialog-imap-editor.c:526
+#: gnucash/gnome/dialog-imap-editor.c:501
msgid "CSV Account Map"
msgstr "Mapa CSV konta"
-#: gnucash/gnome/dialog-imap-editor.c:563
+#: gnucash/gnome/dialog-imap-editor.c:538
msgid "Online Id"
msgstr "Internetski identifikacijski broj"
@@ -1923,13 +1944,14 @@ msgid "Are you sure you want to delete the selected entry?"
msgstr "Sigurno želiš izbrisati odabrani unos?"
#: gnucash/gnome/dialog-invoice.c:617
-msgid "This entry is attached to an order and will be deleted from that as well!"
+msgid ""
+"This entry is attached to an order and will be deleted from that as well!"
msgstr "Ovaj je unos priložen narudžbi i bit će također izbrisan iz nje!"
#: gnucash/gnome/dialog-invoice.c:726 gnucash/gnome/dialog-invoice.c:3112
#: gnucash/gnome/dialog-invoice.c:3146 gnucash/gnome/dialog-invoice.c:3180
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2764
-#: gnucash/register/ledger-core/split-register-model.c:231
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2736
+#: gnucash/register/ledger-core/split-register-model.c:233
#: gnucash/report/business-reports/aging.scm:407
#: gnucash/report/business-reports/invoice.scm:271
#: gnucash/report/business-reports/invoice.scm:622
@@ -1941,7 +1963,8 @@ msgid "Due Date"
msgstr "Datum dospijeća"
#. Should be using standard label for due date?
-#: gnucash/gnome/dialog-invoice.c:727 gnucash/report/business-reports/aging.scm:408
+#: gnucash/gnome/dialog-invoice.c:727
+#: gnucash/report/business-reports/aging.scm:408
#: gnucash/report/business-reports/owner-report.scm:615
msgid "Post Date"
msgstr "Datum knjiženja"
@@ -1968,8 +1991,8 @@ msgid ""
"One or more of the entries are for accounts different from the invoice/bill "
"currency. You will be asked a conversion rate for each."
msgstr ""
-"Jedan ili viÅ¡e unosa su za konta, koji su drugaÄiji od valute izlaznih/ulaznih "
-"raÄuna. Za svaki ćeÅ¡ morati odrediti teÄaj."
+"Jedan ili viÅ¡e unosa su za konta, koji su drugaÄiji od valute izlaznih/"
+"ulaznih raÄuna. Za svaki ćeÅ¡ morati odrediti teÄaj."
#: gnucash/gnome/dialog-invoice.c:992
msgid "The post action was canceled because not all exchange rates were given."
@@ -2048,7 +2071,8 @@ msgstr "Uredi ulazni raÄun"
msgid "View Bill"
msgstr "Pogledaj ulazni raÄun"
-#: gnucash/gnome/dialog-invoice.c:1999 gnucash/gnome-search/dialog-search.c:1068
+#: gnucash/gnome/dialog-invoice.c:1999
+#: gnucash/gnome-search/dialog-search.c:1068
msgid "New Expense Voucher"
msgstr "Novi rashodni vauÄer"
@@ -2099,14 +2123,16 @@ msgid "View/Edit Invoice"
msgstr "Pogledaj/uredi izlazni raÄun"
#: gnucash/gnome/dialog-invoice.c:3059 gnucash/gnome/dialog-invoice.c:3068
-#: gnucash/gnome/dialog-invoice.c:3079 gnucash/gnome/gnc-plugin-page-invoice.c:262
+#: gnucash/gnome/dialog-invoice.c:3079
+#: gnucash/gnome/gnc-plugin-page-invoice.c:262
#: gnucash/gnome/gnc-plugin-page-register2.c:487
#: gnucash/gnome/gnc-plugin-page-register.c:501
msgid "Duplicate"
msgstr "Dupliciraj"
#: gnucash/gnome/dialog-invoice.c:3060 gnucash/gnome/dialog-invoice.c:3069
-#: gnucash/gnome/dialog-invoice.c:3080 gnucash/gnome/gnc-plugin-page-invoice.c:266
+#: gnucash/gnome/dialog-invoice.c:3080
+#: gnucash/gnome/gnc-plugin-page-invoice.c:266
msgid "Post"
msgstr "Uknjiži"
@@ -2167,7 +2193,8 @@ msgstr "Datum raÄuna"
msgid "Company Name "
msgstr "Ime poduzeća "
-#: gnucash/gnome/dialog-invoice.c:3119 gnucash/gtkbuilder/dialog-invoice.glade:58
+#: gnucash/gnome/dialog-invoice.c:3119
+#: gnucash/gtkbuilder/dialog-invoice.glade:58
#: gnucash/gtkbuilder/dialog-invoice.glade:793
msgid "Invoice ID"
msgstr "Broj izlaznog raÄuna"
@@ -2189,15 +2216,15 @@ msgid "Voucher Notes"
msgstr "Napomene za vauÄer"
#: gnucash/gnome/dialog-invoice.c:3196 gnucash/gnome/dialog-lot-viewer.c:835
-#: gnucash/gnome/dialog-tax-info.c:1192
-#: gnucash/gnome-utils/gnc-tree-view-account.c:768
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:429
-#: gnucash/gnome-utils/gnc-tree-view-price.c:448
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2900
+#: gnucash/gnome/dialog-tax-info.c:1212
+#: gnucash/gnome-utils/gnc-tree-view-account.c:740
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:401
+#: gnucash/gnome-utils/gnc-tree-view-price.c:420
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2872
#: gnucash/gtkbuilder/dialog-invoice.glade:44
#: gnucash/gtkbuilder/dialog-invoice.glade:779
#: gnucash/gtkbuilder/dialog-payment.glade:312
-#: gnucash/register/ledger-core/split-register-model.c:354
+#: gnucash/register/ledger-core/split-register-model.c:356
#: gnucash/report/business-reports/customer-summary.scm:72
#: gnucash/report/business-reports/job-report.scm:45
#: gnucash/report/business-reports/owner-report.scm:54
@@ -2207,7 +2234,7 @@ msgid "Type"
msgstr "Vrsta"
#: gnucash/gnome/dialog-invoice.c:3198
-#: gnucash/register/ledger-core/split-register-model.c:301
+#: gnucash/register/ledger-core/split-register-model.c:303
msgid "Paid"
msgstr "Plaćeno"
@@ -2226,17 +2253,18 @@ msgstr "Otvoreno"
#: gnucash/gnome/dialog-invoice.c:3210 gnucash/gnome/dialog-lot-viewer.c:918
#: gnucash/gnome/dialog-order.c:899 gnucash/gnome/reconcile-view.c:439
-#: gnucash/gnome/reconcile-view.c:443 gnucash/gtkbuilder/dialog-payment.glade:516
+#: gnucash/gnome/reconcile-view.c:443
+#: gnucash/gtkbuilder/dialog-payment.glade:516
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:53
-#: gnucash/register/ledger-core/split-register-model.c:247
-#: gnucash/register/ledger-core/split-register-model.c:267
+#: gnucash/register/ledger-core/split-register-model.c:249
+#: gnucash/register/ledger-core/split-register-model.c:269
#: gnucash/report/standard-reports/general-journal.scm:110
-#: gnucash/report/standard-reports/general-ledger.scm:99
-#: gnucash/report/standard-reports/register.scm:136
-#: gnucash/report/standard-reports/register.scm:410
-#: gnucash/report/standard-reports/transaction.scm:894
-#: gnucash/report/standard-reports/transaction.scm:1018
-#: gnucash/report/standard-reports/transaction.scm:1105
+#: gnucash/report/standard-reports/general-ledger.scm:96
+#: gnucash/report/standard-reports/register.scm:135
+#: gnucash/report/standard-reports/register.scm:409
+#: gnucash/report/standard-reports/transaction.scm:904
+#: gnucash/report/standard-reports/transaction.scm:1028
+#: gnucash/report/standard-reports/transaction.scm:1115
msgid "Num"
msgstr "Broj"
@@ -2248,7 +2276,8 @@ msgstr "NaÄ‘i ulazni raÄun"
msgid "Find Expense Voucher"
msgstr "NaÄ‘i rashodni vauÄer"
-#: gnucash/gnome/dialog-invoice.c:3299 gnucash/gnome-search/dialog-search.c:1066
+#: gnucash/gnome/dialog-invoice.c:3299
+#: gnucash/gnome-search/dialog-search.c:1066
#: gnucash/report/business-reports/invoice.scm:794
msgid "Expense Voucher"
msgstr "Rashodni vauÄer"
@@ -2325,19 +2354,19 @@ msgid "Only Active?"
msgstr "Samo aktivne?"
#: gnucash/gnome/dialog-job.c:575 gnucash/gnome/dialog-job.c:588
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2954
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2926
#: gnucash/gtkbuilder/dialog-job.glade:252
-#: gnucash/register/ledger-core/split-register-model.c:361
+#: gnucash/register/ledger-core/split-register-model.c:363
msgid "Rate"
msgstr "TeÄaj"
-#: gnucash/gnome/dialog-job.c:577 gnucash/gnome-utils/gnc-tree-view-owner.c:385
+#: gnucash/gnome/dialog-job.c:577 gnucash/gnome-utils/gnc-tree-view-owner.c:357
#: gnucash/gtkbuilder/dialog-job.glade:106
msgid "Job Number"
msgstr "Broj naloga"
#: gnucash/gnome/dialog-job.c:579 gnucash/gnome/dialog-job.c:592
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:384
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:356
#: gnucash/gtkbuilder/dialog-job.glade:120
msgid "Job Name"
msgstr "Ime naloga"
@@ -2360,25 +2389,26 @@ msgid "Closed"
msgstr "ZakljuÄano"
#: gnucash/gnome/dialog-lot-viewer.c:861
-#: gnucash/report/report-system/html-fonts.scm:89
+#: gnucash/report/report-system/html-fonts.scm:72
#: gnucash/report/standard-reports/general-journal.scm:96
-#: gnucash/report/standard-reports/register.scm:394
+#: gnucash/report/standard-reports/register.scm:393
msgid "Title"
msgstr "Naslov"
+#. Balance line (do this here so it draws over the minimum line)
#: gnucash/gnome/dialog-lot-viewer.c:867 gnucash/gnome/dialog-lot-viewer.c:948
-#: gnucash/gnome-utils/gnc-tree-view-account.c:811
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:485
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:493
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3140
-#: gnucash/register/ledger-core/split-register-model.c:312
-#: gnucash/register/ledger-core/split-register-model.c:476
-#: gnucash/report/business-reports/customer-summary.scm:180
+#: gnucash/gnome-utils/gnc-tree-view-account.c:783
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:457
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:465
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3112
+#: gnucash/register/ledger-core/split-register-model.c:314
+#: gnucash/register/ledger-core/split-register-model.c:478
#: gnucash/report/business-reports/job-report.scm:209
#: gnucash/report/business-reports/owner-report.scm:320
#: gnucash/report/report-system/html-utilities.scm:731
#: gnucash/report/standard-reports/account-summary.scm:462
-#: gnucash/report/standard-reports/register.scm:164
+#: gnucash/report/standard-reports/balance-forecast.scm:240
+#: gnucash/report/standard-reports/register.scm:163
#: gnucash/report/standard-reports/sx-summary.scm:463
msgid "Balance"
msgstr "Saldo"
@@ -2410,11 +2440,11 @@ msgstr "Naudžba mora imati barem jedan unos."
#.
#: gnucash/gnome/dialog-order.c:301
msgid ""
-"This order contains entries that have not been invoiced. Are you sure you want "
-"to close it out before you invoice all the entries?"
+"This order contains entries that have not been invoiced. Are you sure you "
+"want to close it out before you invoice all the entries?"
msgstr ""
-"Ova narudžba sadrži unose, koji nisu uknjiženi. Sigurno želiš zatvoriti prije "
-"knjiženja svih unosa?"
+"Ova narudžba sadrži unose, koji nisu uknjiženi. Sigurno želiš zatvoriti "
+"prije knjiženja svih unosa?"
#. Ok, we can close this. Ask for verification and set the closed date
#: gnucash/gnome/dialog-order.c:310
@@ -2472,45 +2502,45 @@ msgstr "Predplata"
#: gnucash/gnome/dialog-payment.c:951
msgid ""
-"The transfer and post accounts are associated with different currencies. Please "
-"specify the conversion rate."
+"The transfer and post accounts are associated with different currencies. "
+"Please specify the conversion rate."
msgstr ""
"Konti prijenosa i uknjiženja su povezani s razliÄitim valutama. Odredi teÄaj."
-#: gnucash/gnome/dialog-payment.c:1197 gnucash/gnome/search-owner.c:241
+#: gnucash/gnome/dialog-payment.c:1197 gnucash/gnome/search-owner.c:213
#: gnucash/gnome-search/dialog-search.c:1058
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2811
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2783
#: gnucash/gtkbuilder/dialog-customer.glade:569
#: gnucash/gtkbuilder/dialog-customer-import-gui.glade:163
#: gnucash/gtkbuilder/dialog-invoice.glade:1143
#: gnucash/gtkbuilder/dialog-payment.glade:40
-#: gnucash/register/ledger-core/split-register-model.c:283
-#: gnucash/report/business-reports/customer-summary.scm:722
-#: gnucash/report/business-reports/customer-summary.scm:832
+#: gnucash/register/ledger-core/split-register-model.c:285
+#: gnucash/report/business-reports/customer-summary.scm:352
+#: gnucash/report/business-reports/customer-summary.scm:462
#: gnucash/report/business-reports/job-report.scm:551
#: gnucash/report/business-reports/owner-report.scm:73
#: gnucash/report/business-reports/owner-report.scm:114
msgid "Customer"
msgstr "Kupac"
-#: gnucash/gnome/dialog-payment.c:1201 gnucash/gnome/search-owner.c:242
+#: gnucash/gnome/dialog-payment.c:1201 gnucash/gnome/search-owner.c:214
#: gnucash/gnome-search/dialog-search.c:1090
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2822
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2794
#: gnucash/gtkbuilder/dialog-customer-import-gui.glade:180
#: gnucash/gtkbuilder/dialog-payment.glade:44
#: gnucash/gtkbuilder/dialog-vendor.glade:564
-#: gnucash/register/ledger-core/split-register-model.c:285
-#: gnucash/report/business-reports/customer-summary.scm:724
+#: gnucash/register/ledger-core/split-register-model.c:287
+#: gnucash/report/business-reports/customer-summary.scm:354
#: gnucash/report/business-reports/job-report.scm:557
#: gnucash/report/business-reports/owner-report.scm:118
msgid "Vendor"
msgstr "DobavljaÄ"
-#: gnucash/gnome/dialog-payment.c:1205 gnucash/gnome/search-owner.c:243
+#: gnucash/gnome/dialog-payment.c:1205 gnucash/gnome/search-owner.c:215
#: gnucash/gnome-search/dialog-search.c:1062
#: gnucash/gtkbuilder/dialog-employee.glade:600
#: gnucash/gtkbuilder/dialog-payment.glade:48
-#: gnucash/report/business-reports/customer-summary.scm:726
+#: gnucash/report/business-reports/customer-summary.scm:356
#: gnucash/report/business-reports/job-report.scm:560
#: gnucash/report/business-reports/owner-report.scm:74
#: gnucash/report/business-reports/owner-report.scm:115
@@ -2520,9 +2550,9 @@ msgstr "Radnik"
#: gnucash/gnome/dialog-payment.c:1344
#, c-format
msgid ""
-"You have no valid \"Post To\" accounts. Please create an account of type \"%s\" "
-"before you continue to process this payment. Perhaps you want to create an "
-"Invoice or Bill first?"
+"You have no valid \"Post To\" accounts. Please create an account of type \"%s"
+"\" before you continue to process this payment. Perhaps you want to create "
+"an Invoice or Bill first?"
msgstr ""
"Nemaš valjana konta za „Uknjiži u“. Stvori konto vrste „%s“ prije nego što "
"nastaviš s obradom ovog plaćanja. Možda najprije želiš stvoriti izlazni ili "
@@ -2530,8 +2560,10 @@ msgstr ""
#: gnucash/gnome/dialog-payment.c:1497
msgid ""
-"The selected transaction doesn't have splits that can be assigned as a payment"
-msgstr "Odabrane transakcije nemaju stavke, koje bi se mogle odretiti kao plaćanje"
+"The selected transaction doesn't have splits that can be assigned as a "
+"payment"
+msgstr ""
+"Odabrane transakcije nemaju stavke, koje bi se mogle odretiti kao plaćanje"
#: gnucash/gnome/dialog-payment.c:1511
msgid ""
@@ -2553,7 +2585,8 @@ msgstr "Upozorenje"
msgid "Continue"
msgstr "Nastavi"
-#: gnucash/gnome/dialog-payment.c:1518 gnucash/gnome/gnc-plugin-page-invoice.c:260
+#: gnucash/gnome/dialog-payment.c:1518
+#: gnucash/gnome/gnc-plugin-page-invoice.c:260
#: gnucash/gnome/gnc-plugin-page-register2.c:485
#: gnucash/gnome/gnc-plugin-page-register.c:499
#: gnucash/gnome-utils/gnc-cell-renderer-date.c:159
@@ -2563,15 +2596,15 @@ msgstr "Odustani"
#: gnucash/gnome/dialog-payment.c:1630
#, c-format
msgid ""
-"The transaction has at least one split in a business account that is not part of "
-"a business transaction.\n"
+"The transaction has at least one split in a business account that is not "
+"part of a business transaction.\n"
"If you continue these splits will be ignored:\n"
"\n"
"%s\n"
"Do you wish to continue and ignore these splits ?"
msgstr ""
-"Ova transakcija ima barem jednu stavku u poslovnom kontu, koja nije dio poslovne "
-"transakcije.\n"
+"Ova transakcija ima barem jednu stavku u poslovnom kontu, koja nije dio "
+"poslovne transakcije.\n"
"Ako nastaviš, ove će stavke biti zanemarene:\n"
"\n"
"%s\n"
@@ -2640,8 +2673,8 @@ msgid ""
"The GUIDs in the %s check format file '%s' and the %s check format file '%s' "
"match."
msgstr ""
-"GUID-brojevi formata Äeka %s u datoteci „%s“ i formata Äeka %s u datoteci „%s“ "
-"se poklapaju."
+"GUID-brojevi formata Äeka %s u datoteci „%s“ i formata Äeka %s u datoteci "
+"„%s“ se poklapaju."
#. Translators: This is a directory name. It may be presented to
#. * the user to indicate that some data file was defined by the
@@ -2657,7 +2690,8 @@ msgstr "program"
msgid "user"
msgstr "korisnik"
-#: gnucash/gnome/dialog-print-check.c:1592 gnucash/gnome/dialog-print-check.c:2605
+#: gnucash/gnome/dialog-print-check.c:1592
+#: gnucash/gnome/dialog-print-check.c:2605
#: gnucash/gtkbuilder/assistant-csv-export.glade:186
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:375
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:372
@@ -2685,7 +2719,7 @@ msgstr "Završeno"
#: gnucash/gnome/dialog-sx-editor2.c:164 gnucash/gnome/dialog-sx-editor.c:166
#: gnucash/gnome/gnc-plugin-page-sx-list.c:148
#: gnucash/gnome/window-reconcile2.c:2232 gnucash/gnome/window-reconcile.c:2316
-#: gnucash/gnome-utils/gnc-main-window.c:265
+#: gnucash/gnome-utils/gnc-main-window.c:266
#: gnucash/gtkbuilder/dialog-billterms.glade:734
#: gnucash/gtkbuilder/dialog-commodities.glade:58
#: gnucash/gtkbuilder/dialog-price.glade:907
@@ -2701,17 +2735,18 @@ msgid "_Transaction"
msgstr "_Transakcija"
#: gnucash/gnome/dialog-sx-editor2.c:166 gnucash/gnome/dialog-sx-editor.c:168
-#: gnucash/gnome-utils/gnc-main-window.c:266
+#: gnucash/gnome-utils/gnc-main-window.c:267
msgid "_View"
msgstr "_Pogled"
#: gnucash/gnome/dialog-sx-editor2.c:167 gnucash/gnome/dialog-sx-editor.c:169
-#: gnucash/gnome-utils/gnc-main-window.c:267
+#: gnucash/gnome-utils/gnc-main-window.c:268
msgid "_Actions"
msgstr "_Radnje"
#: gnucash/gnome/dialog-sx-editor2.c:199 gnucash/gnome/dialog-sx-editor.c:201
-msgid "This Scheduled Transaction has changed; are you sure you want to cancel?"
+msgid ""
+"This Scheduled Transaction has changed; are you sure you want to cancel?"
msgstr "Ova je terminirana transakcija promijenjena. Zaista želiš odustati?"
#: gnucash/gnome/dialog-sx-editor2.c:635
@@ -2727,11 +2762,11 @@ msgstr "Nije moguće obraditi formulu za dugovanje za stavku „%s“."
#: gnucash/gnome/dialog-sx-editor2.c:690 gnucash/gnome/dialog-sx-editor.c:872
#: gnucash/gnome/dialog-sx-from-trans.c:261
msgid ""
-"The Scheduled Transaction Editor cannot automatically balance this transaction. "
-"Should it still be entered?"
+"The Scheduled Transaction Editor cannot automatically balance this "
+"transaction. Should it still be entered?"
msgstr ""
-"UreÄ‘ivaÄ terminirane transakcije ne može automatski saldirati ovu transakciju. "
-"Da li je ipak želiš unijeti?"
+"UreÄ‘ivaÄ terminirane transakcije ne može automatski saldirati ovu "
+"transakciju. Da li je ipak želiš unijeti?"
#: gnucash/gnome/dialog-sx-editor2.c:711 gnucash/gnome/dialog-sx-editor.c:492
msgid "Please name the Scheduled Transaction."
@@ -2740,21 +2775,23 @@ msgstr "Imenuj terminiranu transakciju."
#: gnucash/gnome/dialog-sx-editor2.c:738 gnucash/gnome/dialog-sx-editor.c:518
#, c-format
msgid ""
-"A Scheduled Transaction with the name \"%s\" already exists. Are you sure you "
-"want to name this one the same?"
+"A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
+"you want to name this one the same?"
msgstr ""
-"Već postoji terminirana transakcija pod nazivom „%s“. Sigurno želiš i ovu tako "
-"nazvati?"
+"Već postoji terminirana transakcija pod nazivom „%s“. Sigurno želiš i ovu "
+"tako nazvati?"
#: gnucash/gnome/dialog-sx-editor2.c:766
msgid "Scheduled Transactions with variables cannot be automatically created."
-msgstr "Terminirane transakcije s varijablama ne mogu biti automatski stvorene."
+msgstr ""
+"Terminirane transakcije s varijablama ne mogu biti automatski stvorene."
#: gnucash/gnome/dialog-sx-editor2.c:776 gnucash/gnome/dialog-sx-editor.c:627
msgid ""
-"Scheduled Transactions without a template transaction cannot be automatically "
-"created."
-msgstr "Terminirane transakcije bez predloška ne mogu biti automatski stvorene."
+"Scheduled Transactions without a template transaction cannot be "
+"automatically created."
+msgstr ""
+"Terminirane transakcije bez predloška ne mogu biti automatski stvorene."
#: gnucash/gnome/dialog-sx-editor2.c:791 gnucash/gnome/dialog-sx-editor.c:542
msgid "Please provide a valid end selection."
@@ -2773,8 +2810,8 @@ msgstr "Broj preostalih događaja (%d) je veći od broja ukupnih događaja (%d).
#: gnucash/gnome/dialog-sx-editor2.c:850 gnucash/gnome/dialog-sx-editor.c:594
msgid ""
-"You have attempted to create a Scheduled Transaction which will never run. Do "
-"you really want to do this?"
+"You have attempted to create a Scheduled Transaction which will never run. "
+"Do you really want to do this?"
msgstr ""
"Pokušavaš stvoriti terminiranu transakciju, koja se nikada neće pokrenuti. "
"Stvarno to želiÅ¡ uÄiniti?"
@@ -2793,14 +2830,15 @@ msgstr "(nikada)"
#: gnucash/gnome/dialog-sx-editor2.c:1513 gnucash/gnome/dialog-sx-editor.c:1551
msgid ""
-"The current template transaction has been changed. Would you like to record the "
-"changes?"
+"The current template transaction has been changed. Would you like to record "
+"the changes?"
msgstr ""
-"TrenutaÄni predložak za transakcije je promijenjen. ŽeliÅ¡ li spremiti promjene?"
+"TrenutaÄni predložak za transakcije je promijenjen. ŽeliÅ¡ li spremiti "
+"promjene?"
#: gnucash/gnome/dialog-sx-editor2.c:1780 gnucash/gnome/dialog-sx-editor.c:1831
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:288
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:294
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:257
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:263
msgid "Scheduled Transactions"
msgstr "Terminirane transakcije"
@@ -2809,8 +2847,8 @@ msgid ""
"Scheduled Transactions with variables or involving more than one commodity "
"cannot be automatically created."
msgstr ""
-"Terminirane transakcije s varijablama ili koje obuhvaćaju više od jedne dionice "
-"ne mogu biti automatski stvorene."
+"Terminirane transakcije s varijablama ili koje obuhvaćaju više od jedne "
+"dionice ne mogu biti automatski stvorene."
#: gnucash/gnome/dialog-sx-editor.c:674
#, c-format
@@ -2842,14 +2880,15 @@ msgstr "Stavka sa zabilješkom „%s“ ima neobradivu formulu za dugovanje."
#: gnucash/gnome/dialog-sx-from-trans.c:557
msgid ""
-"The Scheduled Transaction is unbalanced. You are strongly encouraged to correct "
-"this situation."
-msgstr "Terminirana transakcija nije saldirana. Savjetujemo ti, da to ispraviš."
+"The Scheduled Transaction is unbalanced. You are strongly encouraged to "
+"correct this situation."
+msgstr ""
+"Terminirana transakcija nije saldirana. Savjetujemo ti, da to ispraviš."
#: gnucash/gnome/dialog-sx-from-trans.c:788
msgid ""
-"Cannot create a Scheduled Transaction from a Transaction currently being edited. "
-"Please Enter the Transaction before Scheduling."
+"Cannot create a Scheduled Transaction from a Transaction currently being "
+"edited. Please Enter the Transaction before Scheduling."
msgstr ""
"Nije moguće stvoriti terminiranu transakciju iz transakcije koja se upravo "
"uređuje. Unesi transakciju prije terminiranja."
@@ -2891,20 +2930,20 @@ msgstr "Nevaljane transakcije"
#: gnucash/gnome/dialog-sx-since-last-run.c:864
#, c-format
msgid ""
-"There are no Scheduled Transactions to be entered at this time. (One transaction "
-"automatically created)"
+"There are no Scheduled Transactions to be entered at this time. (One "
+"transaction automatically created)"
msgid_plural ""
-"There are no Scheduled Transactions to be entered at this time. (%d transactions "
-"automatically created)"
+"There are no Scheduled Transactions to be entered at this time. (%d "
+"transactions automatically created)"
msgstr[0] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je stvorena "
-"%d transakcija)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je "
+"stvorena %d transakcija)"
msgstr[1] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski su stvorene "
-"%d transakcije)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski su "
+"stvorene %d transakcije)"
msgstr[2] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je stvoreno "
-"%d transakcija)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je "
+"stvoreno %d transakcija)"
#: gnucash/gnome/dialog-sx-since-last-run.c:992
#: gnucash/gnome-search/dialog-search.c:1082
@@ -2939,61 +2978,67 @@ msgstr "Å ifra"
msgid "now"
msgstr "sad"
-#: gnucash/gnome/dialog-tax-info.c:1142
+#: gnucash/gnome/dialog-tax-info.c:1162
msgid "Income Tax Identity"
msgstr "Osobni identifikacijski broj (OIB)"
-#: gnucash/gnome/dialog-tax-info.c:1148 gnucash/gtkbuilder/dialog-options.glade:55
+#: gnucash/gnome/dialog-tax-info.c:1168
+#: gnucash/gtkbuilder/dialog-options.glade:55
#: gnucash/gtkbuilder/dialog-price.glade:85
#: gnucash/gtkbuilder/dialog-reset-warnings.glade:39
msgid "_Apply"
msgstr "_Primijeni"
-#: gnucash/gnome/dialog-tax-info.c:1197
+#: gnucash/gnome/dialog-tax-info.c:1217
msgid ""
-"CAUTION: If you set TXF categories, and later change 'Type', you will need to "
-"manually reset those categories one at a time"
+"CAUTION: If you set TXF categories, and later change 'Type', you will need "
+"to manually reset those categories one at a time"
msgstr ""
-"OPREZ: Ako podesiÅ¡ TXF kategorije, i kasnije promijeniÅ¡ „vrstu“, morat ćeÅ¡ ruÄno "
-"povratiti te kategorije jednu po jednu"
+"OPREZ: Ako podesiš TXF kategorije, i kasnije promijeniš „vrstu“, morat ćeš "
+"ruÄno povratiti te kategorije jednu po jednu"
-#: gnucash/gnome/dialog-tax-info.c:1349
+#: gnucash/gnome/dialog-tax-info.c:1369
msgid "Form"
msgstr "Obrazac"
-#: gnucash/gnome/dialog-trans-assoc.c:206
+#: gnucash/gnome/dialog-trans-assoc.c:214
msgid "File Found"
msgstr "Datoteka je nađena"
-#: gnucash/gnome/dialog-trans-assoc.c:208
+#: gnucash/gnome/dialog-trans-assoc.c:216
msgid "File Not Found"
msgstr "Datoteka nije nađena"
-#: gnucash/gnome/dialog-trans-assoc.c:218
+#: gnucash/gnome/dialog-trans-assoc.c:227
msgid "Address Found"
msgstr "Adresa je nađena"
-#: gnucash/gnome/dialog-trans-assoc.c:220
+#: gnucash/gnome/dialog-trans-assoc.c:229
msgid "Address Not Found"
msgstr "Adresa nije nađena"
-#: gnucash/gnome/dialog-trans-assoc.c:281 gnucash/gnome/gnc-split-reg.c:1279
+#: gnucash/gnome/dialog-trans-assoc.c:311 gnucash/gnome/gnc-split-reg.c:1375
msgid "This transaction is not associated with a valid URI."
msgstr "Ova transakcija nije povezana s valjanom URI adresom."
-#: gnucash/gnome/dialog-trans-assoc.c:416
+#: gnucash/gnome/dialog-trans-assoc.c:477
msgid "Transaction Associations"
msgstr "Poveznice transakcija"
-#: gnucash/gnome/dialog-trans-assoc.c:436
+#: gnucash/gnome/dialog-trans-assoc.c:494
msgid "Path head for files is, "
msgstr "PoÄetak staze za datoteke je, "
-#: gnucash/gnome/dialog-trans-assoc.c:438
+#: gnucash/gnome/dialog-trans-assoc.c:496
msgid "Path head does not exist, "
msgstr "PoÄetak staze ne postoji, "
-#: gnucash/gnome/dialog-trans-assoc.c:450
+#: gnucash/gnome/dialog-trans-assoc.c:514
+#, c-format
+msgid "Path head not set, using '%s' for relative paths"
+msgstr "PoÄetak staze nije postavljen. Za relativne staze se koristi „%sâ€"
+
+#: gnucash/gnome/dialog-trans-assoc.c:526
msgid "Relative"
msgstr "Relativno"
@@ -3047,9 +3092,9 @@ msgstr "Broj dobavljaÄa"
msgid "Find Vendor"
msgstr "NaÄ‘i dobavljaÄa"
-#: gnucash/gnome/gnc-budget-view.c:450
+#: gnucash/gnome/gnc-budget-view.c:448
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2952
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3004
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2976
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:33
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:39
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:48
@@ -3059,14 +3104,14 @@ msgstr "NaÄ‘i dobavljaÄa"
#: gnucash/register/ledger-core/split-register.c:2639
#: gnucash/report/report-system/report-utilities.scm:116
#: gnucash/report/standard-reports/advanced-portfolio.scm:1092
-#: gnucash/report/standard-reports/net-charts.scm:403
-#: gnucash/report/standard-reports/net-charts.scm:483
-#: libgnucash/app-utils/prefs.scm:89 libgnucash/engine/Account.cpp:4101
+#: gnucash/report/standard-reports/net-charts.scm:409
+#: gnucash/report/standard-reports/net-charts.scm:489
+#: libgnucash/app-utils/prefs.scm:89 libgnucash/engine/Account.cpp:4099
#: libgnucash/engine/Scrub.c:422
msgid "Income"
msgstr "Prihod"
-#: gnucash/gnome/gnc-budget-view.c:452
+#: gnucash/gnome/gnc-budget-view.c:450
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:80
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:85
#: gnucash/report/report-system/report-utilities.scm:117
@@ -3075,21 +3120,16 @@ msgstr "Prihod"
msgid "Expenses"
msgstr "Rashod"
-#: gnucash/gnome/gnc-budget-view.c:454
+#: gnucash/gnome/gnc-budget-view.c:452
msgid "Transfers"
msgstr "Prijenosi"
-#. (if (gnc-numeric-negative-p total)
-#. (_ "Total Credit")
-#. (_ "Total Due")))
-#. Display Grand Total
-#: gnucash/gnome/gnc-budget-view.c:456 gnucash/gnome/gnc-budget-view.c:1292
-#: gnucash/gnome-utils/gnc-tree-view-account.c:880
+#: gnucash/gnome/gnc-budget-view.c:454 gnucash/gnome/gnc-budget-view.c:1315
+#: gnucash/gnome-utils/gnc-tree-view-account.c:852
#: gnucash/report/business-reports/aging.scm:563
#: gnucash/report/business-reports/aging.scm:847
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:120
-#: gnucash/report/business-reports/customer-summary.scm:306
-#: gnucash/report/business-reports/customer-summary.scm:949
+#: gnucash/report/business-reports/customer-summary.scm:579
#: gnucash/report/business-reports/invoice.scm:105
#: gnucash/report/business-reports/invoice.scm:261
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:304
@@ -3097,10 +3137,10 @@ msgstr "Prijenosi"
#: gnucash/report/report-system/html-utilities.scm:623
#: gnucash/report/standard-reports/advanced-portfolio.scm:1057
#: gnucash/report/standard-reports/budget-flow.scm:169
-#: gnucash/report/standard-reports/budget-flow.scm:251
-#: gnucash/report/standard-reports/budget.scm:560
+#: gnucash/report/standard-reports/budget-flow.scm:248
+#: gnucash/report/standard-reports/budget.scm:462
#: gnucash/report/standard-reports/portfolio.scm:278
-#: gnucash/report/standard-reports/transaction.scm:1787
+#: gnucash/report/standard-reports/transaction.scm:1799
msgid "Total"
msgstr "Ukupno"
@@ -3128,8 +3168,9 @@ msgstr "_Otvori …"
msgid "Open an existing GnuCash file"
msgstr "Otvori postojeću GnuCash datoteku"
-#: gnucash/gnome/gnc-plugin-basic-commands.c:121 gnucash/gnome-utils/gnc-file.c:113
-#: gnucash/gnome-utils/gnc-file.c:614 gnucash/gnome-utils/gnc-main-window.c:1284
+#: gnucash/gnome/gnc-plugin-basic-commands.c:121
+#: gnucash/gnome-utils/gnc-file.c:113 gnucash/gnome-utils/gnc-file.c:614
+#: gnucash/gnome-utils/gnc-main-window.c:1285
#: gnucash/html/gnc-html-webkit1.c:1198
msgid "_Save"
msgstr "_Spremi"
@@ -3153,7 +3194,8 @@ msgstr "_Vrati"
#: gnucash/gnome/gnc-plugin-basic-commands.c:132
msgid "Reload the current database, reverting all unsaved changes"
msgstr ""
-"Ponovo uÄitaj trenutaÄnu bazu podataka, poniÅ¡tavajući sve nespremljene promjene"
+"Ponovo uÄitaj trenutaÄnu bazu podataka, poniÅ¡tavajući sve nespremljene "
+"promjene"
#: gnucash/gnome/gnc-plugin-basic-commands.c:137
msgid "Export _Accounts"
@@ -3208,7 +3250,8 @@ msgstr "Od _posljednjeg pokretanja …"
#: gnucash/gnome/gnc-plugin-basic-commands.c:172
msgid "Create Scheduled Transactions since the last time run"
-msgstr "Stvori terminirane transakcije, poÄevÅ¡i s vremenom posljednjeg pokretanja"
+msgstr ""
+"Stvori terminirane transakcije, poÄevÅ¡i s vremenom posljednjeg pokretanja"
#: gnucash/gnome/gnc-plugin-basic-commands.c:176
msgid "_Mortgage & Loan Repayment..."
@@ -3219,7 +3262,7 @@ msgid "Setup scheduled transactions for repayment of a loan"
msgstr "Postavi terminirane transakcije za otplaćivanje kredita"
#: gnucash/gnome/gnc-plugin-basic-commands.c:180
-#: gnucash/report/report-system/report.scm:64
+#: gnucash/report/report-system/report.scm:63
msgid "B_udget"
msgstr "_ProraÄun"
@@ -3287,29 +3330,29 @@ msgstr "Savjeti _dana"
msgid "View the Tips of the Day"
msgstr "Pogledaj „Savjet danaâ€"
-#: gnucash/gnome/gnc-plugin-basic-commands.c:559
+#: gnucash/gnome/gnc-plugin-basic-commands.c:528
msgid "There are no Scheduled Transactions to be entered at this time."
msgstr "U ovom trenutku nema terminiranih transakcija za unos."
#. Translators: %d is the number of transactions. This is a
#. ngettext(3) message.
-#: gnucash/gnome/gnc-plugin-basic-commands.c:590
+#: gnucash/gnome/gnc-plugin-basic-commands.c:559
#, c-format
msgid ""
-"There are no Scheduled Transactions to be entered at this time. (%d transaction "
-"automatically created)"
+"There are no Scheduled Transactions to be entered at this time. (%d "
+"transaction automatically created)"
msgid_plural ""
-"There are no Scheduled Transactions to be entered at this time. (%d transactions "
-"automatically created)"
+"There are no Scheduled Transactions to be entered at this time. (%d "
+"transactions automatically created)"
msgstr[0] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je stvorena "
-"%d transakcija)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je "
+"stvorena %d transakcija)"
msgstr[1] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski su stvorene "
-"%d transakcije)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski su "
+"stvorene %d transakcije)"
msgstr[2] ""
-"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je stvoreno "
-"%d transakcija)"
+"U ovom trenutku nema terminiranih transakcija za unos. (Automatski je "
+"stvoreno %d transakcija)"
#: gnucash/gnome/gnc-plugin-budget.c:61
msgid "New Budget"
@@ -3335,13 +3378,14 @@ msgstr "Kopiraj proraÄun"
msgid "Copy an existing Budget"
msgstr "Kopiraj postojeći proraÄun"
-#: gnucash/gnome/gnc-plugin-budget.c:327
+#: gnucash/gnome/gnc-plugin-budget.c:301
msgid "Select a Budget"
msgstr "Odaberi proraÄun"
-#: gnucash/gnome/gnc-plugin-budget.c:328 gnucash/gnome/gnc-split-reg.c:1051
-#: gnucash/gnome/gnc-split-reg.c:1122 gnucash/gnome-search/search-account.c:267
-#: gnucash/gnome-utils/dialog-account.c:658 gnucash/gnome-utils/gnc-gui-query.c:297
+#: gnucash/gnome/gnc-plugin-budget.c:302 gnucash/gnome/gnc-split-reg.c:1053
+#: gnucash/gnome/gnc-split-reg.c:1178 gnucash/gnome-search/search-account.c:238
+#: gnucash/gnome-utils/dialog-account.c:658
+#: gnucash/gnome-utils/gnc-gui-query.c:297
#: gnucash/gtkbuilder/assistant-xml-encoding.glade:211
#: gnucash/gtkbuilder/dialog-account-picker.glade:188
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:53
@@ -3375,7 +3419,8 @@ msgstr "Odaberi proraÄun"
#: gnucash/gtkbuilder/dialog-report.glade:754
#: gnucash/gtkbuilder/dialog-reset-warnings.glade:54
#: gnucash/gtkbuilder/dialog-sx.glade:25 gnucash/gtkbuilder/dialog-sx.glade:189
-#: gnucash/gtkbuilder/dialog-sx.glade:796 gnucash/gtkbuilder/dialog-sx.glade:1493
+#: gnucash/gtkbuilder/dialog-sx.glade:796
+#: gnucash/gtkbuilder/dialog-sx.glade:1493
#: gnucash/gtkbuilder/dialog-tax-info.glade:43
#: gnucash/gtkbuilder/dialog-tax-table.glade:342
#: gnucash/gtkbuilder/dialog-userpass.glade:38
@@ -3395,15 +3440,16 @@ msgstr "Odaberi proraÄun"
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:419
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:477
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:377
-#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:385
-#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:442
+#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:383
+#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:440
msgid "_OK"
msgstr "_U redu"
#. Toplevel
#. Extensions Menu
-#: gnucash/gnome/gnc-plugin-business.c:152 gnucash/gnome/gnc-plugin-business.c:297
-#: gnucash/report/report-system/report.scm:73
+#: gnucash/gnome/gnc-plugin-business.c:152
+#: gnucash/gnome/gnc-plugin-business.c:297
+#: gnucash/report/report-system/report.scm:72
msgid "_Business"
msgstr "_Poduzeće"
@@ -3437,12 +3483,14 @@ msgstr "_Nađi kupca …"
msgid "Open the Find Customer dialog"
msgstr "Otvori dijalog „NaÄ‘i kupcaâ€"
-#: gnucash/gnome/gnc-plugin-business.c:172 gnucash/gnome/gnc-plugin-business.c:311
+#: gnucash/gnome/gnc-plugin-business.c:172
+#: gnucash/gnome/gnc-plugin-business.c:311
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:192
msgid "New _Invoice..."
msgstr "Novi _izlazni raÄun …"
-#: gnucash/gnome/gnc-plugin-business.c:173 gnucash/gnome/gnc-plugin-business.c:312
+#: gnucash/gnome/gnc-plugin-business.c:173
+#: gnucash/gnome/gnc-plugin-business.c:312
msgid "Open the New Invoice dialog"
msgstr "Otvori dijalog „Novi izlazni raÄunâ€"
@@ -3454,28 +3502,34 @@ msgstr "_NaÄ‘i izlazni raÄun …"
msgid "Open the Find Invoice dialog"
msgstr "Otvori dijalog „NaÄ‘i izlazni raÄunâ€"
-#: gnucash/gnome/gnc-plugin-business.c:182 gnucash/gnome/gnc-plugin-business.c:225
+#: gnucash/gnome/gnc-plugin-business.c:182
+#: gnucash/gnome/gnc-plugin-business.c:225
msgid "New _Job..."
msgstr "Novi _nalog …"
-#: gnucash/gnome/gnc-plugin-business.c:183 gnucash/gnome/gnc-plugin-business.c:226
+#: gnucash/gnome/gnc-plugin-business.c:183
+#: gnucash/gnome/gnc-plugin-business.c:226
msgid "Open the New Job dialog"
msgstr "Otvori dijalog „Novi nalogâ€"
-#: gnucash/gnome/gnc-plugin-business.c:187 gnucash/gnome/gnc-plugin-business.c:230
+#: gnucash/gnome/gnc-plugin-business.c:187
+#: gnucash/gnome/gnc-plugin-business.c:230
msgid "Find Jo_b..."
msgstr "Nađi _nalog …"
-#: gnucash/gnome/gnc-plugin-business.c:188 gnucash/gnome/gnc-plugin-business.c:231
+#: gnucash/gnome/gnc-plugin-business.c:188
+#: gnucash/gnome/gnc-plugin-business.c:231
msgid "Open the Find Job dialog"
msgstr "Otvori dijalog „NaÄ‘i nalogâ€"
-#: gnucash/gnome/gnc-plugin-business.c:192 gnucash/gnome/gnc-plugin-business.c:235
+#: gnucash/gnome/gnc-plugin-business.c:192
+#: gnucash/gnome/gnc-plugin-business.c:235
#: gnucash/gnome/gnc-plugin-business.c:268
msgid "_Process Payment..."
msgstr "_Obradi plaćanje …"
-#: gnucash/gnome/gnc-plugin-business.c:193 gnucash/gnome/gnc-plugin-business.c:236
+#: gnucash/gnome/gnc-plugin-business.c:193
+#: gnucash/gnome/gnc-plugin-business.c:236
#: gnucash/gnome/gnc-plugin-business.c:269
msgid "Open the Process Payment dialog"
msgstr "Otvori dijalog „Obradi plaćanjeâ€"
@@ -3607,11 +3661,13 @@ msgstr "Otvori dijalog podsjetnika o dospijeću izlaznih raÄuna"
msgid "E_xport"
msgstr "_Izvezi"
-#: gnucash/gnome/gnc-plugin-business.c:299 gnucash/gnome/gnc-plugin-business.c:300
+#: gnucash/gnome/gnc-plugin-business.c:299
+#: gnucash/gnome/gnc-plugin-business.c:300
msgid "Test Search Dialog"
msgstr "Dijalog probne pretrage"
-#: gnucash/gnome/gnc-plugin-business.c:304 gnucash/gnome/gnc-plugin-business.c:305
+#: gnucash/gnome/gnc-plugin-business.c:304
+#: gnucash/gnome/gnc-plugin-business.c:305
msgid "Initialize Test Data"
msgstr "Pokreni probne podatke"
@@ -3646,7 +3702,8 @@ msgstr "Novi _kontni plan …"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:178
msgid "Extend the current book by merging with new account type categories"
-msgstr "ProÅ¡iri trenutaÄnu knjigu, stapajući je s novim kategorijama vrsta konta"
+msgstr ""
+"ProÅ¡iri trenutaÄnu knjigu, stapajući je s novim kategorijama vrsta konta"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:183
#: gnucash/gnome/gnc-plugin-page-account-tree.c:194
@@ -3746,7 +3803,7 @@ msgstr "Ponovi numeriranje podreÄ‘enih stavaka u odabranom raÄunu"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:181
#: gnucash/gnome/gnc-plugin-page-register2.c:326
#: gnucash/gnome/gnc-plugin-page-register.c:349
-#: gnucash/gnome-utils/gnc-main-window.c:337
+#: gnucash/gnome-utils/gnc-main-window.c:338
msgid "_Filter By..."
msgstr "_Filtriraj …"
@@ -3770,7 +3827,8 @@ msgstr "Potvrdi _automatski …"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:265
msgid "Automatically clear individual transactions, given a cleared amount"
-msgstr "Automatski potvrdi pojedinaÄne transakcije, ako je zadan potvrÄ‘eni iznos"
+msgstr ""
+"Automatski potvrdi pojedinaÄne transakcije, ako je zadan potvrÄ‘eni iznos"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:269
#: gnucash/gnome/gnc-plugin-page-register2.c:338
@@ -3817,7 +3875,8 @@ msgstr "Provjeri i popravi _konto"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:285
#: gnucash/gnome/window-reconcile2.c:2219 gnucash/gnome/window-reconcile.c:2303
msgid ""
-"Check for and repair unbalanced transactions and orphan splits in this account"
+"Check for and repair unbalanced transactions and orphan splits in this "
+"account"
msgstr ""
"Provjeri i popravi nesaldirane transakcije i nepovezane stavke u ovom kontu"
@@ -3827,11 +3886,11 @@ msgstr "Provjeri i popravi _podkonta"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:290
msgid ""
-"Check for and repair unbalanced transactions and orphan splits in this account "
-"and its subaccounts"
+"Check for and repair unbalanced transactions and orphan splits in this "
+"account and its subaccounts"
msgstr ""
-"Provjeri i popravi nesaldirane transakcije i nepovezane stavke u ovom kontu i u "
-"njegovim podkontima"
+"Provjeri i popravi nesaldirane transakcije i nepovezane stavke u ovom kontu "
+"i u njegovim podkontima"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:295
msgid "Check & Repair A_ll"
@@ -3839,7 +3898,8 @@ msgstr "Provjeri i popravi _sve"
#: gnucash/gnome/gnc-plugin-page-account-tree.c:296
msgid ""
-"Check for and repair unbalanced transactions and orphan splits in all accounts"
+"Check for and repair unbalanced transactions and orphan splits in all "
+"accounts"
msgstr ""
"Provjeri i popravi nesaldirane transakcije i nepovezane stavke u svim kontima"
@@ -3890,28 +3950,29 @@ msgstr "Izbriši"
#. * The translated string appears as the tab name and as the
#. * text associated with the option selector on the tab
#.
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:458
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:464
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2857
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2859
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2861
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2863
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2874
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2878
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:429
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:435
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2829
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2831
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2833
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2835
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2846
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2850
#: gnucash/gtkbuilder/dialog-preferences.glade:864
-#: gnucash/report/report-system/report.scm:69
+#: gnucash/report/report-system/report.scm:68
#: gnucash/report/standard-reports/account-piecharts.scm:69
#: gnucash/report/standard-reports/account-summary.scm:75
#: gnucash/report/standard-reports/advanced-portfolio.scm:162
#: gnucash/report/standard-reports/average-balance.scm:90
-#: gnucash/report/standard-reports/average-balance.scm:336
+#: gnucash/report/standard-reports/average-balance.scm:178
+#: gnucash/report/standard-reports/balance-forecast.scm:37
#: gnucash/report/standard-reports/balance-sheet.scm:88
#: gnucash/report/standard-reports/budget-balance-sheet.scm:53
#: gnucash/report/standard-reports/budget-barchart.scm:39
#: gnucash/report/standard-reports/budget-income-statement.scm:76
-#: gnucash/report/standard-reports/cashflow-barchart.scm:48
+#: gnucash/report/standard-reports/cashflow-barchart.scm:45
#: gnucash/report/standard-reports/category-barchart.scm:72
-#: gnucash/report/standard-reports/daily-reports.scm:58
+#: gnucash/report/standard-reports/daily-reports.scm:57
#: gnucash/report/standard-reports/equity-statement.scm:68
#: gnucash/report/standard-reports/income-gst-statement.scm:80
#: gnucash/report/standard-reports/income-gst-statement.scm:86
@@ -3925,61 +3986,61 @@ msgstr "Izbriši"
msgid "Accounts"
msgstr "Konti"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1376
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1355
msgid ""
"The list below shows objects which make use of the account which you want to "
"delete.\n"
-"Before you can delete it, you must either delete those objects or else modify "
-"them so they make use\n"
+"Before you can delete it, you must either delete those objects or else "
+"modify them so they make use\n"
"of another account"
msgstr ""
"Popis ispod prikazuje objekte, koji koriste konto, koji želiš izbrisati.\n"
-"Prije brisanja, moraš ili obrisati objekte ili ih promijeniti, tako da koriste "
-"neki drugi konto"
+"Prije brisanja, moraš ili obrisati objekte ili ih promijeniti, tako da "
+"koriste neki drugi konto"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1387
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1126
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1366
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1097
msgid "(no name)"
msgstr "(bez imena)"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1411
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1390
#, c-format
msgid "Deleting account %s"
msgstr "Brisanje konta „%s“"
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1526
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1505
#, c-format
msgid "The account %s will be deleted."
msgstr "Konto „%s“ će biti izbrisan."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1539
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1518
#, c-format
msgid "All transactions in this account will be moved to the account %s."
msgstr "Sve transakcije u ovom kontu će biti premještene u konto „%s“."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1545
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1524
msgid "All transactions in this account will be deleted."
msgstr "Sve transakcije u ovom kontu će biti izbrisane."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1554
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1533
#, c-format
msgid "All of its sub-accounts will be moved to the account %s."
msgstr "Svi njegovi podkonti će biti premješteni u konto „%s“."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1560
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1539
msgid "All of its subaccounts will be deleted."
msgstr "Svi njegovi podkonti će biti izbrisani."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1565
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1544
#, c-format
msgid "All sub-account transactions will be moved to the account %s."
msgstr "Sve transakcije podkonta će biti premještene u konto „%s“."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1571
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1550
msgid "All sub-account transactions will be deleted."
msgstr "Sve transakcije podkonta će biti izbrisane."
-#: gnucash/gnome/gnc-plugin-page-account-tree.c:1576
+#: gnucash/gnome/gnc-plugin-page-account-tree.c:1555
msgid "Are you sure you want to do this?"
msgstr "Sigurno želiš to uraditi?"
@@ -4010,14 +4071,15 @@ msgid "Estimate Budget"
msgstr "Procijeni proraÄun"
#: gnucash/gnome/gnc-plugin-page-budget.c:151
-msgid "Estimate a budget value for the selected accounts from past transactions"
+msgid ""
+"Estimate a budget value for the selected accounts from past transactions"
msgstr ""
"Procijeni vrijednosti proraÄuna za odabrana konta iz prijaÅ¡njih transakcija"
#: gnucash/gnome/gnc-plugin-page-budget.c:180
#: gnucash/gtkbuilder/assistant-csv-export.glade:105
#: gnucash/gtkbuilder/dialog-print-check.glade:617
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1125
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1097
msgid "Options"
msgstr "Opcije"
@@ -4025,29 +4087,29 @@ msgstr "Opcije"
msgid "Estimate"
msgstr "Procijeni"
-#: gnucash/gnome/gnc-plugin-page-budget.c:274
-#: gnucash/gnome/gnc-plugin-page-budget.c:316
-#: gnucash/gnome/gnc-plugin-page-budget.c:822
+#: gnucash/gnome/gnc-plugin-page-budget.c:246
+#: gnucash/gnome/gnc-plugin-page-budget.c:286
+#: gnucash/gnome/gnc-plugin-page-budget.c:796
#: gnucash/report/standard-reports/budget-balance-sheet.scm:111
#: gnucash/report/standard-reports/budget-barchart.scm:40
#: gnucash/report/standard-reports/budget-barchart.scm:153
#: gnucash/report/standard-reports/budget-barchart.scm:166
#: gnucash/report/standard-reports/budget-flow.scm:44
#: gnucash/report/standard-reports/budget-income-statement.scm:58
-#: gnucash/report/standard-reports/budget.scm:99
+#: gnucash/report/standard-reports/budget.scm:97
msgid "Budget"
msgstr "ProraÄun"
-#: gnucash/gnome/gnc-plugin-page-budget.c:859 libgnucash/engine/gnc-budget.c:94
+#: gnucash/gnome/gnc-plugin-page-budget.c:833 libgnucash/engine/gnc-budget.c:94
msgid "Unnamed Budget"
msgstr "Neimenovani proraÄun"
-#: gnucash/gnome/gnc-plugin-page-budget.c:861
+#: gnucash/gnome/gnc-plugin-page-budget.c:835
#, c-format
msgid "Delete %s?"
msgstr "Izbrisati „%s“?"
-#: gnucash/gnome/gnc-plugin-page-budget.c:932
+#: gnucash/gnome/gnc-plugin-page-budget.c:906
msgid "You must select at least one account to estimate."
msgstr "Moraš odabrati barem jedan konto za procjenu."
@@ -4078,8 +4140,8 @@ msgstr "Kopiraj"
#: gnucash/gnome/gnc-plugin-page-invoice.c:125
#: gnucash/gnome/gnc-plugin-page-register2.c:238
#: gnucash/gnome/gnc-plugin-page-register.c:252
-#: gnucash/gnome-utils/gnc-main-window.c:320
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1213
+#: gnucash/gnome-utils/gnc-main-window.c:321
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1185
msgid "_Paste"
msgstr "_Zalijepi"
@@ -4334,7 +4396,7 @@ msgstr "Stvori novi vauÄer"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:202
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:277
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:960
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:931
msgid "Vendor Listing"
msgstr "Popis dobavljaÄa"
@@ -4344,7 +4406,7 @@ msgstr "Prikaži pregled razvoja dobavljaÄa za sve dobavljaÄe"
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:207
#: gnucash/gnome/gnc-plugin-page-owner-tree.c:278
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:966
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:937
msgid "Customer Listing"
msgstr "Popis kupaca"
@@ -4386,27 +4448,27 @@ msgstr "Prikaži izvještaj o radnicima"
msgid "New Voucher"
msgstr "Novi vauÄer"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:478
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:449
msgid "Owners"
msgstr "Vlasnici"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:660
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:631
msgid "Customers"
msgstr "Kupci"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:665
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:636
msgid "Jobs"
msgstr "Nalozi"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:670
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:641
msgid "Vendors"
msgstr "DobavljaÄi"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:675
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:646
msgid "Employees"
msgstr "Radnici"
-#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1134
+#: gnucash/gnome/gnc-plugin-page-owner-tree.c:1105
#, c-format
msgid ""
"The owner %s will be deleted.\n"
@@ -4439,7 +4501,8 @@ msgid "Dup_licate Transaction"
msgstr "Dup_liciraj transakciju"
#: gnucash/gnome/gnc-plugin-page-register2.c:196
-#: gnucash/gnome/gnc-plugin-page-register.c:207 gnucash/gnome/gnc-split-reg.c:1433
+#: gnucash/gnome/gnc-plugin-page-register.c:207
+#: gnucash/gnome/gnc-split-reg.c:1529
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1064
msgid "_Delete Transaction"
msgstr "_Izbriši transakciju"
@@ -4465,7 +4528,8 @@ msgid "Dup_licate Split"
msgstr "Dup_liciraj stavku"
#: gnucash/gnome/gnc-plugin-page-register2.c:201
-#: gnucash/gnome/gnc-plugin-page-register.c:215 gnucash/gnome/gnc-split-reg.c:1393
+#: gnucash/gnome/gnc-plugin-page-register.c:215
+#: gnucash/gnome/gnc-split-reg.c:1489
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1024
msgid "_Delete Split"
msgstr "_Izbriši stavku"
@@ -4527,36 +4591,36 @@ msgstr "_IspiÅ¡i Äekove …"
#: gnucash/gnome/gnc-plugin-page-register2.c:228
#: gnucash/gnome/gnc-plugin-page-register.c:242
-#: gnucash/gnome-utils/gnc-main-window.c:310
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1203
+#: gnucash/gnome-utils/gnc-main-window.c:311
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1175
msgid "Cu_t"
msgstr "_Izreži"
#: gnucash/gnome/gnc-plugin-page-register2.c:229
#: gnucash/gnome/gnc-plugin-page-register.c:243
-#: gnucash/gnome-utils/gnc-main-window.c:311
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1204
+#: gnucash/gnome-utils/gnc-main-window.c:312
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1176
msgid "Cut the current selection and copy it to clipboard"
msgstr "Izreži trenutaÄni odabir i kopiraj ga u meÄ‘uspremnik"
#: gnucash/gnome/gnc-plugin-page-register2.c:233
#: gnucash/gnome/gnc-plugin-page-register.c:247
-#: gnucash/gnome-utils/gnc-main-window.c:315
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1208
+#: gnucash/gnome-utils/gnc-main-window.c:316
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1180
msgid "_Copy"
msgstr "_Kopiraj"
#: gnucash/gnome/gnc-plugin-page-register2.c:234
#: gnucash/gnome/gnc-plugin-page-register.c:248
-#: gnucash/gnome-utils/gnc-main-window.c:316
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1209
+#: gnucash/gnome-utils/gnc-main-window.c:317
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1181
msgid "Copy the current selection to clipboard"
msgstr "Kopiraj trenutaÄni odabir u meÄ‘uspremnik"
#: gnucash/gnome/gnc-plugin-page-register2.c:239
#: gnucash/gnome/gnc-plugin-page-register.c:253
-#: gnucash/gnome-utils/gnc-main-window.c:321
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1214
+#: gnucash/gnome-utils/gnc-main-window.c:322
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1186
msgid "Paste the clipboard content at the cursor position"
msgstr "Zalijepi sadržaj spremnika na mjesto kursora"
@@ -4613,8 +4677,9 @@ msgid ""
"Move the current transaction one row upwards. Only available if the date and "
"number of both rows are identical and the register window is sorted by date."
msgstr ""
-"Premjesti trenutaÄnu transakciju jedan redak prema gore. Dostupno je samo, ako "
-"su datumi i brojevi oba retka isti, a prozor registra razvrstan prema datumu."
+"Premjesti trenutaÄnu transakciju jedan redak prema gore. Dostupno je samo, "
+"ako su datumi i brojevi oba retka isti, a prozor registra razvrstan prema "
+"datumu."
#: gnucash/gnome/gnc-plugin-page-register2.c:318
msgid "Move Transaction Do_wn"
@@ -4622,32 +4687,34 @@ msgstr "Premjesti transakciju _dolje"
#: gnucash/gnome/gnc-plugin-page-register2.c:319
msgid ""
-"Move the current transaction one row downwards. Only available if the date and "
-"number of both rows are identical and the register window is sorted by date."
+"Move the current transaction one row downwards. Only available if the date "
+"and number of both rows are identical and the register window is sorted by "
+"date."
msgstr ""
-"Premjesti trenutaÄnu transakciju jedan redak prema dolje. Dostupno je samo, ako "
-"su datumi i brojevi oba retka isti, a prozor registra razvrstan prema datumu."
+"Premjesti trenutaÄnu transakciju jedan redak prema dolje. Dostupno je samo, "
+"ako su datumi i brojevi oba retka isti, a prozor registra razvrstan prema "
+"datumu."
#: gnucash/gnome/gnc-plugin-page-register2.c:330
-#: gnucash/gnome-utils/gnc-main-window.c:341
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1218
+#: gnucash/gnome-utils/gnc-main-window.c:342
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1190
msgid "_Refresh"
msgstr "_Osvježi"
#: gnucash/gnome/gnc-plugin-page-register2.c:331
-#: gnucash/gnome-utils/gnc-main-window.c:342
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1219
+#: gnucash/gnome-utils/gnc-main-window.c:343
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1191
msgid "Refresh this window"
msgstr "Osvježi ovaj prozor"
#: gnucash/gnome/gnc-plugin-page-register2.c:349
#: gnucash/gnome/gnc-plugin-page-register.c:367
msgid ""
-"Automatically clear individual transactions, so as to reach a certain cleared "
-"amount"
+"Automatically clear individual transactions, so as to reach a certain "
+"cleared amount"
msgstr ""
-"Automatski potvrdi pojedinaÄne transakcije, tako da dostigne odreÄ‘en potvrÄ‘eni "
-"iznos"
+"Automatski potvrdi pojedinaÄne transakcije, tako da dostigne odreÄ‘en "
+"potvrđeni iznos"
#: gnucash/gnome/gnc-plugin-page-register2.c:363
#: gnucash/gnome/gnc-plugin-page-register.c:381
@@ -4686,8 +4753,10 @@ msgstr "_Terminiranje …"
#: gnucash/gnome/gnc-plugin-page-register2.c:379
#: gnucash/gnome/gnc-plugin-page-register.c:397
-msgid "Create a Scheduled Transaction with the current transaction as a template"
-msgstr "Stvori terminiranu transakciju s trenutaÄnom transakcijom, kao predložkom"
+msgid ""
+"Create a Scheduled Transaction with the current transaction as a template"
+msgstr ""
+"Stvori terminiranu transakciju s trenutaÄnom transakcijom, kao predložkom"
#. Translators: The following 2 are Scrub actions in register view
#: gnucash/gnome/gnc-plugin-page-register2.c:383
@@ -4766,7 +4835,8 @@ msgstr "Podjela _aktivne transakcije"
#: gnucash/gnome/gnc-plugin-page-register2.c:440
#: gnucash/gnome/gnc-plugin-page-register.c:454
-msgid "Show transactions on one or two lines and expand the current transaction"
+msgid ""
+"Show transactions on one or two lines and expand the current transaction"
msgstr ""
"Prikaži transakcije u jednom ili dva retka i proÅ¡iri trenutaÄnu transakciju"
@@ -4786,8 +4856,8 @@ msgstr "Prikaži transakcije prošireno sa svim stavkama"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2877
#: gnucash/register/ledger-core/split-register.c:2564
#: gnucash/register/ledger-core/split-register-layout.c:727
-#: gnucash/register/ledger-core/split-register-model.c:340
-#: gnucash/report/standard-reports/register.scm:144
+#: gnucash/register/ledger-core/split-register-model.c:342
+#: gnucash/report/standard-reports/register.scm:143
msgid "Transfer"
msgstr "Prijenos"
@@ -4803,187 +4873,192 @@ msgid "Schedule"
msgstr "Terminiranje"
#: gnucash/gnome/gnc-plugin-page-register2.c:492
-#: gnucash/gnome/gnc-plugin-page-register.c:506 gnucash/gnome/window-autoclear.c:92
+#: gnucash/gnome/gnc-plugin-page-register.c:506
+#: gnucash/gnome/window-autoclear.c:92
msgid "Auto-clear"
msgstr "Automatska potvrda"
-#: gnucash/gnome/gnc-plugin-page-register2.c:683
+#: gnucash/gnome/gnc-plugin-page-register2.c:655
msgid ""
-"You have tried to open an account in the new register while it is open in the "
-"old register."
+"You have tried to open an account in the new register while it is open in "
+"the old register."
msgstr "Pokušavaš otvoriti konto u novom registru, dok je on otvoren u starom."
-#: gnucash/gnome/gnc-plugin-page-register2.c:756
+#: gnucash/gnome/gnc-plugin-page-register2.c:728
msgid "General Journal2"
msgstr "Opći dnevnik2"
#. Translators: %s is the name
#. of the tab page
-#: gnucash/gnome/gnc-plugin-page-register2.c:1616
-#: gnucash/gnome/gnc-plugin-page-register.c:1713
+#: gnucash/gnome/gnc-plugin-page-register2.c:1588
+#: gnucash/gnome/gnc-plugin-page-register.c:1685
#, c-format
msgid "Save changes to %s?"
msgstr "Spremiti izmjene u „%s“?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1620
-#: gnucash/gnome/gnc-plugin-page-register.c:1717
+#: gnucash/gnome/gnc-plugin-page-register2.c:1592
+#: gnucash/gnome/gnc-plugin-page-register.c:1689
msgid ""
-"This register has pending changes to a transaction. Would you like to save the "
-"changes to this transaction, discard the transaction, or cancel the operation?"
+"This register has pending changes to a transaction. Would you like to save "
+"the changes to this transaction, discard the transaction, or cancel the "
+"operation?"
msgstr ""
"Ovaj registar ima neostvarene promjene za transakciju. Želiš li: spremiti "
"promjene u ovoj transakciji, odbaciti transakciju ili odustati od radnje?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1623
-#: gnucash/gnome/gnc-plugin-page-register.c:1720
+#: gnucash/gnome/gnc-plugin-page-register2.c:1595
+#: gnucash/gnome/gnc-plugin-page-register.c:1692
msgid "_Discard Transaction"
msgstr "_Odbaci transakciju"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1627
-#: gnucash/gnome/gnc-plugin-page-register.c:1724
+#: gnucash/gnome/gnc-plugin-page-register2.c:1599
+#: gnucash/gnome/gnc-plugin-page-register.c:1696
msgid "_Save Transaction"
msgstr "_Spremi transakciju"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1656
-#: gnucash/gnome/gnc-plugin-page-register2.c:1691
-#: gnucash/gnome/gnc-plugin-page-register2.c:1703
-#: gnucash/gnome/gnc-plugin-page-register2.c:1726
-#: gnucash/gnome/gnc-plugin-page-register2.c:1774
-#: gnucash/gnome/gnc-plugin-page-register.c:1756
-#: gnucash/gnome/gnc-plugin-page-register.c:1791
-#: gnucash/gnome/gnc-plugin-page-register.c:1803
-#: gnucash/gnome/gnc-plugin-page-register.c:1853
-#: gnucash/gnome/gnc-plugin-page-register.c:1970
-#: gnucash/gnome/gnc-plugin-page-register.c:2142
+#: gnucash/gnome/gnc-plugin-page-register2.c:1628
+#: gnucash/gnome/gnc-plugin-page-register2.c:1663
+#: gnucash/gnome/gnc-plugin-page-register2.c:1675
+#: gnucash/gnome/gnc-plugin-page-register2.c:1698
+#: gnucash/gnome/gnc-plugin-page-register2.c:1746
+#: gnucash/gnome/gnc-plugin-page-register.c:1728
+#: gnucash/gnome/gnc-plugin-page-register.c:1763
+#: gnucash/gnome/gnc-plugin-page-register.c:1775
+#: gnucash/gnome/gnc-plugin-page-register.c:1825
+#: gnucash/gnome/gnc-plugin-page-register.c:1942
+#: gnucash/gnome/gnc-plugin-page-register.c:2114
msgid "unknown"
msgstr "nepoznato"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1677
-#: gnucash/gnome/gnc-plugin-page-register2.c:2412
-#: gnucash/gnome/gnc-plugin-page-register.c:784
-#: gnucash/gnome/gnc-plugin-page-register.c:1777
-#: gnucash/gnome/gnc-plugin-page-register.c:3240 gnucash/gnome/gnc-split-reg.c:717
+#: gnucash/gnome/gnc-plugin-page-register2.c:1649
+#: gnucash/gnome/gnc-plugin-page-register2.c:2384
+#: gnucash/gnome/gnc-plugin-page-register.c:756
+#: gnucash/gnome/gnc-plugin-page-register.c:1749
+#: gnucash/gnome/gnc-plugin-page-register.c:3212
+#: gnucash/gnome/gnc-split-reg.c:719
#: gnucash/report/standard-reports/general-journal.scm:37
msgid "General Journal"
msgstr "Opći dnevnik"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1679
-#: gnucash/gnome/gnc-plugin-page-register2.c:2418
-#: gnucash/gnome/gnc-plugin-page-register.c:1779
-#: gnucash/gnome/gnc-plugin-page-register.c:3246
+#: gnucash/gnome/gnc-plugin-page-register2.c:1651
+#: gnucash/gnome/gnc-plugin-page-register2.c:2390
+#: gnucash/gnome/gnc-plugin-page-register.c:1751
+#: gnucash/gnome/gnc-plugin-page-register.c:3218
msgid "Portfolio"
msgstr "Portfelj"
-#: gnucash/gnome/gnc-plugin-page-register2.c:1681
-#: gnucash/gnome/gnc-plugin-page-register2.c:2424
-#: gnucash/gnome/gnc-plugin-page-register.c:1781
-#: gnucash/gnome/gnc-plugin-page-register.c:3252
+#: gnucash/gnome/gnc-plugin-page-register2.c:1653
+#: gnucash/gnome/gnc-plugin-page-register2.c:2396
+#: gnucash/gnome/gnc-plugin-page-register.c:1753
+#: gnucash/gnome/gnc-plugin-page-register.c:3224
msgid "Search Results"
msgstr "Traži u rezultatima"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2414
+#: gnucash/gnome/gnc-plugin-page-register2.c:2386
msgid "General Journal Report"
msgstr "Izvještaj o općem dnevniku"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2420
-#: gnucash/gnome/gnc-plugin-page-register.c:3248
+#: gnucash/gnome/gnc-plugin-page-register2.c:2392
+#: gnucash/gnome/gnc-plugin-page-register.c:3220
msgid "Portfolio Report"
msgstr "Izvještaj o portfelju"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2426
-#: gnucash/gnome/gnc-plugin-page-register.c:3254
+#: gnucash/gnome/gnc-plugin-page-register2.c:2398
+#: gnucash/gnome/gnc-plugin-page-register.c:3226
msgid "Search Results Report"
msgstr "Izvještaj o rezultatima pretrage"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2430
-#: gnucash/gnome/gnc-plugin-page-register.c:3258
+#: gnucash/gnome/gnc-plugin-page-register2.c:2402
+#: gnucash/gnome/gnc-plugin-page-register.c:3230
#: gnucash/gtkbuilder/dialog-preferences.glade:2342
#: gnucash/report/standard-reports/general-journal.scm:38
-#: gnucash/report/standard-reports/register.scm:884
+#: gnucash/report/standard-reports/register.scm:718
msgid "Register"
msgstr "Registar"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2432
-#: gnucash/report/standard-reports/register.scm:396
+#: gnucash/gnome/gnc-plugin-page-register2.c:2404
+#: gnucash/report/standard-reports/register.scm:395
msgid "Register Report"
msgstr "Izvještaj o registru"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2448
-#: gnucash/gnome/gnc-plugin-page-register.c:3276
+#: gnucash/gnome/gnc-plugin-page-register2.c:2420
+#: gnucash/gnome/gnc-plugin-page-register.c:3248
msgid "and subaccounts"
msgstr "i podkonti"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2480
-#: gnucash/gnome/gnc-plugin-page-register.c:3304
+#: gnucash/gnome/gnc-plugin-page-register2.c:2452
+#: gnucash/gnome/gnc-plugin-page-register.c:3276
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2912
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3046
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3051
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3018
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3023
#: gnucash/gtkbuilder/dialog-payment.glade:344
#: gnucash/register/ledger-core/split-register.c:2465
#: gnucash/register/ledger-core/split-register.c:2562
#: gnucash/register/ledger-core/split-register.c:2581
#: gnucash/register/ledger-core/split-register.c:2599
#: gnucash/report/standard-reports/general-journal.scm:89
-#: gnucash/report/standard-reports/register.scm:390
-#: gnucash/report/standard-reports/transaction.scm:1256
-#: gnucash/report/standard-reports/transaction.scm:1273
-#: gnucash/report/standard-reports/trial-balance.scm:702
+#: gnucash/report/standard-reports/register.scm:389
+#: gnucash/report/standard-reports/transaction.scm:1270
+#: gnucash/report/standard-reports/transaction.scm:1287
+#: gnucash/report/standard-reports/trial-balance.scm:753
#: libgnucash/app-utils/guile-util.c:850
msgid "Credit"
msgstr "Potražuje"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2483
-#: gnucash/gnome/gnc-plugin-page-register.c:3308
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3127
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3132
+#: gnucash/gnome/gnc-plugin-page-register2.c:2455
+#: gnucash/gnome/gnc-plugin-page-register.c:3280
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3099
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3104
#: gnucash/gtkbuilder/dialog-payment.glade:328
#: gnucash/register/ledger-core/split-register.c:2442
#: gnucash/report/standard-reports/general-journal.scm:88
-#: gnucash/report/standard-reports/register.scm:388
-#: gnucash/report/standard-reports/transaction.scm:1253
-#: gnucash/report/standard-reports/transaction.scm:1270
-#: gnucash/report/standard-reports/trial-balance.scm:699
+#: gnucash/report/standard-reports/register.scm:387
+#: gnucash/report/standard-reports/transaction.scm:1267
+#: gnucash/report/standard-reports/transaction.scm:1284
+#: gnucash/report/standard-reports/trial-balance.scm:750
#: libgnucash/app-utils/guile-util.c:819
msgid "Debit"
msgstr "Duguje"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2649
-#: gnucash/gnome/gnc-plugin-page-register.c:3441
+#: gnucash/gnome/gnc-plugin-page-register2.c:2621
+#: gnucash/gnome/gnc-plugin-page-register.c:3413
msgid "Print checks from multiple accounts?"
msgstr "IspiÅ¡i Äekove iz viÅ¡estrukih konta?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2651
-#: gnucash/gnome/gnc-plugin-page-register.c:3443
+#: gnucash/gnome/gnc-plugin-page-register2.c:2623
+#: gnucash/gnome/gnc-plugin-page-register.c:3415
msgid ""
-"This search result contains splits from more than one account. Do you want to "
-"print the checks even though they are not all from the same account?"
+"This search result contains splits from more than one account. Do you want "
+"to print the checks even though they are not all from the same account?"
msgstr ""
-"Rezultat ove pretrage sadrži stavke iz više od jednog konta. Želiš li ispisati "
-"Äekove, Äak i ako nisu sve iz istog konta?"
+"Rezultat ove pretrage sadrži stavke iz više od jednog konta. Želiš li "
+"ispisati Äekove, Äak i ako nisu sve iz istog konta?"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2661
-#: gnucash/gnome/gnc-plugin-page-register.c:3453
+#: gnucash/gnome/gnc-plugin-page-register2.c:2633
+#: gnucash/gnome/gnc-plugin-page-register.c:3425
msgid "_Print checks"
msgstr "_IspiÅ¡i Äekove"
-#: gnucash/gnome/gnc-plugin-page-register2.c:2680
-#: gnucash/gnome/gnc-plugin-page-register.c:3472
-msgid "You can only print checks from a bank account register or search results."
+#: gnucash/gnome/gnc-plugin-page-register2.c:2652
+#: gnucash/gnome/gnc-plugin-page-register.c:3444
+msgid ""
+"You can only print checks from a bank account register or search results."
msgstr ""
-"Čekove možeš ispisati samo iz registra bankovnog konta ili iz rezultata pretrage."
+"Čekove možeš ispisati samo iz registra bankovnog konta ili iz rezultata "
+"pretrage."
-#: gnucash/gnome/gnc-plugin-page-register2.c:2873
-#: gnucash/gnome/gnc-plugin-page-register.c:3650
+#: gnucash/gnome/gnc-plugin-page-register2.c:2845
+#: gnucash/gnome/gnc-plugin-page-register.c:3622
msgid "You cannot void a transaction with reconciled or cleared splits."
msgstr "Ne možeš stornirati transakciju s usklađenim ili potvrđenim stavkama."
#. Translators: The %s is the name of the plugin page
-#: gnucash/gnome/gnc-plugin-page-register2.c:3016
-#: gnucash/gnome/gnc-plugin-page-register.c:3890
-#: gnucash/gnome-utils/gnc-tree-view-account.c:2238
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:1205
+#: gnucash/gnome/gnc-plugin-page-register2.c:2988
+#: gnucash/gnome/gnc-plugin-page-register.c:3862
+#: gnucash/gnome-utils/gnc-tree-view-account.c:2210
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:1177
#, c-format
msgid "Filter %s by..."
msgstr "Filtriraj „%s“ …"
@@ -5017,7 +5092,7 @@ msgid "Remo_ve Other Splits"
msgstr "Ukloni _ostale stavke"
#: gnucash/gnome/gnc-plugin-page-register.c:345
-#: gnucash/gnome-utils/gnc-main-window.c:333
+#: gnucash/gnome-utils/gnc-main-window.c:334
msgid "_Sort By..."
msgstr "_Razvrstaj prema …"
@@ -5033,17 +5108,17 @@ msgstr "Poveži URL-adresu"
msgid "Open File/Location"
msgstr "Otvori datoteku/stazu"
-#: gnucash/gnome/gnc-plugin-page-register.c:711
+#: gnucash/gnome/gnc-plugin-page-register.c:685
msgid ""
-"You have tried to open an account in the old register while it is open in the "
-"new register."
+"You have tried to open an account in the old register while it is open in "
+"the new register."
msgstr "Pokušavaš otvoriti konto u starom registru, dok je on otvoren u novom."
-#: gnucash/gnome/gnc-plugin-page-register.c:3114
+#: gnucash/gnome/gnc-plugin-page-register.c:3086
msgid "Filter By:"
msgstr "Filtriraj:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3128
+#: gnucash/gnome/gnc-plugin-page-register.c:3100
#: gnucash/gtkbuilder/assistant-loan.glade:161
#: gnucash/gtkbuilder/assistant-loan.glade:1248
#: gnucash/gtkbuilder/dialog-sx.glade:257
@@ -5052,33 +5127,33 @@ msgstr "Filtriraj:"
msgid "Start Date:"
msgstr "Datum poÄetka:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3134
+#: gnucash/gnome/gnc-plugin-page-register.c:3106
msgid "Show previous number of days:"
msgstr "Prikaži prethodni broj dana:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3140
+#: gnucash/gnome/gnc-plugin-page-register.c:3112
#: gnucash/gtkbuilder/assistant-loan.glade:1260
#: gnucash/gtkbuilder/dialog-sx.glade:329
msgid "End Date:"
msgstr "Datum završetka:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3150
+#: gnucash/gnome/gnc-plugin-page-register.c:3122
#: gnucash/report/standard-reports/transaction.scm:167
#: gnucash/report/standard-reports/transaction.scm:358
msgid "Unreconciled"
msgstr "Neusklađeno"
-#: gnucash/gnome/gnc-plugin-page-register.c:3151
-#: gnucash/gnome-search/search-reconciled.c:246
-#: gnucash/gnome-utils/gnc-tree-view-account.c:832
+#: gnucash/gnome/gnc-plugin-page-register.c:3123
+#: gnucash/gnome-search/search-reconciled.c:218
+#: gnucash/gnome-utils/gnc-tree-view-account.c:804
#: gnucash/report/standard-reports/transaction.scm:166
#: gnucash/report/standard-reports/transaction.scm:364
msgid "Cleared"
msgstr "Potvrđeno"
-#: gnucash/gnome/gnc-plugin-page-register.c:3152
-#: gnucash/gnome-search/search-reconciled.c:249
-#: gnucash/gnome-utils/gnc-tree-view-account.c:846
+#: gnucash/gnome/gnc-plugin-page-register.c:3124
+#: gnucash/gnome-search/search-reconciled.c:221
+#: gnucash/gnome-utils/gnc-tree-view-account.c:818
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:64
#: gnucash/import-export/import-match-picker.c:437
#: gnucash/report/standard-reports/transaction.scm:165
@@ -5086,52 +5161,54 @@ msgstr "Potvrđeno"
msgid "Reconciled"
msgstr "Usklađeno"
-#: gnucash/gnome/gnc-plugin-page-register.c:3153
-#: gnucash/gnome-search/search-reconciled.c:252
+#: gnucash/gnome/gnc-plugin-page-register.c:3125
+#: gnucash/gnome-search/search-reconciled.c:224
#: gnucash/report/standard-reports/transaction.scm:168
msgid "Frozen"
msgstr "Zamrznuto"
-#: gnucash/gnome/gnc-plugin-page-register.c:3154
-#: gnucash/gnome-search/search-reconciled.c:255
+#: gnucash/gnome/gnc-plugin-page-register.c:3126
+#: gnucash/gnome-search/search-reconciled.c:227
#: gnucash/report/standard-reports/transaction.scm:169
msgid "Voided"
msgstr "Stornirano"
-#: gnucash/gnome/gnc-plugin-page-register.c:3157
-#: gnucash/gnome/gnc-plugin-page-register.c:3159
+#: gnucash/gnome/gnc-plugin-page-register.c:3129
+#: gnucash/gnome/gnc-plugin-page-register.c:3131
msgid "Hide:"
msgstr "Sakrij:"
-#: gnucash/gnome/gnc-plugin-page-register.c:3159
+#: gnucash/gnome/gnc-plugin-page-register.c:3131
msgid "Show:"
msgstr "Prikaži:"
#. Define the strings here to avoid typos and make changes easier.
-#: gnucash/gnome/gnc-plugin-page-register.c:3242
-#: gnucash/gnome/gnc-plugin-page-register.c:3260
+#: gnucash/gnome/gnc-plugin-page-register.c:3214
+#: gnucash/gnome/gnc-plugin-page-register.c:3232
#: gnucash/report/standard-reports/transaction.scm:55
msgid "Transaction Report"
msgstr "Izvještaj o transakcijama"
-#: gnucash/gnome/gnc-plugin-page-register.c:3656 gnucash/gnome/gnc-split-reg.c:931
+#: gnucash/gnome/gnc-plugin-page-register.c:3628
+#: gnucash/gnome/gnc-split-reg.c:933
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:68
#, c-format
msgid "This transaction is marked read-only with the comment: '%s'"
msgstr "Ova je transakcija obilježena samo-za-Äitanje, s napomenom: „%s“"
-#: gnucash/gnome/gnc-plugin-page-register.c:3729 gnucash/gnome/gnc-split-reg.c:902
+#: gnucash/gnome/gnc-plugin-page-register.c:3701
+#: gnucash/gnome/gnc-split-reg.c:904
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1121
msgid "A reversing entry has already been created for this transaction."
msgstr "Obratni unos je već napravljen za ovu transakciju."
#. Translations: The %s is the name of the plugin page
-#: gnucash/gnome/gnc-plugin-page-register.c:3807
+#: gnucash/gnome/gnc-plugin-page-register.c:3779
#, c-format
msgid "Sort %s by..."
msgstr "Razvrstaj „%s“ prema …"
-#: gnucash/gnome/gnc-plugin-page-register.c:4515
+#: gnucash/gnome/gnc-plugin-page-register.c:4487
#, c-format
msgid "Checking splits in current register: %u of %u"
msgstr "Provjera stavaka u trenutaÄnom registru: %u od %u"
@@ -5178,12 +5255,12 @@ msgstr "Uredi odabranu terminiranu transakciju 2"
msgid "Delete the selected scheduled transaction"
msgstr "Izbriši odabranu terminiranu transakciju"
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:429
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:398
#, c-format
msgid "Transactions"
msgstr "Transakcije"
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:492
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:461
#, c-format
msgid "Upcoming Transactions"
msgstr "Nadolazeće transakcije"
@@ -5192,11 +5269,12 @@ msgstr "Nadolazeće transakcije"
#. multiple SXs be deleted as well? Ideally, the number of
#. to-be-deleted SXs should be mentioned here; see
#. dialog-sx-since-last-run.c:807
-#: gnucash/gnome/gnc-plugin-page-sx-list.c:836
+#: gnucash/gnome/gnc-plugin-page-sx-list.c:805
msgid "Do you really want to delete this scheduled transaction?"
msgstr "Stvarno želiš izbrisati ovu terminiranu transakciju?"
-#: gnucash/gnome/gnc-plugin-register2.c:57 gnucash/gnome/gnc-plugin-register.c:58
+#: gnucash/gnome/gnc-plugin-register2.c:57
+#: gnucash/gnome/gnc-plugin-register.c:58
msgid "_General Journal"
msgstr "_Opći dnevnik"
@@ -5204,7 +5282,8 @@ msgstr "_Opći dnevnik"
msgid "Open a general journal window"
msgstr "Otvori jedan prozor općeg dnevnika"
-#: gnucash/gnome/gnc-plugin-register2.c:66 gnucash/gnome/gnc-plugin-register2.c:67
+#: gnucash/gnome/gnc-plugin-register2.c:66
+#: gnucash/gnome/gnc-plugin-register2.c:67
msgid "Register2 Open GL Account"
msgstr "Registar2 otvoreni GL konto"
@@ -5220,35 +5299,35 @@ msgstr "Otvori prozor općeg dnevnika u starom stilu"
msgid "Open general journal window"
msgstr "Otvori prozor općeg dnevnika"
-#: gnucash/gnome/gnc-split-reg2.c:632 gnucash/gnome/gnc-split-reg.c:1721
+#: gnucash/gnome/gnc-split-reg2.c:632 gnucash/gnome/gnc-split-reg.c:1817
msgid "Balancing entry from reconciliation"
msgstr "Saldirani unos iz usklađivanja"
-#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2195
+#: gnucash/gnome/gnc-split-reg2.c:802 gnucash/gnome/gnc-split-reg.c:2291
msgid "Present:"
msgstr "TrenutaÄno:"
-#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2196
+#: gnucash/gnome/gnc-split-reg2.c:803 gnucash/gnome/gnc-split-reg.c:2292
msgid "Future:"
msgstr "Buduće:"
-#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2197
+#: gnucash/gnome/gnc-split-reg2.c:804 gnucash/gnome/gnc-split-reg.c:2293
msgid "Cleared:"
msgstr "Potvrđeno:"
-#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2198
+#: gnucash/gnome/gnc-split-reg2.c:805 gnucash/gnome/gnc-split-reg.c:2294
msgid "Reconciled:"
msgstr "Usklađeno:"
-#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2199
+#: gnucash/gnome/gnc-split-reg2.c:806 gnucash/gnome/gnc-split-reg.c:2295
msgid "Projected Minimum:"
msgstr "Projicirani minimum:"
-#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2203
+#: gnucash/gnome/gnc-split-reg2.c:810 gnucash/gnome/gnc-split-reg.c:2299
msgid "Shares:"
msgstr "Dionice:"
-#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2204
+#: gnucash/gnome/gnc-split-reg2.c:811 gnucash/gnome/gnc-split-reg.c:2300
msgid "Current Value:"
msgstr "TrenutaÄna vrijednost:"
@@ -5258,104 +5337,105 @@ msgstr "Registar konta dugovanja/potraživanja"
#: gnucash/gnome/gnc-split-reg2.c:888
msgid ""
-"The register displayed is for Account Payable or Account Receivable. Changing "
-"the entries may cause harm, please use the business options to change the "
-"entries."
+"The register displayed is for Account Payable or Account Receivable. "
+"Changing the entries may cause harm, please use the business options to "
+"change the entries."
msgstr ""
-"Prikazani registar je za konto dugovanja ili konto potraživanja. Promjena stavke "
-"može izazvati štetu. Koristi opcije za poduzeća, za promjenu unosa."
+"Prikazani registar je za konto dugovanja ili konto potraživanja. Promjena "
+"stavke može izazvati štetu. Koristi opcije za poduzeća, za promjenu unosa."
-#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2286
+#: gnucash/gnome/gnc-split-reg2.c:937 gnucash/gnome/gnc-split-reg.c:2382
msgid "This account register is read-only."
msgstr "Ovaj je registar konta samo-za-Äitanje."
-#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2329
+#: gnucash/gnome/gnc-split-reg2.c:980 gnucash/gnome/gnc-split-reg.c:2425
msgid ""
"This account may not be edited. If you want to edit transactions in this "
-"register, please open the account options and turn off the placeholder checkbox."
+"register, please open the account options and turn off the placeholder "
+"checkbox."
msgstr ""
-"Ovaj se konto ne može uređivati. Ako želiš urediti transakcije u ovom registru, "
-"otvori opcije konta i iskljuÄi potvrdu za rezervirano."
+"Ovaj se konto ne može uređivati. Ako želiš urediti transakcije u ovom "
+"registru, otvori opcije konta i iskljuÄi potvrdu za rezervirano."
-#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2336
+#: gnucash/gnome/gnc-split-reg2.c:987 gnucash/gnome/gnc-split-reg.c:2432
msgid ""
"One of the sub-accounts selected may not be edited. If you want to edit "
-"transactions in this register, please open the sub-account options and turn off "
-"the placeholder checkbox. You may also open an individual account instead of a "
-"set of accounts."
+"transactions in this register, please open the sub-account options and turn "
+"off the placeholder checkbox. You may also open an individual account "
+"instead of a set of accounts."
msgstr ""
-"Jedan od odabranih podkonta se ne može urediti. Ako želiš urediti transakcije u "
-"ovom registru, otvori opcije podkonta i iskljuÄi potvrdu za rezervirano. TakoÄ‘er "
-"možeš otvoriti jedan konto, umjesto skupine konta."
+"Jedan od odabranih podkonta se ne može urediti. Ako želiš urediti "
+"transakcije u ovom registru, otvori opcije podkonta i iskljuÄi potvrdu za "
+"rezervirano. Također možeš otvoriti jedan konto, umjesto skupine konta."
-#: gnucash/gnome/gnc-split-reg.c:597
+#: gnucash/gnome/gnc-split-reg.c:599
msgid "Standard Order"
msgstr "Standardni redoslijed"
-#: gnucash/gnome/gnc-split-reg.c:603
+#: gnucash/gnome/gnc-split-reg.c:605
msgid "Date of Entry"
msgstr "Datum unosa"
-#: gnucash/gnome/gnc-split-reg.c:606
+#: gnucash/gnome/gnc-split-reg.c:608
msgid "Statement Date"
msgstr "Datum stanja"
-#: gnucash/gnome/gnc-split-reg.c:629
-#: gnucash/report/business-reports/customer-summary.scm:471
+#: gnucash/gnome/gnc-split-reg.c:631
+#: gnucash/report/business-reports/customer-summary.scm:170
#: gnucash/report/standard-reports/transaction.scm:381
msgid "Descending"
msgstr "Silazno"
-#: gnucash/gnome/gnc-split-reg.c:631
-#: gnucash/report/business-reports/customer-summary.scm:468
+#: gnucash/gnome/gnc-split-reg.c:633
+#: gnucash/report/business-reports/customer-summary.scm:167
#: gnucash/report/standard-reports/transaction.scm:378
msgid "Ascending"
msgstr "Uzlazno"
-#: gnucash/gnome/gnc-split-reg.c:657
+#: gnucash/gnome/gnc-split-reg.c:659
msgid "Filtered"
msgstr "Filtrirano"
-#: gnucash/gnome/gnc-split-reg.c:929
+#: gnucash/gnome/gnc-split-reg.c:931
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:66
msgid "Cannot modify or delete this transaction."
msgstr "Nije moguće promijeniti ili izbrisati ovu transakciju."
-#: gnucash/gnome/gnc-split-reg.c:943
+#: gnucash/gnome/gnc-split-reg.c:945
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:83
msgid ""
-"The date of this transaction is older than the \"Read-Only Threshold\" set for "
-"this book. This setting can be changed in File -> Properties -> Accounts."
+"The date of this transaction is older than the \"Read-Only Threshold\" set "
+"for this book. This setting can be changed in File -> Properties -> Accounts."
msgstr ""
-"Datum ove transakcije je stariji od „Prag samo-za-Äitanje“ postavljenog za ovu "
-"knjigu. Možeš izmijeniti ovo podešavanje u izborniku „Datoteka → Svojstva → "
-"Konti“."
+"Datum ove transakcije je stariji od „Prag samo-za-Äitanje“ postavljenog za "
+"ovu knjigu. Možeš izmijeniti ovo podešavanje u izborniku „Datoteka → "
+"Svojstva → Konti“."
-#: gnucash/gnome/gnc-split-reg.c:979
+#: gnucash/gnome/gnc-split-reg.c:981
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:840
msgid "Remove the splits from this transaction?"
msgstr "Ukloniti stavke iz ove transakcije?"
-#: gnucash/gnome/gnc-split-reg.c:980
+#: gnucash/gnome/gnc-split-reg.c:982
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:841
msgid ""
"This transaction contains reconciled splits. Modifying it is not a good idea "
"because that will cause your reconciled balance to be off."
msgstr ""
-"Ova transakcija sadrži usklađene stavke. To baš i nije dobra ideja, jer će na "
-"taj naÄin tvoj usklaÄ‘eni saldo postati neusklaÄ‘en."
+"Ova transakcija sadrži usklađene stavke. To baš i nije dobra ideja, jer će "
+"na taj naÄin tvoj usklaÄ‘eni saldo postati neusklaÄ‘en."
#. Translators: This is the confirmation button in a warning dialog
-#: gnucash/gnome/gnc-split-reg.c:1009
+#: gnucash/gnome/gnc-split-reg.c:1011
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:887
msgid "_Remove Splits"
msgstr "_Ukloni stavke"
-#: gnucash/gnome/gnc-split-reg.c:1046
+#: gnucash/gnome/gnc-split-reg.c:1048
msgid "Associate File with Transaction"
msgstr "Poveži datoteku s transakcijom"
-#: gnucash/gnome/gnc-split-reg.c:1049 gnucash/gnome/gnc-split-reg.c:1120
+#: gnucash/gnome/gnc-split-reg.c:1051 gnucash/gnome/gnc-split-reg.c:1173
#: gnucash/gnome-search/dialog-search.c:693
#: gnucash/gnome-utils/gnc-recurrence.c:552
#: gnucash/gtkbuilder/dialog-commodities.glade:41
@@ -5363,84 +5443,84 @@ msgstr "Poveži datoteku s transakcijom"
msgid "_Remove"
msgstr "_Ukloni"
-#: gnucash/gnome/gnc-split-reg.c:1076
-msgid "Existing Association is "
-msgstr "Postojeća poveznica je "
+#: gnucash/gnome/gnc-split-reg.c:1086
+msgid "Existing Association is '"
+msgstr "Postojeća veza je „"
-#: gnucash/gnome/gnc-split-reg.c:1117
+#: gnucash/gnome/gnc-split-reg.c:1170
msgid "Associate Location with Transaction"
msgstr "Poveži URL-adresu s transakcijom"
-#: gnucash/gnome/gnc-split-reg.c:1135
+#: gnucash/gnome/gnc-split-reg.c:1194
msgid "Amend URL:"
msgstr "Nadodaj URL:"
-#: gnucash/gnome/gnc-split-reg.c:1139
-msgid "Enter URL:"
-msgstr "Unesi URL:"
+#: gnucash/gnome/gnc-split-reg.c:1198
+msgid "Enter URL like http://www.gnucash.org:"
+msgstr "Unesi URL, npr. http://www.gnucash.org:"
-#: gnucash/gnome/gnc-split-reg.c:1253
+#: gnucash/gnome/gnc-split-reg.c:1344
msgid "This transaction is not associated with a URI."
msgstr "Ova transakcija nije povezana s URI adresom."
-#: gnucash/gnome/gnc-split-reg.c:1332
+#: gnucash/gnome/gnc-split-reg.c:1428
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:963
#, c-format
msgid "Delete the split '%s' from the transaction '%s'?"
msgstr "Izbrisati stavku „%s“ iz transakcije „%s“?"
-#: gnucash/gnome/gnc-split-reg.c:1333
+#: gnucash/gnome/gnc-split-reg.c:1429
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:964
msgid ""
"You would be deleting a reconciled split! This is not a good idea as it will "
"cause your reconciled balance to be off."
msgstr ""
-"Izbrisat ćeÅ¡ usklaÄ‘enu stavku! To baÅ¡ i nije dobra ideja, jer će na taj naÄin "
-"tvoj usklađeni saldo postati neusklađen."
+"Izbrisat ćeš usklađenu stavku! To baš i nije dobra ideja, jer će na taj "
+"naÄin tvoj usklaÄ‘eni saldo postati neusklaÄ‘en."
-#: gnucash/gnome/gnc-split-reg.c:1336
+#: gnucash/gnome/gnc-split-reg.c:1432
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:967
msgid "You cannot delete this split."
msgstr "Ne možeš izbrisati ovu stavku."
-#: gnucash/gnome/gnc-split-reg.c:1337
+#: gnucash/gnome/gnc-split-reg.c:1433
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:968
msgid ""
-"This is the split anchoring this transaction to the register. You may not delete "
-"it from this register window. You may delete the entire transaction from this "
-"window, or you may navigate to a register that shows another side of this same "
-"transaction and delete the split from that register."
+"This is the split anchoring this transaction to the register. You may not "
+"delete it from this register window. You may delete the entire transaction "
+"from this window, or you may navigate to a register that shows another side "
+"of this same transaction and delete the split from that register."
msgstr ""
-"Ovo je stavka, koja spaja ovu transakciju u registar. Ne možeš je izbrisati iz "
-"ovog prozora registra. MožeÅ¡ izbrisati Äitavu transakciju iz ovog prozora, ili "
-"možeš ići do registra, koji pokazuje drugu stranu ove iste transakcije i "
-"izbrisati stavku iz tog registra."
+"Ovo je stavka, koja spaja ovu transakciju u registar. Ne možeš je izbrisati "
+"iz ovog prozora registra. MožeÅ¡ izbrisati Äitavu transakciju iz ovog "
+"prozora, ili možeš ići do registra, koji pokazuje drugu stranu ove iste "
+"transakcije i izbrisati stavku iz tog registra."
-#: gnucash/gnome/gnc-split-reg.c:1365
+#: gnucash/gnome/gnc-split-reg.c:1461
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:996
msgid "(no memo)"
msgstr "(bez zabilješke)"
-#: gnucash/gnome/gnc-split-reg.c:1368
+#: gnucash/gnome/gnc-split-reg.c:1464
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:999
msgid "(no description)"
msgstr "(bez opisa)"
-#: gnucash/gnome/gnc-split-reg.c:1409
+#: gnucash/gnome/gnc-split-reg.c:1505
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1040
msgid "Delete the current transaction?"
msgstr "Izbrisati trenutaÄnu transakciju?"
-#: gnucash/gnome/gnc-split-reg.c:1410
+#: gnucash/gnome/gnc-split-reg.c:1506
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1041
msgid ""
-"You would be deleting a transaction with reconciled splits! This is not a good "
-"idea as it will cause your reconciled balance to be off."
+"You would be deleting a transaction with reconciled splits! This is not a "
+"good idea as it will cause your reconciled balance to be off."
msgstr ""
-"Izbrisat ćeš transakciju s usklađenim stavkama! To baš i nije dobra ideja, jer "
-"će na taj naÄin tvoj usklaÄ‘eni saldo postati neusklaÄ‘en."
+"Izbrisat ćeš transakciju s usklađenim stavkama! To baš i nije dobra ideja, "
+"jer će na taj naÄin tvoj usklaÄ‘eni saldo postati neusklaÄ‘en."
-#: gnucash/gnome/gnc-split-reg.c:2210
+#: gnucash/gnome/gnc-split-reg.c:2306
msgid "Sort By: "
msgstr "Razvrstaj prema: "
@@ -5453,21 +5533,24 @@ msgid "Manage your finances, accounts, and investments"
msgstr "Upravljaj tvojim novÄanim sredstvima, kontima i ulaganjima"
#: gnucash/gnome/gnucash.appdata.xml.in:10
-msgid "GnuCash is a program for personal and small-business financial-accounting."
+msgid ""
+"GnuCash is a program for personal and small-business financial-accounting."
msgstr ""
-"GnuCash je raÄunovodstveni program, namijenjen pojedincima i malim poduzećima."
+"GnuCash je raÄunovodstveni program, namijenjen pojedincima i malim "
+"poduzećima."
#: gnucash/gnome/gnucash.appdata.xml.in:13
msgid ""
"Designed to be easy to use, yet powerful and flexible, GnuCash allows you to "
-"track bank accounts, stocks, income and expenses. As quick and intuitive to use "
-"as a checkbook register, it is based on professional accounting principles like "
-"double-entry accounting to ensure balanced books and accurate reports."
+"track bank accounts, stocks, income and expenses. As quick and intuitive to "
+"use as a checkbook register, it is based on professional accounting "
+"principles like double-entry accounting to ensure balanced books and "
+"accurate reports."
msgstr ""
"Osmišljen da bude jednostavan u upotrebi, istovremeno moćan i prilagodljiv, "
"GnuCash ti omogućava praćenje bankovnih raÄuna, dionica, prihoda i rashoda. "
-"GnuCash se zasniva na profesionalnim raÄunovodstvenim naÄelima kao Å¡to je dvojno "
-"knjigovodstvo, te osigurava bilancirane knjige i toÄne izvjeÅ¡taje."
+"GnuCash se zasniva na profesionalnim raÄunovodstvenim naÄelima kao Å¡to je "
+"dvojno knjigovodstvo, te osigurava bilancirane knjige i toÄne izvjeÅ¡taje."
#: gnucash/gnome/gnucash.appdata.xml.in:17
msgid "With GnuCash you can (but are not limited to):"
@@ -5480,7 +5563,8 @@ msgstr "Prati tvoje dnevne prihode i rashode"
#: gnucash/gnome/gnucash.appdata.xml.in:20
msgid "Manage your stock, bond and mutual fund accounts with ease"
msgstr ""
-"Upravljaj s lakoćom tvojim kontima dionica, obveznica i investicijskih fondova"
+"Upravljaj s lakoćom tvojim kontima dionica, obveznica i investicijskih "
+"fondova"
#: gnucash/gnome/gnucash.appdata.xml.in:21
msgid "Keep your small business' accounting up to date"
@@ -5488,15 +5572,20 @@ msgstr "Održi raÄunovodstvo tvojeg malog poduzeća aktualnim"
#: gnucash/gnome/gnucash.appdata.xml.in:22
msgid "Create accurate reports and graphs from your financial data"
-msgstr "Stvori toÄne izvjeÅ¡taje i dijagrame pomoću tvojih financijskih podataka"
+msgstr ""
+"Stvori toÄne izvjeÅ¡taje i dijagrame pomoću tvojih financijskih podataka"
#: gnucash/gnome/gnucash.appdata.xml.in:23
msgid "Set up scheduled transactions to avoid repeated data entry"
msgstr "Postavi terminirane transakcije i izbjegni višestruko unositi datume"
#: gnucash/gnome/gnucash.appdata.xml.in:24
-msgid "QIF/OFX/HBCI Import, Transaction Matching"
-msgstr "QIF/OFX/HBCI uvoz, uspoređivanje transakcija"
+msgid ""
+"Exchange by CSV/FinTS(former HBCI) or import SWIFT-MT9xx/QIF/OFX data "
+"including Transaction Matching"
+msgstr ""
+"Razmjenjuj pomoću CSV/FinTS (prijašnji HBCI) ili uvozi SWIFT-MT9xx/QIF/OFX "
+"podatke, ukljuÄujući usporeÄ‘ivanje transakcija"
#: gnucash/gnome/gnucash.appdata.xml.in:25
msgid "Perform financial calculations, such as a loan repayment"
@@ -5518,15 +5607,15 @@ msgstr "gnucash-icon"
#. leave the rest ("Reconciled:") as is.
#: gnucash/gnome/reconcile-view.c:425
#: gnucash/register/ledger-core/split-register-layout.c:699
-#: gnucash/register/ledger-core/split-register-model.c:304
+#: gnucash/register/ledger-core/split-register-model.c:306
msgid "Reconciled:R"
msgstr "Reconciled:Uskl"
-#: gnucash/gnome/search-owner.c:166
+#: gnucash/gnome/search-owner.c:138
msgid "You have not selected an owner"
msgstr "Vlasnik nije odabran"
-#: gnucash/gnome/search-owner.c:244 gnucash/gnome-search/dialog-search.c:1074
+#: gnucash/gnome/search-owner.c:216 gnucash/gnome-search/dialog-search.c:1074
#: gnucash/gtkbuilder/dialog-invoice.glade:304
#: gnucash/gtkbuilder/dialog-invoice.glade:987
#: gnucash/gtkbuilder/dialog-invoice.glade:1157
@@ -5535,11 +5624,13 @@ msgstr "Vlasnik nije odabran"
msgid "Job"
msgstr "Nalog"
-#: gnucash/gnome/search-owner.c:261 gnucash/gnome-search/search-reconciled.c:205
+#: gnucash/gnome/search-owner.c:233
+#: gnucash/gnome-search/search-reconciled.c:177
msgid "is"
msgstr "je"
-#: gnucash/gnome/search-owner.c:262 gnucash/gnome-search/search-reconciled.c:206
+#: gnucash/gnome/search-owner.c:234
+#: gnucash/gnome-search/search-reconciled.c:178
msgid "is not"
msgstr "nije"
@@ -5564,7 +5655,7 @@ msgid "No such price: %s"
msgstr "Nema takve cijene: %s"
#. Business options
-#: gnucash/gnome/top-level.c:429 libgnucash/app-utils/app-utils.scm:305
+#: gnucash/gnome/top-level.c:429 libgnucash/app-utils/app-utils.scm:292
msgid "Business"
msgstr "Poduzeće"
@@ -5667,7 +5758,8 @@ msgstr "Razlika:"
#: gnucash/gnome/window-reconcile2.c:1958 gnucash/gnome/window-reconcile.c:2042
msgid ""
-"You have made changes to this reconcile window. Are you sure you want to cancel?"
+"You have made changes to this reconcile window. Are you sure you want to "
+"cancel?"
msgstr ""
"UÄinjene su promjene u ovom prozoru za usklaÄ‘ivanje. Zaista želiÅ¡ odustati?"
@@ -5689,9 +5781,10 @@ msgid "_Account"
msgstr "_Konto"
#. Add the help button for the matcher
-#: gnucash/gnome/window-reconcile2.c:2174 gnucash/gnome/window-reconcile2.c:2255
-#: gnucash/gnome/window-reconcile.c:2258 gnucash/gnome/window-reconcile.c:2339
-#: gnucash/gnome-utils/gnc-main-window.c:273
+#: gnucash/gnome/window-reconcile2.c:2174
+#: gnucash/gnome/window-reconcile2.c:2255 gnucash/gnome/window-reconcile.c:2258
+#: gnucash/gnome/window-reconcile.c:2339
+#: gnucash/gnome-utils/gnc-main-window.c:274
#: gnucash/gtkbuilder/dialog-account.glade:940
#: gnucash/gtkbuilder/dialog-bi-import-gui.glade:23
#: gnucash/gtkbuilder/dialog-book-close.glade:23
@@ -5708,9 +5801,10 @@ msgstr "_Konto"
#: gnucash/gtkbuilder/dialog-order.glade:546
#: gnucash/gtkbuilder/dialog-preferences.glade:120
#: gnucash/gtkbuilder/dialog-print-check.glade:297
-#: gnucash/gtkbuilder/dialog-search.glade:21 gnucash/gtkbuilder/dialog-sx.glade:766
+#: gnucash/gtkbuilder/dialog-search.glade:21
+#: gnucash/gtkbuilder/dialog-sx.glade:766
#: gnucash/gtkbuilder/dialog-vendor.glade:47
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2036
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2049
msgid "_Help"
msgstr "Po_moć"
@@ -5722,7 +5816,8 @@ msgstr "_Informacije o usklađivanju …"
msgid ""
"Change the reconcile information including statement date and ending balance."
msgstr ""
-"Promijeni informacije o usklaÄ‘ivanju, ukljuÄujući datum stanja i zakljuÄni saldo."
+"Promijeni informacije o usklaÄ‘ivanju, ukljuÄujući datum stanja i zakljuÄni "
+"saldo."
#: gnucash/gnome/window-reconcile2.c:2185 gnucash/gnome/window-reconcile.c:2269
msgid "_Finish"
@@ -5762,7 +5857,7 @@ msgstr "Unesi glavni konto za ovaj registar"
#. Actions menu
#: gnucash/gnome/window-reconcile2.c:2218 gnucash/gnome/window-reconcile.c:2302
-#: gnucash/gnome-utils/gnc-main-window.c:348
+#: gnucash/gnome-utils/gnc-main-window.c:349
msgid "_Check & Repair"
msgstr "_Provjeri i popravi"
@@ -5831,8 +5926,8 @@ msgstr "Nova podjela"
#. Translators: This string has a disambiguation prefix. Translate only the part behind '|'
#: gnucash/gnome-search/dialog-search.c:1098
msgid ""
-"Item represents an unknown object type (in the sense of bill, customer, invoice, "
-"transaction, split,...)|New item"
+"Item represents an unknown object type (in the sense of bill, customer, "
+"invoice, transaction, split,...)|New item"
msgstr "Nova stavka"
#. Set the 'add criterion' button
@@ -5851,141 +5946,147 @@ msgstr "zadovoljeni su svi kriteriji"
msgid "any criteria are met"
msgstr "zadovoljen je bilo koji kriterij"
-#: gnucash/gnome-search/search-account.c:180
+#: gnucash/gnome-search/search-account.c:151
msgid "You have not selected any accounts"
msgstr "Nijedan konto nije odabran"
-#: gnucash/gnome-search/search-account.c:201
+#: gnucash/gnome-search/search-account.c:172
msgid "matches all accounts"
msgstr "poklapa se sa svim kontima"
-#: gnucash/gnome-search/search-account.c:206
+#: gnucash/gnome-search/search-account.c:177
msgid "matches any account"
msgstr "poklapa se s bilo kojim kontom"
-#: gnucash/gnome-search/search-account.c:207
+#: gnucash/gnome-search/search-account.c:178
msgid "matches no accounts"
msgstr "ne poklapa se s nijednim kontom"
-#: gnucash/gnome-search/search-account.c:224
-#: gnucash/report/standard-reports/cash-flow.scm:259
+#: gnucash/gnome-search/search-account.c:195
+#: gnucash/report/standard-reports/cash-flow.scm:263
msgid "Selected Accounts"
msgstr "Odabrani konti"
-#: gnucash/gnome-search/search-account.c:225
+#: gnucash/gnome-search/search-account.c:196
msgid "Choose Accounts"
msgstr "Odaberi konta"
#. Create the label
-#: gnucash/gnome-search/search-account.c:259
+#: gnucash/gnome-search/search-account.c:230
msgid "Select Accounts to Match"
msgstr "Odaberi konta za poklapanje"
-#: gnucash/gnome-search/search-account.c:263
+#: gnucash/gnome-search/search-account.c:234
msgid "Select the Accounts to Compare"
msgstr "Odaberi konta za uspoređivanje"
-#: gnucash/gnome-search/search-date.c:224
+#: gnucash/gnome-search/search-date.c:196
msgid "is before"
msgstr "je prije"
-#: gnucash/gnome-search/search-date.c:225
+#: gnucash/gnome-search/search-date.c:197
msgid "is before or on"
msgstr "je prije ili na"
-#: gnucash/gnome-search/search-date.c:226
+#: gnucash/gnome-search/search-date.c:198
msgid "is on"
msgstr "je na"
-#: gnucash/gnome-search/search-date.c:227
+#: gnucash/gnome-search/search-date.c:199
msgid "is not on"
msgstr "nije na"
-#: gnucash/gnome-search/search-date.c:228
+#: gnucash/gnome-search/search-date.c:200
msgid "is after"
msgstr "je nakon"
-#: gnucash/gnome-search/search-date.c:229
+#: gnucash/gnome-search/search-date.c:201
msgid "is on or after"
msgstr "je na ili nakon"
-#: gnucash/gnome-search/search-double.c:203 gnucash/gnome-search/search-int64.c:205
-#: gnucash/gnome-search/search-numeric.c:236
+#: gnucash/gnome-search/search-double.c:175
+#: gnucash/gnome-search/search-int64.c:177
+#: gnucash/gnome-search/search-numeric.c:208
msgid "is less than"
msgstr "je manje od"
-#: gnucash/gnome-search/search-double.c:204 gnucash/gnome-search/search-int64.c:206
-#: gnucash/gnome-search/search-numeric.c:240
+#: gnucash/gnome-search/search-double.c:176
+#: gnucash/gnome-search/search-int64.c:178
+#: gnucash/gnome-search/search-numeric.c:212
msgid "is less than or equal to"
msgstr "je manje od ili jednako sa"
-#: gnucash/gnome-search/search-double.c:205 gnucash/gnome-search/search-int64.c:207
-#: gnucash/gnome-search/search-numeric.c:243
-#: gnucash/gnome-search/search-string.c:271
+#: gnucash/gnome-search/search-double.c:177
+#: gnucash/gnome-search/search-int64.c:179
+#: gnucash/gnome-search/search-numeric.c:215
+#: gnucash/gnome-search/search-string.c:243
msgid "equals"
msgstr "jednako"
-#: gnucash/gnome-search/search-double.c:206 gnucash/gnome-search/search-int64.c:208
-#: gnucash/gnome-search/search-numeric.c:246
+#: gnucash/gnome-search/search-double.c:178
+#: gnucash/gnome-search/search-int64.c:180
+#: gnucash/gnome-search/search-numeric.c:218
msgid "does not equal"
msgstr "nije jednako"
-#: gnucash/gnome-search/search-double.c:207 gnucash/gnome-search/search-int64.c:209
-#: gnucash/gnome-search/search-numeric.c:249
+#: gnucash/gnome-search/search-double.c:179
+#: gnucash/gnome-search/search-int64.c:181
+#: gnucash/gnome-search/search-numeric.c:221
msgid "is greater than"
msgstr "je veće od"
-#: gnucash/gnome-search/search-double.c:208 gnucash/gnome-search/search-int64.c:210
-#: gnucash/gnome-search/search-numeric.c:253
+#: gnucash/gnome-search/search-double.c:180
+#: gnucash/gnome-search/search-int64.c:182
+#: gnucash/gnome-search/search-numeric.c:225
msgid "is greater than or equal to"
msgstr "je veće od ili jednako sa"
-#: gnucash/gnome-search/search-numeric.c:236
+#: gnucash/gnome-search/search-numeric.c:208
msgid "less than"
msgstr "manje od"
-#: gnucash/gnome-search/search-numeric.c:239
+#: gnucash/gnome-search/search-numeric.c:211
msgid "less than or equal to"
msgstr "manje ili jednako od"
-#: gnucash/gnome-search/search-numeric.c:243
+#: gnucash/gnome-search/search-numeric.c:215
msgid "equal to"
msgstr "jednako sa"
-#: gnucash/gnome-search/search-numeric.c:246
+#: gnucash/gnome-search/search-numeric.c:218
msgid "not equal to"
msgstr "nije jednako"
-#: gnucash/gnome-search/search-numeric.c:249
+#: gnucash/gnome-search/search-numeric.c:221
msgid "greater than"
msgstr "veće od"
-#: gnucash/gnome-search/search-numeric.c:252
+#: gnucash/gnome-search/search-numeric.c:224
msgid "greater than or equal to"
msgstr "veće od ili jednako kao"
-#: gnucash/gnome-search/search-numeric.c:269
+#: gnucash/gnome-search/search-numeric.c:241
msgid "has credits or debits"
msgstr "ima potraživanja ili dugovanja"
-#: gnucash/gnome-search/search-numeric.c:270
+#: gnucash/gnome-search/search-numeric.c:242
msgid "has debits"
msgstr "ima dugovanja"
-#: gnucash/gnome-search/search-numeric.c:271
+#: gnucash/gnome-search/search-numeric.c:243
msgid "has credits"
msgstr "ima potraživanja"
#. Build and connect the toggles
-#: gnucash/gnome-search/search-reconciled.c:243
+#: gnucash/gnome-search/search-reconciled.c:215
msgid "Not Cleared"
msgstr "Nepotvrđeno"
-#: gnucash/gnome-search/search-string.c:197
+#: gnucash/gnome-search/search-string.c:169
msgid "You need to enter some search text."
msgstr "Moraš unijeti neki tekst za pretragu."
-#: gnucash/gnome-search/search-string.c:226
+#: gnucash/gnome-search/search-string.c:198
#: gnucash/import-export/bi-import/dialog-bi-import.c:118
#: gnucash/import-export/csv-imp/csv-account-import.c:113
#: gnucash/import-export/customer-import/dialog-customer-import.c:102
@@ -5997,40 +6098,41 @@ msgstr ""
"Greška u regularnom izrazu „%s“:\n"
"%s"
-#: gnucash/gnome-search/search-string.c:270
+#: gnucash/gnome-search/search-string.c:242
msgid "contains"
msgstr "sadrži"
-#: gnucash/gnome-search/search-string.c:272
+#: gnucash/gnome-search/search-string.c:244
msgid "matches regex"
msgstr "poklapa se s regularnim izrazom"
-#: gnucash/gnome-search/search-string.c:274
+#: gnucash/gnome-search/search-string.c:246
msgid "does not match regex"
msgstr "ne poklapa se s regularnim izrazom"
#. Build and connect the case-sensitive check button; defaults to off
-#: gnucash/gnome-search/search-string.c:350
+#: gnucash/gnome-search/search-string.c:322
msgid "Match case"
msgstr "Usporedi velika/mala slova"
#: gnucash/gnome-utils/assistant-xml-encoding.c:178
msgid ""
"\n"
-"The file you are trying to load is from an older version of GnuCash. The file "
-"format in the older versions was missing the detailed specification of the "
-"character encoding being used. This means the text in your data file could be "
-"read in multiple ambiguous ways. This ambiguity cannot be resolved "
-"automatically, but the new GnuCash 2.0.0 file format will include all necessary "
-"specifications so that you do not have to go through this step again.\n"
+"The file you are trying to load is from an older version of GnuCash. The "
+"file format in the older versions was missing the detailed specification of "
+"the character encoding being used. This means the text in your data file "
+"could be read in multiple ambiguous ways. This ambiguity cannot be resolved "
+"automatically, but the new GnuCash 2.0.0 file format will include all "
+"necessary specifications so that you do not have to go through this step "
+"again.\n"
"\n"
-"GnuCash will try to guess the correct character encoding for your data file. On "
-"the next page GnuCash will show the resulting texts when using this guess. You "
-"have to check whether the words look as expected. Either everything looks fine "
-"and you can simply press 'Forward'. Or the words contain unexpected characters, "
-"in which case you should select different character encodings to see different "
-"results. You may have to edit the list of character encodings by clicking on the "
-"respective button.\n"
+"GnuCash will try to guess the correct character encoding for your data file. "
+"On the next page GnuCash will show the resulting texts when using this "
+"guess. You have to check whether the words look as expected. Either "
+"everything looks fine and you can simply press 'Forward'. Or the words "
+"contain unexpected characters, in which case you should select different "
+"character encodings to see different results. You may have to edit the list "
+"of character encodings by clicking on the respective button.\n"
"\n"
"Press 'Forward' now to select the correct character encoding for your data "
"file.\n"
@@ -6038,17 +6140,19 @@ msgstr ""
"\n"
"Datoteku koju pokuÅ¡avaÅ¡ uÄitati je iz starijeg izdanja GnuCasha. Formatu "
"datoteka stvorenih starijim izdanjima, nedostaje detaljna specifikacija o "
-"koriÅ¡tenom kodiranju slovnih znakova. To znaÄi da tekst u datoteci nije moguće "
-"uÄitati na jednozaÄan naÄin. Ova se dvoznaÄnost ne može rijeÅ¡iti automatski, ali "
-"će novi format datoteka za GnuCash 2.0.0 obuhvatiti sve potrebne specifikacije, "
-"tako da nećeš morati ponovo prolaziti kroz ovaj korak.\n"
+"koriÅ¡tenom kodiranju slovnih znakova. To znaÄi da tekst u datoteci nije "
+"moguće uÄitati na jednozaÄan naÄin. Ova se dvoznaÄnost ne može rijeÅ¡iti "
+"automatski, ali će novi format datoteka za GnuCash 2.0.0 obuhvatiti sve "
+"potrebne specifikacije, tako da nećeš morati ponovo prolaziti kroz ovaj "
+"korak.\n"
"\n"
"GnuCash će pokušati pogoditi ispravno kodiranje slovnih znakova za tvoju "
-"datoteku podataka. Na sljedećoj stranici će vam pokazati rezultirajući tekst, "
-"kad pogaÄ‘a kodiranje. MoraÅ¡ provjeriti ispravnost rijeÄi. Ako sve izgleda kako "
-"treba, jednostavno klikni „Sljedeće“. Ako rijeÄi sadrže neoÄekivane znakove, "
-"moraÅ¡ odabrati druga kodiranja slovnih znakova, za drugaÄije rezultate. Možda "
-"ćeš morati promijeniti popis kodiranja, pritiskom na odgovarajuće gumbe.\n"
+"datoteku podataka. Na sljedećoj stranici će vam pokazati rezultirajući "
+"tekst, kad pogaÄ‘a kodiranje. MoraÅ¡ provjeriti ispravnost rijeÄi. Ako sve "
+"izgleda kako treba, jednostavno klikni „Sljedeće“. Ako rijeÄi sadrže "
+"neoÄekivane znakove, moraÅ¡ odabrati druga kodiranja slovnih znakova, za "
+"drugaÄije rezultate. Možda ćeÅ¡ morati promijeniti popis kodiranja, pritiskom "
+"na odgovarajuće gumbe.\n"
"\n"
"Sad klikni „Sljedeće“, za odabir ispravnog kodiranja za tvoju datoteku "
"podataka.\n"
@@ -6059,9 +6163,9 @@ msgstr "Kodiranje slovnih znakova nije jednoznaÄno"
#: gnucash/gnome-utils/assistant-xml-encoding.c:201
msgid ""
-"The file has been loaded successfully. If you click 'Apply' it will be saved and "
-"reloaded into the main application. That way you will have a working file as "
-"backup in the same directory.\n"
+"The file has been loaded successfully. If you click 'Apply' it will be saved "
+"and reloaded into the main application. That way you will have a working "
+"file as backup in the same directory.\n"
"\n"
"You can also go back and verify your selections by clicking on 'Back'."
msgstr ""
@@ -6146,7 +6250,8 @@ msgstr "KOI8‑U (ukrajinski)"
#: gnucash/gnome-utils/assistant-xml-encoding.c:680
#, c-format
msgid "There are %d unassigned and %d undecodable words. Please add encodings."
-msgstr "Ima (%d) nedodijeljenih i (%d) nedekodirajućih rijeÄi. Dodaj kodiranja."
+msgstr ""
+"Ima (%d) nedodijeljenih i (%d) nedekodirajućih rijeÄi. Dodaj kodiranja."
#: gnucash/gnome-utils/assistant-xml-encoding.c:688
#, c-format
@@ -6240,8 +6345,10 @@ msgstr "Moraš odabrati vrstu konta."
#: gnucash/gnome-utils/dialog-account.c:819
msgid ""
-"The selected account type is incompatible with the one of the selected parent."
-msgstr "Vrsta odabranog konta nije kompatibilna s vrstom odabranog matiÄnog konta."
+"The selected account type is incompatible with the one of the selected "
+"parent."
+msgstr ""
+"Vrsta odabranog konta nije kompatibilna s vrstom odabranog matiÄnog konta."
#: gnucash/gnome-utils/dialog-account.c:831
msgid "You must choose a commodity."
@@ -6253,7 +6360,8 @@ msgstr "MoraÅ¡ unijeti valjan poÄetni saldo ili ga ostavi praznim."
#: gnucash/gnome-utils/dialog-account.c:911
msgid ""
-"You must select a transfer account or choose the opening balances equity account."
+"You must select a transfer account or choose the opening balances equity "
+"account."
msgstr ""
"MoraÅ¡ odabrati konto prijenosa ili odaberi konto kapitala za poÄetni saldo."
@@ -6283,11 +6391,11 @@ msgstr "Novi konto"
#: gnucash/gnome-utils/dialog-account.c:2073
#, c-format
msgid ""
-"Renumber the immediate sub-accounts of %s? This will replace the account code "
-"field of each child account with a newly generated code."
+"Renumber the immediate sub-accounts of %s? This will replace the account "
+"code field of each child account with a newly generated code."
msgstr ""
-"Želiš li ponovo numerirati podređena podkonta od „%s“? Ovime će se promijeniti "
-"polje šifre svakog podređenog konta novostvorenom šifrom."
+"Želiš li ponovo numerirati podređena podkonta od „%s“? Ovime će se "
+"promijeniti polje šifre svakog podređenog konta novostvorenom šifrom."
#: gnucash/gnome-utils/dialog-account.c:2155
#, c-format
@@ -6370,8 +6478,9 @@ msgstr "_Valuta:"
#: gnucash/gnome-utils/dialog-commodity.c:772
#: gnucash/gnome-utils/dialog-options.c:702
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:440
-#: gnucash/gnome-utils/gnc-tree-view-price.c:430 libgnucash/engine/Account.cpp:4100
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:412
+#: gnucash/gnome-utils/gnc-tree-view-price.c:402
+#: libgnucash/engine/Account.cpp:4098
msgid "Currency"
msgstr "Valuta"
@@ -6414,8 +6523,8 @@ msgstr "Ta roba već postoji."
#: gnucash/gnome-utils/dialog-commodity.c:1360
msgid ""
-"You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type\" "
-"for the commodity."
+"You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type"
+"\" for the commodity."
msgstr ""
"Moraš unijeti neprazno „Cjelokupno ime“, „Oznaka/kratica†i „Vrsta“ za robu."
@@ -6428,7 +6537,8 @@ msgstr "Radnja/broj:"
msgid "Open..."
msgstr "Otvori …"
-#: gnucash/gnome-utils/dialog-file-access.c:303 gnucash/gnome-utils/gnc-file.c:101
+#: gnucash/gnome-utils/dialog-file-access.c:303
+#: gnucash/gnome-utils/gnc-file.c:101
#: gnucash/gtkbuilder/dialog-customer-import-gui.glade:112
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:504
msgid "_Open"
@@ -6444,21 +6554,21 @@ msgstr "Spremi kao …"
msgid "_Save As"
msgstr "_Spremi kao"
-#: gnucash/gnome-utils/dialog-file-access.c:318 gnucash/gnome-utils/gnc-file.c:122
-#: gnucash/gnome-utils/gnc-file.c:299
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1124
+#: gnucash/gnome-utils/dialog-file-access.c:318
+#: gnucash/gnome-utils/gnc-file.c:122 gnucash/gnome-utils/gnc-file.c:299
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1096
msgid "Export"
msgstr "Izvezi"
#: gnucash/gnome-utils/dialog-options.c:642
msgid ""
-"Because no accounts have been set up yet, you will need to return to this dialog "
-"(via File->Properties), after account setup, if you want to set a default gain/"
-"loss account."
+"Because no accounts have been set up yet, you will need to return to this "
+"dialog (via File->Properties), after account setup, if you want to set a "
+"default gain/loss account."
msgstr ""
-"Budući da do sad nije postavljen niti jedan konto, morat ćeš se vratiti na ovaj "
-"dijalog (putem Datoteka → Postavke), nakon postavljanja konta, ako želiš "
-"postaviti standardni konto za dobit/gubitak."
+"Budući da do sad nije postavljen niti jedan konto, morat ćeš se vratiti na "
+"ovaj dijalog (putem Datoteka → Postavke), nakon postavljanja konta, ako "
+"želiš postaviti standardni konto za dobit/gubitak."
#: gnucash/gnome-utils/dialog-options.c:686
msgid "Select no account"
@@ -6471,7 +6581,7 @@ msgstr "Nemoj odabrati nijedan konto"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
#: gnucash/gnome-utils/dialog-options.c:722
-#: gnucash/gnome-utils/gnc-tree-view-account.c:936
+#: gnucash/gnome-utils/gnc-tree-view-account.c:908
msgid "Column letter for 'Placeholder'|P"
msgstr "R"
@@ -6489,13 +6599,14 @@ msgstr ""
#: gnucash/gnome-utils/dialog-options.c:858
msgid ""
-"You have selected a placeholder account, which is shown so that child accounts "
-"are displayed, but is invalid. Please select another account. (You can expand "
-"the tree below the placeholder account by clicking on the arrow to the left.)"
+"You have selected a placeholder account, which is shown so that child "
+"accounts are displayed, but is invalid. Please select another account. (You "
+"can expand the tree below the placeholder account by clicking on the arrow "
+"to the left.)"
msgstr ""
-"Odabran je rezervirani konto, koji se pokazuje kako bi se prikazala podređena "
-"konta, ali nije valjan. Odaberi neki drugi konto. (Možeš proširiti stablo ispod "
-"rezerviranog konta pritiskom na strelicu, na lijevoj strani.)"
+"Odabran je rezervirani konto, koji se pokazuje kako bi se prikazala "
+"podređena konta, ali nije valjan. Odaberi neki drugi konto. (Možeš proširiti "
+"stablo ispod rezerviranog konta pritiskom na strelicu, na lijevoj strani.)"
#: gnucash/gnome-utils/dialog-options.c:1294
msgid "Book currency:"
@@ -6578,7 +6689,7 @@ msgid "Page"
msgstr "Stranica"
#: gnucash/gnome-utils/dialog-options.c:2913
-#: gnucash/gnome-utils/dialog-preferences.c:1343
+#: gnucash/gnome-utils/dialog-preferences.c:1352
msgid "Clear"
msgstr "Ukloni"
@@ -6613,12 +6724,12 @@ msgstr "Postotak"
msgid "Income%sSalary%sTaxable"
msgstr "Prihod%sPlaća%sPorez"
-#: gnucash/gnome-utils/dialog-preferences.c:811
+#: gnucash/gnome-utils/dialog-preferences.c:820
msgid "Path does not exist, "
msgstr "Staza ne postoji, "
-#: gnucash/gnome-utils/dialog-preferences.c:861
-#: gnucash/gnome-utils/dialog-preferences.c:1340
+#: gnucash/gnome-utils/dialog-preferences.c:870
+#: gnucash/gnome-utils/dialog-preferences.c:1349
msgid "Select a folder"
msgstr "Odaberi mapu"
@@ -6629,8 +6740,8 @@ msgstr "Moraš zadati ime za ovu poreznu tablicu."
#: gnucash/gnome-utils/dialog-tax-table.c:123
#, c-format
msgid ""
-"You must provide a unique name for this Tax Table. Your choice \"%s\" is already "
-"in use."
+"You must provide a unique name for this Tax Table. Your choice \"%s\" is "
+"already in use."
msgstr ""
"Moraš zadati jedinstveno ime za ovu poreznu tablicu. Tvoj izbor „%s†se već "
"upotrebljava."
@@ -6650,11 +6761,11 @@ msgstr "Porezna tablica „%s“ je u upotrebi. Ne možeš je izbrisati."
#: gnucash/gnome-utils/dialog-tax-table.c:612
msgid ""
-"You cannot remove the last entry from the tax table. Try deleting the tax table "
-"if you want to do that."
+"You cannot remove the last entry from the tax table. Try deleting the tax "
+"table if you want to do that."
msgstr ""
-"Ne možeš ukloniti posljednji unos iz porezne tablice. Pokušaj obrisati poreznu "
-"tablicu, ako to želiš uraditi."
+"Ne možeš ukloniti posljednji unos iz porezne tablice. Pokušaj obrisati "
+"poreznu tablicu, ako to želiš uraditi."
#: gnucash/gnome-utils/dialog-tax-table.c:619
msgid "Are you sure you want to delete this entry?"
@@ -6670,8 +6781,8 @@ msgstr "Greška"
#: gnucash/gnome-utils/dialog-transfer.c:1319
msgid ""
-"Retrieve the current online quote. This will fail if there is a manually-created "
-"price for today."
+"Retrieve the current online quote. This will fail if there is a manually-"
+"created price for today."
msgstr ""
"Dohvati trenutaÄni teÄaj s interneta. Ovo neće uspjeti, ako postoji ruÄno "
"određena cijena za danas."
@@ -6685,8 +6796,8 @@ msgid ""
"You must specify an account to transfer from, or to, or both, for this "
"transaction. Otherwise, it will not be recorded."
msgstr ""
-"Moraš navesti konto, iz kojeg ili u koji ili iz i u koji ćeš prebaciti, za ovu "
-"transakciju. U protivnom, neće biti zabilježeno."
+"Moraš navesti konto, iz kojeg ili u koji ili iz i u koji ćeš prebaciti, za "
+"ovu transakciju. U protivnom, neće biti zabilježeno."
#: gnucash/gnome-utils/dialog-transfer.c:1435
msgid "You can't transfer from and to the same account!"
@@ -6702,11 +6813,11 @@ msgstr "Konto „%s“ ne dozvoljava transakcije."
#: gnucash/gnome-utils/dialog-transfer.c:1462
msgid ""
-"You can't transfer from a non-currency account. Try reversing the \"from\" and "
-"\"to\" accounts and making the \"amount\" negative."
+"You can't transfer from a non-currency account. Try reversing the \"from\" "
+"and \"to\" accounts and making the \"amount\" negative."
msgstr ""
-"Ne možeš prenijeti s ne-valutnog konta. Pokušaj obrnuti konta „od“ i „prema“ i "
-"uÄini „iznos“ negativnim."
+"Ne možeš prenijeti s ne-valutnog konta. Pokušaj obrnuti konta „od“ i „prema“ "
+"i uÄini „iznos“ negativnim."
#: gnucash/gnome-utils/dialog-transfer.c:1480
msgid "You must enter a valid price."
@@ -6748,11 +6859,11 @@ msgstr "Do iznosa:"
#: gnucash/gnome-utils/dialog-utils.c:433
msgid ""
-"The entered date is out of the range 01/01/1400 - 31/12/9999, resetting to this "
-"year"
+"The entered date is out of the range 01/01/1400 - 31/12/9999, resetting to "
+"this year"
msgstr ""
-"Unešeni datum se nalazi izvan raspona 01/01/1400 - 31/12/9999, datum se vraća na "
-"ovu godinu"
+"Unešeni datum se nalazi izvan raspona 01/01/1400 - 31/12/9999, datum se "
+"vraća na ovu godinu"
#: gnucash/gnome-utils/dialog-utils.c:435
msgid "Date out of range"
@@ -6786,18 +6897,18 @@ msgstr "Spremiti datoteku automatski?"
#: gnucash/gnome-utils/gnc-autosave.c:106
#, c-format
msgid ""
-"Your data file needs to be saved to your hard disk to save your changes. GnuCash "
-"has a feature to save the file automatically every %d minute, just as if you had "
-"pressed the \"Save\" button each time. \n"
+"Your data file needs to be saved to your hard disk to save your changes. "
+"GnuCash has a feature to save the file automatically every %d minute, just "
+"as if you had pressed the \"Save\" button each time. \n"
"\n"
"You can change the time interval or turn off this feature under Edit -> "
"Preferences -> General -> Auto-save time interval. \n"
"\n"
"Should your file be saved automatically?"
msgid_plural ""
-"Your data file needs to be saved to your hard disk to save your changes. GnuCash "
-"has a feature to save the file automatically every %d minutes, just as if you "
-"had pressed the \"Save\" button each time. \n"
+"Your data file needs to be saved to your hard disk to save your changes. "
+"GnuCash has a feature to save the file automatically every %d minutes, just "
+"as if you had pressed the \"Save\" button each time. \n"
"\n"
"You can change the time interval or turn off this feature under Edit -> "
"Preferences -> General -> Auto-save time interval. \n"
@@ -6805,8 +6916,8 @@ msgid_plural ""
"Should your file be saved automatically?"
msgstr[0] ""
"Tvoja datoteka podataka treba biti spremljena na Ävrstom disku, kako bi se "
-"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke svake "
-"%d minute, baš kao da svaki put klikneš gumb „Spremi“.\n"
+"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke "
+"svake %d minute, baš kao da svaki put klikneš gumb „Spremi“.\n"
"\n"
"MožeÅ¡ promijeniti vremenski interval ili iskljuÄiti ovu funkciju u izborniku "
"„Uredi → Postavke → Općenito → Interval za automatsko spremanje“.\n"
@@ -6814,8 +6925,8 @@ msgstr[0] ""
"Da li želiš automatski spremati tvoju datoteku?"
msgstr[1] ""
"Tvoja datoteka podataka treba biti spremljena na Ävrstom disku, kako bi se "
-"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke svake "
-"%d minute, baš kao da svaki put klikneš gumb „Spremi“.\n"
+"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke "
+"svake %d minute, baš kao da svaki put klikneš gumb „Spremi“.\n"
"\n"
"MožeÅ¡ promijeniti vremenski interval ili iskljuÄiti ovu funkciju u izborniku "
"„Uredi → Postavke → Opće → Interval za automatsko spremanje“.\n"
@@ -6823,8 +6934,8 @@ msgstr[1] ""
"Da li želiš automatski spremati tvoju datoteku?"
msgstr[2] ""
"Tvoja datoteka podataka treba biti spremljena na Ävrstom disku, kako bi se "
-"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke svakih "
-"%d minuta, baš kao da svaki put klikneš gumb „Spremi“.\n"
+"spremile promjene. GnuCash ima funkciju za samostalno spremanje datoteke "
+"svakih %d minuta, baš kao da svaki put klikneš gumb „Spremi“.\n"
"\n"
"MožeÅ¡ promijeniti vremenski interval ili iskljuÄiti ovu funkciju u izborniku "
"„Uredi → Postavke → Opće → Interval za automatsko spremanje“.\n"
@@ -6851,7 +6962,7 @@ msgstr "Ne, ne ovaj _put"
#: gnucash/gnome-utils/gnc-cell-renderer-date.c:165
#: gnucash/gnome-utils/gnc-period-select.c:70
#: gnucash/gnome-utils/gnc-period-select.c:86
-#: libgnucash/app-utils/date-utilities.scm:888
+#: libgnucash/app-utils/date-utilities.scm:959
msgid "Today"
msgstr "Danas"
@@ -6921,7 +7032,7 @@ msgid "Date: "
msgstr "Datum: "
#: gnucash/gnome-utils/gnc-dense-cal.c:357
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:177
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:149
#: gnucash/gtkbuilder/dialog-sx.glade:1403
msgid "Frequency"
msgstr "UÄestalost"
@@ -6932,7 +7043,7 @@ msgstr "(neimenovano)"
#. File menu
#. Menu Items
-#: gnucash/gnome-utils/gnc-file.c:107 gnucash/gnome-utils/gnc-main-window.c:277
+#: gnucash/gnome-utils/gnc-file.c:107 gnucash/gnome-utils/gnc-main-window.c:278
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:56
#: gnucash/import-export/customer-import/gnc-plugin-customer-import.c:56
msgid "_Import"
@@ -6947,7 +7058,7 @@ msgstr "Uvezi"
msgid "Save"
msgstr "Spremi"
-#: gnucash/gnome-utils/gnc-file.c:119 gnucash/gnome-utils/gnc-main-window.c:278
+#: gnucash/gnome-utils/gnc-file.c:119 gnucash/gnome-utils/gnc-main-window.c:279
msgid "_Export"
msgstr "_Izvezi"
@@ -6985,12 +7096,13 @@ msgstr ""
#, c-format
msgid "Can't connect to %s. Connection was lost, unable to send data."
msgstr ""
-"Nije moguće povezivanje sa „%s“. Veza je izgubljena, nije moguće poslati podatke."
+"Nije moguće povezivanje sa „%s“. Veza je izgubljena, nije moguće poslati "
+"podatke."
#: gnucash/gnome-utils/gnc-file.c:255
msgid ""
-"This file/URL appears to be from a newer version of GnuCash. You must upgrade "
-"your version of GnuCash to work with this data."
+"This file/URL appears to be from a newer version of GnuCash. You must "
+"upgrade your version of GnuCash to work with this data."
msgstr ""
"Izgleda da je ova datoteka/URL-adresa novijeg izdanja GnuCasha. Moraš "
"nadograditi GnuCash na novije izdanje za rad s ovim podacima."
@@ -7003,70 +7115,71 @@ msgstr "Čini se da baza podataka „%s“ ne postoji. Da li želiš je stvoriti
#: gnucash/gnome-utils/gnc-file.c:276
#, c-format
msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by another "
-"user, in which case you should not open the database. Do you want to proceed "
-"with opening the database?"
+"GnuCash could not obtain the lock for %s. That database may be in use by "
+"another user, in which case you should not open the database. Do you want to "
+"proceed with opening the database?"
msgstr ""
-"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu podataka "
-"koristi neki drugi korisnik. U tom sluÄaju je nemoj otvarati. ŽeliÅ¡ li nastaviti "
-"s otvaranjem baze podataka?"
+"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu "
+"podataka koristi neki drugi korisnik. U tom sluÄaju je nemoj otvarati. ŽeliÅ¡ "
+"li nastaviti s otvaranjem baze podataka?"
#: gnucash/gnome-utils/gnc-file.c:284
#, c-format
msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by another "
-"user, in which case you should not import the database. Do you want to proceed "
-"with importing the database?"
+"GnuCash could not obtain the lock for %s. That database may be in use by "
+"another user, in which case you should not import the database. Do you want "
+"to proceed with importing the database?"
msgstr ""
-"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu podataka "
-"koristi neki drugi korisnik. U tom sluÄaju je nemoj uvoziti. ŽeliÅ¡ li nastaviti "
-"s uvozom baze podataka?"
+"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu "
+"podataka koristi neki drugi korisnik. U tom sluÄaju je nemoj uvoziti. ŽeliÅ¡ "
+"li nastaviti s uvozom baze podataka?"
#: gnucash/gnome-utils/gnc-file.c:292
#, c-format
msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by another "
-"user, in which case you should not save the database. Do you want to proceed "
-"with saving the database?"
+"GnuCash could not obtain the lock for %s. That database may be in use by "
+"another user, in which case you should not save the database. Do you want to "
+"proceed with saving the database?"
msgstr ""
-"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu podataka "
-"koristi neki drugi korisnik. U tom sluÄaju je nemoj spremiti. ŽeliÅ¡ li nastaviti "
-"sa spremanjem baze podataka?"
+"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu "
+"podataka koristi neki drugi korisnik. U tom sluÄaju je nemoj spremiti. ŽeliÅ¡ "
+"li nastaviti sa spremanjem baze podataka?"
#: gnucash/gnome-utils/gnc-file.c:300
#, c-format
msgid ""
-"GnuCash could not obtain the lock for %s. That database may be in use by another "
-"user, in which case you should not export the database. Do you want to proceed "
-"with exporting the database?"
+"GnuCash could not obtain the lock for %s. That database may be in use by "
+"another user, in which case you should not export the database. Do you want "
+"to proceed with exporting the database?"
msgstr ""
-"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu podataka "
-"koristi neki drugi korisnik. U tom sluÄaju je nemoj izvoziti. ŽeliÅ¡ li nastaviti "
-"s izvozom baze podataka?"
+"GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“. Možda tu bazu "
+"podataka koristi neki drugi korisnik. U tom sluÄaju je nemoj izvoziti. ŽeliÅ¡ "
+"li nastaviti s izvozom baze podataka?"
#: gnucash/gnome-utils/gnc-file.c:325
#, c-format
msgid ""
-"GnuCash could not write to %s. That database may be on a read-only file system, "
-"you may not have write permission for the directory or your anti-virus software "
-"is preventing this action."
+"GnuCash could not write to %s. That database may be on a read-only file "
+"system, you may not have write permission for the directory or your anti-"
+"virus software is preventing this action."
msgstr ""
-"GnuCash nije mogao pisati po „%sâ€. Baza podataka se možda nalazi na datoteÄnom "
-"sustavu koji je samo-za-Äitanje ili nemaÅ¡ korisniÄkih prava za taj direktorij "
-"ili tvoj protuvirusni program onamogućava ovu radnju."
+"GnuCash nije mogao pisati po „%sâ€. Baza podataka se možda nalazi na "
+"datoteÄnom sustavu koji je samo-za-Äitanje ili nemaÅ¡ korisniÄkih prava za "
+"taj direktorij ili tvoj protuvirusni program onamogućava ovu radnju."
#: gnucash/gnome-utils/gnc-file.c:333
#, c-format
msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
-msgstr "Datoteka/URL-adresa „%s“ ne sadrži GnuCash podatke ili su podaci oštećeni."
+msgstr ""
+"Datoteka/URL-adresa „%s“ ne sadrži GnuCash podatke ili su podaci oštećeni."
#: gnucash/gnome-utils/gnc-file.c:339
#, c-format
msgid ""
"The server at URL %s experienced an error or encountered bad or corrupt data."
msgstr ""
-"Server na URL-adresi „%s“ je doživjeo grešku ili je naišao na loše ili oštećene "
-"podatke."
+"Server na URL-adresi „%s“ je doživjeo grešku ili je naišao na loše ili "
+"oštećene podatke."
#: gnucash/gnome-utils/gnc-file.c:345
#, c-format
@@ -7127,8 +7240,8 @@ msgstr "Nije moguće stvoriti sigurnosnu kopiju za datoteku „%s“"
#: gnucash/gnome-utils/gnc-file.c:414
#, c-format
msgid ""
-"Could not write to file %s. Check that you have permission to write to this file "
-"and that there is sufficient space to create it."
+"Could not write to file %s. Check that you have permission to write to this "
+"file and that there is sufficient space to create it."
msgstr ""
"Nije moguće pisati u datoteku „%s“. Provjeri, da li imaÅ¡ korisniÄka prava za "
"pisanje u tu datoteku i da li ima dovoljno mjesta."
@@ -7146,84 +7259,85 @@ msgstr "NemaÅ¡ korisniÄka prava za Äitanje iz datoteke „%s“."
msgid ""
"You attempted to save in\n"
"%s\n"
-"or a subdirectory thereof. This is not allowed as %s reserves that directory for "
-"internal use.\n"
+"or a subdirectory thereof. This is not allowed as %s reserves that directory "
+"for internal use.\n"
"\n"
"Please try again in a different directory."
msgstr ""
"Pokušavaš spremiti u\n"
"%s\n"
-"ili u njegov poddirektoriju. Ovo nije dopuÅ¡teno, jer „%s“ Äuva ovaj direktorij "
-"za unutrašnju upotrebu.\n"
+"ili u njegov poddirektoriju. Ovo nije dopuÅ¡teno, jer „%s“ Äuva ovaj "
+"direktorij za unutrašnju upotrebu.\n"
"\n"
"Pokušaj ponovo u nekom drugom direktoriju."
#: gnucash/gnome-utils/gnc-file.c:436
msgid ""
-"This database is from an older version of GnuCash. Select OK to upgrade it to "
-"the current version, Cancel to mark it read-only."
+"This database is from an older version of GnuCash. Select OK to upgrade it "
+"to the current version, Cancel to mark it read-only."
msgstr ""
"Ova je baza podataka starijeg izdanja GnuCasha. Odaberi „U redu“ za "
-"aktualiziranje na trenutaÄno izdanje, „Odustani“, za oznaÄavanje, da je samo-za-"
-"Äitanje."
+"aktualiziranje na trenutaÄno izdanje, „Odustani“, za oznaÄavanje, da je samo-"
+"za-Äitanje."
#: gnucash/gnome-utils/gnc-file.c:445
msgid ""
-"This database is from a newer version of GnuCash. This version can read it, but "
-"cannot safely save to it. It will be marked read-only until you do File>Save As, "
-"but data may be lost in writing to the old version."
+"This database is from a newer version of GnuCash. This version can read it, "
+"but cannot safely save to it. It will be marked read-only until you do "
+"File>Save As, but data may be lost in writing to the old version."
msgstr ""
-"Ova je baza podataka novijeg izdanja GnuCasha. Ovo izdanje ju može proÄitati, "
-"ali ne i sigurno spremiti u nju. Bit će oznaÄena samo-za-Äitanje, sve dok je ne "
-"spremiš „Datoteka → Spremi kao“. Međutim, podaci se mogu izgubiti prilikom "
-"zapisivanja u staro izdanje."
+"Ova je baza podataka novijeg izdanja GnuCasha. Ovo izdanje ju može "
+"proÄitati, ali ne i sigurno spremiti u nju. Bit će oznaÄena samo-za-Äitanje, "
+"sve dok je ne spremiš „Datoteka → Spremi kao“. Međutim, podaci se mogu "
+"izgubiti prilikom zapisivanja u staro izdanje."
#: gnucash/gnome-utils/gnc-file.c:454
msgid ""
-"The SQL database is in use by other users, and the upgrade cannot be performed "
-"until they logoff. If there are currently no other users, consult the "
-"documentation to learn how to clear out dangling login sessions."
+"The SQL database is in use by other users, and the upgrade cannot be "
+"performed until they logoff. If there are currently no other users, consult "
+"the documentation to learn how to clear out dangling login sessions."
msgstr ""
-"SQL bazu podataka koriste drugi korisnici, a nadogradnja se ne može izvršiti dok "
-"se oni ne odjave. Ako trenutaÄno nema drugih korisnika, pogledaj dokumentaciju i "
-"saznaj, kako izbrisati nesvršene sesije prijavljivanja."
+"SQL bazu podataka koriste drugi korisnici, a nadogradnja se ne može izvršiti "
+"dok se oni ne odjave. Ako trenutaÄno nema drugih korisnika, pogledaj "
+"dokumentaciju i saznaj, kako izbrisati nesvršene sesije prijavljivanja."
#: gnucash/gnome-utils/gnc-file.c:464
msgid ""
-"The library \"libdbi\" installed on your system doesn't correctly store large "
-"numbers. This means GnuCash cannot use SQL databases correctly. Gnucash will not "
-"open or save to SQL databases until this is fixed by installing a different "
-"version of \"libdbi\". Please see https://bugs.gnucash.org/show_bug.cgi?"
-"id=611936 for more information."
+"The library \"libdbi\" installed on your system doesn't correctly store "
+"large numbers. This means GnuCash cannot use SQL databases correctly. "
+"Gnucash will not open or save to SQL databases until this is fixed by "
+"installing a different version of \"libdbi\". Please see https://bugs."
+"gnucash.org/show_bug.cgi?id=611936 for more information."
msgstr ""
"Biblioteka „libdbi“ instalirana na tvom sustavu ne sprema pravilno velike "
"brojeve. To znaÄi, da GnuCash ne može pravilno koristiti SQL bazu podataka. "
"GnuCash neće otvarati ili spremati u SQL bazame podataka, sve dok se ovo ne "
-"popravi ugradnjom drugaÄijeg izdanja biblioteke „libdbi“. Za daljnje informacije "
-"pogledaj „https://bugs.gnucash.org/show_bug.cgi?id=611936“."
+"popravi ugradnjom drugaÄijeg izdanja biblioteke „libdbi“. Za daljnje "
+"informacije pogledaj „https://bugs.gnucash.org/show_bug.cgi?id=611936“."
#: gnucash/gnome-utils/gnc-file.c:476
msgid ""
"GnuCash could not complete a critical test for the presence of a bug in the "
-"\"libdbi\" library. This may be caused by a permissions misconfiguration of your "
-"SQL database. Please see https://bugs.gnucash.org/show_bug.cgi?id=645216 for "
-"more information."
+"\"libdbi\" library. This may be caused by a permissions misconfiguration of "
+"your SQL database. Please see https://bugs.gnucash.org/show_bug.cgi?"
+"id=645216 for more information."
msgstr ""
-"GnuCash nije mogao dovrÅ¡iti kritiÄni test zbog greÅ¡ke u biblioteci „libdbi“. Ovo "
-"može biti uzrokovano neispravnim korisniÄkim pravima tvoje SQL baze podataka. Za "
-"daljnje informacije pogledaj „https://bugs.gnucash.org/show_bug.cgi?id=645216“."
+"GnuCash nije mogao dovrÅ¡iti kritiÄni test zbog greÅ¡ke u biblioteci „libdbi“. "
+"Ovo može biti uzrokovano neispravnim korisniÄkim pravima tvoje SQL baze "
+"podataka. Za daljnje informacije pogledaj „https://bugs.gnucash.org/show_bug."
+"cgi?id=645216“."
#: gnucash/gnome-utils/gnc-file.c:486
msgid ""
-"This file is from an older version of GnuCash and will be upgraded when saved by "
-"this version. You will not be able to read the saved file from the older version "
-"of Gnucash (it will report an \"error parsing the file\"). If you wish to "
-"preserve the old version, exit without saving."
+"This file is from an older version of GnuCash and will be upgraded when "
+"saved by this version. You will not be able to read the saved file from the "
+"older version of Gnucash (it will report an \"error parsing the file\"). If "
+"you wish to preserve the old version, exit without saving."
msgstr ""
"Ova je datoteka starijeg izdanja GnuCasha i će biti nadograđena prilikom "
-"spremanja ovim izdanjem. NećeÅ¡ moći Äitati spremljenu datoteku starijeg izdanja "
-"GnuCasha (prijavit će „greÅ¡ku u obradi datotekeâ€). Ako želiÅ¡ spremiti staro "
-"izdanje, izađi bez spremanja."
+"spremanja ovim izdanjem. NećeÅ¡ moći Äitati spremljenu datoteku starijeg "
+"izdanja GnuCasha (prijavit će „greÅ¡ku u obradi datotekeâ€). Ako želiÅ¡ "
+"spremiti staro izdanje, izađi bez spremanja."
#: gnucash/gnome-utils/gnc-file.c:497
#, c-format
@@ -7234,14 +7348,18 @@ msgstr "Došlo je do nepoznate U/I greške (%d)."
msgid "Save changes to the file?"
msgstr "Spremiti izmjene u datoteku?"
-#: gnucash/gnome-utils/gnc-file.c:604 gnucash/gnome-utils/gnc-main-window.c:1277
+#: gnucash/gnome-utils/gnc-file.c:604
+#: gnucash/gnome-utils/gnc-main-window.c:1278
#, c-format
msgid "If you don't save, changes from the past %d minute will be discarded."
msgid_plural ""
"If you don't save, changes from the past %d minutes will be discarded."
-msgstr[0] "Ako ne spremiÅ¡, uÄinjene promjene zadnje %d minute će biti odbaÄene."
-msgstr[1] "Ako ne spremiÅ¡, uÄinjene promjene zadnje %d minute će biti odbaÄene."
-msgstr[2] "Ako ne spremiÅ¡, uÄinjene promjene zadnjih %d minuta će biti odbaÄene."
+msgstr[0] ""
+"Ako ne spremiÅ¡, uÄinjene promjene zadnje %d minute će biti odbaÄene."
+msgstr[1] ""
+"Ako ne spremiÅ¡, uÄinjene promjene zadnje %d minute će biti odbaÄene."
+msgstr[2] ""
+"Ako ne spremiÅ¡, uÄinjene promjene zadnjih %d minuta će biti odbaÄene."
#: gnucash/gnome-utils/gnc-file.c:608
msgid "Continue _Without Saving"
@@ -7254,8 +7372,8 @@ msgstr "GnuCash nije ustanovio pravilno zatvaranje datoteke „%s“."
#: gnucash/gnome-utils/gnc-file.c:768
msgid ""
-"That database may be in use by another user, in which case you should not open "
-"the database. What would you like to do?"
+"That database may be in use by another user, in which case you should not "
+"open the database. What would you like to do?"
msgstr ""
"Možda tu bazu podataka koristi neki drugi korisnik. U tom sluÄaju je nemoj "
"otvarati. Što želiš uraditi?"
@@ -7264,13 +7382,13 @@ msgstr ""
msgid ""
"That database may be on a read-only file system, you may not have write "
"permission for the directory, or your anti-virus software is preventing this "
-"action. If you proceed you may not be able to save any changes. What would you "
-"like to do?"
+"action. If you proceed you may not be able to save any changes. What would "
+"you like to do?"
msgstr ""
-"Baza podataka se možda nalazi na datoteÄnom sustavu, koji je samo-za-Äitanje ili "
-"nemaÅ¡ korisniÄkih prava za tu mapu ili tvoj program protiv virusa onamogućuje "
-"ovu radnju. Ako nastaviš, možda nećeš biti u stanju spremiti promjene. Što želiš "
-"napraviti?"
+"Baza podataka se možda nalazi na datoteÄnom sustavu, koji je samo-za-Äitanje "
+"ili nemaÅ¡ korisniÄkih prava za tu mapu ili tvoj program protiv virusa "
+"onamogućuje ovu radnju. Ako nastaviš, možda nećeš biti u stanju spremiti "
+"promjene. Što želiš napraviti?"
#: gnucash/gnome-utils/gnc-file.c:794
msgid "_Open Read-Only"
@@ -7284,7 +7402,7 @@ msgstr "_Stvori novu datoteku"
msgid "Open _Anyway"
msgstr "_Svejedno otvori"
-#: gnucash/gnome-utils/gnc-file.c:802 gnucash/gnome-utils/gnc-main-window.c:302
+#: gnucash/gnome-utils/gnc-file.c:802 gnucash/gnome-utils/gnc-main-window.c:303
msgid "_Quit"
msgstr "_Zatvori"
@@ -7299,7 +7417,7 @@ msgstr "Ponovo spremanje korisniÄkih podataka …"
#: gnucash/gnome-utils/gnc-file.c:1241 gnucash/gnome-utils/gnc-file.c:1479
#: gnucash/import-export/csv-exp/assistant-csv-export.c:711
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1597
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1569
#, c-format
msgid "The file %s already exists. Are you sure you want to overwrite it?"
msgstr "Datoteka „%s“ već postoji. Sigurno je želiš prepisati?"
@@ -7322,10 +7440,11 @@ msgstr ""
#: gnucash/gnome-utils/gnc-file.c:1315
msgid ""
-"The database was opened read-only. Do you want to save it to a different place?"
+"The database was opened read-only. Do you want to save it to a different "
+"place?"
msgstr ""
-"Baza podataka je otvorena u zastićenom modusu (samo-za-Äitanje). Da li je želiÅ¡ "
-"spremiti na drugom mjestu?"
+"Baza podataka je otvorena u zastićenom modusu (samo-za-Äitanje). Da li je "
+"želiš spremiti na drugom mjestu?"
#: gnucash/gnome-utils/gnc-file.c:1604
#, c-format
@@ -7333,9 +7452,11 @@ msgid ""
"Reverting will discard all unsaved changes to %s. Are you sure you want to "
"proceed ?"
msgstr ""
-"Vraćanje će odbaciti sve nespremljene promjene u „%s“. Sigurno želiš nastaviti?"
+"Vraćanje će odbaciti sve nespremljene promjene u „%s“. Sigurno želiš "
+"nastaviti?"
-#: gnucash/gnome-utils/gnc-file.c:1612 gnucash/gnome-utils/gnc-main-window.c:1245
+#: gnucash/gnome-utils/gnc-file.c:1612
+#: gnucash/gnome-utils/gnc-main-window.c:1246
msgid "<unknown>"
msgstr "<nepoznato>"
@@ -7343,7 +7464,7 @@ msgstr "<nepoznato>"
msgid "View..."
msgstr "Pogledaj …"
-#: gnucash/gnome-utils/gnc-gnome-utils.c:283
+#: gnucash/gnome-utils/gnc-gnome-utils.c:284
msgid ""
"GnuCash could not find the files for the help documentation. This is likely "
"because the 'gnucash-docs' package is not installed"
@@ -7351,8 +7472,8 @@ msgstr ""
"GnuCash nije mogao pronaći datoteke pomoćne dokumentacije. Vjerojatno paket "
"„gnucash-docs“ nije instaliran"
-#: gnucash/gnome-utils/gnc-gnome-utils.c:376
-#: gnucash/gnome-utils/gnc-gnome-utils.c:442
+#: gnucash/gnome-utils/gnc-gnome-utils.c:377
+#: gnucash/gnome-utils/gnc-gnome-utils.c:443
msgid ""
"GnuCash could not find the files for the help documentation. This is likely "
"because the 'gnucash-docs' package is not installed."
@@ -7360,19 +7481,19 @@ msgstr ""
"GnuCash nije mogao pronaći datoteke pomoćne dokumentacije. Vjerojatno paket "
"„gnucash-docs“ nije instaliran."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:407
+#: gnucash/gnome-utils/gnc-gnome-utils.c:408
msgid "GnuCash could not find the files for the help documentation."
msgstr "GnuCash nije mogao pronaći datoteke pomoćne dokumentacije."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:466
+#: gnucash/gnome-utils/gnc-gnome-utils.c:467
msgid "GnuCash could not find the associated file."
msgstr "GnuCash nije mogao pronaći povezanu datoteku."
-#: gnucash/gnome-utils/gnc-gnome-utils.c:504
+#: gnucash/gnome-utils/gnc-gnome-utils.c:507
msgid "GnuCash could not find the associated file"
msgstr "GnuCash nije mogao pronaći povezanu datoteku"
-#: gnucash/gnome-utils/gnc-gnome-utils.c:535
+#: gnucash/gnome-utils/gnc-gnome-utils.c:537
msgid "GnuCash could not open the associated URI:"
msgstr "GnuCash nije mogao otvoriti povezanu stazu:"
@@ -7389,55 +7510,55 @@ msgid "Changes will be saved automatically in %u seconds"
msgstr "Izmjene će biti automatski spremljene za %u sekunde"
#. Toplevel
-#: gnucash/gnome-utils/gnc-main-window.c:264
+#: gnucash/gnome-utils/gnc-main-window.c:265
msgid "_File"
msgstr "_Datoteka"
-#: gnucash/gnome-utils/gnc-main-window.c:268
+#: gnucash/gnome-utils/gnc-main-window.c:269
msgid "Tra_nsaction"
msgstr "_Transakcija"
-#: gnucash/gnome-utils/gnc-main-window.c:269
+#: gnucash/gnome-utils/gnc-main-window.c:270
msgid "_Reports"
msgstr "_Izvještaji"
-#: gnucash/gnome-utils/gnc-main-window.c:270
+#: gnucash/gnome-utils/gnc-main-window.c:271
msgid "_Tools"
msgstr "_Alati"
-#: gnucash/gnome-utils/gnc-main-window.c:271
+#: gnucash/gnome-utils/gnc-main-window.c:272
msgid "E_xtensions"
msgstr "Pro_Å¡irenja"
-#: gnucash/gnome-utils/gnc-main-window.c:272
+#: gnucash/gnome-utils/gnc-main-window.c:273
msgid "_Windows"
msgstr "Pro_zori"
-#: gnucash/gnome-utils/gnc-main-window.c:280
+#: gnucash/gnome-utils/gnc-main-window.c:281
msgid "_Print..."
msgstr "_Ispiši …"
-#: gnucash/gnome-utils/gnc-main-window.c:281
+#: gnucash/gnome-utils/gnc-main-window.c:282
msgid "Print the currently active page"
msgstr "IspiÅ¡i trenutaÄno aktivnu stranicu"
-#: gnucash/gnome-utils/gnc-main-window.c:287
+#: gnucash/gnome-utils/gnc-main-window.c:288
msgid "Pa_ge Setup..."
msgstr "Postavke _stranice …"
-#: gnucash/gnome-utils/gnc-main-window.c:288
+#: gnucash/gnome-utils/gnc-main-window.c:289
msgid "Specify the page size and orientation for printing"
msgstr "Odredi veliÄinu i položaj stranice za ispis"
-#: gnucash/gnome-utils/gnc-main-window.c:292
+#: gnucash/gnome-utils/gnc-main-window.c:293
msgid "Proper_ties"
msgstr "_Svojstva"
-#: gnucash/gnome-utils/gnc-main-window.c:293
+#: gnucash/gnome-utils/gnc-main-window.c:294
msgid "Edit the properties of the current file"
msgstr "Uredi svojstva trenutaÄne datoteke"
-#: gnucash/gnome-utils/gnc-main-window.c:297
+#: gnucash/gnome-utils/gnc-main-window.c:298
#: gnucash/gtkbuilder/dialog-billterms.glade:460
#: gnucash/gtkbuilder/dialog-commodities.glade:75
#: gnucash/gtkbuilder/dialog-custom-report.glade:44
@@ -7458,156 +7579,156 @@ msgstr "Uredi svojstva trenutaÄne datoteke"
msgid "_Close"
msgstr "_Zatvori"
-#: gnucash/gnome-utils/gnc-main-window.c:298
+#: gnucash/gnome-utils/gnc-main-window.c:299
msgid "Close the currently active page"
msgstr "Zatvori trenutaÄnu aktivnu stranicu"
-#: gnucash/gnome-utils/gnc-main-window.c:303
+#: gnucash/gnome-utils/gnc-main-window.c:304
msgid "Quit this application"
msgstr "Zatvori program"
-#: gnucash/gnome-utils/gnc-main-window.c:325
+#: gnucash/gnome-utils/gnc-main-window.c:326
msgid "Pr_eferences"
msgstr "_Postavke"
-#: gnucash/gnome-utils/gnc-main-window.c:326
+#: gnucash/gnome-utils/gnc-main-window.c:327
msgid "Edit the global preferences of GnuCash"
msgstr "Uredi opće postavke za GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:334
+#: gnucash/gnome-utils/gnc-main-window.c:335
msgid "Select sorting criteria for this page view"
msgstr "Odaberi kriterij razvrstavanja za ovaj pogled stranice"
-#: gnucash/gnome-utils/gnc-main-window.c:338
+#: gnucash/gnome-utils/gnc-main-window.c:339
msgid "Select the account types that should be displayed."
msgstr "Odaberi vrste konta koji će biti prikazani."
-#: gnucash/gnome-utils/gnc-main-window.c:350
+#: gnucash/gnome-utils/gnc-main-window.c:351
msgid "Reset _Warnings..."
msgstr "Vrati _upozorenja …"
-#: gnucash/gnome-utils/gnc-main-window.c:351
+#: gnucash/gnome-utils/gnc-main-window.c:352
msgid "Reset the state of all warning messages so they will be shown again."
msgstr "Vrati stanje svih poruka upozorenja, tako da se opet prikazuju."
-#: gnucash/gnome-utils/gnc-main-window.c:355
+#: gnucash/gnome-utils/gnc-main-window.c:356
msgid "Re_name Page"
msgstr "_Preimenuj stranicu"
-#: gnucash/gnome-utils/gnc-main-window.c:356
+#: gnucash/gnome-utils/gnc-main-window.c:357
msgid "Rename this page."
msgstr "Preimenuj ovu stranicu."
-#: gnucash/gnome-utils/gnc-main-window.c:363
+#: gnucash/gnome-utils/gnc-main-window.c:364
msgid "_New Window"
msgstr "_Novi prozor"
-#: gnucash/gnome-utils/gnc-main-window.c:364
+#: gnucash/gnome-utils/gnc-main-window.c:365
msgid "Open a new top-level GnuCash window."
msgstr "Otvori novi GnuCash prozor najviše razine."
-#: gnucash/gnome-utils/gnc-main-window.c:368
+#: gnucash/gnome-utils/gnc-main-window.c:369
msgid "New Window with _Page"
msgstr "Novi prozor sa _stranicom"
-#: gnucash/gnome-utils/gnc-main-window.c:369
+#: gnucash/gnome-utils/gnc-main-window.c:370
msgid "Move the current page to a new top-level GnuCash window."
msgstr "Premjesti trenutaÄnu stranicu na novi GnuCash prozor najviÅ¡e razine."
-#: gnucash/gnome-utils/gnc-main-window.c:376
+#: gnucash/gnome-utils/gnc-main-window.c:377
msgid "Tutorial and Concepts _Guide"
msgstr "_Upute i koncepti za GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:377
+#: gnucash/gnome-utils/gnc-main-window.c:378
msgid "Open the GnuCash Tutorial"
msgstr "Otvori GnuCash upute"
-#: gnucash/gnome-utils/gnc-main-window.c:381
+#: gnucash/gnome-utils/gnc-main-window.c:382
msgid "_Contents"
msgstr "_Sadržaj"
-#: gnucash/gnome-utils/gnc-main-window.c:382
+#: gnucash/gnome-utils/gnc-main-window.c:383
msgid "Open the GnuCash Help"
msgstr "Otvori GnuCash pomoć"
-#: gnucash/gnome-utils/gnc-main-window.c:386
+#: gnucash/gnome-utils/gnc-main-window.c:387
msgid "_About"
msgstr "_O programu"
-#: gnucash/gnome-utils/gnc-main-window.c:387
+#: gnucash/gnome-utils/gnc-main-window.c:388
msgid "About GnuCash"
msgstr "O programu GnuCash"
-#: gnucash/gnome-utils/gnc-main-window.c:399
+#: gnucash/gnome-utils/gnc-main-window.c:400
msgid "_Toolbar"
msgstr "Traka _alata"
-#: gnucash/gnome-utils/gnc-main-window.c:400
+#: gnucash/gnome-utils/gnc-main-window.c:401
msgid "Show/hide the toolbar on this window"
msgstr "Prikaži/sakrij traku alata na ovom prozoru"
-#: gnucash/gnome-utils/gnc-main-window.c:404
+#: gnucash/gnome-utils/gnc-main-window.c:405
msgid "Su_mmary Bar"
msgstr "Traka _sažetka"
-#: gnucash/gnome-utils/gnc-main-window.c:405
+#: gnucash/gnome-utils/gnc-main-window.c:406
msgid "Show/hide the summary bar on this window"
msgstr "Prikaži/sakrij traku sažetka na ovom prozoru"
-#: gnucash/gnome-utils/gnc-main-window.c:409
+#: gnucash/gnome-utils/gnc-main-window.c:410
msgid "Stat_us Bar"
msgstr "Traka s_tanja"
-#: gnucash/gnome-utils/gnc-main-window.c:410
+#: gnucash/gnome-utils/gnc-main-window.c:411
msgid "Show/hide the status bar on this window"
msgstr "Prikaži/sakrij traku stanja za ovaj prozor"
-#: gnucash/gnome-utils/gnc-main-window.c:422
+#: gnucash/gnome-utils/gnc-main-window.c:423
msgid "Window _1"
msgstr "Prozor _1"
-#: gnucash/gnome-utils/gnc-main-window.c:423
+#: gnucash/gnome-utils/gnc-main-window.c:424
msgid "Window _2"
msgstr "Prozor _2"
-#: gnucash/gnome-utils/gnc-main-window.c:424
+#: gnucash/gnome-utils/gnc-main-window.c:425
msgid "Window _3"
msgstr "Prozor _3"
-#: gnucash/gnome-utils/gnc-main-window.c:425
+#: gnucash/gnome-utils/gnc-main-window.c:426
msgid "Window _4"
msgstr "Prozor _4"
-#: gnucash/gnome-utils/gnc-main-window.c:426
+#: gnucash/gnome-utils/gnc-main-window.c:427
msgid "Window _5"
msgstr "Prozor _5"
-#: gnucash/gnome-utils/gnc-main-window.c:427
+#: gnucash/gnome-utils/gnc-main-window.c:428
msgid "Window _6"
msgstr "Prozor _6"
-#: gnucash/gnome-utils/gnc-main-window.c:428
+#: gnucash/gnome-utils/gnc-main-window.c:429
msgid "Window _7"
msgstr "Prozor _7"
-#: gnucash/gnome-utils/gnc-main-window.c:429
+#: gnucash/gnome-utils/gnc-main-window.c:430
msgid "Window _8"
msgstr "Prozor _8"
-#: gnucash/gnome-utils/gnc-main-window.c:430
+#: gnucash/gnome-utils/gnc-main-window.c:431
msgid "Window _9"
msgstr "Prozor _9"
-#: gnucash/gnome-utils/gnc-main-window.c:431
+#: gnucash/gnome-utils/gnc-main-window.c:432
msgid "Window _0"
msgstr "Prozor _0"
-#: gnucash/gnome-utils/gnc-main-window.c:1229
+#: gnucash/gnome-utils/gnc-main-window.c:1230
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "Spremiti izmjene u datoteci „%s“ prije zatvaranja?"
-#: gnucash/gnome-utils/gnc-main-window.c:1232
+#: gnucash/gnome-utils/gnc-main-window.c:1233
#, c-format
msgid ""
"If you don't save, changes from the past %d hours and %d minutes will be "
@@ -7616,71 +7737,70 @@ msgstr ""
"Ako ne spremiÅ¡, promjene naÄinjene u posljednja %d sata i %d minuta će biti "
"odbaÄene."
-#: gnucash/gnome-utils/gnc-main-window.c:1234
+#: gnucash/gnome-utils/gnc-main-window.c:1235
#, c-format
msgid ""
-"If you don't save, changes from the past %d days and %d hours will be discarded."
+"If you don't save, changes from the past %d days and %d hours will be "
+"discarded."
msgstr ""
"Ako ne spremiÅ¡, promjene naÄinjene u posljednja %d dana i %d sata će biti "
"odbaÄene."
-#: gnucash/gnome-utils/gnc-main-window.c:1282
+#: gnucash/gnome-utils/gnc-main-window.c:1283
msgid "Close _Without Saving"
msgstr "Zatvori _bez spremanja"
#. Translators: This string is shown in the window title if this
#. document is, well, read-only.
-#: gnucash/gnome-utils/gnc-main-window.c:1510
+#: gnucash/gnome-utils/gnc-main-window.c:1511
msgid "(read-only)"
msgstr "(samo-za-Äitanje)"
-#: gnucash/gnome-utils/gnc-main-window.c:1518
+#: gnucash/gnome-utils/gnc-main-window.c:1519
msgid "Unsaved Book"
msgstr "Nespremljena knjiga"
-#: gnucash/gnome-utils/gnc-main-window.c:1678
+#: gnucash/gnome-utils/gnc-main-window.c:1679
msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
msgstr "Zadnja promjena: %A, %e. %B %Y. u %k:%M"
#. g_warning("got time %ld, str=%s\n", mtime, time_string);
#. Translators: This message appears in the status bar after opening the file.
-#: gnucash/gnome-utils/gnc-main-window.c:1681
+#: gnucash/gnome-utils/gnc-main-window.c:1682
#, c-format
msgid "File %s opened. %s"
msgstr "Otvorena je datoteka „%s“. %s"
-#: gnucash/gnome-utils/gnc-main-window.c:2751
+#: gnucash/gnome-utils/gnc-main-window.c:2709
msgid "Unable to save to database."
msgstr "Nije moguće spremanje u bazu podataka."
-#: gnucash/gnome-utils/gnc-main-window.c:2753
+#: gnucash/gnome-utils/gnc-main-window.c:2711
msgid "Unable to save to database: Book is marked read-only."
-msgstr "Nije moguće spremanje u bazu podataka: Knjiga je oznaÄena samo-za-Äitanje."
+msgstr ""
+"Nije moguće spremanje u bazu podataka: Knjiga je oznaÄena samo-za-Äitanje."
-#: gnucash/gnome-utils/gnc-main-window.c:4145
+#: gnucash/gnome-utils/gnc-main-window.c:4084
msgid "Book Options"
msgstr "Opcije za knjigu"
#. Translators: %s will be replaced with the current year
-#: gnucash/gnome-utils/gnc-main-window.c:4533
+#: gnucash/gnome-utils/gnc-main-window.c:4466
#, c-format
msgid "Copyright © 1997-%s The GnuCash contributors."
msgstr "Copyright © 1997. - %s. GnuCash doprinositelji."
-#: gnucash/gnome-utils/gnc-main-window.c:4556
-#: gnucash/gnome-utils/gnc-main-window.c:4560 gnucash/gnome-utils/gnc-splash.c:106
-#: gnucash/gnome-utils/gnc-splash.c:109
+#: gnucash/gnome-utils/gnc-main-window.c:4478
+#: gnucash/gnome-utils/gnc-splash.c:97
msgid "Version"
msgstr "Verzija"
-#: gnucash/gnome-utils/gnc-main-window.c:4557
-#: gnucash/gnome-utils/gnc-main-window.c:4561 gnucash/gnome-utils/gnc-splash.c:107
-#: gnucash/gnome-utils/gnc-splash.c:110 gnucash/gnucash-bin.c:461
-#: gnucash/gnucash-bin.c:464
+#: gnucash/gnome-utils/gnc-main-window.c:4479
+#: gnucash/gnome-utils/gnc-splash.c:98 gnucash/gnucash-bin.c:455
msgid "Build ID"
msgstr "Broj gradnje"
-#: gnucash/gnome-utils/gnc-main-window.c:4567
+#: gnucash/gnome-utils/gnc-main-window.c:4487
msgid "Accounting for personal and small business finance."
msgstr "RaÄunovodstveni program, namijenjen pojedincima i malim poduzećima."
@@ -7688,21 +7808,21 @@ msgstr "RaÄunovodstveni program, namijenjen pojedincima i malim poduzećima."
#. * 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.
-#: gnucash/gnome-utils/gnc-main-window.c:4576
+#: gnucash/gnome-utils/gnc-main-window.c:4496
msgid "translator-credits"
msgstr "Milo Ivir <mail at milotype.de>"
-#: gnucash/gnome-utils/gnc-main-window.c:4579
+#: gnucash/gnome-utils/gnc-main-window.c:4499
msgid "Visit the GnuCash website."
msgstr "Posjeti GnuCash web stranicu."
#: gnucash/gnome-utils/gnc-period-select.c:71
-#: libgnucash/app-utils/date-utilities.scm:804
+#: libgnucash/app-utils/date-utilities.scm:875
msgid "Start of this month"
msgstr "PoÄetak ovog mjeseca"
#: gnucash/gnome-utils/gnc-period-select.c:72
-#: libgnucash/app-utils/date-utilities.scm:818
+#: libgnucash/app-utils/date-utilities.scm:889
msgid "Start of previous month"
msgstr "PoÄetak prethodnog mjeseca"
@@ -7711,17 +7831,17 @@ msgid "Start of this quarter"
msgstr "PoÄetak ovog kvartala"
#: gnucash/gnome-utils/gnc-period-select.c:74
-#: libgnucash/app-utils/date-utilities.scm:860
+#: libgnucash/app-utils/date-utilities.scm:931
msgid "Start of previous quarter"
msgstr "PoÄetak prethodnog kvartala"
#: gnucash/gnome-utils/gnc-period-select.c:75
-#: libgnucash/app-utils/date-utilities.scm:748
+#: libgnucash/app-utils/date-utilities.scm:819
msgid "Start of this year"
msgstr "PoÄetak ove godine"
#: gnucash/gnome-utils/gnc-period-select.c:76
-#: libgnucash/app-utils/date-utilities.scm:762
+#: libgnucash/app-utils/date-utilities.scm:833
msgid "Start of previous year"
msgstr "PoÄetak prethodne godine"
@@ -7735,12 +7855,12 @@ msgid "Start of previous accounting period"
msgstr "PoÄetak prethodnog obraÄunskog razdoblja"
#: gnucash/gnome-utils/gnc-period-select.c:87
-#: libgnucash/app-utils/date-utilities.scm:811
+#: libgnucash/app-utils/date-utilities.scm:882
msgid "End of this month"
msgstr "Kraj ovog mjeseca"
#: gnucash/gnome-utils/gnc-period-select.c:88
-#: libgnucash/app-utils/date-utilities.scm:825
+#: libgnucash/app-utils/date-utilities.scm:896
msgid "End of previous month"
msgstr "Kraj prethodnog mjeseca"
@@ -7749,17 +7869,17 @@ msgid "End of this quarter"
msgstr "Kraj ovog kvartala"
#: gnucash/gnome-utils/gnc-period-select.c:90
-#: libgnucash/app-utils/date-utilities.scm:867
+#: libgnucash/app-utils/date-utilities.scm:938
msgid "End of previous quarter"
msgstr "Kraj prethodnog kvartala"
#: gnucash/gnome-utils/gnc-period-select.c:91
-#: libgnucash/app-utils/date-utilities.scm:755
+#: libgnucash/app-utils/date-utilities.scm:826
msgid "End of this year"
msgstr "Kraj ove godine"
#: gnucash/gnome-utils/gnc-period-select.c:92
-#: libgnucash/app-utils/date-utilities.scm:769
+#: libgnucash/app-utils/date-utilities.scm:840
msgid "End of previous year"
msgstr "Kraj prethodne godine"
@@ -7772,7 +7892,7 @@ msgstr "Kraj ovog obraÄunskog razdoblja"
msgid "End of previous accounting period"
msgstr "Kraj prethodnog obraÄunskog razdoblja"
-#: gnucash/gnome-utils/gnc-splash.c:126
+#: gnucash/gnome-utils/gnc-splash.c:112
msgid "Loading..."
msgstr "UÄitavanje …"
@@ -7782,10 +7902,11 @@ msgstr "nikad"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:113
msgid ""
-"You can not change this transaction, the Book or Register is set to Read Only."
+"You can not change this transaction, the Book or Register is set to Read "
+"Only."
msgstr ""
-"Ne možeš promijeniti ovu transakciju, knjiga ili registar su postavljeni na samo "
-"za Äitanje."
+"Ne možeš promijeniti ovu transakciju, knjiga ili registar su postavljeni na "
+"samo za Äitanje."
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:131
msgid "Save Transaction before proceeding?"
@@ -7793,8 +7914,8 @@ msgstr "Spremiti transakciju prije nastavljanja?"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:133
msgid ""
-"The current transaction has been changed. Would you like to record the changes "
-"before proceeding, or cancel?"
+"The current transaction has been changed. Would you like to record the "
+"changes before proceeding, or cancel?"
msgstr ""
"TrenutaÄna transakcija je promijenjena. ŽeliÅ¡ li spremiti promjene ili ih "
"odbaciti?"
@@ -7855,7 +7976,8 @@ msgstr "Ovaj registar ne podržava ureÄ‘ivanje teÄajeva."
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:421
#: gnucash/register/ledger-core/split-register-control.c:1367
#: gnucash/register/ledger-core/split-register-control.c:1442
-msgid "You need to expand the transaction in order to modify its exchange rates."
+msgid ""
+"You need to expand the transaction in order to modify its exchange rates."
msgstr "MoraÅ¡ proÅ¡iriti transakciju, za promjenu njenih teÄajeva."
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:461
@@ -7874,8 +7996,8 @@ msgid ""
"This is the split anchoring this transaction to the register. You can not "
"duplicate it from this register window."
msgstr ""
-"Ovo je stavka, koja spaja ovu transakciju u registar. Ne možeš je duplicirati iz "
-"ovog prozora registra."
+"Ovo je stavka, koja spaja ovu transakciju u registar. Ne možeš je "
+"duplicirati iz ovog prozora registra."
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1357
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:477
@@ -7888,12 +8010,12 @@ msgstr "Nije moguće stvoriti transakciju na ovaj datum"
#: gnucash/register/ledger-core/split-register.c:615
msgid ""
"The entered date of the duplicated transaction is older than the \"Read-Only "
-"Threshold\" set for this book. This setting can be changed in File -> Properties "
-"-> Accounts."
+"Threshold\" set for this book. This setting can be changed in File -> "
+"Properties -> Accounts."
msgstr ""
"Uneseni datum duplicirane transakcije je stariji od „Prag samo-za-Äitanje“, "
-"postavljenog za ovu knjigu. Ovu postavku možeš izmijeniti u izborniku „Datoteka "
-"→ Svojstva → Konti“."
+"postavljenog za ovu knjigu. Ovu postavku možeš izmijeniti u izborniku "
+"„Datoteka → Svojstva → Konti“."
#. Translators: This message will be presented when a user *
#. * attempts to record a transaction without splits
@@ -7906,8 +8028,8 @@ msgid ""
"The blank transaction does not have enough information to save it. Would you "
"like to return to the transaction to update, or cancel the save?"
msgstr ""
-"Prazna transakcija nema dovoljno podataka za spremanje. Želiš li se vratiti na "
-"transakciju i aktualizirati je ili želiš odustati od spremanja?"
+"Prazna transakcija nema dovoljno podataka za spremanje. Želiš li se vratiti "
+"na transakciju i aktualizirati je ili želiš odustati od spremanja?"
#. Translators: Return to the transaction to update
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1737
@@ -7922,8 +8044,8 @@ msgstr "OznaÄiti stavku kao neusklaÄ‘enu?"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1782
#: gnucash/register/ledger-core/split-register-control.c:1833
msgid ""
-"You are about to mark a reconciled split as unreconciled. Doing so might make "
-"future reconciliation difficult! Continue with this change?"
+"You are about to mark a reconciled split as unreconciled. Doing so might "
+"make future reconciliation difficult! Continue with this change?"
msgstr ""
"Ovime ćeÅ¡ oznaÄiti usklaÄ‘enu stavku kao neusklaÄ‘enu. Time ćeÅ¡ možda otežati "
"buduća usklađivanja! Želiš li nastaviti s ovom promjenom?"
@@ -7934,7 +8056,7 @@ msgid "_Unreconcile"
msgstr "Poništi _usklađenost"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1911
-#: gnucash/register/ledger-core/split-register-model.c:2167
+#: gnucash/register/ledger-core/split-register-model.c:2187
msgid "Change reconciled split?"
msgstr "Promijeniti usklađenu stavku?"
@@ -7952,14 +8074,14 @@ msgstr "Promijeniti stavku, koja je povezana s usklađenom stavkom?"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1920
msgid ""
-"You are about to change a split that is linked to a reconciled split. Doing so "
-"might make future reconciliation difficult! Continue with this change?"
+"You are about to change a split that is linked to a reconciled split. Doing "
+"so might make future reconciliation difficult! Continue with this change?"
msgstr ""
-"Ovime ćeš promijeniti stavku, koja je povezana s usklađenom stavkom. Time ćeš "
-"možda otežati buduća usklađivanja! Želiš li nastaviti s ovom promjenom?"
+"Ovime ćeš promijeniti stavku, koja je povezana s usklađenom stavkom. Time "
+"ćeš možda otežati buduća usklađivanja! Želiš li nastaviti s ovom promjenom?"
#: gnucash/gnome-utils/gnc-tree-control-split-reg.c:1934
-#: gnucash/register/ledger-core/split-register-model.c:2191
+#: gnucash/register/ledger-core/split-register-model.c:2211
msgid "Chan_ge Split"
msgstr "_Promijeni stavku"
@@ -7974,7 +8096,7 @@ msgstr "Ne postoji konto „%s“. Želiš li ga stvoriti?"
msgid "You can not paste from the general journal to a register."
msgstr "Ne možeš zalijepiti iz općeg dnevnika u registar."
-#: gnucash/gnome-utils/gnc-tree-model-account.c:629
+#: gnucash/gnome-utils/gnc-tree-model-account.c:593
msgid "New top level account"
msgstr "Novi konto najviše razine"
@@ -8014,13 +8136,12 @@ msgid "Teller"
msgstr "Bankovni Å¡alter"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2863
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2998
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3084
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2970
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3056
#: gnucash/register/ledger-core/gncEntryLedgerLoad.c:135
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:529
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:1093
#: gnucash/register/ledger-core/split-register.c:2550
-#: gnucash/report/standard-reports/register.scm:841
#: libgnucash/app-utils/prefs.scm:72 libgnucash/app-utils/prefs.scm:83
msgid "Charge"
msgstr "Terećenje"
@@ -8039,8 +8160,8 @@ msgstr "Priznanica"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2993
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3071
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2965
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3043
#: gnucash/register/ledger-core/split-register.c:2553
#: gnucash/register/ledger-core/split-register.c:2567
#: gnucash/register/ledger-core/split-register.c:2603
@@ -8056,8 +8177,8 @@ msgstr "Povećanje"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2961
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2986
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3078
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2958
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3050
#: gnucash/register/ledger-core/split-register.c:2554
#: gnucash/register/ledger-core/split-register.c:2568
#: gnucash/register/ledger-core/split-register.c:2604
@@ -8075,7 +8196,7 @@ msgid "POS"
msgstr "Prodajno mjesto"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2870
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:470
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:442
#: gnucash/register/ledger-core/split-register.c:2557
#: gnucash/report/business-reports/aging.scm:708
#: gnucash/report/business-reports/taxinvoice.eguile.scm:200
@@ -8115,7 +8236,7 @@ msgstr "Izravno terećenje"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2962
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3096
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3068
#: gnucash/register/ledger-core/split-register.c:2569
#: gnucash/register/ledger-core/split-register.c:2573
#: gnucash/register/ledger-core/split-register.c:2580
@@ -8138,7 +8259,7 @@ msgstr "Kupovina"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2935
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2963
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3016
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2988
#: gnucash/register/ledger-core/split-register.c:2570
#: gnucash/register/ledger-core/split-register.c:2574
#: gnucash/register/ledger-core/split-register.c:2585
@@ -8166,7 +8287,7 @@ msgid "ATM Withdraw"
msgstr "Bankomat, isplata"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2922
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3009
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2981
#: gnucash/register/ledger-core/split-register.c:2609
#: libgnucash/app-utils/prefs.scm:90
msgid "Rebate"
@@ -8183,29 +8304,29 @@ msgstr "Isplatnica"
#: gnucash/register/ledger-core/split-register.c:2623
#: gnucash/report/standard-reports/balance-sheet.scm:661
#: gnucash/report/standard-reports/budget-balance-sheet.scm:813
-#: libgnucash/app-utils/gnc-ui-util.c:888 libgnucash/engine/Account.cpp:4103
+#: libgnucash/app-utils/gnc-ui-util.c:1048 libgnucash/engine/Account.cpp:4101
msgid "Equity"
msgstr "Kapital"
#: gnucash/gnome-utils/gnc-tree-model-split-reg.c:2943
-#: gnucash/gnome-utils/gnc-tree-view-price.c:454
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2964
+#: gnucash/gnome-utils/gnc-tree-view-price.c:426
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2936
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:62
#: gnucash/register/ledger-core/split-register.c:2630
-#: gnucash/register/ledger-core/split-register-model.c:394
+#: gnucash/register/ledger-core/split-register-model.c:396
#: gnucash/report/business-reports/invoice.scm:241
#: gnucash/report/standard-reports/advanced-portfolio.scm:1080
#: gnucash/report/standard-reports/general-journal.scm:114
-#: gnucash/report/standard-reports/general-ledger.scm:89
-#: gnucash/report/standard-reports/general-ledger.scm:109
+#: gnucash/report/standard-reports/general-ledger.scm:86
+#: gnucash/report/standard-reports/general-ledger.scm:106
#: gnucash/report/standard-reports/portfolio.scm:257
#: gnucash/report/standard-reports/price-scatter.scm:39
#: gnucash/report/standard-reports/price-scatter.scm:346
-#: gnucash/report/standard-reports/register.scm:150
-#: gnucash/report/standard-reports/register.scm:440
-#: gnucash/report/standard-reports/transaction.scm:904
-#: gnucash/report/standard-reports/transaction.scm:1024
-#: gnucash/report/standard-reports/transaction.scm:1167
+#: gnucash/report/standard-reports/register.scm:149
+#: gnucash/report/standard-reports/register.scm:439
+#: gnucash/report/standard-reports/transaction.scm:914
+#: gnucash/report/standard-reports/transaction.scm:1034
+#: gnucash/report/standard-reports/transaction.scm:1181
msgid "Price"
msgstr "Cijena"
@@ -8234,8 +8355,8 @@ msgid "Dist"
msgstr "Rasp"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: gnucash/report/standard-reports/register.scm:241 libgnucash/engine/Split.c:1579
-#: libgnucash/engine/Split.c:1596
+#: gnucash/report/standard-reports/register.scm:240
+#: libgnucash/engine/Split.c:1579 libgnucash/engine/Split.c:1596
msgid "-- Split Transaction --"
msgstr "-- višedjelna transakcija --"
@@ -8245,27 +8366,27 @@ msgstr "-- podjela dionice --"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:436
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:576
-#: gnucash/register/ledger-core/split-register-model.c:980
+#: gnucash/register/ledger-core/split-register-model.c:1000
msgid "%A %d %B %Y"
msgstr "%A, %e. %B %Y."
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:479
msgid ""
-"The entered date of the new transaction is older than the \"Read-Only Threshold"
-"\" set for this book. This setting can be changed in File -> Properties -> "
-"Accounts."
+"The entered date of the new transaction is older than the \"Read-Only "
+"Threshold\" set for this book. This setting can be changed in File -> "
+"Properties -> Accounts."
msgstr ""
"Uneseni datum nove transakcije je stariji od „Prag samo-za-Äitanje“, "
-"postavljenog za ovu knjigu. Ovu postavku možeš izmijeniti u izborniku „Datoteka "
-"→ Svojstva → Konti“."
+"postavljenog za ovu knjigu. Ovu postavku možeš izmijeniti u izborniku "
+"„Datoteka → Svojstva → Konti“."
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:861
msgid ""
-"Exchange Rate Canceled, using existing rate or default 1 to 1 rate if this is a "
-"new transaction."
+"Exchange Rate Canceled, using existing rate or default 1 to 1 rate if this "
+"is a new transaction."
msgstr ""
-"Odustano je od unosa teÄaja. Koristi se postojeći teÄaj ili standardni teÄaj 1 "
-"prema 1, ako je ovo nova transakcija."
+"Odustano je od unosa teÄaja. Koristi se postojeći teÄaj ili standardni teÄaj "
+"1 prema 1, ako je ovo nova transakcija."
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:1122
#: gnucash/register/ledger-core/split-register.c:2002
@@ -8275,11 +8396,11 @@ msgstr "Ponovo izraÄunaj transakciju"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:1123
#: gnucash/register/ledger-core/split-register.c:2003
msgid ""
-"The values entered for this transaction are inconsistent. Which value would you "
-"like to have recalculated?"
+"The values entered for this transaction are inconsistent. Which value would "
+"you like to have recalculated?"
msgstr ""
-"Vrijednosti unesene za u ovu transakciju su nedosljedne. Koju vrijednost želiš "
-"izraÄunati?"
+"Vrijednosti unesene za u ovu transakciju su nedosljedne. Koju vrijednost "
+"želiÅ¡ izraÄunati?"
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:1130
#: gnucash/gnome-utils/gnc-tree-util-split-reg.c:1132
@@ -8309,236 +8430,236 @@ msgstr "_Vrijednost"
msgid "_Recalculate"
msgstr "_Ponovo izraÄunaj"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:762
+#: gnucash/gnome-utils/gnc-tree-view-account.c:734
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:1010
#: gnucash/import-export/csv-exp/csv-transactions-export.c:611
#: gnucash/import-export/csv-exp/csv-transactions-export.c:625
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:301
-#: gnucash/report/standard-reports/general-ledger.scm:82
-#: gnucash/report/standard-reports/general-ledger.scm:102
+#: gnucash/report/standard-reports/general-ledger.scm:79
+#: gnucash/report/standard-reports/general-ledger.scm:99
#: gnucash/report/standard-reports/transaction.scm:137
-#: gnucash/report/standard-reports/transaction.scm:930
-#: gnucash/report/standard-reports/transaction.scm:1020
-#: gnucash/report/standard-reports/trial-balance.scm:705
+#: gnucash/report/standard-reports/transaction.scm:940
+#: gnucash/report/standard-reports/transaction.scm:1030
+#: gnucash/report/standard-reports/trial-balance.scm:756
msgid "Account Name"
msgstr "Ime konta"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:773
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2944
+#: gnucash/gnome-utils/gnc-tree-view-account.c:745
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2916
#: gnucash/gtkbuilder/dialog-price.glade:571
msgid "Commodity"
msgstr "Roba"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:779
+#: gnucash/gnome-utils/gnc-tree-view-account.c:751
#: gnucash/report/report-system/options-utilities.scm:245
#: gnucash/report/standard-reports/account-summary.scm:104
-#: gnucash/report/standard-reports/general-ledger.scm:84
-#: gnucash/report/standard-reports/general-ledger.scm:104
+#: gnucash/report/standard-reports/general-ledger.scm:81
+#: gnucash/report/standard-reports/general-ledger.scm:101
#: gnucash/report/standard-reports/sx-summary.scm:83
#: gnucash/report/standard-reports/transaction.scm:143
-#: gnucash/report/standard-reports/transaction.scm:899
-#: gnucash/report/standard-reports/transaction.scm:1038
+#: gnucash/report/standard-reports/transaction.scm:909
+#: gnucash/report/standard-reports/transaction.scm:1048
msgid "Account Code"
msgstr "Å ifra konta"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:791
+#: gnucash/gnome-utils/gnc-tree-view-account.c:763
msgid "Last Num"
msgstr "Posljednji broj"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:797
+#: gnucash/gnome-utils/gnc-tree-view-account.c:769
msgid "Present"
msgstr "TrenutaÄno"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:804
+#: gnucash/gnome-utils/gnc-tree-view-account.c:776
msgid "Present (Report)"
msgstr "TrenutaÄno (izvjeÅ¡taj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:818
+#: gnucash/gnome-utils/gnc-tree-view-account.c:790
msgid "Balance (Report)"
msgstr "Saldo (izvještaj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:825
+#: gnucash/gnome-utils/gnc-tree-view-account.c:797
msgid "Balance (Period)"
msgstr "Saldo (razdoblje)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:839
+#: gnucash/gnome-utils/gnc-tree-view-account.c:811
msgid "Cleared (Report)"
msgstr "Potvrđeno (izvještaj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:853
+#: gnucash/gnome-utils/gnc-tree-view-account.c:825
msgid "Reconciled (Report)"
msgstr "Usklađeno (izvještaj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:860
+#: gnucash/gnome-utils/gnc-tree-view-account.c:832
msgid "Last Reconcile Date"
msgstr "Datum zadnjeg usklađivanja"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:866
+#: gnucash/gnome-utils/gnc-tree-view-account.c:838
msgid "Future Minimum"
msgstr "Budući minimum"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:873
+#: gnucash/gnome-utils/gnc-tree-view-account.c:845
msgid "Future Minimum (Report)"
msgstr "Budući minimum (izvještaj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:887
+#: gnucash/gnome-utils/gnc-tree-view-account.c:859
msgid "Total (Report)"
msgstr "Ukupno (izvještaj)"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:894
+#: gnucash/gnome-utils/gnc-tree-view-account.c:866
msgid "Total (Period)"
msgstr "Ukupno (razdoblje)"
# B = Boja
-#: gnucash/gnome-utils/gnc-tree-view-account.c:903
+#: gnucash/gnome-utils/gnc-tree-view-account.c:875
msgid "C"
msgstr "B"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:911
+#: gnucash/gnome-utils/gnc-tree-view-account.c:883
msgid "Account Color"
msgstr "Boja konta"
-#: gnucash/gnome-utils/gnc-tree-view-account.c:920
+#: gnucash/gnome-utils/gnc-tree-view-account.c:892
msgid "Tax Info"
msgstr "Porezne informacije"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1746
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1718
#, c-format
msgid "Present (%s)"
msgstr "TrenutaÄno (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1749
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:954
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1721
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:926
#, c-format
msgid "Balance (%s)"
msgstr "Saldo (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1752
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1724
#, c-format
msgid "Cleared (%s)"
msgstr "Potvrđeno (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1755
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1727
#, c-format
msgid "Reconciled (%s)"
msgstr "Usklađeno (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1758
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1730
#, c-format
msgid "Future Minimum (%s)"
msgstr "Budući minimum (%s)"
#. Translators: %s is a currency mnemonic.
-#: gnucash/gnome-utils/gnc-tree-view-account.c:1761
+#: gnucash/gnome-utils/gnc-tree-view-account.c:1733
#, c-format
msgid "Total (%s)"
msgstr "Ukupno (%s)"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:385
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:357
msgid "Namespace"
msgstr "Imenski prostor"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:402
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:374
msgid "Print Name"
msgstr "Ispiši ime"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:408
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:380
msgid "Display symbol"
msgstr "Prikaži oznaku"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:414
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:386
msgid "Unique Name"
msgstr "Jedinstveno ime"
#. Translators: Again replace CUSIP by the name of your
#. National Securities Identifying Number.
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:421
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:393
msgid "ISIN/CUSIP"
msgstr "ISIN/CUSIP"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:427
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:399
msgid "Fraction"
msgstr "Apoeni"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:434
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:406
msgid "Get Quotes"
msgstr "Preuzmi teÄajeve"
# T = TeÄajevi
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:437
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:409
msgid "Column letter for 'Get Quotes'|Q"
msgstr "T"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:443
-#: gnucash/gnome-utils/gnc-tree-view-price.c:442
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:415
+#: gnucash/gnome-utils/gnc-tree-view-price.c:414
msgid "Source"
msgstr "Izvor"
-#: gnucash/gnome-utils/gnc-tree-view-commodity.c:448
+#: gnucash/gnome-utils/gnc-tree-view-commodity.c:420
msgid "Timezone"
msgstr "Vremenska zona"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:381
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:353
msgid "Customer Number"
msgstr "Broj kupca"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:389
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:361
msgid "Vendor Number"
msgstr "Broj dobavljaÄa"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:393
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:365
msgid "Employee Number"
msgstr "Broj radnika"
#. Billing or Shipping addresses
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:445
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:417
#: gnucash/report/business-reports/aging.scm:49
#: gnucash/report/business-reports/aging.scm:698
msgid "Address Name"
msgstr "Ime adrese"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:450
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:422
#: gnucash/report/business-reports/aging.scm:50
#: gnucash/report/business-reports/aging.scm:700
msgid "Address 1"
msgstr "Adresa 1"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:455
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:427
#: gnucash/report/business-reports/aging.scm:51
#: gnucash/report/business-reports/aging.scm:702
msgid "Address 2"
msgstr "Adresa 2"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:460
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:432
#: gnucash/report/business-reports/aging.scm:52
#: gnucash/report/business-reports/aging.scm:704
msgid "Address 3"
msgstr "Adresa 3"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:465
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:437
#: gnucash/report/business-reports/aging.scm:53
#: gnucash/report/business-reports/aging.scm:706
msgid "Address 4"
msgstr "Adresa 4"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:475
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:447
#: gnucash/report/business-reports/aging.scm:710
#: gnucash/report/business-reports/taxinvoice.eguile.scm:206
msgid "Fax"
msgstr "Faks"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:480
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:452
msgid "E-mail"
msgstr "E-pošta"
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:506
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:478
#: gnucash/gtkbuilder/dialog-customer.glade:162
#: gnucash/gtkbuilder/dialog-employee.glade:138
#: gnucash/gtkbuilder/dialog-invoice.glade:217
@@ -8553,64 +8674,64 @@ msgstr "Aktivno"
# A = Aktivno
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-owner.c:509
+#: gnucash/gnome-utils/gnc-tree-view-owner.c:481
msgid "Column letter for 'Active'|A"
msgstr "A"
-#: gnucash/gnome-utils/gnc-tree-view-price.c:424
+#: gnucash/gnome-utils/gnc-tree-view-price.c:396
msgid "Security"
msgstr "Vrijednosni papir"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:790
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:762
msgid "Status Bar"
msgstr "Traka stanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1275
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1247
#: gnucash/report/business-reports/balsheet-eg.scm:499
#: libgnucash/engine/Scrub.c:365
msgid "Imbalance"
msgstr "Debalans"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1515
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:1487
msgid " Scheduled "
msgstr " Terminirano "
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2342
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2314
#: gnucash/register/ledger-core/split-register-control.c:1527
msgid "Save the changed transaction?"
msgstr "Spremiti izmjenjenu transakciju?"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2344
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2316
msgid ""
-"The current transaction has changed. Would you like to record the changes, or "
-"discard the changes?"
+"The current transaction has changed. Would you like to record the changes, "
+"or discard the changes?"
msgstr ""
"TrenutaÄna transakcija se promijenila. ŽeliÅ¡ li spremiti promjene ili ih "
"odbaciti?"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2382
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2354
#: gnucash/register/ledger-core/split-register-control.c:1542
msgid "_Discard Changes"
msgstr "_Odbaci promjene"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2384
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2356
#: gnucash/register/ledger-core/split-register-control.c:1544
msgid "_Record Changes"
msgstr "_Zabilježi promjene"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2750
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2722
msgid "Date Entered"
msgstr "Datum unosa"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2752
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2724
msgid "Date Reconciled"
msgstr "Datum usklađivanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2754
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2726
msgid "Date Posted / Entered / Reconciled"
msgstr "Datum uknjiženja / unosa / usklađivanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2775
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2747
#: gnucash/gtkbuilder/dialog-order.glade:308
#: gnucash/gtkbuilder/dialog-order.glade:756
#: gnucash/report/business-reports/customer-summary.scm:71
@@ -8619,225 +8740,225 @@ msgstr "Datum uknjiženja / unosa / usklađivanja"
msgid "Reference"
msgstr "Referenca"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2781
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2753
msgid "Reference / Action"
msgstr "Referenca / radnja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2795
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2767
msgid "T-Number"
msgstr "T-broj"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2801
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2773
msgid "Number / Action"
msgstr "Broj / radnja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2817
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2789
msgid "Customer / Memo"
msgstr "Kupac / zabilješka"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2828
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2800
msgid "Vendor / Memo"
msgstr "DobavljaÄ / zabiljeÅ¡ka"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2846
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2818
msgid "Description / Notes / Memo"
msgstr "Opis / napomene / zabilješka"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2876
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2848
#: gnucash/import-export/csv-exp/csv-transactions-export.c:623
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:57
msgid "Void Reason"
msgstr "Razlog storniranja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2880
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2852
msgid "Accounts / Void Reason"
msgstr "Konti / Razlog storniranja"
-# Uskl = Usklađeno
+# U = Usklađeno
#. toggle column: mark existing transaction reconciled
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2890
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2862
#: gnucash/import-export/import-main-matcher.c:510
msgid "R"
-msgstr "Uskl"
+msgstr "U"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2934
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2906
msgid "Amount / Value"
msgstr "Iznos / vrijednost"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2976
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2948
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:61
#: libgnucash/app-utils/prefs.scm:81
msgid "Withdrawal"
msgstr "Isplata"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2981
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:2953
#: libgnucash/app-utils/prefs.scm:82
msgid "Spend"
msgstr "Trošak"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3031
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3038
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3003
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3010
#: gnucash/report/standard-reports/transaction.scm:485
#: libgnucash/app-utils/prefs.scm:80
msgid "Funds Out"
msgstr "Izlazna sredstva"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3040
-#: gnucash/register/ledger-core/split-register-model.c:497
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3012
+#: gnucash/register/ledger-core/split-register-model.c:499
msgid "Credit Formula"
msgstr "Formula potraživanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3061
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3033
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:60
#: libgnucash/app-utils/prefs.scm:64
msgid "Deposit"
msgstr "Uplata"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3066
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3038
#: libgnucash/app-utils/prefs.scm:65
msgid "Receive"
msgstr "Primi"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3089
-#: gnucash/report/business-reports/customer-summary.scm:458
-#: gnucash/report/business-reports/customer-summary.scm:842
-#: gnucash/report/standard-reports/net-charts.scm:403
-#: gnucash/report/standard-reports/net-charts.scm:483
-#: libgnucash/app-utils/prefs.scm:73 libgnucash/engine/Account.cpp:4102
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3061
+#: gnucash/report/business-reports/customer-summary.scm:157
+#: gnucash/report/business-reports/customer-summary.scm:472
+#: gnucash/report/standard-reports/net-charts.scm:409
+#: gnucash/report/standard-reports/net-charts.scm:489
+#: libgnucash/app-utils/prefs.scm:73 libgnucash/engine/Account.cpp:4100
#: libgnucash/engine/gncInvoice.c:1061
msgid "Expense"
msgstr "Rashod"
#. similar to default-calculated-cells but disable dual-subtotals.
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3112
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3119
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3084
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3091
#: gnucash/report/standard-reports/transaction.scm:482
#: libgnucash/app-utils/prefs.scm:63
msgid "Funds In"
msgstr "Ulazna sredstva"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3121
-#: gnucash/register/ledger-core/split-register-model.c:490
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3093
+#: gnucash/register/ledger-core/split-register-model.c:492
msgid "Debit Formula"
msgstr "Formula dugovanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3191
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3163
msgid "Enter Due Date"
msgstr "Unesi datum dospijeća"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3202
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3174
msgid "Enter the transaction reference, such as the invoice or check number"
msgstr "Unesi referencu transakcije, npr. broj izlaznog raÄuna ili broj Äeka"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3204
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3211
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3176
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3183
msgid "Enter the type of transaction, or choose one from the list"
msgstr "Unesi vrstu transakcije ili odaberi jednu iz popisa"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3209
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3181
msgid "Enter the transaction number, such as the check number"
msgstr "Unesi broj transakcije, npr. broj Äeka"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3221
-#: gnucash/register/ledger-core/split-register-model.c:1112
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3193
+#: gnucash/register/ledger-core/split-register-model.c:1132
msgid "Enter the name of the Customer"
msgstr "Unesi ime kupca"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3223
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3232
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3241
-#: gnucash/register/ledger-core/split-register-model.c:1149
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3195
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3204
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3213
+#: gnucash/register/ledger-core/split-register-model.c:1169
msgid "Enter notes for the transaction"
msgstr "Unesi napomenu za transakciju"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3225
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3234
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3243
-#: gnucash/register/ledger-core/split-register-model.c:1309
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3197
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3206
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3215
+#: gnucash/register/ledger-core/split-register-model.c:1329
msgid "Enter a description of the split"
msgstr "Unesi opis stavke"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3230
-#: gnucash/register/ledger-core/split-register-model.c:1115
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3202
+#: gnucash/register/ledger-core/split-register-model.c:1135
msgid "Enter the name of the Vendor"
msgstr "Unesi ime dobavljaÄa"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3239
-#: gnucash/register/ledger-core/split-register-model.c:1118
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3211
+#: gnucash/register/ledger-core/split-register-model.c:1138
msgid "Enter a description of the transaction"
msgstr "Unesi opis transakcije"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3253
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3257
-#: gnucash/register/ledger-core/split-register-model.c:1471
-#: gnucash/register/ledger-core/split-register-model.c:1538
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3225
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3229
+#: gnucash/register/ledger-core/split-register-model.c:1491
+#: gnucash/register/ledger-core/split-register-model.c:1558
msgid "Enter the account to transfer from, or choose one from the list"
msgstr "Unesi konto s kojeg se prenosi, ili odaberi jedan iz popisa"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3255
-#: gnucash/register/ledger-core/split-register-model.c:1182
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3227
+#: gnucash/register/ledger-core/split-register-model.c:1202
msgid "Reason the transaction was voided"
msgstr "Razlog, zbog kojeg je transakcija stornirana"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3267
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3239
msgid "Enter the reconcile type"
msgstr "Unesi vrstu usklađivanja"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3277
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3249
msgid "Enter the type of transaction"
msgstr "Unesi vrstu transakcije"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3287
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3307
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3259
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3279
msgid "Enter the value of shares bought or sold"
msgstr "Unesi vrijednost kupljenih ili prodanih dionica"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3297
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3309
-#: gnucash/register/ledger-core/split-register-model.c:1419
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3269
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3281
+#: gnucash/register/ledger-core/split-register-model.c:1439
msgid "Enter the number of shares bought or sold"
msgstr "Unesi broj kupljenih ili prodanih dionica"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3319
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3291
msgid "* Indicates the transaction Commodity."
msgstr "* NaznaÄuje dionicu transakcije."
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3329
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3301
msgid "Enter the rate"
msgstr "Unesi stopu"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3339
-#: gnucash/register/ledger-core/split-register-model.c:1383
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3311
+#: gnucash/register/ledger-core/split-register-model.c:1403
msgid "Enter the effective share price"
msgstr "Unesi efektivnu cijenu dionica"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3349
-#: gnucash/register/ledger-core/split-register-model.c:2332
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3321
+#: gnucash/register/ledger-core/split-register-model.c:2352
msgid "Enter credit formula for real transaction"
msgstr "Unesi formulu potraživanja za stvarnu transakciju"
-#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3359
-#: gnucash/register/ledger-core/split-register-model.c:2298
+#: gnucash/gnome-utils/gnc-tree-view-split-reg.c:3331
+#: gnucash/register/ledger-core/split-register-model.c:2318
msgid "Enter debit formula for real transaction"
msgstr "Unesi formulu dugovanja za stvarnu transakciju"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:168
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:140
#: gnucash/gtkbuilder/dialog-sx.glade:1075
-#: gnucash/report/report-system/html-utilities.scm:833
+#: gnucash/report/report-system/html-utilities.scm:802
msgid "Enabled"
msgstr "UkljuÄeno"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:171
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:143
msgid "Single-character short column-title form of 'Enabled'|E"
msgstr "U"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:182
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:154
msgid "Last Occur"
msgstr "Posljednji događaj"
-#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:187
+#: gnucash/gnome-utils/gnc-tree-view-sx-list.c:159
msgid "Next Occur"
msgstr "Sljedeće nastupanje"
@@ -8869,11 +8990,11 @@ msgstr "Neto imovina:"
msgid "Profits:"
msgstr "Dobici:"
-#: gnucash/gnucash-bin.c:100
+#: gnucash/gnucash-bin.c:104
msgid "Show GnuCash version"
msgstr "Prikaži GnuCash verziju"
-#: gnucash/gnucash-bin.c:105
+#: gnucash/gnucash-bin.c:109
msgid ""
"Enable debugging mode: provide deep detail in the logs.\n"
"This is equivalent to: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
@@ -8882,13 +9003,14 @@ msgstr ""
"podataka.\n"
"Ovo je jednako kao: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
-#: gnucash/gnucash-bin.c:110
+#: gnucash/gnucash-bin.c:114
msgid "Enable extra/development/debugging features."
msgstr "UkljuÄi dodatne/razvojne/probne funkcije."
-#: gnucash/gnucash-bin.c:115
+#: gnucash/gnucash-bin.c:119
msgid ""
-"Log level overrides, of the form \"modulename={debug,info,warn,crit,error}\"\n"
+"Log level overrides, of the form \"modulename={debug,info,warn,crit,"
+"error}\"\n"
"Examples: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
"This can be invoked multiple times."
msgstr ""
@@ -8897,121 +9019,121 @@ msgstr ""
"Primjeri: \"--log qof=debug\" ili \"--log gnc.backend.file.sx=info\"\n"
"Ovo je moguće pozvati višestruko."
-#: gnucash/gnucash-bin.c:121
+#: gnucash/gnucash-bin.c:125
msgid ""
"File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or "
"\"stdout\"."
msgstr ""
-"Datoteka za log-podatke; standardna datoteka je „/tmp/gnucash.trace“; može biti "
-"„stderr“ ili „stdout“."
+"Datoteka za log-podatke; standardna datoteka je „/tmp/gnucash.trace“; može "
+"biti „stderr“ ili „stdout“."
-#: gnucash/gnucash-bin.c:127
+#: gnucash/gnucash-bin.c:131
msgid "Do not load the last file opened"
msgstr "Nemoj ponovo uÄitati posljednju otvorenu datoteku"
-#: gnucash/gnucash-bin.c:131
+#: gnucash/gnucash-bin.c:135
msgid ""
-"Set the prefix for gsettings schemas for gsettings queries. This can be useful "
-"to have a different settings tree while debugging."
+"Set the prefix for gsettings schemas for gsettings queries. This can be "
+"useful to have a different settings tree while debugging."
msgstr ""
-"Postavi prefiks za gsettings sheme za gsettings upite. Ovo može biti korisno za "
-"dobivanje drugaÄijeg stabla podeÅ¡avanja prilikom ispravljanja."
+"Postavi prefiks za gsettings sheme za gsettings upite. Ovo može biti korisno "
+"za dobivanje drugaÄijeg stabla podeÅ¡avanja prilikom ispravljanja."
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: gnucash/gnucash-bin.c:134
+#: gnucash/gnucash-bin.c:138
msgid "GSETTINGSPREFIX"
msgstr "GSETTINGSPREFIX"
-#: gnucash/gnucash-bin.c:138
+#: gnucash/gnucash-bin.c:142
msgid "Add price quotes to given GnuCash datafile"
msgstr "Dodaj teÄaj cijena zadanoj GnuCash datoteci"
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: gnucash/gnucash-bin.c:141
+#: gnucash/gnucash-bin.c:145
msgid "FILE"
msgstr "FILE"
-#: gnucash/gnucash-bin.c:145
+#: gnucash/gnucash-bin.c:149
msgid ""
"Regular expression determining which namespace commodities will be retrieved"
msgstr "Regularni izraz, koji određuje nazivni prostor dohvaćene robe"
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: gnucash/gnucash-bin.c:148
+#: gnucash/gnucash-bin.c:152
msgid "REGEXP"
msgstr "REGEXP"
-#: gnucash/gnucash-bin.c:151
+#: gnucash/gnucash-bin.c:155
msgid "[datafile]"
msgstr "[datoteka podataka]"
-#: gnucash/gnucash-bin.c:163
+#: gnucash/gnucash-bin.c:167
msgid "This is a development version. It may or may not work."
msgstr "Ovo je razvojno izdanje. Možda radi, a možda i ne."
-#: gnucash/gnucash-bin.c:164
+#: gnucash/gnucash-bin.c:168
msgid "Report bugs and other problems to gnucash-devel at gnucash.org"
msgstr "Prijavi greške i druge probleme na „gnucash-devel at gnucash.org“"
#. Translators: An URLs follows
-#: gnucash/gnucash-bin.c:166
+#: gnucash/gnucash-bin.c:170
msgid "You can also lookup and file bug reports at"
msgstr "Također možeš pregledati i prijaviti greške na"
#. Translators: An URLs follows
-#: gnucash/gnucash-bin.c:168
+#: gnucash/gnucash-bin.c:172
msgid "To find the last stable version, please refer to"
msgstr "Za nalaženje poslijednje stabline verzije, pregledaj"
-#: gnucash/gnucash-bin.c:430
+#: gnucash/gnucash-bin.c:434
msgid "- GnuCash, accounting for personal and small business finance"
msgstr ""
"– GnuCash, raÄunovodstveni program, namijenjen pojedincima i malim poduzećima"
-#: gnucash/gnucash-bin.c:436 gnucash/gnucash-bin.c:838
+#: gnucash/gnucash-bin.c:440 gnucash/gnucash-bin.c:880
#, c-format
msgid ""
"%s\n"
"Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"%s\n"
-"Pokreni „%s --help“ za prikaz cjelokupnog popisa dostupnih opcija u naredbenom "
-"retku.\n"
+"Pokreni „%s --help“ za prikaz cjelokupnog popisa dostupnih opcija u "
+"naredbenom retku.\n"
-#: gnucash/gnucash-bin.c:447
+#: gnucash/gnucash-bin.c:450
#, c-format
msgid "GnuCash %s development version"
msgstr "GnuCash %s razvojno izdanje"
-#: gnucash/gnucash-bin.c:449
+#: gnucash/gnucash-bin.c:452
#, c-format
msgid "GnuCash %s"
msgstr "GnuCash %s"
-#: gnucash/gnucash-bin.c:559
+#: gnucash/gnucash-bin.c:550
msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
msgstr "TeÄajevi nisu dohvaćeni. Finance::Quote nije ispravno instalirano.\n"
#. Install Price Quote Sources
-#: gnucash/gnucash-bin.c:646
+#: gnucash/gnucash-bin.c:653
msgid "Checking Finance::Quote..."
msgstr "Provjera Finance::Quote …"
-#: gnucash/gnucash-bin.c:654
+#: gnucash/gnucash-bin.c:661
msgid "Loading data..."
msgstr "UÄitavanje podataka …"
-#: gnucash/gnucash-bin.c:839
+#: gnucash/gnucash-bin.c:881
msgid ""
-"Error: could not initialize graphical user interface and option add-price-quotes "
-"was not set.\n"
+"Error: could not initialize graphical user interface and option add-price-"
+"quotes was not set.\n"
" Perhaps you need to set the $DISPLAY environment variable ?"
msgstr ""
-"GreÅ¡ka: nije moguće pokrenuti grafiÄko korisniÄko suÄelje i opcija „dodaj-cijenu-"
-"teÄajeva“ nije postavljena.\n"
+"GreÅ¡ka: nije moguće pokrenuti grafiÄko korisniÄko suÄelje i opcija „dodaj-"
+"cijenu-teÄajeva“ nije postavljena.\n"
" Možda moraš podesiti varijablu okruženja „$DISPLAY“ ?"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:17
@@ -9091,8 +9213,8 @@ msgstr "Posljednji položaj i veliÄina prozora"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:65
msgid ""
"This setting describes the size and position of the window when it was last "
-"closed. The numbers are the X and Y coordinates of the top left corner of the "
-"window followed by the width and height of the window."
+"closed. The numbers are the X and Y coordinates of the top left corner of "
+"the window followed by the width and height of the window."
msgstr ""
"Ova postavka opisuje veliÄinu i položaj prozora u trenutku posljednjeg "
"zatvaranja. Brojevi su X i Y koordinate gornjeg lijevog ugla prozora, zatim "
@@ -9118,8 +9240,8 @@ msgid ""
"If active, only the 'active' items in the current class will be searched. "
"Otherwise all items in the current class will be searched."
msgstr ""
-"Ako je aktivirano, samo „aktivne“ stavke u trenutaÄnom razredu će biti tražene. "
-"U protivnom će biti tražene sve stavke u trenutaÄnom razredu."
+"Ako je aktivirano, samo „aktivne“ stavke u trenutaÄnom razredu će biti "
+"tražene. U protivnom će biti tražene sve stavke u trenutaÄnom razredu."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:107
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:149
@@ -9129,11 +9251,11 @@ msgstr "Da li je porez ukljuÄen u ovu vrstu poslovnog unosa?"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:108
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:150
msgid ""
-"If set to active then tax is included by default in entries of this type. This "
-"setting is inherited by new customers and vendors."
+"If set to active then tax is included by default in entries of this type. "
+"This setting is inherited by new customers and vendors."
msgstr ""
-"Ako je aktivirano, onda je porez standardno ukljuÄen u unosima ove vrste. Ova se "
-"postavka koristi za nove kupce i dobavljaÄe."
+"Ako je aktivirano, onda je porez standardno ukljuÄen u unosima ove vrste. "
+"Ova se postavka koristi za nove kupce i dobavljaÄe."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:112
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:154
@@ -9143,28 +9265,29 @@ msgstr "Automatski plati prilikom uknjiženja."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:113
#: gnucash/gtkbuilder/business-prefs.glade:295
msgid ""
-"At post time, automatically attempt to pay customer documents with outstanding "
-"pre-payments and counter documents. The pre-payments and documents obviously "
-"have to be against the same customer. Counter documents are documents with "
-"opposite sign. For example for an invoice, customer credit notes and negative "
-"invoices are considered counter documents."
+"At post time, automatically attempt to pay customer documents with "
+"outstanding pre-payments and counter documents. The pre-payments and "
+"documents obviously have to be against the same customer. Counter documents "
+"are documents with opposite sign. For example for an invoice, customer "
+"credit notes and negative invoices are considered counter documents."
msgstr ""
-"Prilikom uknjiženja, automatski pokušaj platiti uplatnice kupca s neotplaćenim "
-"pretplatama i nalozima blagajni. Pretplate i uplatnice oÄigledno moraju biti "
-"namijenjene istom potroÅ¡aÄu. Konti blagajne su dokumenti sa suprotnim znakom. Na "
-"primjer za izlazni raÄun, knjižno odobrenje kupca i negativni izlazni raÄuni se "
-"smatraju nalozima blagajni."
+"Prilikom uknjiženja, automatski pokušaj platiti uplatnice kupca s "
+"neotplaćenim pretplatama i nalozima blagajni. Pretplate i uplatnice "
+"oÄigledno moraju biti namijenjene istom potroÅ¡aÄu. Konti blagajne su "
+"dokumenti sa suprotnim znakom. Na primjer za izlazni raÄun, knjižno "
+"odobrenje kupca i negativni izlazni raÄuni se smatraju nalozima blagajni."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:117
msgid "Show invoices due reminder at startup"
-msgstr "Prikaži podsjetnika o dospijeću izlaznih raÄuna nakon pokretanja programa"
+msgstr ""
+"Prikaži podsjetnika o dospijeću izlaznih raÄuna nakon pokretanja programa"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:118
msgid ""
-"If active, at startup GnuCash will check to see whether any invoices will become "
-"due soon. If so, it will present the user with a reminder dialog. The definition "
-"of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash "
-"does not check for due invoices."
+"If active, at startup GnuCash will check to see whether any invoices will "
+"become due soon. If so, it will present the user with a reminder dialog. The "
+"definition of \"soon\" is controlled by the \"Days in Advance\" setting. "
+"Otherwise GnuCash does not check for due invoices."
msgstr ""
"Ako je aktivirano, GnuCash će prilikom pokretanja provjeriti, da li će neki "
"izlazni raÄuni uskoro dospjeti. Ako je tako, prikazat će korisniku prozor "
@@ -9177,12 +9300,13 @@ msgstr "Prikaži ulazne raÄune, koji dospijevaju za ovoliko dana"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:123
msgid ""
-"This field defines the number of days in advance that GnuCash will check for due "
-"invoices. Its value is only used if the \"Notify when due\" setting is active."
+"This field defines the number of days in advance that GnuCash will check for "
+"due invoices. Its value is only used if the \"Notify when due\" setting is "
+"active."
msgstr ""
-"Ovo polje određuje broj dana unaprijed, za koje će GnuCash provjeriti dospijeća "
-"izaznih raÄuna. Njegova vrijednost se koristi samo, ako je odabrana postavka "
-"„Obavijesti o dospijeću“."
+"Ovo polje određuje broj dana unaprijed, za koje će GnuCash provjeriti "
+"dospijeća izaznih raÄuna. Njegova vrijednost se koristi samo, ako je "
+"odabrana postavka „Obavijesti o dospijeću“."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:127
msgid "Enable extra toolbar buttons for business"
@@ -9215,8 +9339,8 @@ msgid ""
"If active, each new invoice will be opened in a new window. Otherwise a new "
"invoice will be opened as a tab in the main window."
msgstr ""
-"Ako je aktivirano, svaki novi izlazni raÄun će biti otvoren u novom prozoru. U "
-"protivnom, nov izlazni raÄun će biti otvoren kao kartica u glavnom prozoru."
+"Ako je aktivirano, svaki novi izlazni raÄun će biti otvoren u novom prozoru. "
+"U protivnom, nov izlazni raÄun će biti otvoren kao kartica u glavnom prozoru."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:142
msgid "Accumulate multiple splits into one"
@@ -9224,39 +9348,40 @@ msgstr "Kumuliraj više stavaka u jednu"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:143
msgid ""
-"If this field is active then multiple entries in an invoice that transfer to the "
-"same account will be accumulated into a single split. This field can be "
+"If this field is active then multiple entries in an invoice that transfer to "
+"the same account will be accumulated into a single split. This field can be "
"overridden per invoice in the Posting dialog."
msgstr ""
-"Ako je ovo polje aktivno, tada će viÅ¡e unosa u jednom izlaznom raÄunu, koji se "
-"prenose na isti konto, biti združeni u jednu stavku. Ovo polje može biti "
+"Ako je ovo polje aktivno, tada će viÅ¡e unosa u jednom izlaznom raÄunu, koji "
+"se prenose na isti konto, biti združeni u jednu stavku. Ovo polje može biti "
"prepisano za izlazne raÄune u prozoru uknjiženja."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:155
#: gnucash/gtkbuilder/business-prefs.glade:312
msgid ""
-"At post time, automatically attempt to pay vendor documents with outstanding pre-"
-"payments and counter documents. The pre-payments and documents obviously have to "
-"be against the same vendor. Counter documents are documents with opposite sign. "
-"For example for a bill, vendor credit notes and negative bills are considered "
-"counter documents."
+"At post time, automatically attempt to pay vendor documents with outstanding "
+"pre-payments and counter documents. The pre-payments and documents obviously "
+"have to be against the same vendor. Counter documents are documents with "
+"opposite sign. For example for a bill, vendor credit notes and negative "
+"bills are considered counter documents."
msgstr ""
"Prilikom uknjiženja, automatski pokuÅ¡aj platiti uplatnice dobavljaÄa s "
-"neotplaćenim pretplatama i nalozima blagajni. Pretplate i uplatnice oÄigledno "
-"moraju biti namijenjene istom dobavljaÄu. Konti blagajne su dokumenti sa "
-"suprotnim znakom. Na primjer za ulazni raÄun, knjižno odobrenje dobavljaÄa i "
-"negativni ulazni raÄuni se smatraju nalozima blagajni."
+"neotplaćenim pretplatama i nalozima blagajni. Pretplate i uplatnice "
+"oÄigledno moraju biti namijenjene istom dobavljaÄu. Konti blagajne su "
+"dokumenti sa suprotnim znakom. Na primjer za ulazni raÄun, knjižno odobrenje "
+"dobavljaÄa i negativni ulazni raÄuni se smatraju nalozima blagajni."
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:159
msgid "Show bills due reminder at startup"
-msgstr "Prikaži podsjetnika o dospijeću ulaznih raÄuna nakon pokretanja programa"
+msgstr ""
+"Prikaži podsjetnika o dospijeću ulaznih raÄuna nakon pokretanja programa"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:160
msgid ""
-"If active, at startup GnuCash will check to see whether any bills will become "
-"due soon. If so, it will present the user with a reminder dialog. The definition "
-"of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash "
-"does not check for due bills."
+"If active, at startup GnuCash will check to see whether any bills will "
+"become due soon. If so, it will present the user with a reminder dialog. The "
+"definition of \"soon\" is controlled by the \"Days in Advance\" setting. "
+"Otherwise GnuCash does not check for due bills."
msgstr ""
"Ako je aktivirano, GnuCash će prilikom pokretanja provjeriti, da li će neki "
"ulazni raÄuni uskoro dospjeti. Ako je tako, prikazat će korisniku prozor "
@@ -9269,26 +9394,27 @@ msgstr "Prikaži izlazne raÄune, koji dospijevaju za ovoliko dana"
#: gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in:165
msgid ""
-"This field defines the number of days in advance that GnuCash will check for due "
-"bills. Its value is only used if the \"Notify when due\" setting is active."
+"This field defines the number of days in advance that GnuCash will check for "
+"due bills. Its value is only used if the \"Notify when due\" setting is "
+"active."
msgstr ""
-"Ovo polje određuje broj dana unaprijed, za koje će GnuCash provjeriti dospijeća "
-"ulaznih raÄuna. Njegova vrijednost se koristi samo, ako je odabrana postavka "
-"„Obavijesti o dospijeću“."
+"Ovo polje određuje broj dana unaprijed, za koje će GnuCash provjeriti "
+"dospijeća ulaznih raÄuna. Njegova vrijednost se koristi samo, ako je "
+"odabrana postavka „Obavijesti o dospijeću“."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:5
msgid "GUID of predefined check format to use"
msgstr ""
-"Globalan jedinstveni identifikacijski broj (GUID) predodreÄ‘enog formata Äeka, "
-"koji će se koristiti"
+"Globalan jedinstveni identifikacijski broj (GUID) predodređenog formata "
+"Äeka, koji će se koristiti"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:6
msgid ""
-"This value specifies the predefined check format to use. The number is the guid "
-"of a known check format."
+"This value specifies the predefined check format to use. The number is the "
+"guid of a known check format."
msgstr ""
-"Ova vrijednost određuje format za preddefiniranu provjeru. Broj je guid poznatog "
-"Äek formata."
+"Ova vrijednost određuje format za preddefiniranu provjeru. Broj je guid "
+"poznatog Äek formata."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:10
msgid "Which check position to print"
@@ -9296,13 +9422,13 @@ msgstr "Koji se dio Äeka treba ispisati"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:11
msgid ""
-"On preprinted checks containing multiple checks per page, this setting specifies "
-"which check position to print. The possible values are 0, 1 and 2, corresponding "
-"to the top, middle and bottom checks on the page."
+"On preprinted checks containing multiple checks per page, this setting "
+"specifies which check position to print. The possible values are 0, 1 and 2, "
+"corresponding to the top, middle and bottom checks on the page."
msgstr ""
"Na unaprijed tiskanim Äekovima koji sadrže viÅ¡e Äekova po stranici, ovo "
-"podeÅ¡avanje navodi, na kojem Äeku će se izvrÅ¡iti ispis. Moguće vrijednosti su 0, "
-"1 i 2, Å¡to odgovara Äekovima na vrhu, u sredini i na dnu stranice."
+"podeÅ¡avanje navodi, na kojem Äeku će se izvrÅ¡iti ispis. Moguće vrijednosti "
+"su 0, 1 i 2, Å¡to odgovara Äekovima na vrhu, u sredini i na dnu stranice."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:15
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:16
@@ -9323,15 +9449,15 @@ msgstr "Proizvoljni format datuma"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:26
msgid ""
-"If the date format is set to indicate a custom date format, this value is used "
-"as an argument to strftime to produce the date to be printed. It may be any "
-"valid strftime string; for more information about this format, read the manual "
-"page of strftime by \"man 3 strftime\"."
+"If the date format is set to indicate a custom date format, this value is "
+"used as an argument to strftime to produce the date to be printed. It may be "
+"any valid strftime string; for more information about this format, read the "
+"manual page of strftime by \"man 3 strftime\"."
msgstr ""
-"Ako je format datuma postavljen na proizvoljni format datuma, ova vrijednost se "
-"koristi kao argument funkcije „strftime“ za izradu datuma za ispis. Može biti "
-"bilo koji ispravni znakovni niz „strftime“-a. Za daljnje informacije o ovom "
-"zapisu, proÄitaj stranicu priruÄnika „strftime“-a iz „man 3 strftime“."
+"Ako je format datuma postavljen na proizvoljni format datuma, ova vrijednost "
+"se koristi kao argument funkcije „strftime“ za izradu datuma za ispis. Može "
+"biti bilo koji ispravni znakovni niz „strftime“-a. Za daljnje informacije o "
+"ovom zapisu, proÄitaj stranicu priruÄnika „strftime“-a iz „man 3 strftime“."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:30
msgid "Units in which the custom coordinates are expressed"
@@ -9347,9 +9473,10 @@ msgstr "Položaj imena primaoca"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:36
msgid ""
-"This value contains the X,Y coordinates for the start of the payee line on the "
-"check."
-msgstr "Ova vrijednost sadrži X,Y koordinate za poÄetni redak primaoca na Äeku."
+"This value contains the X,Y coordinates for the start of the payee line on "
+"the check."
+msgstr ""
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak primaoca na Äeku."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:40
msgid "Position of date line"
@@ -9357,12 +9484,12 @@ msgstr "Položaj retka s datumom"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:41
msgid ""
-"This value contains the X,Y coordinates for the start of the date line on the "
-"check. Coordinates are from the lower left corner of the specified check "
+"This value contains the X,Y coordinates for the start of the date line on "
+"the check. Coordinates are from the lower left corner of the specified check "
"position."
msgstr ""
-"Ova vrijednost sadrži X,Y koordinate za poÄetni redak datuma na Äeku. Koordinate "
-"se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak datuma na Äeku. "
+"Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:45
msgid "Position of check amount in words"
@@ -9370,12 +9497,13 @@ msgstr "Položaj iznosa Äeka ispisan slovima"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:46
msgid ""
-"This value contains the X,Y coordinates for the start of the written amount line "
-"on the check. Coordinates are from the lower left corner of the specified check "
-"position."
+"This value contains the X,Y coordinates for the start of the written amount "
+"line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
-"Ova vrijednost sadrži X,Y koordinate za poÄetni redak iznosa, ispisan slovima na "
-"Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak iznosa, ispisan "
+"slovima na Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog "
+"Äeka."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:50
msgid "Position of check amount in numbers"
@@ -9383,12 +9511,13 @@ msgstr "Položaj iznosa Äeka ispisan brojkama"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:51
msgid ""
-"This value contains the X,Y coordinates for the start of the numerical amount "
-"line on the check. Coordinates are from the lower left corner of the specified "
-"check position."
+"This value contains the X,Y coordinates for the start of the numerical "
+"amount line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
-"Ova vrijednost sadrži X,Y koordinate za poÄetni redak iznosa, ispisan brojkama "
-"na Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak iznosa, ispisan "
+"brojkama na Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog "
+"Äeka."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:55
msgid "Position of payee address"
@@ -9396,12 +9525,12 @@ msgstr "Položaj adrese primaoca"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:56
msgid ""
-"This value contains the X,Y coordinates for the start of the payee address line "
-"on the check. Coordinates are from the lower left corner of the specified check "
-"position."
+"This value contains the X,Y coordinates for the start of the payee address "
+"line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
-"Ova vrijednost sadrži X,Y koordinate za poÄetni redak adrese primaoca na Äeku. "
-"Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak adrese primaoca na "
+"Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:60
msgid "Position of notes line"
@@ -9409,8 +9538,8 @@ msgstr "Položaj retka za napomene"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:61
msgid ""
-"This value contains the X,Y coordinates for the start of the notes line on the "
-"check. Coordinates are from the lower left corner of the specified check "
+"This value contains the X,Y coordinates for the start of the notes line on "
+"the check. Coordinates are from the lower left corner of the specified check "
"position."
msgstr ""
"Ova vrijednost sadrži X,Y koordinate za poÄetni redak napomena na Äeku. "
@@ -9422,8 +9551,8 @@ msgstr "Položaj retka za zabilješke"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:66
msgid ""
-"This value contains the X,Y coordinates for the start of the memo line on the "
-"check. Coordinates are from the lower left corner of the specified check "
+"This value contains the X,Y coordinates for the start of the memo line on "
+"the check. Coordinates are from the lower left corner of the specified check "
"position."
msgstr ""
"Ova vrijednost sadrži X,Y koordinate za poÄetni redak zabiljeÅ¡ke na Äeku. "
@@ -9435,8 +9564,8 @@ msgstr "Odmak za ispunjeni Äek"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:71
msgid ""
-"This value contains the X,Y offset for the complete check. Coordinates are from "
-"the lower left corner of the specified check position."
+"This value contains the X,Y offset for the complete check. Coordinates are "
+"from the lower left corner of the specified check position."
msgstr ""
"Ova vrijednost sadrži X,Y odmak za popunjeni Äek. Koordinate se raÄunaju od "
"donjeg lijevog ugla odreÄ‘enog Äeka."
@@ -9455,9 +9584,9 @@ msgstr "Položaj iznosa stavke ispisan brojkama"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:81
msgid ""
-"This value contains the X,Y coordinates for the start of the split's amount line "
-"on the check. Coordinates are from the lower left corner of the specified check "
-"position."
+"This value contains the X,Y coordinates for the start of the split's amount "
+"line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
"Ova vrijednost sadrži X,Y koordinate za poÄetni redak iznosa stavke na Äeku. "
"Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
@@ -9468,12 +9597,12 @@ msgstr "Položaj retka za zabilješke stavke"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:86
msgid ""
-"This value contains the X,Y coordinates for the start of the split's memo line "
-"on the check. Coordinates are from the lower left corner of the specified check "
-"position."
+"This value contains the X,Y coordinates for the start of the split's memo "
+"line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
-"Ova vrijednost sadrži X,Y koordinate za poÄetni redak zabiljeÅ¡ke za stavku na "
-"Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
+"Ova vrijednost sadrži X,Y koordinate za poÄetni redak zabiljeÅ¡ke za stavku "
+"na Äeku. Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:90
msgid "Position of split's account line"
@@ -9482,8 +9611,8 @@ msgstr "Položaj retka za konto stavke"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:91
msgid ""
"This value contains the X,Y coordinates for the start of the split's account "
-"line on the check. Coordinates are from the lower left corner of the specified "
-"check position."
+"line on the check. Coordinates are from the lower left corner of the "
+"specified check position."
msgstr ""
"Ova vrijednost sadrži X,Y koordinate za poÄetni redak konta stavke na Äeku. "
"Koordinate se raÄunaju od donjeg lijevog ugla odreÄ‘enog Äeka."
@@ -9497,8 +9626,8 @@ msgid ""
"Each time the date is printed, print the date format immediately below in 8 "
"point type using the characters Y, M, and D."
msgstr ""
-"Prilikom ispisa datuma, ispiÅ¡i datum veliÄinom od 8 toÄaka, koristeći slova G, M "
-"i D."
+"Prilikom ispisa datuma, ispiÅ¡i datum veliÄinom od 8 toÄaka, koristeći slova "
+"G, M i D."
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:100
msgid "The default check printing font"
@@ -9506,8 +9635,8 @@ msgstr "Standardni font za ispis Äeka"
#: gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in:101
msgid ""
-"The default font to use when printing checks. This value will be overridden by "
-"any font specified in a check description file."
+"The default font to use when printing checks. This value will be overridden "
+"by any font specified in a check description file."
msgstr ""
"Standardni font za ispis Äekova. Ova vrijednost će biti prepisana bilo kojim "
"fontom, navedenim u opisnoj datoteci Äeka."
@@ -9544,11 +9673,11 @@ msgstr "Posljednja korištena staza"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:56
#: gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in:6
msgid ""
-"This field contains the last pathname used by this window. It will be used as "
-"the initial filename/pathname the next time this window is opened."
+"This field contains the last pathname used by this window. It will be used "
+"as the initial filename/pathname the next time this window is opened."
msgstr ""
-"Ovo polje sadrži posljednju stazu, koju je koristio ovaj prozor. Koristit će se "
-"kao poÄetno ime datoteke/staze, prilikom sljedećeg otvaranja ovog prozora."
+"Ovo polje sadrži posljednju stazu, koju je koristio ovaj prozor. Koristit će "
+"se kao poÄetno ime datoteke/staze, prilikom sljedećeg otvaranja ovog prozora."
#: gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in:17
msgid "Window geometry"
@@ -9567,11 +9696,11 @@ msgstr "Položaj vodoravnog razdjelnika radne površine."
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:133
msgid ""
-"This setting indicates whether to search in all items in the current class, or "
-"only in 'active' items in the current class."
+"This setting indicates whether to search in all items in the current class, "
+"or only in 'active' items in the current class."
msgstr ""
-"Ova postavka ukazuje na to, da li će se tražiti u svim stavkama u trenutaÄnom "
-"razredu, ili samo u „aktivnim“ stavkama u trenutaÄnom razredu."
+"Ova postavka ukazuje na to, da li će se tražiti u svim stavkama u "
+"trenutaÄnom razredu, ili samo u „aktivnim“ stavkama u trenutaÄnom razredu."
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:187
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:188
@@ -9594,16 +9723,18 @@ msgstr "Novi prozor kontnog plana, prilikom pokretanja „Nova datoteka“"
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:218
msgid ""
-"If active, the \"New Hierarchy\" window will be shown whenever the \"New File\" "
-"menu item is chosen. Otherwise it will not be shown."
+"If active, the \"New Hierarchy\" window will be shown whenever the \"New File"
+"\" menu item is chosen. Otherwise it will not be shown."
msgstr ""
-"Ako je aktivirano, prikazat će se prozor „Postavke za novi kontni plan“, kad god "
-"odabereš stavku izbornika „Nova datoteka“. U protivnom neće biti prikazan."
+"Ako je aktivirano, prikazat će se prozor „Postavke za novi kontni plan“, kad "
+"god odabereš stavku izbornika „Nova datoteka“. U protivnom neće biti "
+"prikazan."
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:225
#: gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in:226
msgid "Default to 'new search' if fewer than this number of items is returned"
-msgstr "Vraća se na „Nova pretraga“, ako je dobijeno manje stavaka od ovog broja"
+msgstr ""
+"Vraća se na „Nova pretraga“, ako je dobijeno manje stavaka od ovog broja"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:5
msgid "Enable SKIP transaction action"
@@ -9613,8 +9744,8 @@ msgstr "UkljuÄi radnju PRESKOÄŒI transakciju"
#: gnucash/gtkbuilder/dialog-import.glade:316
msgid ""
"Enable the SKIP action in the transaction matcher. If enabled, a transaction "
-"whose best match's score is in the yellow zone (above the Auto-ADD threshold but "
-"below the Auto-CLEAR threshold) will be skipped by default."
+"whose best match's score is in the yellow zone (above the Auto-ADD threshold "
+"but below the Auto-CLEAR threshold) will be skipped by default."
msgstr ""
"UkljuÄi radnju „PRESKOÄŒI“ u uporeÄ‘ivaÄu transakcija. Ako je ukljuÄeno, "
"transakcija, Äije se najbolje poklapanje nalazi u žutoj zoni (iznad praga za "
@@ -9628,10 +9759,11 @@ msgstr "UkljuÄi radnju AKTUALIZIRAJ poklapanja"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:11
#: gnucash/gtkbuilder/dialog-import.glade:336
msgid ""
-"Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a "
-"transaction whose best match's score is above the Auto-CLEAR threshold and has a "
-"different date or amount than the matching existing transaction will cause the "
-"existing transaction to be updated and cleared by default."
+"Enable the UPDATE AND RECONCILE action in the transaction matcher. If "
+"enabled, a transaction whose best match's score is above the Auto-CLEAR "
+"threshold and has a different date or amount than the matching existing "
+"transaction will cause the existing transaction to be updated and cleared by "
+"default."
msgstr ""
"UkljuÄi radnju „AKTUALIZIRAJ I USKLADI“ u uporeÄ‘ivaÄu transakcije. Ako je "
"ukljuÄeno, transakcija, Äije se najbolje poklapanje nalazi iznad praga za "
@@ -9645,13 +9777,13 @@ msgstr "Koristi Bayesov aloritam"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:16
msgid ""
-"Enables bayesian matching when matching imported transaction against existing "
-"transactions. Otherwise a less sophisticated rule-based matching mechanism will "
-"be used."
+"Enables bayesian matching when matching imported transaction against "
+"existing transactions. Otherwise a less sophisticated rule-based matching "
+"mechanism will be used."
msgstr ""
-"UkljuÄuje Bayesov algoritam, za usporeÄ‘ivanje uvezene transakcije s postojećim "
-"transakcijama. U protivnom će se koristiti mehanizam poklapanja na osnovi manje "
-"osjetljivih pravila."
+"UkljuÄuje Bayesov algoritam, za usporeÄ‘ivanje uvezene transakcije s "
+"postojećim transakcijama. U protivnom će se koristiti mehanizam poklapanja "
+"na osnovi manje osjetljivih pravila."
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:20
msgid "Minimum score to be displayed"
@@ -9659,8 +9791,8 @@ msgstr "Najmanji rezultat koji se prikazuje"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:21
msgid ""
-"This field specifies the minimum matching score a potential matching transaction "
-"must have to be displayed in the match list."
+"This field specifies the minimum matching score a potential matching "
+"transaction must have to be displayed in the match list."
msgstr ""
"Ovo polje određuje najmanji rezultat poklapanja, koji moguća poklapajuća "
"transakcija mora imati, da bi bila prikazana u popisu poklapanja."
@@ -9671,15 +9803,16 @@ msgstr "Dodaj poklapajuće transakcije ispod ovog rezultata"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:26
msgid ""
-"This field specifies the threshold below which a matching transaction will be "
-"added automatically. A transaction whose best match's score is in the red zone "
-"(above the display minimum score but below or equal to the Add match score) will "
-"be added to the GnuCash file by default."
+"This field specifies the threshold below which a matching transaction will "
+"be added automatically. A transaction whose best match's score is in the red "
+"zone (above the display minimum score but below or equal to the Add match "
+"score) will be added to the GnuCash file by default."
msgstr ""
-"Ovo polje određuje prag, ispod kojeg će transakcija poklapanja biti automatski "
-"dodana. Transakcija, Äiji se najbolji rezultat poklapanja nalazi je u crvenoj "
-"zoni (iznad najmanjeg rezultata prikazivanja, ali ispod ili je jednak rezultatu "
-"poklapanja „Dodaj“), će standardno biti dodana u GnuCash datoteku."
+"Ovo polje određuje prag, ispod kojeg će transakcija poklapanja biti "
+"automatski dodana. Transakcija, Äiji se najbolji rezultat poklapanja nalazi "
+"je u crvenoj zoni (iznad najmanjeg rezultata prikazivanja, ali ispod ili je "
+"jednak rezultatu poklapanja „Dodaj“), će standardno biti dodana u GnuCash "
+"datoteku."
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:30
msgid "Clear matching transactions above this score"
@@ -9687,13 +9820,15 @@ msgstr "Ukloni poklapajuće transakcije iznad ovog rezultata"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:31
msgid ""
-"This field specifies the threshold above which a matching transaction will be "
-"cleared by default. A transaction whose best match's score is in the green zone "
-"(above or equal to this Clear threshold) will be cleared by default."
+"This field specifies the threshold above which a matching transaction will "
+"be cleared by default. A transaction whose best match's score is in the "
+"green zone (above or equal to this Clear threshold) will be cleared by "
+"default."
msgstr ""
-"Ovo polje određuje prag, iznad kojeg će poklapajuća transakcija standardno biti "
-"potvrÄ‘ena. Transakcija, Äiji se najbolji rezultat poklapanja nalazi je u zelenoj "
-"zoni (iznad ili jednak ovom pragu „OÄisti“), će biti potvrÄ‘ena po osnovi."
+"Ovo polje određuje prag, iznad kojeg će poklapajuća transakcija standardno "
+"biti potvrÄ‘ena. Transakcija, Äiji se najbolji rezultat poklapanja nalazi je "
+"u zelenoj zoni (iznad ili jednak ovom pragu „OÄisti“), će biti potvrÄ‘ena po "
+"osnovi."
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:35
msgid "Maximum ATM fee amount in your area"
@@ -9703,23 +9838,24 @@ msgstr "NajviÅ¡a bankomatna naknada u tvojem podruÄju"
msgid ""
"This field specifies the extra fee that is taken into account when matching "
"imported transactions. In some places commercial ATMs (not belonging to a "
-"financial institution) are installed in places like convenience stores. These "
-"ATMs add their fee directly to the amount instead of showing up as a separate "
-"transaction or in your monthly banking fees. For example, you withdraw $100, and "
-"you are charged $101,50 plus Interac fees. If you manually entered that $100, "
-"the amounts won't match. You should set this to whatever is the maximum such fee "
-"in your area (in units of your local currency), so the transaction will be "
-"recognised as a match."
-msgstr ""
-"U ovom polju se navodi dodatna naknada, koja se uraÄunava prilikom poklapanja "
-"uvezenih transakcija. U nekim mjestima, komercijalni bankomati (koji ne "
-"pripadaju financijskoj instituciji) su instalirani na mjestima, kao Å¡to su "
-"dućani. Ovi bankomati dodaju svoju naknadu direktno na iznos, umjesto da je "
-"prikažu kao zasebnu transakciju ili u tvojim mjeseÄnim bankovnim naknadama. Na "
-"primjer, podigneš 100 kn, a naplaćeno ti je 101,50 kn, plus naknada za "
-"interakciju. Ako tih 100 kn uneseÅ¡ ruÄno, iznosi se neće poklopiti. Postavi ovo "
-"na najveću takvu naknadu u tvom podruÄju (u jedinicama tvoje lokalne valute), "
-"kako bi se transakcija prepoznala kao poklapajuća."
+"financial institution) are installed in places like convenience stores. "
+"These ATMs add their fee directly to the amount instead of showing up as a "
+"separate transaction or in your monthly banking fees. For example, you "
+"withdraw $100, and you are charged $101,50 plus Interac fees. If you "
+"manually entered that $100, the amounts won't match. You should set this to "
+"whatever is the maximum such fee in your area (in units of your local "
+"currency), so the transaction will be recognised as a match."
+msgstr ""
+"U ovom polju se navodi dodatna naknada, koja se uraÄunava prilikom "
+"poklapanja uvezenih transakcija. U nekim mjestima, komercijalni bankomati "
+"(koji ne pripadaju financijskoj instituciji) su instalirani na mjestima, kao "
+"što su dućani. Ovi bankomati dodaju svoju naknadu direktno na iznos, umjesto "
+"da je prikažu kao zasebnu transakciju ili u tvojim mjeseÄnim bankovnim "
+"naknadama. Na primjer, podigneš 100 kn, a naplaćeno ti je 101,50 kn, plus "
+"naknada za interakciju. Ako tih 100 kn uneseÅ¡ ruÄno, iznosi se neće "
+"poklopiti. Postavi ovo na najveću takvu naknadu u tvom podruÄju (u "
+"jedinicama tvoje lokalne valute), kako bi se transakcija prepoznala kao "
+"poklapajuća."
#. Preferences->Online Banking:Generic
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:40
@@ -9730,12 +9866,13 @@ msgstr "Automatski stvori novu robu"
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:41
#: gnucash/gtkbuilder/dialog-import.glade:531
msgid ""
-"Enables the automatic creation of new commodities if any unknown commodity is "
-"encountered during import. Otherwise the user will be asked what to do with each "
-"unknown commodity."
+"Enables the automatic creation of new commodities if any unknown commodity "
+"is encountered during import. Otherwise the user will be asked what to do "
+"with each unknown commodity."
msgstr ""
-"UkljuÄuje automatsko stvaranje nove robe, ako se naiÄ‘e na nepoznatu robu tijekom "
-"uvoza. U protivnom će pitati korisnika što raditi sa svakom nepoznatom robom."
+"UkljuÄuje automatsko stvaranje nove robe, ako se naiÄ‘e na nepoznatu robu "
+"tijekom uvoza. U protivnom će pitati korisnika što raditi sa svakom "
+"nepoznatom robom."
#: gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in:57
msgid "Display or hide reconciled matches"
@@ -9758,15 +9895,17 @@ msgstr "Standardno stanje QIF transakcije"
#: gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in:11
#: gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in:16
msgid "Default status for QIF transaction when not specified in QIF file."
-msgstr "Standardno stanje za QIF transakciju, kad nije određeno u QIF datoteci."
+msgstr ""
+"Standardno stanje za QIF transakciju, kad nije određeno u QIF datoteci."
#: gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in:15
#: gnucash/gtkbuilder/dialog-account-picker.glade:54
msgid ""
-"When the status is not specified in a QIF file, the transactions are marked as "
-"reconciled."
+"When the status is not specified in a QIF file, the transactions are marked "
+"as reconciled."
msgstr ""
-"Kad stanje nije navedeno u QIF datoteci, transakcije se oznaÄavaju kao usklaÄ‘ene."
+"Kad stanje nije navedeno u QIF datoteci, transakcije se oznaÄavaju kao "
+"usklađene."
#: gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in:32
msgid "Show documentation"
@@ -9799,15 +9938,15 @@ msgstr "Upitaj za kamatne naknade"
#: gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in:11
#: gnucash/gtkbuilder/dialog-preferences.glade:2122
msgid ""
-"Prior to reconciling an account which charges or pays interest, prompt the user "
-"to enter a transaction for the interest charge or payment. Currently only "
-"enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability "
-"accounts."
+"Prior to reconciling an account which charges or pays interest, prompt the "
+"user to enter a transaction for the interest charge or payment. Currently "
+"only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and "
+"Liability accounts."
msgstr ""
-"Prije usklađivanja konta koji naplaćuje ili plaća kamatu, zatraži od korisnika "
-"da unese transakciju za naplaćivanje kamate ili plaćanje. TrenutaÄno je "
-"ukljuÄeno samo za konta banke, kredita, investicijske fondove, imovine, "
-"potraživanja, dugovanja i obveza."
+"Prije usklađivanja konta koji naplaćuje ili plaća kamatu, zatraži od "
+"korisnika da unese transakciju za naplaćivanje kamate ili plaćanje. "
+"TrenutaÄno je ukljuÄeno samo za konta banke, kredita, investicijske fondove, "
+"imovine, potraživanja, dugovanja i obveza."
#: gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in:15
msgid "Prompt for credit card payment"
@@ -9815,8 +9954,8 @@ msgstr "Upitaj za plaćanje kreditnom karticom"
#: gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in:16
msgid ""
-"If active, after reconciling a credit card account, prompt the user to enter a "
-"credit card payment. Otherwise do not prompt the user for this."
+"If active, after reconciling a credit card account, prompt the user to enter "
+"a credit card payment. Otherwise do not prompt the user for this."
msgstr ""
"Ako je aktivirano, nakon usklađivanja konta kreditne kartice, zatraži od "
"korisnika da unese plaćanje kreditnom karticom. U protivnom ga nemoj tražiti."
@@ -9827,8 +9966,8 @@ msgstr "Uvijek uskladi na danas"
#: gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in:21
msgid ""
-"If active, always open the reconcile dialog using today's date for the statement "
-"date, regardless of previous reconciliations."
+"If active, always open the reconcile dialog using today's date for the "
+"statement date, regardless of previous reconciliations."
msgstr ""
"Ako je aktivirano, uvijek otvori prozor za usklađivanje, koristeći današnji "
"datum za datum stanja, bez obzira na prethodna usklađivanja."
@@ -9840,14 +9979,15 @@ msgstr "Pokreni prozor „od posljednjeg pokretanja“, kad se otvori datoteka."
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:18
msgid ""
"This setting controls whether the scheduled transactions \"since last run\" "
-"processing is run automatically when a data file is opened. This includes the "
-"initial opening of the data file when GnuCash starts. If this setting is active, "
-"run the \"since last run\" process, otherwise it is not run."
+"processing is run automatically when a data file is opened. This includes "
+"the initial opening of the data file when GnuCash starts. If this setting is "
+"active, run the \"since last run\" process, otherwise it is not run."
msgstr ""
"Ova postavka odluÄuje, da li će terminirane transakcije „od posljednjeg "
-"pokretanja“ obrade biti samostalno pokrenute prilikom otvaranja datoteke. Ovo "
-"ukljuÄuje poÄetno otvaranje datoteke prilikom pokretanja GnuCasha. Ako je ovo "
-"podeÅ¡avanje ukljuÄeno, pokreće proces „od posljednjeg pokretanja“, inaÄe ne."
+"pokretanja“ obrade biti samostalno pokrenute prilikom otvaranja datoteke. "
+"Ovo ukljuÄuje poÄetno otvaranje datoteke prilikom pokretanja GnuCasha. Ako "
+"je ovo podeÅ¡avanje ukljuÄeno, pokreće proces „od posljednjeg pokretanja“, "
+"inaÄe ne."
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:22
msgid "Show \"since last run\" notification dialog when a file is opened."
@@ -9856,16 +9996,16 @@ msgstr "Prikaži obavijest „od posljednjeg pokretanja“, kad se otvori datote
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:23
msgid ""
"This setting controls whether the scheduled transactions notification-only "
-"\"since last run\" dialog is shown when a data file is opened (if \"since last "
-"run\" processing is enabled on file open). This includes the initial opening of "
-"the data file when GnuCash starts. If this setting is active, show the dialog, "
-"otherwise it is not shown."
+"\"since last run\" dialog is shown when a data file is opened (if \"since "
+"last run\" processing is enabled on file open). This includes the initial "
+"opening of the data file when GnuCash starts. If this setting is active, "
+"show the dialog, otherwise it is not shown."
msgstr ""
"Ova postavka određuje, da li se prozor samo-obavještenja terminiranih "
-"transakcija „od posljednjeg pokretanja“ prikazuje kad se otvori datoteka (ako je "
-"obraÄ‘ivanje „od posljednjeg pokretanja“ ukljuÄeno na otvorenoj datoteci). U ovo "
-"spada poÄetno otvaranje datoteke podataka kad se pokreće GnuCash. Ako je ovo "
-"podeÅ¡avanje ukljuÄeno, prikazuje prozor, u protivnom ne."
+"transakcija „od posljednjeg pokretanja“ prikazuje kad se otvori datoteka "
+"(ako je obraÄ‘ivanje „od posljednjeg pokretanja“ ukljuÄeno na otvorenoj "
+"datoteci). U ovo spada poÄetno otvaranje datoteke podataka kad se pokreće "
+"GnuCash. Ako je ovo podeÅ¡avanje ukljuÄeno, prikazuje prozor, u protivnom ne."
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:30
msgid "Set the \"auto create\" flag by default"
@@ -9873,14 +10013,15 @@ msgstr "Standardno postavi oznaku „automatski stvori“"
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:31
msgid ""
-"If active, any newly created scheduled transaction will have its 'auto create' "
-"flag set active by default. The user can change this flag during transaction "
-"creation, or at any later time by editing the scheduled transaction."
+"If active, any newly created scheduled transaction will have its 'auto "
+"create' flag set active by default. The user can change this flag during "
+"transaction creation, or at any later time by editing the scheduled "
+"transaction."
msgstr ""
-"Ako je aktivirano, bilo koja novostvorena terminirana transakcija će standardno "
-"imati svoju podeÅ¡avajuću oznaku „automatski stvori“ ukljuÄenu. Korisnik može "
-"promijeniti ovu oznaku prilikom stvaranja transakcije, ili u bilo koje kasnije "
-"vrijeme u ureÄ‘ivaÄu za terminirane transakcije."
+"Ako je aktivirano, bilo koja novostvorena terminirana transakcija će "
+"standardno imati svoju podeÅ¡avajuću oznaku „automatski stvori“ ukljuÄenu. "
+"Korisnik može promijeniti ovu oznaku prilikom stvaranja transakcije, ili u "
+"bilo koje kasnije vrijeme u ureÄ‘ivaÄu za terminirane transakcije."
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:35
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:36
@@ -9893,16 +10034,16 @@ msgstr "Standardno postavi oznaku „obavijesti“"
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:48
msgid ""
-"If active, any newly created scheduled transaction will have its 'notify' flag "
-"set by default. The user can change this flag during transaction creation, or at "
-"any later time by editing the scheduled transaction. This setting only has "
-"meaning if the create-auto setting is active."
+"If active, any newly created scheduled transaction will have its 'notify' "
+"flag set by default. The user can change this flag during transaction "
+"creation, or at any later time by editing the scheduled transaction. This "
+"setting only has meaning if the create-auto setting is active."
msgstr ""
-"Ako je aktivirano, bilo koja novostvorena terminirana transakcija će standardno "
-"imati svoju podeÅ¡avajuću oznaku „obavijesti“ ukljuÄenu. Korisnik može "
-"promijeniti ovu oznaku prilikom stvaranja transakcije, ili u bilo koje kasnije "
-"vrijeme u ureÄ‘ivaÄu za terminirane transakcije. Ovo podeÅ¡avanje ima smisla samo, "
-"ako je ukljuÄeno podeÅ¡avanje „automatski stvori“."
+"Ako je aktivirano, bilo koja novostvorena terminirana transakcija će "
+"standardno imati svoju podeÅ¡avajuću oznaku „obavijesti“ ukljuÄenu. Korisnik "
+"može promijeniti ovu oznaku prilikom stvaranja transakcije, ili u bilo koje "
+"kasnije vrijeme u ureÄ‘ivaÄu za terminirane transakcije. Ovo podeÅ¡avanje ima "
+"smisla samo, ako je ukljuÄeno podeÅ¡avanje „automatski stvori“."
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:52
#: gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in:53
@@ -9935,8 +10076,8 @@ msgstr "Alpha Vantage API kljuÄ"
#: gnucash/gtkbuilder/dialog-preferences.glade:3291
#: gnucash/gtkbuilder/dialog-preferences.glade:3303
msgid ""
-"To retrieve online quotes from Alphavantage, this key needs to be set. A key can "
-"be retrieved from the Alpha Vantage website."
+"To retrieve online quotes from Alphavantage, this key needs to be set. A key "
+"can be retrieved from the Alpha Vantage website."
msgstr ""
"Za dohvaćanje Alphavantage internetskih teÄajeva, potrebno je postaviti ovaj "
"kljuÄ. KljuÄ je moguće pronaći na Alpha Vantage web-stranici."
@@ -9959,13 +10100,13 @@ msgstr "Spremi veliÄinu i položaj prozora"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:16
msgid ""
-"If active, the size and location of each dialog window will be saved when it is "
-"closed. The sizes and locations of content windows will be remembered when you "
-"quit GnuCash. Otherwise the sizes will not be saved."
+"If active, the size and location of each dialog window will be saved when it "
+"is closed. The sizes and locations of content windows will be remembered "
+"when you quit GnuCash. Otherwise the sizes will not be saved."
msgstr ""
-"Ako je aktivirano, veliÄina i položaj svakog prozorta će biti spremljeni kad se "
-"zatvori. VeliÄine i položaji trenutaÄnih prozora će biti zapamćeni kad izaÄ‘eÅ¡ iz "
-"GnuCasha. U protivnom veliÄine neće biti spremljene."
+"Ako je aktivirano, veliÄina i položaj svakog prozorta će biti spremljeni kad "
+"se zatvori. VeliÄine i položaji trenutaÄnih prozora će biti zapamćeni kad "
+"izaÄ‘eÅ¡ iz GnuCasha. U protivnom veliÄine neće biti spremljene."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:20
msgid "Character to use as separator between account names"
@@ -9973,15 +10114,15 @@ msgstr "Slovni znak za razdvajanje imena konta"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:21
msgid ""
-"This setting determines the character that will be used between components of an "
-"account name. Possible values are any single non-alphanumeric unicode character, "
-"or any of the following strings: \"colon\", \"slash\", \"backslash\", \"dash\" "
-"and \"period\"."
+"This setting determines the character that will be used between components "
+"of an account name. Possible values are any single non-alphanumeric unicode "
+"character, or any of the following strings: \"colon\", \"slash\", \"backslash"
+"\", \"dash\" and \"period\"."
msgstr ""
-"Ova postavka određuje slovni znak, koji će se koristiti između dijelova imena "
-"konta. Moguće vrijednosti su svi ne-alfanumeriÄki unikodni slovni znakovi ili "
-"bilo koji od sljedećih znakovnih nizova: „dvotoÄka“, „kosa crta“, „kontra kosa "
-"crta“, „crtica“ i „toÄka“."
+"Ova postavka određuje slovni znak, koji će se koristiti između dijelova "
+"imena konta. Moguće vrijednosti su svi ne-alfanumeriÄki unikodni slovni "
+"znakovi ili bilo koji od sljedećih znakovnih nizova: „dvotoÄka“, „kosa "
+"crta“, „kontra kosa crta“, „crtica“ i „toÄka“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:25
msgid "Transaction Associations head path"
@@ -10005,12 +10146,12 @@ msgstr "Prikaži objašnjenje za automatskog spremanja"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:36
msgid ""
-"If active, GnuCash shows an explanation of the auto-save feature the first time "
-"that feature is started. Otherwise no extra explanation is shown."
+"If active, GnuCash shows an explanation of the auto-save feature the first "
+"time that feature is started. Otherwise no extra explanation is shown."
msgstr ""
-"Ako je aktivirano, GnuCash pokazuje objašnjenje funkcije automatskog spremanja "
-"prilikom prvog pokretanja te funkcije. U protivnom ne prikazuje dodatna "
-"objašnjenja."
+"Ako je aktivirano, GnuCash pokazuje objašnjenje funkcije automatskog "
+"spremanja prilikom prvog pokretanja te funkcije. U protivnom ne prikazuje "
+"dodatna objašnjenja."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:40
msgid "Auto-save time interval"
@@ -10019,11 +10160,11 @@ msgstr "Interval za automatsko spremanje"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:41
#: gnucash/gtkbuilder/dialog-preferences.glade:1500
msgid ""
-"The number of minutes until saving of the data file to harddisk will be started "
-"automatically. If zero, no saving will be started automatically."
+"The number of minutes until saving of the data file to harddisk will be "
+"started automatically. If zero, no saving will be started automatically."
msgstr ""
-"Nakon koliko se minuta datoteke automatski spremaju. Ako je nula, datoteke se "
-"neće spremati automatski."
+"Nakon koliko se minuta datoteke automatski spremaju. Ako je nula, datoteke "
+"se neće spremati automatski."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:45
#: gnucash/gtkbuilder/dialog-preferences.glade:1619
@@ -10035,13 +10176,14 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:46
#: gnucash/gtkbuilder/dialog-preferences.glade:1623
msgid ""
-"If enabled, the \"Save changes on closing\" question will only wait a limited "
-"number of seconds for an answer. If the user didn't answer within that time, the "
-"changes will be saved automatically and the question window closed."
+"If enabled, the \"Save changes on closing\" question will only wait a "
+"limited number of seconds for an answer. If the user didn't answer within "
+"that time, the changes will be saved automatically and the question window "
+"closed."
msgstr ""
-"Ako je ukljuÄeno, pitanje „Spremi promjene prilikom zatvaranja“ će Äekati samo "
-"ograniÄeni broj sekundi na odgovor. Ako korisnik ne odgovori u tom vremenu, "
-"promjene će se automatski spremiti, a prozor zatvoriti."
+"Ako je ukljuÄeno, pitanje „Spremi promjene prilikom zatvaranja“ će Äekati "
+"samo ograniÄeni broj sekundi na odgovor. Ako korisnik ne odgovori u tom "
+"vremenu, promjene će se automatski spremiti, a prozor zatvoriti."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:50
msgid "Time to wait for answer"
@@ -10050,8 +10192,8 @@ msgstr "Vrijeme za Äekanje na odgovor"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:51
#: gnucash/gtkbuilder/dialog-preferences.glade:1659
msgid ""
-"The number of seconds to wait before the question window will be closed and the "
-"changes saved automatically."
+"The number of seconds to wait before the question window will be closed and "
+"the changes saved automatically."
msgstr "Nakon koliko se sekunda prozor zatvara i spremaju promjene automatski."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:55
@@ -10065,12 +10207,13 @@ msgstr "Automatski umetni decimalni zarez"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:61
msgid ""
-"If active, GnuCash will automatically insert a decimal point into values that "
-"are entered without one. Otherwise GnuCash will not modify entered numbers."
+"If active, GnuCash will automatically insert a decimal point into values "
+"that are entered without one. Otherwise GnuCash will not modify entered "
+"numbers."
msgstr ""
"Ako je aktivirano, GnuCash će automatski ubaciti decimalni zarez u "
-"vrijednostima, koje su unešene bez zareza. U protivnom neće promijeniti unijete "
-"brojeve."
+"vrijednostima, koje su unešene bez zareza. U protivnom neće promijeniti "
+"unijete brojeve."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:65
msgid "Number of automatic decimal places"
@@ -10078,49 +10221,50 @@ msgstr "Broj automatskih decimalnih mjesta"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:66
msgid ""
-"This field specifies the number of automatic decimal places that will be filled "
-"in."
+"This field specifies the number of automatic decimal places that will be "
+"filled in."
msgstr ""
-"Ovo polje određuje broj automatskih decimalnih mjesta, kojim će se nadopuniti "
-"iznos."
+"Ovo polje određuje broj automatskih decimalnih mjesta, kojim će se "
+"nadopuniti iznos."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:70
msgid "Force prices to display as decimals even if they must be rounded."
msgstr ""
-"Prisili prikaz cijena s decimalnim mjestima, Äak i ako moraju biti zaokružene "
-"vrijednosti."
+"Prisili prikaz cijena s decimalnim mjestima, Äak i ako moraju biti "
+"zaokružene vrijednosti."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:71
#: gnucash/gtkbuilder/dialog-preferences.glade:1375
msgid ""
-"If active, GnuCash will round prices as necessary to display them as decimals "
-"instead of displaying the exact fraction if the fractional part cannot be "
-"exactly represented as a decimal."
+"If active, GnuCash will round prices as necessary to display them as "
+"decimals instead of displaying the exact fraction if the fractional part "
+"cannot be exactly represented as a decimal."
msgstr ""
-"Ako je aktivirano, GnuCash će zaokružiti cijene po potrebi, kako bi ih prikazao "
-"kao decimalne brojeve, umjesto toÄnog prikazivanja djeliÄaka, ako ih nije moguće "
-"prikazati kao decimalni broj."
+"Ako je aktivirano, GnuCash će zaokružiti cijene po potrebi, kako bi ih "
+"prikazao kao decimalne brojeve, umjesto toÄnog prikazivanja djeliÄaka, ako "
+"ih nije moguće prikazati kao decimalni broj."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:75
msgid ""
-"Tool to migrate preferences from old backend (GConf) to new one (GSettings) has "
-"run successfully."
+"Tool to migrate preferences from old backend (GConf) to new one (GSettings) "
+"has run successfully."
msgstr ""
"Alat za migraciju postavaka iz starog pozadinskog sustava (GConf) u novi "
"(GSettings) je uspješno obavljena."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:76
msgid ""
-"GnuCash switched to another backend to store user preferences between 2.4 and "
-"2.6. To smooth the transition, most preferences will be migrated the first time "
-"a 2.6 version of GnuCash is run. This migration should only run once. This "
-"preference keeps track whether or not this migration tool has run successfully."
+"GnuCash switched to another backend to store user preferences between 2.4 "
+"and 2.6. To smooth the transition, most preferences will be migrated the "
+"first time a 2.6 version of GnuCash is run. This migration should only run "
+"once. This preference keeps track whether or not this migration tool has run "
+"successfully."
msgstr ""
"GnuCash se prebacio na jedan drugi pozadinski sustav, kako bi se oÄuvale "
"korisniÄke postavke izmeÄ‘u izdanja 2.4 i 2.6. Za bezbolniji prelazak, većina "
-"postavaka će biti preseljena prilikom prvog pokretanja izdanja GnuCash 2.6. Ovo "
-"preseljavanje treba odraditi samo jednom. Ova postavka vodi raÄuna o tome, da li "
-"je ovaj alat za preseljavanje uspješno odradio posao."
+"postavaka će biti preseljena prilikom prvog pokretanja izdanja GnuCash 2.6. "
+"Ovo preseljavanje treba odraditi samo jednom. Ova postavka vodi raÄuna o "
+"tome, da li je ovaj alat za preseljavanje uspješno odradio posao."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:80
#: gnucash/gtkbuilder/dialog-preferences.glade:1568
@@ -10131,17 +10275,18 @@ msgstr "Ne stvaraj log-datoteke/sigurnosne kopije."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:86
#: gnucash/gschemas/org.gnucash.gschema.xml.in:91
msgid ""
-"This setting specifies what to do with old log/backups files. \"forever\" means "
-"keep all old files. \"never\" means no old log/backup files are kept. Each time "
-"you save, older versions of the file are removed. \"days\" means keep old files "
-"for a number of days. How many days is defined in key 'retain-days'"
+"This setting specifies what to do with old log/backups files. \"forever\" "
+"means keep all old files. \"never\" means no old log/backup files are kept. "
+"Each time you save, older versions of the file are removed. \"days\" means "
+"keep old files for a number of days. How many days is defined in key 'retain-"
+"days'"
msgstr ""
"Ova postavka određuje što će se raditi sa starim log-datotekama/sigurnosnim "
-"kopijama. „Zauvijek“ znaÄi zadržavanje svih starih datoteka. „Nikada“ znaÄi da "
-"nijedna stara log-datoteka/sigurnosna kopija neće biti zadržana. Svaki put kad "
-"spremaÅ¡, stara izdanja datoteke se uklanjaju. „Dani“ znaÄi zadržavanje starih "
-"datoteka za odreÄ‘eni broj dana. Broj dana se odreÄ‘uje u kljuÄu „dani-"
-"zadržavanja“."
+"kopijama. „Zauvijek“ znaÄi zadržavanje svih starih datoteka. „Nikada“ znaÄi "
+"da nijedna stara log-datoteka/sigurnosna kopija neće biti zadržana. Svaki "
+"put kad spremaÅ¡, stara izdanja datoteke se uklanjaju. „Dani“ znaÄi "
+"zadržavanje starih datoteka za određeni broj dana. Broj dana se određuje u "
+"kljuÄu „dani-zadržavanja“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:85
#: gnucash/gtkbuilder/dialog-preferences.glade:1587
@@ -10161,11 +10306,11 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:96
msgid ""
-"This setting specifies the number of days after which old log/backup files will "
-"be deleted (0 = never)."
+"This setting specifies the number of days after which old log/backup files "
+"will be deleted (0 = never)."
msgstr ""
-"Ova postavka određuje broj dana, nakon kojih će stare log-datoteke/sigurnosne "
-"kopije biti izbrisane (0 = nikada)."
+"Ova postavka određuje broj dana, nakon kojih će stare log-datoteke/"
+"sigurnosne kopije biti izbrisane (0 = nikada)."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:100
#: gnucash/gtkbuilder/dialog-preferences.glade:500
@@ -10177,25 +10322,27 @@ msgstr "Ne mijenjaj predznak u kontima."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:111
msgid ""
"This setting allows certain accounts to have their balances reversed in sign "
-"from positive to negative, or vice versa. The setting \"income-expense\" is for "
-"users who like to see negative expenses and positive income. The setting of "
-"\"credit\" is for users who want to see balances reflect the debit/credit status "
-"of the account. The setting \"none\" doesn't reverse the sign on any balances."
-msgstr ""
-"Ova postavka omogućava određenim kontima mijenjanje predznaka svojih salda iz "
-"pozitivnog u negativno ili obrnuto. Postavka „prihod-rashod“ je za korisnike, "
-"koji vole vidjeti negativne rashode i pozitvne prihode. Postavka „Potražuje“ je "
-"za one korisnike, koji žele vidjeti da salda odražavaju duguje/potražuje stanja "
-"konta. Postavka „ništa“ ne preokreće znak nijednog salda."
+"from positive to negative, or vice versa. The setting \"income-expense\" is "
+"for users who like to see negative expenses and positive income. The setting "
+"of \"credit\" is for users who want to see balances reflect the debit/credit "
+"status of the account. The setting \"none\" doesn't reverse the sign on any "
+"balances."
+msgstr ""
+"Ova postavka omogućava određenim kontima mijenjanje predznaka svojih salda "
+"iz pozitivnog u negativno ili obrnuto. Postavka „prihod-rashod“ je za "
+"korisnike, koji vole vidjeti negativne rashode i pozitvne prihode. Postavka "
+"„Potražuje“ je za one korisnike, koji žele vidjeti da salda odražavaju "
+"duguje/potražuje stanja konta. Postavka „ništa“ ne preokreće znak nijednog "
+"salda."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:105
#: gnucash/gtkbuilder/dialog-preferences.glade:520
msgid ""
-"Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, "
-"and Income."
+"Sign reverse balances on the following: Credit Card, Payable, Liability, "
+"Equity, and Income."
msgstr ""
-"OznaÄi salda suprotnim predznakom u kontima kreditne kartice, dugovanja, obveze, "
-"kapital i prihode."
+"OznaÄi salda suprotnim predznakom u kontima kreditne kartice, dugovanja, "
+"obveze, kapital i prihode."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:110
#: gnucash/gtkbuilder/dialog-preferences.glade:540
@@ -10208,11 +10355,13 @@ msgstr "Koristi boje konta u kontnom planu"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:116
msgid ""
-"If active the account hierarchy will colorize the account using the account's "
-"custom color if set. This can serve as a visual aid to quickly identify accounts."
+"If active the account hierarchy will colorize the account using the "
+"account's custom color if set. This can serve as a visual aid to quickly "
+"identify accounts."
msgstr ""
-"Ako je aktivirano, kontni plan će obojiti konto prilagođenom bojom konta, ako je "
-"postavljena. To može poslužiti kao vizualna pomoć za brzo prepoznavanje konta."
+"Ako je aktivirano, kontni plan će obojiti konto prilagođenom bojom konta, "
+"ako je postavljena. To može poslužiti kao vizualna pomoć za brzo "
+"prepoznavanje konta."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:120
msgid "Use account colors in the tabs of open account registers"
@@ -10220,8 +10369,9 @@ msgstr "Koristi boje konta u karticama otvorenih registara konta"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:121
msgid ""
-"If active the account register tabs will be colored using the account's custom "
-"color if set. This can serve as a visual aid to quickly identify accounts."
+"If active the account register tabs will be colored using the account's "
+"custom color if set. This can serve as a visual aid to quickly identify "
+"accounts."
msgstr ""
"Ako je aktivirano, kartice registra konta će biti obojene prilagođenom bojom "
"konta, ako je postavljena. To može poslužiti kao vizualna pomoć za brzo "
@@ -10233,14 +10383,14 @@ msgstr "Koristi službene raÄunovodstvene natpise"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:126
msgid ""
-"If active, formal accounting labels \"Credit\" and \"Debit\" will be used when "
-"designating fields on screen. Otherwise, informal labels such as Increase/"
-"Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
+"If active, formal accounting labels \"Credit\" and \"Debit\" will be used "
+"when designating fields on screen. Otherwise, informal labels such as "
+"Increase/Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
msgstr ""
"Ako je aktivirano, prilikom prikazivanja polja na ekranu će se koristiti "
"službeni natpisi raÄunovodstva „Potražuje“ i „Duguje“. U protivnom će se "
-"koristiti neslužbeni natpisi, kao što su Povećanje/Smanjenje, „Ulazna sredstva“/"
-"„Izlazna sredstva“, itd."
+"koristiti neslužbeni natpisi, kao što su Povećanje/Smanjenje, „Ulazna "
+"sredstva“/„Izlazna sredstva“, itd."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:130
msgid "Show close buttons on notebook tabs"
@@ -10248,15 +10398,15 @@ msgstr "Na karticama prikaži gumbe za zatvaranje"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:131
msgid ""
-"If active, a \"close\" button will be displayed on any notebook tab that may be "
-"closed. Otherwise, no such button will be shown on the tab. Regardless of this "
-"setting, pages can always be closed via the \"close\" menu item or the \"close\" "
-"button on toolbar."
+"If active, a \"close\" button will be displayed on any notebook tab that may "
+"be closed. Otherwise, no such button will be shown on the tab. Regardless of "
+"this setting, pages can always be closed via the \"close\" menu item or the "
+"\"close\" button on toolbar."
msgstr ""
-"Ako je aktivirano, gumb za zatvaranje će biti prikazan na svakoj kartici koji se "
-"može zatvoriti. U protivnom, takav gumb neće biti prikazan na kartici. Bez "
-"obzira na ovu postavku, stranice se uvijek mogu zatvoriti putem izbornika, "
-"stavkom „Zatvori†ili odgovarajućim gumbom na traci alata."
+"Ako je aktivirano, gumb za zatvaranje će biti prikazan na svakoj kartici "
+"koji se može zatvoriti. U protivnom, takav gumb neće biti prikazan na "
+"kartici. Bez obzira na ovu postavku, stranice se uvijek mogu zatvoriti putem "
+"izbornika, stavkom „Zatvori†ili odgovarajućim gumbom na traci alata."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:135
msgid "Width of notebook tabs"
@@ -10264,13 +10414,13 @@ msgstr "Å irina kartica"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:136
msgid ""
-"This key specifies the maximum width of notebook tabs. If the text in the tab is "
-"longer than this value (the test is approximate) then the tab label will have "
-"the middle cut and replaced with an ellipsis."
+"This key specifies the maximum width of notebook tabs. If the text in the "
+"tab is longer than this value (the test is approximate) then the tab label "
+"will have the middle cut and replaced with an ellipsis."
msgstr ""
-"Ovaj kljuÄ odreÄ‘uje najveću Å¡irinu kartice. Ako je tekst u kartici duži od ove "
-"vrijednosti (test je približan), onda će natpis biti odrezan po sredini i "
-"zamijenjen trotoÄkom."
+"Ovaj kljuÄ odreÄ‘uje najveću Å¡irinu kartice. Ako je tekst u kartici duži od "
+"ove vrijednosti (test je približan), onda će natpis biti odrezan po sredini "
+"i zamijenjen trotoÄkom."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:140
#: gnucash/gtkbuilder/dialog-preferences.glade:759
@@ -10281,15 +10431,15 @@ msgstr "Koristi valutu odreÄ‘enu u sustavu raÄunala za sva novostvorena konta."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:146
#: gnucash/gschemas/org.gnucash.gschema.xml.in:359
msgid ""
-"This setting controls the source of the default currency for new accounts. If "
-"set to \"locale\" then GnuCash will retrieve the default currency from the "
-"user's locale setting. If set to \"other\", GnuCash will use the setting "
+"This setting controls the source of the default currency for new accounts. "
+"If set to \"locale\" then GnuCash will retrieve the default currency from "
+"the user's locale setting. If set to \"other\", GnuCash will use the setting "
"specified by the currency-other key."
msgstr ""
"Ova postavka upravlja izvorom standardne valute za nova konta. Ako je "
-"postavljeno na „jezik“, onda će GnuCash dohvatiti osnovnu valutu iz korisniÄkog "
-"podešavanja jezika. Ako je postavljeno na „drugo“, GnuCash će koristiti "
-"postavku, odreÄ‘enu kljuÄem „valuta-druga“."
+"postavljeno na „jezik“, onda će GnuCash dohvatiti osnovnu valutu iz "
+"korisniÄkog podeÅ¡avanja jezika. Ako je postavljeno na „drugo“, GnuCash će "
+"koristiti postavku, odreÄ‘enu kljuÄem „valuta-druga“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:145
#: gnucash/gtkbuilder/dialog-preferences.glade:622
@@ -10303,19 +10453,20 @@ msgstr "Standardna valuta za nova konta"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:151
msgid ""
"This setting specifies the default currency used for new accounts if the "
-"currency-choice setting is set to \"other\". This field must contain the three "
-"letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
+"currency-choice setting is set to \"other\". This field must contain the "
+"three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
msgstr ""
"Ova postavka navodi standardnu valutu za nova konta, ako je postavka „odabir-"
-"valute“ postavljeno na „druga“. Ovo polje mora sadržati troslovnu ISO-4217 šifru "
-"za valutu (npr. HRK, GBP, EUR)."
+"valute“ postavljeno na „druga“. Ovo polje mora sadržati troslovnu ISO-4217 "
+"Å¡ifru za valutu (npr. HRK, GBP, EUR)."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:155
msgid "Use 24 hour time format"
msgstr "Koristi 24-satni vremenski format"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:156
-msgid "If active, use a 24 hour time format. Otherwise use a 12 hour time format."
+msgid ""
+"If active, use a 24 hour time format. Otherwise use a 12 hour time format."
msgstr ""
"Ako je aktivirano, koristit će format vremena od 24 sata. U protivnom će "
"koristii format vremena od 12 sata."
@@ -10326,15 +10477,16 @@ msgstr "Izbor formata datuma"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:161
msgid ""
-"This setting chooses the way dates are displayed in GnuCash. Possible values for "
-"this setting are \"locale\" to use the system locale setting, \"ce\" for "
-"Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for "
-"United Kingdom style dates, and \"us\" for United States style dates."
+"This setting chooses the way dates are displayed in GnuCash. Possible values "
+"for this setting are \"locale\" to use the system locale setting, \"ce\" for "
+"Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" "
+"for United Kingdom style dates, and \"us\" for United States style dates."
msgstr ""
-"Ova postavka bira naÄin prikazivanja datuma u GnuCashu. Moguće vrijednosti za "
-"ovo podeÅ¡avanje su „lokalno“ za koriÅ¡tenje jeziÄnih postavaka sustava, „ce“ za "
-"datume kontinentalne Europe, „iso“ za datume ISO-8601 standarda, „uk“ za datume "
-"Velike Britanije, i „us“ za datume Sjedinjenih AmeriÄkih Država."
+"Ova postavka bira naÄin prikazivanja datuma u GnuCashu. Moguće vrijednosti "
+"za ovo podeÅ¡avanje su „lokalno“ za koriÅ¡tenje jeziÄnih postavaka sustava, "
+"„ce“ za datume kontinentalne Europe, „iso“ za datume ISO-8601 standarda, "
+"„uk“ za datume Velike Britanije, i „us“ za datume Sjedinjenih AmeriÄkih "
+"Država."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:165
#: gnucash/gtkbuilder/dialog-preferences.glade:982
@@ -10345,8 +10497,8 @@ msgstr "U tekućoj kalendarskoj godini"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:171
msgid ""
"When a date is entered without year it can be completed so that it will be "
-"within the current calendar year or close to the current date based on a sliding "
-"window starting a set number of months backwards in time."
+"within the current calendar year or close to the current date based on a "
+"sliding window starting a set number of months backwards in time."
msgstr ""
"Kad se unese datum bez godine, može biti upotpunjen, tako da bude u okviru "
"tekuće kalendarske godine ili blizu trenutaÄnog datuma, na osnovi kliznog "
@@ -10354,11 +10506,11 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:170
msgid ""
-"In a sliding 12-month window starting a configurable number of months before the "
-"current month"
+"In a sliding 12-month window starting a configurable number of months before "
+"the current month"
msgstr ""
-"U kliznom 12-mjeseÄnom razdoblju, koji zapoÄinje ovoliko mjeseci prije tekućeg "
-"mjeseca"
+"U kliznom 12-mjeseÄnom razdoblju, koji zapoÄinje ovoliko mjeseci prije "
+"tekućeg mjeseca"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:175
msgid "Maximum number of months to go back."
@@ -10367,8 +10519,8 @@ msgstr "Najveći broj mjeseci unatrag."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:176
#: gnucash/gtkbuilder/dialog-preferences.glade:1009
msgid ""
-"Dates will be completed so that they are close to the current date. Enter the "
-"maximum number of months to go backwards in time when completing dates."
+"Dates will be completed so that they are close to the current date. Enter "
+"the maximum number of months to go backwards in time when completing dates."
msgstr ""
"Datumi će biti dovrÅ¡eni tako da budu blizu trenutaÄnom datumu. Unesi najveći "
"broj mjeseci za kretanje unatrag, prilikom dovršavanja datuma."
@@ -10379,8 +10531,8 @@ msgstr "Prikaži vodoravne linije mreže"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:181
msgid ""
-"If active, horizontal grid lines will be shown on table displays. Otherwise no "
-"horizontal grid lines will be shown."
+"If active, horizontal grid lines will be shown on table displays. Otherwise "
+"no horizontal grid lines will be shown."
msgstr ""
"Ako je aktivirano, vodoravne linije mreže će biti prikazane u tablicama. U "
"protivnom, vodoravne linije mreže neće biti prikazane."
@@ -10403,8 +10555,8 @@ msgstr "Prikaži uvodni ekran"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:191
msgid ""
-"If active, a splash screen will be shown at startup. Otherwise no splash screen "
-"will be shown."
+"If active, a splash screen will be shown at startup. Otherwise no splash "
+"screen will be shown."
msgstr ""
"Ako je aktivirano, bit će prikazan pozdravni ekran prilikom pokretanja. U "
"protivnom neće."
@@ -10424,8 +10576,8 @@ msgid ""
"\"right\". It defaults to \"top\"."
msgstr ""
"Ova postavka određuje rub, na kojem se iscrtavaju kartice za prebacivanje "
-"stranica. Moguće vrijednosti su „gore“, „lijevo“, „dolje“ i „desno“. Standardna "
-"vrijednost je „gore“."
+"stranica. Moguće vrijednosti su „gore“, „lijevo“, „dolje“ i „desno“. "
+"Standardna vrijednost je „gore“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:200
#: gnucash/gtkbuilder/dialog-preferences.glade:3034
@@ -10450,11 +10602,13 @@ msgstr "Prikaži traku sažetka na vrhu stranice."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:216
#: gnucash/gschemas/org.gnucash.gschema.xml.in:221
msgid ""
-"This setting determines the edge at which the summary bar for various pages is "
-"drawn. Possible values are \"top\" and \"bottom\". It defaults to \"bottom\"."
+"This setting determines the edge at which the summary bar for various pages "
+"is drawn. Possible values are \"top\" and \"bottom\". It defaults to \"bottom"
+"\"."
msgstr ""
-"Ova postavka određuje rub, na kojem se iscrtava traka sažetka za razne stranice. "
-"Moguće vrijednosti su „gore“ i „dolje“. Standardna vrijednost je „dolje“."
+"Ova postavka određuje rub, na kojem se iscrtava traka sažetka za razne "
+"stranice. Moguće vrijednosti su „gore“ i „dolje“. Standardna vrijednost je "
+"„dolje“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:220
#: gnucash/gtkbuilder/dialog-preferences.glade:3127
@@ -10478,8 +10632,8 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:230
#: gnucash/gtkbuilder/dialog-preferences.glade:1160
msgid ""
-"Set book option on new files to use split \"action\" field for \"Num\" field on "
-"registers/reports"
+"Set book option on new files to use split \"action\" field for \"Num\" field "
+"on registers/reports"
msgstr ""
"Za nove datoteke, postavi ovu opciju knjige tako, da se polje „Radnja“ u "
"registrima/izvještajima koristi za polje „Broj“"
@@ -10487,18 +10641,19 @@ msgstr ""
#: gnucash/gschemas/org.gnucash.gschema.xml.in:231
#: gnucash/gtkbuilder/dialog-preferences.glade:1166
msgid ""
-"If selected, the default book option for new files is set so that the 'Num' cell "
-"on registers shows/updates the split 'action' field and the transaction 'num' "
-"field is shown on the second line in double line mode (and is not visible in "
-"single line mode). Otherwise, the default book option for new files is set so "
-"that the 'Num' cell on registers shows/updates the transaction 'num' field."
+"If selected, the default book option for new files is set so that the 'Num' "
+"cell on registers shows/updates the split 'action' field and the transaction "
+"'num' field is shown on the second line in double line mode (and is not "
+"visible in single line mode). Otherwise, the default book option for new "
+"files is set so that the 'Num' cell on registers shows/updates the "
+"transaction 'num' field."
msgstr ""
-"Ako je odabrano, standardna opcija knjige za nove datoteke je postavljena tako, "
-"da polje „Broj“ za registre pokazuje/aktualizira polje stavke „Radnja“ i polje "
-"transakcije „Broj“ se prikazuje u drugom redu u dvorednom pogledu (a nije "
-"vidljivo u jednorednom pogledu). U protivnom je standardna opcija knjige za nove "
-"datoteke postavljena tako, da polje „Broj“ za registre pokazuje/aktualizira "
-"polje transakcije „Broj“."
+"Ako je odabrano, standardna opcija knjige za nove datoteke je postavljena "
+"tako, da polje „Broj“ za registre pokazuje/aktualizira polje stavke „Radnja“ "
+"i polje transakcije „Broj“ se prikazuje u drugom redu u dvorednom pogledu (a "
+"nije vidljivo u jednorednom pogledu). U protivnom je standardna opcija "
+"knjige za nove datoteke postavljena tako, da polje „Broj“ za registre "
+"pokazuje/aktualizira polje transakcije „Broj“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:240
msgid "Color the register using a gnucash specific color theme"
@@ -10508,14 +10663,14 @@ msgstr "Oboji registar, koristeći GnuCash specifiÄne boje"
msgid ""
"When enabled the register will use a GnuCash specific color theme (green/"
"yellow). Otherwise it will use the system color theme. Regardless of this "
-"setting the user can always override the color theme via a gnucash specific css "
-"file to be stored in the gnucash used config directory. More information can be "
-"found in the gnucash FAQ."
+"setting the user can always override the color theme via a gnucash specific "
+"css file to be stored in the gnucash used config directory. More information "
+"can be found in the gnucash FAQ."
msgstr ""
"Kad je ukljuÄeno, u registru će se koristiti GnuCash-specifiÄne boje suÄelja "
"(zelena/žuta). U protivnom će se koristiti boje suÄelja odreÄ‘ene sustavom. "
-"Neovisno o ovim postavkama, korisnik uvijek može promijenie boju suÄelja putem "
-"GnuCash-specifiÄnih CSS datoteka, koje trebaju biti spremljene u "
+"Neovisno o ovim postavkama, korisnik uvijek može promijenie boju suÄelja "
+"putem GnuCash-specifiÄnih CSS datoteka, koje trebaju biti spremljene u "
"konfiguracijskom direktoriju GnuCasha. Daljnje informacije možeš naći u FAQ "
"stranicama GnuCasha."
@@ -10525,11 +10680,11 @@ msgstr "Zamijenjeno s „Koristi GnuCash-ugraÄ‘ene boje suÄeljaâ€"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:246
msgid ""
-"This option is temporarily kept around for backwards compatibility. It will be "
-"removed in a future version."
+"This option is temporarily kept around for backwards compatibility. It will "
+"be removed in a future version."
msgstr ""
-"Ova se opcija privremeno zadržava, zbog kompatibilnosti sa starijim verzijama. "
-"Bit će uklonjena u budućoj verziji."
+"Ova se opcija privremeno zadržava, zbog kompatibilnosti sa starijim "
+"verzijama. Bit će uklonjena u budućoj verziji."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:250
msgid "\"Enter\" key moves to bottom of register"
@@ -10540,8 +10695,8 @@ msgid ""
"If active, pressing the enter key will move to the bottom of the register. "
"Otherwise pressing the enter key will move to the next transaction line."
msgstr ""
-"Ako je aktivirano, pritiskom tipke „Enter†premjestit će se na dno registra. U "
-"protivnom, pritiskom na tipku „Enter†premjestit će se na sljedeći redak "
+"Ako je aktivirano, pritiskom tipke „Enter†premjestit će se na dno registra. "
+"U protivnom, pritiskom na tipku „Enter†premjestit će se na sljedeći redak "
"transakcije."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:255
@@ -10552,17 +10707,18 @@ msgstr "Automatski izdiže popis konta ili radnji za vrijeme unosa"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:260
msgid "Move to Transfer field when memorised transaction auto filled"
msgstr ""
-"Premjesti se u polje prijenosa, kad je upamćena transakcija automatski popunjena"
+"Premjesti se u polje prijenosa, kad je upamćena transakcija automatski "
+"popunjena"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:261
msgid ""
"If active then after a memorised transaction is automatically filled in the "
-"cursor will move to the Transfer field. If not active then it skips to the value "
-"field."
+"cursor will move to the Transfer field. If not active then it skips to the "
+"value field."
msgstr ""
-"Ako je aktivirano, onda će nakon automatskog popunjavanja upamćene transakcije, "
-"kursor prijeći u polje prijenosa. Ako nije ukljuÄeno, onda preskaÄe u polje "
-"vrijednosti."
+"Ako je aktivirano, onda će nakon automatskog popunjavanja upamćene "
+"transakcije, kursor prijeći u polje prijenosa. Ako nije ukljuÄeno, onda "
+"preskaÄe u polje vrijednosti."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:265
msgid "Create a new window for each new register"
@@ -10570,8 +10726,8 @@ msgstr "Stvori novi prozor za svaki novi registar"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:266
msgid ""
-"If active, each new register will be opened in a new window. Otherwise each new "
-"register will be opened as a tab in the main window."
+"If active, each new register will be opened in a new window. Otherwise each "
+"new register will be opened as a tab in the main window."
msgstr ""
"Ako je aktivirano, svaki novi registar će biti otvoren u novom prozoru. U "
"protivnom, svaki novi registar će biti otvoren kao kartica u glavnom prozoru."
@@ -10582,9 +10738,9 @@ msgstr "Oboji sve retke jedne transakcije istom bojom"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:271
msgid ""
-"If active all lines that make up a single transaction will use the same color "
-"for their background. Otherwise the background colors are alternated on each "
-"line."
+"If active all lines that make up a single transaction will use the same "
+"color for their background. Otherwise the background colors are alternated "
+"on each line."
msgstr ""
"Ako je aktivirano, svi redci koji Äine jednu transakciju, koristit će istu "
"pozadinsku boju. U protivnom, pozadinske boje se naizmjeniÄno smjenjuju."
@@ -10595,13 +10751,13 @@ msgstr "Prikaži vodoravne rubove u registru"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:276
msgid ""
-"Show horizontal borders between rows in a register. If active the border between "
-"cells will be indicated with a heavy line. Otherwise the border between cells "
-"will not be marked."
+"Show horizontal borders between rows in a register. If active the border "
+"between cells will be indicated with a heavy line. Otherwise the border "
+"between cells will not be marked."
msgstr ""
"Prikaži vodoravne rubove između redaka u registru. Ako je aktivirano, rubovi "
-"izmeÄ‘u polja će biti oznaÄeni debelom linijom. U protivnom, rubovi izmeÄ‘u polja "
-"neće biti oznaÄeni."
+"izmeÄ‘u polja će biti oznaÄeni debelom linijom. U protivnom, rubovi izmeÄ‘u "
+"polja neće biti oznaÄeni."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:280
msgid "Show vertical borders in a register"
@@ -10610,12 +10766,12 @@ msgstr "Prikaži uspravne rubove u registru"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:281
msgid ""
"Show vertical borders between columns in a register. If active the border "
-"between cells will be indicated with a heavy line. Otherwise the border between "
-"cells will not be marked."
+"between cells will be indicated with a heavy line. Otherwise the border "
+"between cells will not be marked."
msgstr ""
"Prikaži uspravne rubove između stupaca u registru. Ako je aktivirano, rubovi "
-"izmeÄ‘u polja će biti oznaÄeni debelom linijom. U protivnom, rubovi izmeÄ‘u polja "
-"neće biti oznaÄeni."
+"izmeÄ‘u polja će biti oznaÄeni debelom linijom. U protivnom, rubovi izmeÄ‘u "
+"polja neće biti oznaÄeni."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:285
msgid "Show future transactions after the blank transaction in a register"
@@ -10623,37 +10779,39 @@ msgstr "Prikaži buduće tranksakcije ispod prazne transakcije u registru"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:286
msgid ""
-"Show future transactions after the blank transaction in a register. If active "
-"then transactions with a date in the future will be displayed at the bottom of "
-"the register after the blank transaction. Otherwise the blank transaction will "
-"be at the bottom of the register after all transactions."
+"Show future transactions after the blank transaction in a register. If "
+"active then transactions with a date in the future will be displayed at the "
+"bottom of the register after the blank transaction. Otherwise the blank "
+"transaction will be at the bottom of the register after all transactions."
msgstr ""
"Prikaži buduće tranksakcije ispod prazne transakcije u registru. Ako je "
-"aktivirano, transakcije u budućnosti će biti prikazane na dnu registra, ispod "
-"prazne transakcije. U protivnom će prazna transakcija biti na dnu registra, "
-"ispod svih transakcija."
+"aktivirano, transakcije u budućnosti će biti prikazane na dnu registra, "
+"ispod prazne transakcije. U protivnom će prazna transakcija biti na dnu "
+"registra, ispod svih transakcija."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:290
#: gnucash/gtkbuilder/dialog-preferences.glade:2398
msgid "Show all transactions on one line. (Two in double line mode.)"
-msgstr "Prikaži sve transakcije u jednom redu. (U dva, u modusu dvostrukog reda.)"
+msgstr ""
+"Prikaži sve transakcije u jednom redu. (U dva, u modusu dvostrukog reda.)"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:291
#: gnucash/gschemas/org.gnucash.gschema.xml.in:296
#: gnucash/gschemas/org.gnucash.gschema.xml.in:301
msgid ""
-"This field specifies the default view style when opening a new register window. "
-"Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The \"ledger\" "
-"setting says to show each transaction on one or two lines. The \"auto-ledger\" "
-"setting does the same, but also expands only the current transaction to show all "
-"splits. The \"journal\" setting shows all transactions in expanded form."
+"This field specifies the default view style when opening a new register "
+"window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The "
+"\"ledger\" setting says to show each transaction on one or two lines. The "
+"\"auto-ledger\" setting does the same, but also expands only the current "
+"transaction to show all splits. The \"journal\" setting shows all "
+"transactions in expanded form."
msgstr ""
"Ovo polje navodi standardni stil pogleda prilikom otvaranja prozora novog "
"registra. Moguće vrijednosti su „Glavna knjiga“, „Raširi aktivnu stavku“ i "
-"„Dnevnik“. „Glavna knjiga“ pokazuje svaku transakciju u jednom ili u dva retka. "
-"„RaÅ¡iri aktivnu stavku“ radi isto, ali uz to Å¡iri samo trenutaÄnu transakciju za "
-"prikaz svih njenih stavaka. „Dnevnik transakcija“ pokazuje sve transakcije u "
-"raširenom obliku."
+"„Dnevnik“. „Glavna knjiga“ pokazuje svaku transakciju u jednom ili u dva "
+"retka. „RaÅ¡iri aktivnu stavku“ radi isto, ali uz to Å¡iri samo trenutaÄnu "
+"transakciju za prikaz svih njenih stavaka. „Dnevnik transakcija“ pokazuje "
+"sve transakcije u raširenom obliku."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:295
#: gnucash/gtkbuilder/dialog-preferences.glade:2418
@@ -10671,9 +10829,9 @@ msgstr "Sve transakcije su raširene, kako bi prikazale sve stavke."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:306
msgid ""
-"Show two lines of information for each transaction in a register. This is the "
-"default setting for when a register is first opened. The setting can be changed "
-"at any time via the \"View->Double Line\" menu item."
+"Show two lines of information for each transaction in a register. This is "
+"the default setting for when a register is first opened. The setting can be "
+"changed at any time via the \"View->Double Line\" menu item."
msgstr ""
"Pokaži dva reda s informacijama za svaku transakciju u registru. Ovo je "
"standardna postavka, kad se registar po prvi puta otvara. Postavku možeš "
@@ -10686,13 +10844,13 @@ msgstr "Prikaži samo imena konta."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:311
msgid ""
"Show only the names of the leaf accounts in the register and in the account "
-"selection popup. The default behaviour is to display the full name, including "
-"the path in the account tree. Activating this option implies that you use unique "
-"leaf names."
+"selection popup. The default behaviour is to display the full name, "
+"including the path in the account tree. Activating this option implies that "
+"you use unique leaf names."
msgstr ""
-"Prikaži samo imena konta u registru i u oblaÄiću odabira konta. Standardni naÄin "
-"je prikazivanje cjelokupnog imena, ukljuÄujući i stazu u kontnom planu. "
-"Aktiviranje ove opcije implicira, da koristiš jedinstvena imena konta."
+"Prikaži samo imena konta u registru i u oblaÄiću odabira konta. Standardni "
+"naÄin je prikazivanje cjelokupnog imena, ukljuÄujući i stazu u kontnom "
+"planu. Aktiviranje ove opcije implicira, da koristiš jedinstvena imena konta."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:315
msgid "Show the entered and reconcile dates"
@@ -10704,8 +10862,8 @@ msgid ""
"Show the date when the transaction was entered below the posted date and "
"reconciled date on split row."
msgstr ""
-"Prikaži datum unošenja transakcije ispod datuma uknjiženja i datuma usklađivanja "
-"za redak stavke."
+"Prikaži datum unošenja transakcije ispod datuma uknjiženja i datuma "
+"usklađivanja za redak stavke."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:320
msgid "Show entered and reconciled dates on selection"
@@ -10732,8 +10890,10 @@ msgstr "Premjesti odabir na praznu stavku prilikom Å¡irenja"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:331
#: gnucash/gtkbuilder/dialog-preferences.glade:2619
msgid ""
-"This will move the selection to the blank split when the transaction is expanded."
-msgstr "Ovo će premjestiti odabir na praznu stavku, kad se transakcija proširi."
+"This will move the selection to the blank split when the transaction is "
+"expanded."
+msgstr ""
+"Ovo će premjestiti odabir na praznu stavku, kad se transakcija proširi."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:335
msgid "Number of transactions to show in a register."
@@ -10756,8 +10916,8 @@ msgstr "Broj slovnih znakova za automatsko dovršavanje."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:341
#: gnucash/gtkbuilder/dialog-preferences.glade:2564
msgid ""
-"This sets the number of characters before auto complete starts for description, "
-"notes and memo fields."
+"This sets the number of characters before auto complete starts for "
+"description, notes and memo fields."
msgstr ""
"Ovo odreÄ‘uje broj slovnih znakova, nakon kojih poÄinje samodovrÅ¡avanje polja "
"opisa, napomena i zabilježaka."
@@ -10772,25 +10932,27 @@ msgid ""
"reports will be opened as tabs in the main window."
msgstr ""
"Ako je aktivirano, svaki novi izvještaj će biti otvoren u novom prozoru. U "
-"protivnom, svaki novi izvještaj će biti otvoren kao kartica u glavnom prozoru."
+"protivnom, svaki novi izvještaj će biti otvoren kao kartica u glavnom "
+"prozoru."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:353
#: gnucash/gtkbuilder/dialog-preferences.glade:2759
msgid "Use the system locale currency for all newly created reports."
-msgstr "Koristi valutu odreÄ‘enu u sustavu raÄunala za sve novostvorene izvjeÅ¡taje."
+msgstr ""
+"Koristi valutu odreÄ‘enu u sustavu raÄunala za sve novostvorene izvjeÅ¡taje."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:354
#: gnucash/gschemas/org.gnucash.gschema.xml.in:364
msgid ""
-"This setting controls the default currency used for reports. If set to \"locale"
-"\" then GnuCash will retrieve the default currency from the user's locale "
-"setting. If set to \"other\", GnuCash will use the setting specified by the "
-"currency-other key."
+"This setting controls the default currency used for reports. If set to "
+"\"locale\" then GnuCash will retrieve the default currency from the user's "
+"locale setting. If set to \"other\", GnuCash will use the setting specified "
+"by the currency-other key."
msgstr ""
-"Ova postavka upravlja standardnom valutom za izvještaje. Ako je postavljeno na "
-"„jezik“, onda će GnuCash dohvatiti osnovnu valutu iz korisniÄkog podeÅ¡avanja "
-"jezika. Ako je postavljeno na „drugo“, GnuCash će koristiti postavku, određenu u "
-"kljuÄu „valuta-druga“."
+"Ova postavka upravlja standardnom valutom za izvještaje. Ako je postavljeno "
+"na „jezik“, onda će GnuCash dohvatiti osnovnu valutu iz korisniÄkog "
+"podešavanja jezika. Ako je postavljeno na „drugo“, GnuCash će koristiti "
+"postavku, odreÄ‘enu u kljuÄu „valuta-druga“."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:358
#: gnucash/gtkbuilder/dialog-preferences.glade:2733
@@ -10808,13 +10970,14 @@ msgstr "Standardno zumiranje za izvještaje."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:369
#: gnucash/gtkbuilder/dialog-preferences.glade:2862
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."
+"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 ""
-"Na ekranima s visokom rezolucijom Äitanje izvjeÅ¡taja postaje otežano. Ova opcija "
-"omogućava skaliranje izvještaja postavljenim faktorom. Npr., postavljanjem na "
-"2.0, prikazat će izvjeÅ¡taje u veliÄini dva puta većoj od uobiÄajene."
+"Na ekranima s visokom rezolucijom Äitanje izvjeÅ¡taja postaje otežano. Ova "
+"opcija omogućava skaliranje izvještaja postavljenim faktorom. Npr., "
+"postavljanjem na 2.0, prikazat će izvjeÅ¡taje u veliÄini dva puta većoj od "
+"uobiÄajene."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:378
msgid "PDF export file name format"
@@ -10823,19 +10986,20 @@ msgstr "Format imena datoteke PDF izvoza"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:379
#, c-format
msgid ""
-"This setting chooses the file name for PDF export. This is a sprintf(3) string "
-"with three arguments: \"%1$s\" is the report name such as \"Invoice\". \"%2$s\" "
-"is the number of the report, which for an invoice report is the invoice number. "
-"\"%3$s\" is the date of the report, formatted according to the filename-date-"
-"format setting. (Note: Any characters that are not allowed in filenames, such as "
-"'/', will be replaced with underscores '_' in the resulting file name.)"
-msgstr ""
-"Ova postavka bira ime datoteke za PDF izvoz. Ovo je „sprintf(3)“ znakovni niz s "
-"tri argumenta: „%1$s“ je ime izvjeÅ¡taja, kao Å¡to je „RaÄun“. „%2$s“ je broj "
-"izvjeÅ¡taja, koji je za izvjeÅ¡taj izlaznog raÄuna, broj izlaznog raÄuna. „%3$s“ "
-"je datum izvještaja, prema postavci „ime datoteke-datum-format“. (Napomena: "
-"svaki nedozvoljeni znak u imenu datoteke, kao Å¡to je „/â€, će biti zamijenjen "
-"podvlakom „_†u rezultirajućem imenu datoteke.)"
+"This setting chooses the file name for PDF export. This is a sprintf(3) "
+"string with three arguments: \"%1$s\" is the report name such as \"Invoice"
+"\". \"%2$s\" is the number of the report, which for an invoice report is the "
+"invoice number. \"%3$s\" is the date of the report, formatted according to "
+"the filename-date-format setting. (Note: Any characters that are not allowed "
+"in filenames, such as '/', will be replaced with underscores '_' in the "
+"resulting file name.)"
+msgstr ""
+"Ova postavka bira ime datoteke za PDF izvoz. Ovo je „sprintf(3)“ znakovni "
+"niz s tri argumenta: „%1$s“ je ime izvjeÅ¡taja, kao Å¡to je „RaÄun“. „%2$s“ je "
+"broj izvjeÅ¡taja, koji je za izvjeÅ¡taj izlaznog raÄuna, broj izlaznog raÄuna. "
+"„%3$s“ je datum izvještaja, prema postavci „ime datoteke-datum-format“. "
+"(Napomena: svaki nedozvoljeni znak u imenu datoteke, kao Å¡to je „/â€, će biti "
+"zamijenjen podvlakom „_†u rezultirajućem imenu datoteke.)"
#: gnucash/gschemas/org.gnucash.gschema.xml.in:383
msgid "PDF export file name date format choice"
@@ -10846,14 +11010,14 @@ msgid ""
"This setting chooses the way dates are used in the filename of PDF export. "
"Possible values for this setting are \"locale\" to use the system locale "
"setting, \"ce\" for Continental Europe style dates, \"iso\" for ISO 8601 "
-"standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United "
-"States style dates."
+"standard dates , \"uk\" for United Kingdom style dates, and \"us\" for "
+"United States style dates."
msgstr ""
-"Ova postavka bira naÄin za koriÅ¡tenje datuma u imenu datoteke PDF izvoza. Moguće "
-"vrijednosti za ovo podeÅ¡avanje su „lokalno“ za koriÅ¡tenje jeziÄnih postavaka "
-"sustava, „ce“ za datume kontinentalne Europe, „iso“ za datume ISO-8601 "
-"standarda, „uk“ za datume Velike Britanije, i „us“ za datume Sjedinjenih "
-"AmeriÄkih Država."
+"Ova postavka bira naÄin za koriÅ¡tenje datuma u imenu datoteke PDF izvoza. "
+"Moguće vrijednosti za ovo podeÅ¡avanje su „lokalno“ za koriÅ¡tenje jeziÄnih "
+"postavaka sustava, „ce“ za datume kontinentalne Europe, „iso“ za datume "
+"ISO-8601 standarda, „uk“ za datume Velike Britanije, i „us“ za datume "
+"Sjedinjenih AmeriÄkih Država."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:390
msgid "Allow file incompatibility with older versions."
@@ -10862,14 +11026,14 @@ msgstr "Dopusti nekompatibilnost s datotekama starijih izdanja."
#: gnucash/gschemas/org.gnucash.gschema.xml.in:391
msgid ""
"If active, gnucash will be allowed to intentionally break file compatibility "
-"with older versions, so that a data file saved in this version cannot be read by "
-"an older version again. Otherwise gnucash will write data files only in formats "
-"that can be read by older versions as well."
+"with older versions, so that a data file saved in this version cannot be "
+"read by an older version again. Otherwise gnucash will write data files only "
+"in formats that can be read by older versions as well."
msgstr ""
-"Ako je aktivirano, GnuCashu će biti dopušteno da namjerno ošteti kompatibilnost "
-"datoteke sa starijim izdanjima, tako da datoteka spremljena ovim izdanjem, ne "
-"može biti Äitana starijim izdanjem. U protivnom, zapisat će datoteke samo u "
-"formatu, koji mogu biti proÄitani i starijim izdanjima."
+"Ako je aktivirano, GnuCashu će biti dopušteno da namjerno ošteti "
+"kompatibilnost datoteke sa starijim izdanjima, tako da datoteka spremljena "
+"ovim izdanjem, ne može biti Äitana starijim izdanjem. U protivnom, zapisat "
+"će datoteke samo u formatu, koji mogu biti proÄitani i starijim izdanjima."
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:5
msgid "Number of files in history"
@@ -10877,13 +11041,13 @@ msgstr "Broj datoteka u popisu prethodnih"
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:6
msgid ""
-"This setting contains the number of files to keep in the Recently Opened Files "
-"menu. This value may be set to zero to disable the file history. This number has "
-"a maximum value of 10."
+"This setting contains the number of files to keep in the Recently Opened "
+"Files menu. This value may be set to zero to disable the file history. This "
+"number has a maximum value of 10."
msgstr ""
-"Ova postavka sadrži broj datoteka u izborniku nedavno otvaranih datoteka. Ova se "
-"vrijednost može podesiti na nulu, za iskljuÄivanje popisa nedavnih datoteka. "
-"Najveći broj je 10."
+"Ova postavka sadrži broj datoteka u izborniku nedavno otvaranih datoteka. "
+"Ova se vrijednost može podesiti na nulu, za iskljuÄivanje popisa nedavnih "
+"datoteka. Najveći broj je 10."
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:10
msgid "Most recently opened file"
@@ -10914,7 +11078,8 @@ msgstr "Sljedeća, zadnja otvorena datoteka"
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:46
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:51
#: gnucash/gschemas/org.gnucash.history.gschema.xml.in:56
-msgid "This field contains the full path of the next most recently opened file."
+msgid ""
+"This field contains the full path of the next most recently opened file."
msgstr "Ovo polje sadrži cjelokupnu stazu predzadnje otvorene datoteke."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:9
@@ -10925,10 +11090,11 @@ msgstr "IspiÅ¡i Äekove iz viÅ¡estrukih konta"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:10
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:103
msgid ""
-"This dialog is presented if you try to print checks from multiple accounts at "
-"the same time."
+"This dialog is presented if you try to print checks from multiple accounts "
+"at the same time."
msgstr ""
-"Ovaj se prozor prikazuje ako pokuÅ¡aÅ¡ ispisati Äekove s viÅ¡e konta u isto vreme."
+"Ovaj se prozor prikazuje ako pokuÅ¡aÅ¡ ispisati Äekove s viÅ¡e konta u isto "
+"vreme."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:14
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:107
@@ -10952,8 +11118,8 @@ msgstr "Dupliciranje promijenjenog unosa u izlaznom raÄunu"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:20
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:113
msgid ""
-"This dialog is presented when you attempt to duplicate a modified invoice entry. "
-"The changed data must be saved or the duplication canceled."
+"This dialog is presented when you attempt to duplicate a modified invoice "
+"entry. The changed data must be saved or the duplication canceled."
msgstr ""
"Ovaj se prozor prikazuje kad pokušaš duplicirati promijenjeni unos izlaznog "
"raÄuna. Promijenjeni podaci moraju biti spremljeni ili moraÅ¡ odustati od "
@@ -10991,10 +11157,11 @@ msgstr "IzbriÅ¡i viÅ¡estruke cijena teÄajeva"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:35
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:128
msgid ""
-"This dialog is presented before allowing you to delete multiple price quotes at "
-"one time."
+"This dialog is presented before allowing you to delete multiple price quotes "
+"at one time."
msgstr ""
-"Ovaj se prozor prikazuje prije dozvole za istodobno brisanje mnogostrukih cijena."
+"Ovaj se prozor prikazuje prije dozvole za istodobno brisanje mnogostrukih "
+"cijena."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:39
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:132
@@ -11005,12 +11172,12 @@ msgstr "Uredi registar konta dugovanja/konta potraživanja"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:133
msgid ""
"This dialog is presented before allowing you to edit an accounts payable/"
-"accounts receivable account. These account types are reserved for the business "
-"features and should rarely be manipulated manually."
+"accounts receivable account. These account types are reserved for the "
+"business features and should rarely be manipulated manually."
msgstr ""
"Ovaj se prozor prikazuje prije mogućnosti za uređivanjem dugovnih konta/"
-"potražnih konta. Ove vrste konta su rezervirane za poslovne funkcije i samo ih "
-"je rijetko potrebno ruÄno mijenjati."
+"potražnih konta. Ove vrste konta su rezervirane za poslovne funkcije i samo "
+"ih je rijetko potrebno ruÄno mijenjati."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:44
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:137
@@ -11020,7 +11187,8 @@ msgstr "UÄitaj samo registar"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:45
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:138
msgid "This dialog is presented when a read-only register is opened."
-msgstr "Ovaj se prozor prikazuje kad se otvori registar, koji je samo-za-Äitanje."
+msgstr ""
+"Ovaj se prozor prikazuje kad se otvori registar, koji je samo-za-Äitanje."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:49
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:142
@@ -11046,12 +11214,12 @@ msgstr "OznaÄi stavku transakcije kao neusklaÄ‘enu"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:148
msgid ""
"This dialog is presented before allowing you to mark a transaction split as "
-"unreconciled. Doing so will throw off the reconciled value of the register and "
-"can make it hard to perform future reconciliations."
+"unreconciled. Doing so will throw off the reconciled value of the register "
+"and can make it hard to perform future reconciliations."
msgstr ""
-"Ovaj se prozor prikazuje prije mogućnosti za obilježavanje stavke transakcije "
-"neusklađenom. Ovime se odbacuje usklađena vrijednost u registru i može otežati "
-"buduća usklađivanja."
+"Ovaj se prozor prikazuje prije mogućnosti za obilježavanje stavke "
+"transakcije neusklađenom. Ovime se odbacuje usklađena vrijednost u registru "
+"i može otežati buduća usklađivanja."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:59
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:152
@@ -11074,13 +11242,13 @@ msgstr "Ukloni usklađenu stavku iz transakcije"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:65
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:158
msgid ""
-"This dialog is presented before allowing you to remove a reconciled split from a "
-"transaction. Doing so will throw off the reconciled value of the register and "
-"can make it hard to perform future reconciliations."
+"This dialog is presented before allowing you to remove a reconciled split "
+"from a transaction. Doing so will throw off the reconciled value of the "
+"register and can make it hard to perform future reconciliations."
msgstr ""
"Ovaj se prozor prikazuje prije mogućnosti za uklanjanjem usklađene stavke iz "
-"transakcije. Ovime se odbacuje usklađena vrijednost u registru i može otežati "
-"buduća usklađivanja."
+"transakcije. Ovime se odbacuje usklađena vrijednost u registru i može "
+"otežati buduća usklađivanja."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:69
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:74
@@ -11095,7 +11263,8 @@ msgid ""
"This dialog is presented before allowing you to remove all splits from a "
"transaction."
msgstr ""
-"Ovaj se prozor prikazuje prije dozvole za uklanjanje svih stavaka iz transkacije."
+"Ovaj se prozor prikazuje prije dozvole za uklanjanje svih stavaka iz "
+"transkacije."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:75
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:168
@@ -11105,9 +11274,9 @@ msgid ""
"reconciled value of the register and can make it hard to perform future "
"reconciliations."
msgstr ""
-"Ovaj se prozor prikazuje prije dozvole za uklanjanjem svih stavaka (ukljuÄujući "
-"i neke usklađene stavke) iz transakcije. Ovime se odbacuje usklađena vrijednost "
-"u registru i može otežati buduća usklađivanja."
+"Ovaj se prozor prikazuje prije dozvole za uklanjanjem svih stavaka "
+"(ukljuÄujući i neke usklaÄ‘ene stavke) iz transakcije. Ovime se odbacuje "
+"usklađena vrijednost u registru i može otežati buduća usklađivanja."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:79
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:172
@@ -11128,8 +11297,8 @@ msgstr "Izbriši transakciju s usklađenim stavkama"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:178
msgid ""
"This dialog is presented before allowing you to delete a transaction that "
-"contains reconciled splits. Doing so will throw off the reconciled value of the "
-"register and can make it hard to perform future reconciliations."
+"contains reconciled splits. Doing so will throw off the reconciled value of "
+"the register and can make it hard to perform future reconciliations."
msgstr ""
"Ovaj se prozor prikazuje prije dozvole za brisanje transakcije, koja sadrži "
"usklađene stavke. Ovime se odbacuje usklađena vrijednost u registru i može "
@@ -11143,11 +11312,12 @@ msgstr "Dupliciranje promijenjene transakcije"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:90
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:183
msgid ""
-"This dialog is presented when you attempt to duplicate a modified transaction. "
-"The changed data must be saved or the duplication canceled."
+"This dialog is presented when you attempt to duplicate a modified "
+"transaction. The changed data must be saved or the duplication canceled."
msgstr ""
"Ovaj se prozor prikazuje kad pokušaš duplicirati promijenjenu transakciju. "
-"Promijenjeni podaci moraju biti spremljeni ili moraš odustati od dupliciranja."
+"Promijenjeni podaci moraju biti spremljeni ili moraš odustati od "
+"dupliciranja."
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:94
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:187
@@ -11157,15 +11327,16 @@ msgstr "Spremi promjene u transakciji"
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:95
#: gnucash/gschemas/org.gnucash.warnings.gschema.xml.in:188
msgid ""
-"This dialog is presented when you attempt to move out of a modified transaction. "
-"The changed data must be either saved or discarded."
+"This dialog is presented when you attempt to move out of a modified "
+"transaction. The changed data must be either saved or discarded."
msgstr ""
"Ovaj se prozor prikazuje kad pokušaš izaći iz promijenjene transakcije. "
"Promijenjeni podaci moraju biti ili spremljeni ili odbaÄeni."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:5
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:6
-msgid "Show a grand total of all accounts converted to the default report currency"
+msgid ""
+"Show a grand total of all accounts converted to the default report currency"
msgstr ""
"Prikaži sveukupni iznos svih konta, pretvorenih standardnu valutu izvještaja"
@@ -11175,11 +11346,11 @@ msgstr "Prikaži bezvalutnu robu"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:11
msgid ""
-"If active, non currency commodities (stocks) will be shown. Otherwise they will "
-"be hidden."
+"If active, non currency commodities (stocks) will be shown. Otherwise they "
+"will be hidden."
msgstr ""
-"Ako je aktivirano, ne valutne robe (dionice) će biti prikazane. U protivnome će "
-"biti skrivene."
+"Ako je aktivirano, ne valutne robe (dionice) će biti prikazane. U protivnome "
+"će biti skrivene."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:15
msgid "Use relative profit/loss starting date"
@@ -11195,8 +11366,9 @@ msgid ""
msgstr ""
"Ova postavka upravlja vrstom poÄetnog datuma koji se koristi u kalkulacijama "
"dobiti/gubitka. Ako je postavljeno na „absolutno“, onda će GnuCash dohvatiti "
-"poÄetni datum, naveden kljuÄem za poÄetni datum. Ako je postavljeno na bilo Å¡to "
-"drugo, GnuCash će dohvatiti poÄetni datum, naveden kljuÄem za poÄetak razdoblja."
+"poÄetni datum, naveden kljuÄem za poÄetni datum. Ako je postavljeno na bilo "
+"Å¡to drugo, GnuCash će dohvatiti poÄetni datum, naveden kljuÄem za poÄetak "
+"razdoblja."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:20
msgid "Use absolute profit/loss starting date"
@@ -11208,13 +11380,13 @@ msgstr "PoÄetni datum (u sekundama, od 1. sijeÄnja 1970.)"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:26
msgid ""
-"This setting controls the starting date set in profit/loss calculations if the "
-"start-choice setting is set to \"absolute\". This field should contain a date as "
-"represented in seconds from January 1st, 1970."
+"This setting controls the starting date set in profit/loss calculations if "
+"the start-choice setting is set to \"absolute\". This field should contain a "
+"date as represented in seconds from January 1st, 1970."
msgstr ""
-"Ova postavka upravlja poÄetnim datumom u kalkulacijama dobiti/gubitka, ako je "
-"podeÅ¡avanje izbora poÄetka postavljeno na „apsolutno“. Ovo polje mora sadržati "
-"datum, prikazan u sekundama od 1. sijeÄnja 1970. godine."
+"Ova postavka upravlja poÄetnim datumom u kalkulacijama dobiti/gubitka, ako "
+"je podeÅ¡avanje izbora poÄetka postavljeno na „apsolutno“. Ovo polje mora "
+"sadržati datum, prikazan u sekundama od 1. sijeÄnja 1970. godine."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:30
msgid "Starting time period identifier"
@@ -11222,13 +11394,13 @@ msgstr "Identifikator poÄetka razdoblja"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:31
msgid ""
-"This setting controls the starting date set in profit/loss calculations if the "
-"start-choice setting is set to anything other than \"absolute\". This field "
-"should contain a value between 0 and 8."
+"This setting controls the starting date set in profit/loss calculations if "
+"the start-choice setting is set to anything other than \"absolute\". This "
+"field should contain a value between 0 and 8."
msgstr ""
-"Ova postavka upravlja poÄetnim datumom u kalkulacijama dobiti/gubitka, ako je "
-"postavka za izbora poÄetka postavljena na bilo Å¡to drugo od „absolutno“. Ovo "
-"polje mora sadržati vrijednost između 0 i 8."
+"Ova postavka upravlja poÄetnim datumom u kalkulacijama dobiti/gubitka, ako "
+"je postavka za izbora poÄetka postavljena na bilo Å¡to drugo od „absolutno“. "
+"Ovo polje mora sadržati vrijednost između 0 i 8."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:35
msgid "Use relative profit/loss ending date"
@@ -11237,15 +11409,16 @@ msgstr "Koristi relativan završni datum za dobit/gubitak"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:36
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:41
msgid ""
-"This setting controls the type of ending date used in profit/loss calculations. "
-"If set to \"absolute\" then GnuCash will retrieve the ending date specified by "
-"the end-date key. If set to anything else, GnuCash will retrieve the ending date "
-"specified by the end-period key."
+"This setting controls the type of ending date used in profit/loss "
+"calculations. If set to \"absolute\" then GnuCash will retrieve the ending "
+"date specified by the end-date key. If set to anything else, GnuCash will "
+"retrieve the ending date specified by the end-period key."
msgstr ""
"Ova postavka upravlja vrstom završnog datuma koji se koristi u kalkulacijama "
"dobiti/gubitka. Ako je postavljeno na „absolutno“, onda će GnuCash dohvatiti "
-"zavrÅ¡ni datum, naveden kljuÄem za zavrÅ¡ni datum. Ako je postavljeno na bilo Å¡to "
-"drugo, GnuCash će dohvatiti zavrÅ¡ni datum, naveden kljuÄem za zavrÅ¡ni razdoblja."
+"zavrÅ¡ni datum, naveden kljuÄem za zavrÅ¡ni datum. Ako je postavljeno na bilo "
+"Å¡to drugo, GnuCash će dohvatiti zavrÅ¡ni datum, naveden kljuÄem za zavrÅ¡ni "
+"razdoblja."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:40
msgid "Use absolute profit/loss ending date"
@@ -11257,13 +11430,13 @@ msgstr "Krajnji datum (u sekundama od 1. sijeÄnja 1970.)"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:46
msgid ""
-"This setting controls the ending date set in profit/loss calculations if the end-"
-"choice setting is set to \"absolute\". This field should contain a date as "
-"represented in seconds from January 1st, 1970."
+"This setting controls the ending date set in profit/loss calculations if the "
+"end-choice setting is set to \"absolute\". This field should contain a date "
+"as represented in seconds from January 1st, 1970."
msgstr ""
-"Ova postavka upravlja završnim datumom u kalkulacijama dobiti/gubitka, ako je "
-"postavka za izbora završetka postavljena na „apsolutno“. Ovo polje mora sadržati "
-"datum, prikazan u sekundama od 1. sijeÄnja 1970. godine."
+"Ova postavka upravlja završnim datumom u kalkulacijama dobiti/gubitka, ako "
+"je postavka za izbora završetka postavljena na „apsolutno“. Ovo polje mora "
+"sadržati datum, prikazan u sekundama od 1. sijeÄnja 1970. godine."
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:50
msgid "Ending time period identifier"
@@ -11271,13 +11444,13 @@ msgstr "Identifikator kraja razdoblja"
#: gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in:51
msgid ""
-"This setting controls the ending date set in profit/loss calculations if the end-"
-"choice setting is set to anything other than \"absolute\". This field should "
-"contain a value between 0 and 8."
+"This setting controls the ending date set in profit/loss calculations if the "
+"end-choice setting is set to anything other than \"absolute\". This field "
+"should contain a value between 0 and 8."
msgstr ""
-"Ova postavka upravlja završnim datumom u kalkulacijama dobiti/gubitka, ako je "
-"postavka za izbora završetka postavljena na bilo što drugo od „absolutno“. Ovo "
-"polje mora sadržati vrijednost između 0 i 8."
+"Ova postavka upravlja završnim datumom u kalkulacijama dobiti/gubitka, ako "
+"je postavka za izbora završetka postavljena na bilo što drugo od "
+"„absolutno“. Ovo polje mora sadržati vrijednost između 0 i 8."
#: gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in:5
msgid "Display this column"
@@ -11285,11 +11458,11 @@ msgstr "Prikaži ovaj stupac"
#: gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in:6
msgid ""
-"This setting controls whether the given column will be visible in the view. TRUE "
-"means visible, FALSE means hidden."
+"This setting controls whether the given column will be visible in the view. "
+"TRUE means visible, FALSE means hidden."
msgstr ""
-"Ova postavka upravlja vidljivost stupca u pogledu. TRUE znaÄi vidljivo, FALSE "
-"znaÄi skriveno."
+"Ova postavka upravlja vidljivost stupca u pogledu. TRUE znaÄi vidljivo, "
+"FALSE znaÄi skriveno."
#: gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in:10
msgid "Width of this column"
@@ -11304,8 +11477,8 @@ msgid ""
"This assistant will help you setup and use accounting periods. \n"
" \n"
"Danger: this feature does not work correctly at this time; it is still under "
-"development. It will probably damage your data in such a way that it cannot be "
-"repaired!"
+"development. It will probably damage your data in such a way that it cannot "
+"be repaired!"
msgstr ""
"Ovaj će ti pomoćnik pomoći podesiti i koristiti obraÄunska razdoblja.\n"
" \n"
@@ -11319,8 +11492,8 @@ msgstr "Postavi razdoblje konta"
#: gnucash/gtkbuilder/assistant-acct-period.glade:38
msgid ""
"\n"
-"Select an accounting period and the closing date which must not be in the future "
-"and is greater than the closing date of the previous book.\n"
+"Select an accounting period and the closing date which must not be in the "
+"future and is greater than the closing date of the previous book.\n"
"\n"
"Books will be closed at midnight on the selected date."
msgstr ""
@@ -11377,26 +11550,27 @@ msgid ""
"\n"
"This assistant will help you import Accounts from a file.\n"
"\n"
-"The file must be in the same format as that exported as this is a fixed format "
-"import which can be seen by looking at a file created by using the 'Export "
-"Account Tree to CSV' export menu option.\n"
+"The file must be in the same format as that exported as this is a fixed "
+"format import which can be seen by looking at a file created by using the "
+"'Export Account Tree to CSV' export menu option.\n"
"\n"
-"If the account is missing, based on the full account name, it will be added as "
-"long as the security / currency specified exists. If the account exists, then "
-"four fields will be updated. These are code, description, notes and color.\n"
+"If the account is missing, based on the full account name, it will be added "
+"as long as the security / currency specified exists. If the account exists, "
+"then four fields will be updated. These are code, description, notes and "
+"color.\n"
"\n"
"Click on 'Forward' to proceed or 'Cancel' to Abort Import.\n"
msgstr ""
"\n"
"Ovaj pomoćnik će ti pomoći uvesti konta iz datoteke.\n"
"\n"
-"Datoteka mora biti istog formata kao izvezena, budući da je ovo uvoz fiksiranog "
-"formata. To možeš vidjeti, ako pogledaš stvorenu datoteku, putem opcije za izvoz "
-"iz izbornika „Izvezi kontni plan u CSV datotekuâ€.\n"
+"Datoteka mora biti istog formata kao izvezena, budući da je ovo uvoz "
+"fiksiranog formata. To možeš vidjeti, ako pogledaš stvorenu datoteku, putem "
+"opcije za izvoz iz izbornika „Izvezi kontni plan u CSV datotekuâ€.\n"
"\n"
-"Ako konto nedostaje, bit će – na osnovi cjelokupnog imena konta – dodan, ukoliko "
-"postoji odreÄ‘eni vrijednosni papir/valuta. Ako konto postoji, Äetiri polja će "
-"biti aktualizirana – šifra, opis, napomene i boja.\n"
+"Ako konto nedostaje, bit će – na osnovi cjelokupnog imena konta – dodan, "
+"ukoliko postoji odreÄ‘eni vrijednosni papir/valuta. Ako konto postoji, Äetiri "
+"polja će biti aktualizirana – šifra, opis, napomene i boja.\n"
"\n"
"Klikni „Sljedeće“ za nastavljanje ili „Odustani“ za prekid uvoza.\n"
@@ -11641,28 +11815,28 @@ msgstr "Uvoz CSV cijena"
msgid ""
"This assistant will help you import Prices from a CSV file.\n"
"\n"
-"There is a minimum number of columns that have to be present for a successful "
-"import, these are Date, Amount, Commodity From and Currency To. If all entries "
-"are for the same Commodity / Currency then you can select them and then the "
-"columns will be Date and Amount.\n"
+"There is a minimum number of columns that have to be present for a "
+"successful import, these are Date, Amount, Commodity From and Currency To. "
+"If all entries are for the same Commodity / Currency then you can select "
+"them and then the columns will be Date and Amount.\n"
"\n"
"Various options exist for specifying the delimiter as well as a fixed width "
-"option. With the fixed width option, double click on the table of rows displayed "
-"to set a column width, then right mouse to change if required.\n"
+"option. With the fixed width option, double click on the table of rows "
+"displayed to set a column width, then right mouse to change if required.\n"
"\n"
"Examples are \"RR.L\",\"21/11/2016\",5.345,\"GBP\" and \"USD\","
"\"2016-11-21\",1.56,\"GBP\"\n"
"\n"
-"There is an option for specifying the start row, end row and an option to skip "
-"alternate rows beginning from the start row which can be used if you have some "
-"header text. Also there is an option to over write existing prices for that day "
-"if required.\n"
+"There is an option for specifying the start row, end row and an option to "
+"skip alternate rows beginning from the start row which can be used if you "
+"have some header text. Also there is an option to over write existing prices "
+"for that day if required.\n"
"\n"
-"Lastly, for repeated imports the preview page has buttons to Load and Save the "
-"settings. To save the settings, tweak the settings to your preferences "
+"Lastly, for repeated imports the preview page has buttons to Load and Save "
+"the settings. To save the settings, tweak the settings to your preferences "
"(optionally starting from an existing preset), then (optionally change the "
-"settings name and press the Save Settings button. Note you can't save to built-"
-"in presets.\n"
+"settings name and press the Save Settings button. Note you can't save to "
+"built-in presets.\n"
"\n"
"This operation is not reversable, so make sure you have a working backup.\n"
"\n"
@@ -11670,24 +11844,26 @@ msgid ""
msgstr ""
"Ovaj će ti pomoćnik pomoći uvesti cijene iz CSV datoteke.\n"
"\n"
-"Za uspjeÅ¡an uvoz su potrebni barem ovi stupci: „Datumâ€, „KoliÄinaâ€, „Roba iz†i "
-"„Valuta uâ€.\n"
+"Za uspjeÅ¡an uvoz su potrebni barem ovi stupci: „Datumâ€, „KoliÄinaâ€, „Roba "
+"iz†i „Valuta uâ€.\n"
"\n"
-"Postoje razne opcije za određivanje razdvojnog znaka i fiksne širine. Za željenu "
-"fiksnu Å¡irinu, klikni dvaput na prikazanu tablicu i ako treba, podesi Å¡irinu "
-"desnim gumbom miša.\n"
+"Postoje razne opcije za određivanje razdvojnog znaka i fiksne širine. Za "
+"željenu fiksnu širinu, klikni dvaput na prikazanu tablicu i ako treba, "
+"podesi širinu desnim gumbom miša.\n"
"\n"
-"Npr. \"RR.L\",\"21/11/2016\",5.345,\"HRK\" and \"EUR\",\"2016-11-21\",1.56,\"HRK"
-"\"\n"
+"Npr. \"RR.L\",\"21/11/2016\",5.345,\"HRK\" and \"EUR\",\"2016-11-21\",1.56,"
+"\"HRK\"\n"
"\n"
-"Postoji opcija za odreÄ‘ivanje poÄetnog reda, kao i opcija za preskakanje redaka, "
-"poÄevÅ¡i od poÄetnog reda. To se može koristiti, ako imaÅ¡ tekstove u zaglavlju "
-"tablice. Moguće je i prepisati postojeće cijene za taj dan, ako treba.\n"
+"Postoji opcija za odreÄ‘ivanje poÄetnog reda, kao i opcija za preskakanje "
+"redaka, poÄevÅ¡i od poÄetnog reda. To se može koristiti, ako imaÅ¡ tekstove u "
+"zaglavlju tablice. Moguće je i prepisati postojeće cijene za taj dan, ako "
+"treba.\n"
"\n"
"I na kraju, za ponavljanje uvoza, pregled stranice ima gumbe za uÄitavanje i "
"spremanje postavaka. Za spremanje postavaka, namjesti postavke kako želiš "
-"(poÄevÅ¡i sa zadanim postavkama), a zatim (opcionalno) promijeni ime postavke i "
-"klikni „Spremi postavkeâ€. Napomena: Spremati možeÅ¡ Äak i u ugraÄ‘ene postavke.\n"
+"(poÄevÅ¡i sa zadanim postavkama), a zatim (opcionalno) promijeni ime postavke "
+"i klikni „Spremi postavkeâ€. Napomena: Spremati možeÅ¡ Äak i u ugraÄ‘ene "
+"postavke.\n"
"\n"
"Ovo je nepovratna radnja, stoga imaj sigurnosnu kopiju pri ruci.\n"
"\n"
@@ -11771,11 +11947,11 @@ msgstr "Dozvoli prepisivanje postojećih cijena."
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:528
msgid ""
-"Normally prices are not over written, select this to change that. This setting "
-"is not saved."
+"Normally prices are not over written, select this to change that. This "
+"setting is not saved."
msgstr ""
-"UobiÄajeno se cijene ne isprepisuju. Odaberi ovo, kako bi se to promijenilo. Ova "
-"postavka se ne sprema."
+"UobiÄajeno se cijene ne isprepisuju. Odaberi ovo, kako bi se to promijenilo. "
+"Ova postavka se ne sprema."
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:554
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:564
@@ -11816,21 +11992,22 @@ msgstr "PreskoÄi retke naizmjeniÄno"
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:760
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:776
msgid ""
-"Starting from the first line that is actually imported every second line will be "
-"skipped. This option will take the leading lines to skip into account as well.\n"
+"Starting from the first line that is actually imported every second line "
+"will be skipped. This option will take the leading lines to skip into "
+"account as well.\n"
"For example\n"
-"* if 'Leading Lines to Skip' is set to 3, the first line to import will be line "
-"4. Lines 5, 7, 9,... will be skipped.\n"
-"* if 'Leading Lines to Skip' is set to 4, the first line to import will be line "
-"5. Lines 6, 8, 10,... will be skipped."
+"* if 'Leading Lines to Skip' is set to 3, the first line to import will be "
+"line 4. Lines 5, 7, 9,... will be skipped.\n"
+"* if 'Leading Lines to Skip' is set to 4, the first line to import will be "
+"line 5. Lines 6, 8, 10,... will be skipped."
msgstr ""
"PoÄevÅ¡i od prvog retka uvoza, svaki drugi redak se preskaÄe. Ovom opcijom se "
"preskaÄu i svi poÄetni redci.\n"
"Na primjer:\n"
-"* ako je „Preskakanje poÄetnih redaka†postavljeno na 3, prvi redak koji će se "
-"uvesti je 4. redak. Redci 5, 7, 9, … se preskaÄu.\n"
-"* ako je „Preskakanje poÄetnih redaka†postavljeno na 4, prvi redak koji će se "
-"uvesti je 5. redak. Redci 6, 8, 10, … se preskaÄu."
+"* ako je „Preskakanje poÄetnih redaka†postavljeno na 3, prvi redak koji će "
+"se uvesti je 4. redak. Redci 5, 7, 9, … se preskaÄu.\n"
+"* ako je „Preskakanje poÄetnih redaka†postavljeno na 4, prvi redak koji će "
+"se uvesti je 5. redak. Redci 6, 8, 10, … se preskaÄu."
#: gnucash/gtkbuilder/assistant-csv-price-import.glade:783
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:801
@@ -11879,34 +12056,35 @@ msgstr "Uvoz CSV transakcije"
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:42
msgid ""
"This assistant will help you import a delimited file containing a list of "
-"transactions. It supports both token separated files (such as comma separated or "
-"semi-colon separated) and fixed width data.\n"
+"transactions. It supports both token separated files (such as comma "
+"separated or semi-colon separated) and fixed width data.\n"
"\n"
-"For a successful import three columns have to be available in the import data:\n"
+"For a successful import three columns have to be available in the import "
+"data:\n"
"• a Date column\n"
"• a Description column\n"
"• a Deposit or Withdrawal column\n"
"\n"
-"If there is no Account data available, a base account can be selected to which "
-"all data will be imported.\n"
+"If there is no Account data available, a base account can be selected to "
+"which all data will be imported.\n"
"\n"
"Apart from a choice of delimiter, there are several options to tweak the "
-"importer. For example a number of lines can be skipped at the start or the end "
-"of the data, as well as odd rows. Several date and number formats are supported. "
-"The file encoding can be defined.\n"
+"importer. For example a number of lines can be skipped at the start or the "
+"end of the data, as well as odd rows. Several date and number formats are "
+"supported. The file encoding can be defined.\n"
"\n"
-"The importer can handle files where transactions are split over multiple lines, "
-"with each line representing one split.\n"
+"The importer can handle files where transactions are split over multiple "
+"lines, with each line representing one split.\n"
"\n"
-"Lastly, for repeated imports the preview page has buttons to Load and Save the "
-"settings. To save the settings, tweak the settings to your preferences "
+"Lastly, for repeated imports the preview page has buttons to Load and Save "
+"the settings. To save the settings, tweak the settings to your preferences "
"(optionally starting from an existing preset), then (optionally change the "
-"settings name and press the Save Settings button. Note you can't save to built-"
-"in presets."
+"settings name and press the Save Settings button. Note you can't save to "
+"built-in presets."
msgstr ""
-"Ovaj će ti pomoćnik pomoći uvesti datoteku s popisom transakcija, Äiji podaci su "
-"razdvojeni. Podržava razdvajanja pomoću oderÄ‘enih znakova (npr. zarez ili toÄku-"
-"zarez), kao i razdvajanje fiksnom Å¡irinom.\n"
+"Ovaj će ti pomoćnik pomoći uvesti datoteku s popisom transakcija, Äiji "
+"podaci su razdvojeni. Podržava razdvajanja pomoću oderđenih znakova (npr. "
+"zarez ili toÄku-zarez), kao i razdvajanje fiksnom Å¡irinom.\n"
"\n"
"Za uspješan uvoz su potrebna tri stupca u uvoznoj datoteci:\n"
"• stupac datuma\n"
@@ -11917,17 +12095,18 @@ msgstr ""
"uvesti svi podaci.\n"
"\n"
"Pored odabira razdvojnog znaka, ima daljnjih opcija za podešavanje uvoznika. "
-"Npr. moguće je preskoÄiti odreÄ‘eni broj redaka na poÄetku ili kraju podataka, "
-"kao i neparne retke. Podržani su i višestruki formati datuma i vremena. Može se "
-"odrediti i kodiranje.\n"
+"Npr. moguće je preskoÄiti odreÄ‘eni broj redaka na poÄetku ili kraju "
+"podataka, kao i neparne retke. Podržani su i višestruki formati datuma i "
+"vremena. Može se odrediti i kodiranje.\n"
"\n"
-"Uvoznik podržava datoteke s transakcijama, Äije se stavke prostiru preko viÅ¡e "
-"redaka, pri Äemu svaki radak prikazuje jednu stavku.\n"
+"Uvoznik podržava datoteke s transakcijama, Äije se stavke prostiru preko "
+"viÅ¡e redaka, pri Äemu svaki radak prikazuje jednu stavku.\n"
"\n"
"I na kraju, za ponavljanje uvoza, pregled stranice ima gumbe za uÄitavanje i "
"spremanje postavaka. Za spremanje postavaka, namjesti postavke kako želiš "
-"(poÄevÅ¡i sa ugraÄ‘enim postavkama), a zatim (opcionalno) promijeni ime postavke i "
-"klikni „Spremi postavkeâ€. Napomena: Spremati možeÅ¡ Äak i u zadane postavke."
+"(poÄevÅ¡i sa ugraÄ‘enim postavkama), a zatim (opcionalno) promijeni ime "
+"postavke i klikni „Spremi postavkeâ€. Napomena: Spremati možeÅ¡ Äak i u zadane "
+"postavke."
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:60
msgid "Transaction Import Assistant"
@@ -11939,31 +12118,31 @@ msgstr "Višedjelno"
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:529
msgid ""
-"Normally the importer will assume each line in the input file will correspond to "
-"one transaction. Each line can have information for one transaction and one or "
-"two splits.\n"
+"Normally the importer will assume each line in the input file will "
+"correspond to one transaction. Each line can have information for one "
+"transaction and one or two splits.\n"
"\n"
-"When Multi-split is enabled the importer will assume multiple consecutive lines "
-"together hold the information for one transaction. Each line provides "
+"When Multi-split is enabled the importer will assume multiple consecutive "
+"lines together hold the information for one transaction. Each line provides "
"information for exactly one split. The first line should also provide the "
"information for the transaction.\n"
-"To know which lines belong to the same transaction, the importer will compare "
-"the provided transaction information in each line. If that information is empty "
-"or the same as the first transaction line the importer will consider this line "
-"part of the same transaction."
-msgstr ""
-"Uvoznik uobiÄajeno pretpostavlja, da svaki redak uvozne datoteke, predstavlja "
-"jednu transakciju. Svaki redak može sadržati informacije jedne transakcije i "
-"jednu ili dvije stavke.\n"
-"\n"
-"Ako je viÅ¡edjelno ukljuÄeno, uvoznik će pretpostaviti, da viÅ¡estruko uzastopni "
-"reci sadrže informaciju za jednu transakciju. Svaki redak sadrži informaciju za "
-"samo jednu stavku. Prvi redak bi također morao sadržati informaciju za "
-"transakciju.\n"
+"To know which lines belong to the same transaction, the importer will "
+"compare the provided transaction information in each line. If that "
+"information is empty or the same as the first transaction line the importer "
+"will consider this line part of the same transaction."
+msgstr ""
+"Uvoznik uobiÄajeno pretpostavlja, da svaki redak uvozne datoteke, "
+"predstavlja jednu transakciju. Svaki redak može sadržati informacije jedne "
+"transakcije i jednu ili dvije stavke.\n"
+"\n"
+"Ako je viÅ¡edjelno ukljuÄeno, uvoznik će pretpostaviti, da viÅ¡estruko "
+"uzastopni reci sadrže informaciju za jednu transakciju. Svaki redak sadrži "
+"informaciju za samo jednu stavku. Prvi redak bi također morao sadržati "
+"informaciju za transakciju.\n"
"Za pogaÄ‘anje redaka, koji se odnose na zajedniÄku transakciju, uvoznik će "
-"usporediti informacije transakcije u svakom retku. Ako je informacija prazna ili "
-"jednaka prethodnom retku transakcije, uvoznik će pretpostaviti da taj redak "
-"spada u istu transakciju."
+"usporediti informacije transakcije u svakom retku. Ako je informacija prazna "
+"ili jednaka prethodnom retku transakcije, uvoznik će pretpostaviti da taj "
+"redak spada u istu transakciju."
#: gnucash/gtkbuilder/assistant-csv-trans-import.glade:839
msgid "<b>Account</b>"
@@ -11998,30 +12177,31 @@ msgid ""
"On the following page you will be able to associate each transaction to a "
"category.\n"
"\n"
-"If there were problems with the import settings, pressing forward will take you "
-"back to the preview page to try and correct.\n"
+"If there were problems with the import settings, pressing forward will take "
+"you back to the preview page to try and correct.\n"
"\n"
-"If this is the first time importing, you will find that all lines may need to be "
-"associated. On subsequent imports, the importer will try to associate the "
-"transactions based on previous imports.\n"
+"If this is the first time importing, you will find that all lines may need "
+"to be associated. On subsequent imports, the importer will try to associate "
+"the transactions based on previous imports.\n"
"\n"
-"If this is your initial import into a new file, you will first see a dialog for "
-"setting book options, since these can affect how imported data are converted to "
-"GnuCash transactions. If this is an existing file, the dialog will not be "
-"shown.\n"
+"If this is your initial import into a new file, you will first see a dialog "
+"for setting book options, since these can affect how imported data are "
+"converted to GnuCash transactions. If this is an existing file, the dialog "
+"will not be shown.\n"
"\n"
"The confidence of a correct association is displayed as a colored bar.\n"
"\n"
"More information can be displayed by using the help button."
msgstr ""
-"Na sljedećoj stranici ćeš moći povezati svaku transakciju s jednom kategorijom.\n"
+"Na sljedećoj stranici ćeš moći povezati svaku transakciju s jednom "
+"kategorijom.\n"
"\n"
-"Ako je bilo problema s postavkama uvoza, pritiskom na „Naprijed†će te vratiti "
-"na stranicu pregleda, te pokuÅ¡aj uÄiniti ispravke.\n"
+"Ako je bilo problema s postavkama uvoza, pritiskom na „Naprijed†će te "
+"vratiti na stranicu pregleda, te pokuÅ¡aj uÄiniti ispravke.\n"
"\n"
"Ako je ovo tvoj prvi uvoz, primijetit ćeš, da se svi redci možda moraju "
-"povezati. Prilikom sljedećih uvoza će uvoznik pokušati povezati transakcije na "
-"osnovi prijašnjih uvoza.\n"
+"povezati. Prilikom sljedećih uvoza će uvoznik pokušati povezati transakcije "
+"na osnovi prijašnjih uvoza.\n"
"\n"
"Ako je ovo tvoj prvi uvoz u novu datoteku, najprije ÄeÅ¡ vidjeti dijalog za "
"postavljanje opcija knjige, jer ove utjeÄu na naÄin uvoza podataka u GnuCash "
@@ -12045,14 +12225,14 @@ msgstr "Usporedi transakcije"
#: gnucash/gtkbuilder/assistant-hierarchy.glade:20
msgid ""
-"This assistant will help you create a set of GnuCash accounts for your assets "
-"(such as investments, checking or savings accounts), liabilities (such as loans) "
-"and different kinds of income and expenses you might have.\n"
+"This assistant will help you create a set of GnuCash accounts for your "
+"assets (such as investments, checking or savings accounts), liabilities "
+"(such as loans) and different kinds of income and expenses you might have.\n"
"\n"
"You can pick a set of accounts here that seem close to your needs. After the "
"assistant completes you will be able to add, rename, modify, and remove "
-"accounts, at any time later on. You will also be able to add sub-accounts, as "
-"well as move accounts (along with their sub-accounts) from one parent to "
+"accounts, at any time later on. You will also be able to add sub-accounts, "
+"as well as move accounts (along with their sub-accounts) from one parent to "
"another.\n"
"\n"
"Click 'Cancel' if you do not wish to create any new accounts now."
@@ -12061,10 +12241,10 @@ msgstr ""
"(investicije, kreditne raÄune ili Å¡tedne raÄune), obveze (kredite/zajmove) i "
"razne vrste prihoda i rashoda.\n"
"\n"
-"Ovdje možeš odabrati skupinu konta, koja odgovara tvojim potrebama. Nakon što "
-"pomoćnik završi, moći ćeš dodati, preimenovati, promijeniti i ukloniti konta, "
-"kad god želiš. Također ćeš moći dodavati podkonta i premještati konta (zajedno s "
-"njihovim podkontima) iz jednog matiÄnog konta u drugi.\n"
+"Ovdje možeš odabrati skupinu konta, koja odgovara tvojim potrebama. Nakon "
+"što pomoćnik završi, moći ćeš dodati, preimenovati, promijeniti i ukloniti "
+"konta, kad god želiš. Također ćeš moći dodavati podkonta i premještati konta "
+"(zajedno s njihovim podkontima) iz jednog matiÄnog konta u drugi.\n"
"\n"
"Klikni „Odustaniâ€, ako sad ne želiÅ¡ stvoriti nova konta."
@@ -12088,19 +12268,20 @@ msgstr "Odaberi valutu"
msgid ""
"\n"
"Select categories that correspond to the ways that you foresee you will use "
-"GnuCash. Each category you select will cause several accounts to be created.\n"
+"GnuCash. Each category you select will cause several accounts to be "
+"created.\n"
"\n"
"<b>Note:</b> the selection you make here is only the starting point for your "
"personalized account hierarchy. Accounts can be added, renamed, moved, or "
"deleted by hand later at any time."
msgstr ""
"\n"
-"Odaberi kategorije, za koje smatraš, da ćeš ubuduće koristiti u GnuCashu. Svaka "
-"odabrana kategorija će stvoriti nekolicinu konta.\n"
+"Odaberi kategorije, za koje smatraš, da ćeš ubuduće koristiti u GnuCashu. "
+"Svaka odabrana kategorija će stvoriti nekolicinu konta.\n"
"\n"
-"<b>Napomena:</b> tvoj odabir ovdje je samo poÄetak za tvoj osobni kontni plan. "
-"Konta možeÅ¡ kasnije u bilo koje doba ruÄno dodavati, preimenovati, premjeÅ¡tati "
-"ili brisati."
+"<b>Napomena:</b> tvoj odabir ovdje je samo poÄetak za tvoj osobni kontni "
+"plan. Konta možeÅ¡ kasnije u bilo koje doba ruÄno dodavati, preimenovati, "
+"premještati ili brisati."
#: gnucash/gtkbuilder/assistant-hierarchy.glade:158
msgid "<b>Categories</b>"
@@ -12128,35 +12309,35 @@ msgstr "Odaberi konta, koje želiš stvoriti"
#: gnucash/gtkbuilder/assistant-hierarchy.glade:356
msgid ""
"\n"
-"If you would like to change an account's name, click on the row containing the "
-"account, then click on the account name and change it.\n"
+"If you would like to change an account's name, click on the row containing "
+"the account, then click on the account name and change it.\n"
"\n"
-"Some accounts are marked as \"Placeholder\". Placeholder accounts are used to "
-"create a hierarchy of accounts and normally do not have transactions or opening "
-"balances. If you would like an account to be a placeholder account, click the "
-"checkbox for that account.\n"
+"Some accounts are marked as \"Placeholder\". Placeholder accounts are used "
+"to create a hierarchy of accounts and normally do not have transactions or "
+"opening balances. If you would like an account to be a placeholder account, "
+"click the checkbox for that account.\n"
"\n"
"If you would like an account to have an opening balance, click on the row "
-"containing the account, then click on the opening balance field and enter the "
-"starting balance.\n"
+"containing the account, then click on the opening balance field and enter "
+"the starting balance.\n"
"\n"
"<b>Note:</b> all accounts except Equity and placeholder accounts may have an "
"opening balance.\n"
msgstr ""
"\n"
-"Ako želiš promijeniti ime konta, klikni na redak koji sadrži konto, zatim klikni "
-"na ime konta, te ga promijeni.\n"
+"Ako želiš promijeniti ime konta, klikni na redak koji sadrži konto, zatim "
+"klikni na ime konta, te ga promijeni.\n"
"\n"
"Neki konti su oznaÄeni kao „Rezerviraniâ€. Rezervirani konti se koriste za "
-"stvaranje hijerarhije konta u kontnom planu i nemaju transakcije, niti poÄetni "
-"saldo. Ako želiÅ¡ promijeniti konto u rezervirani konto, ukljuÄi odgovarajuću "
-"potvrdu za taj konto.\n"
+"stvaranje hijerarhije konta u kontnom planu i nemaju transakcije, niti "
+"poÄetni saldo. Ako želiÅ¡ promijeniti konto u rezervirani konto, ukljuÄi "
+"odgovarajuću potvrdu za taj konto.\n"
"\n"
-"Ako želiÅ¡ da konto sadrži poÄetni saldo, klikni na redak željenog konto, zatim "
-"klikni na polje za poÄetni saldo i unesi poÄetni saldo.\n"
+"Ako želiÅ¡ da konto sadrži poÄetni saldo, klikni na redak željenog konto, "
+"zatim klikni na polje za poÄetni saldo i unesi poÄetni saldo.\n"
"\n"
-"<b>Napomena:</b> svi konti, osim konta kapitala i rezervirana konta, mogu imati "
-"poÄetni saldo.\n"
+"<b>Napomena:</b> svi konti, osim konta kapitala i rezervirana konta, mogu "
+"imati poÄetni saldo.\n"
#: gnucash/gtkbuilder/assistant-hierarchy.glade:394
msgid "Setup selected accounts"
@@ -12164,15 +12345,15 @@ msgstr "Postavi odabrana konta"
#: gnucash/gtkbuilder/assistant-hierarchy.glade:404
msgid ""
-"Press `Apply' to create your new accounts. You will then be able to save them to "
-"a file or database.\n"
+"Press `Apply' to create your new accounts. You will then be able to save "
+"them to a file or database.\n"
"\n"
"Press `Back' to review your selections.\n"
"\n"
"Press `Cancel' to close this dialog without creating any new accounts."
msgstr ""
-"Klikni „Primijeni“ za stvaranje tvojeg novog konta. Nakon toga ih možeš spremiti "
-"u datoteku ili bazu podataka.\n"
+"Klikni „Primijeni“ za stvaranje tvojeg novog konta. Nakon toga ih možeš "
+"spremiti u datoteku ili bazu podataka.\n"
"\n"
"Klikni „Natrag“ za pregled tvojeg odabira.\n"
"\n"
@@ -12240,21 +12421,21 @@ msgstr "10/1 godina hip. s promj. kam. stopom"
#: gnucash/gtkbuilder/assistant-loan.glade:101
msgid ""
-"This is a step-by-step method for creating a loan repayment within GnuCash. In "
-"this assistant, you can input the details of your loan and its repayment along "
-"with the details of its payback. Using that information, the appropriate "
-"Scheduled Transactions will be created.\n"
+"This is a step-by-step method for creating a loan repayment within GnuCash. "
+"In this assistant, you can input the details of your loan and its repayment "
+"along with the details of its payback. Using that information, the "
+"appropriate Scheduled Transactions will be created.\n"
"\n"
-"If you make a mistake or want to make changes later, you can edit the created "
-"Scheduled Transactions directly."
+"If you make a mistake or want to make changes later, you can edit the "
+"created Scheduled Transactions directly."
msgstr ""
"Ovo je metoda korak-po-korak za stvaranje otplaćivanja kredita u GnuCashu. U "
"ovom pomoćniku možeš unijeti detalje o tvojem kreditu/zajmu i njegovim "
"otplaćivanjima, kao i detalje o njegovom povratu. Upotrebom tih podataka, "
"stvorit će se odgovarajuće terminirane transakcije.\n"
"\n"
-"Ako pogriješiš ili kasnije želiš unijeti promjene, možeš neposredno izmijeniti "
-"stvorene terminirane transakcije."
+"Ako pogriješiš ili kasnije želiš unijeti promjene, možeš neposredno "
+"izmijeniti stvorene terminirane transakcije."
#: gnucash/gtkbuilder/assistant-loan.glade:109
msgid "Loan / Mortgage Repayment Setup"
@@ -12294,11 +12475,11 @@ msgstr ""
#: gnucash/gtkbuilder/assistant-loan.glade:313
msgid ""
-"Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The "
-"Mortgage Assistant does not support zero-interest loans."
+"Enter the annual interest rate in percent. Accepts values from 0.001 - 100. "
+"The Mortgage Assistant does not support zero-interest loans."
msgstr ""
-"Unesi godišnju kamatnu stopu u postocima. Prihvaća vrijednosti od 0.001 do 100. "
-"Pomoćnik hipoteke ne podržava kredite s nultom kamatom."
+"Unesi godišnju kamatnu stopu u postocima. Prihvaća vrijednosti od 0.001 do "
+"100. Pomoćnik hipoteke ne podržava kredite s nultom kamatom."
#: gnucash/gtkbuilder/assistant-loan.glade:332
#: gnucash/register/ledger-core/gncEntryLedgerLoad.c:57
@@ -12471,24 +12652,25 @@ msgstr "Pomoćnik za QIF uvoz"
#: gnucash/gtkbuilder/assistant-qif-import.glade:39
msgid ""
-"GnuCash can import financial data from QIF (Quicken Interchange Format) files "
-"written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs. \n"
+"GnuCash can import financial data from QIF (Quicken Interchange Format) "
+"files written by Quicken/QuickBooks, MS Money, Moneydance, and many other "
+"programs. \n"
"\n"
-"The import process has several steps. Your GnuCash accounts will not be changed "
-"until you click \"Apply\" at the end of the process. \n"
+"The import process has several steps. Your GnuCash accounts will not be "
+"changed until you click \"Apply\" at the end of the process. \n"
"\n"
"Click \"Forward\" to start loading your QIF data, or \"Cancel\" to abort the "
"process. "
msgstr ""
"GnuCash može uvesti financijske podatke iz QIF (Quickenov format razmjene) "
-"datoteka zapisanih programima Quicken/QuickBooks, MS Money, Moneydance i mnogim "
-"drugima. \n"
+"datoteka zapisanih programima Quicken/QuickBooks, MS Money, Moneydance i "
+"mnogim drugima. \n"
"\n"
"Proces uvoza se sastoji od nekoliko koraka. Tvoji se GnuCash konti neće "
"promijeniti, sve dok ne klikneš „Primijeni“ na kraju procesa. \n"
"\n"
-"Klikni „Sljedeće“ za pokretanje uÄitavanja tvojih QIF podataka ili „Odustani“ za "
-"prekid procesa. "
+"Klikni „Sljedeće“ za pokretanje uÄitavanja tvojih QIF podataka ili "
+"„Odustani“ za prekid procesa. "
#: gnucash/gtkbuilder/assistant-qif-import.glade:48
msgid "Import QIF files"
@@ -12497,18 +12679,18 @@ msgstr "Uvezi QIF datoteke"
#: gnucash/gtkbuilder/assistant-qif-import.glade:63
msgid ""
"Please select a file to load. When you click \"Forward\", the file will be "
-"loaded and analyzed. You may need to answer some questions about the account(s) "
-"in the file.\n"
+"loaded and analyzed. You may need to answer some questions about the "
+"account(s) in the file.\n"
"\n"
-"You will have the opportunity to load as many files as you wish, so don't worry "
-"if your data is in multiple files. \n"
+"You will have the opportunity to load as many files as you wish, so don't "
+"worry if your data is in multiple files. \n"
msgstr ""
-"Odaberi datoteku za uÄitavanje. Kad klikneÅ¡ „Sljedeće“, datoteka će biti uÄitana "
-"i analizirana. Možda ćeš morati odgovoriti na neka pitanja o komtima u "
-"datoteci.\n"
+"Odaberi datoteku za uÄitavanje. Kad klikneÅ¡ „Sljedeće“, datoteka će biti "
+"uÄitana i analizirana. Možda ćeÅ¡ morati odgovoriti na neka pitanja o komtima "
+"u datoteci.\n"
"\n"
-"Imat ćeÅ¡ priliku uÄitati onoliko datoteka koliko želiÅ¡, stoga ne brini, ako se "
-"tvoji podaci nalaze u više datoteka. \n"
+"Imat ćeÅ¡ priliku uÄitati onoliko datoteka koliko želiÅ¡, stoga ne brini, ako "
+"se tvoji podaci nalaze u više datoteka. \n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:99
msgid "_Select..."
@@ -12529,24 +12711,25 @@ msgstr "UÄitaj QIF datoteke"
#: gnucash/gtkbuilder/assistant-qif-import.glade:280
msgid ""
"The QIF file format does not specify which order the day, month, and year "
-"components of a date are printed. In most cases, it is possible to automatically "
-"determine which format is in use in a particular file. However, in the file you "
-"have just imported there exist more than one possible format that fits the "
-"data. \n"
+"components of a date are printed. In most cases, it is possible to "
+"automatically determine which format is in use in a particular file. "
+"However, in the file you have just imported there exist more than one "
+"possible format that fits the data. \n"
"\n"
-"Please select a date format for the file. QIF files created by European software "
-"are likely to be in \"d-m-y\" or day-month-year format, where US QIF files are "
-"likely to be \"m-d-y\" or month-day-year. \n"
+"Please select a date format for the file. QIF files created by European "
+"software are likely to be in \"d-m-y\" or day-month-year format, where US "
+"QIF files are likely to be \"m-d-y\" or month-day-year. \n"
msgstr ""
"Format QIF datoteke ne precizira kojim se redoslijedom ispisuju komponente "
"datuma, kao Å¡to su: dan, mjesec i godina. U većini sluÄajeva, moguće je "
-"automatski odrediti koji format je u upotrebi u određenoj datoteci. Međutim, u "
-"upravo uvezenoj datoteci postoji više od jednog mogućeg formata, koji odgovara "
-"podacima. \n"
+"automatski odrediti koji format je u upotrebi u određenoj datoteci. Međutim, "
+"u upravo uvezenoj datoteci postoji više od jednog mogućeg formata, koji "
+"odgovara podacima. \n"
"\n"
-"Odaberi format datuma za datoteku. QIF datoteke napravljene europskim programima "
-"će vjerojatno biti u formatu „d-m-g“ ili „dan-mjesec-godina“, dok će QIF "
-"datoteke iz SAD-a vjerojatno biti u formatu „m-d-g\" ili „mjesec-dan-godina“. \n"
+"Odaberi format datuma za datoteku. QIF datoteke napravljene europskim "
+"programima će vjerojatno biti u formatu „d-m-g“ ili „dan-mjesec-godina“, dok "
+"će QIF datoteke iz SAD-a vjerojatno biti u formatu „m-d-g\" ili „mjesec-dan-"
+"godina“. \n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:315
#: gnucash/gtkbuilder/assistant-qif-import.glade:399
@@ -12560,15 +12743,15 @@ msgstr "Postavi format datuma za ovu QIF datoteku"
#: gnucash/gtkbuilder/assistant-qif-import.glade:342
msgid ""
-"The QIF file that you just loaded appears to contain transactions for just one "
-"account, but the file does not specify a name for that account. \n"
+"The QIF file that you just loaded appears to contain transactions for just "
+"one account, but the file does not specify a name for that account. \n"
"\n"
"Please enter a name for the account. If the file was exported from another "
-"accounting program, you should use the same account name that was used in that "
-"program.\n"
+"accounting program, you should use the same account name that was used in "
+"that program.\n"
msgstr ""
-"ÄŒini se, da upravo uÄitana QIF datoteka sadrži transakcije za samo jedan konto, "
-"ali datoteka ne navodi ime tog konta. \n"
+"ÄŒini se, da upravo uÄitana QIF datoteka sadrži transakcije za samo jedan "
+"konto, ali datoteka ne navodi ime tog konta. \n"
"\n"
"Unesi ime za konto. Ako je datoteka izvezena iz jednog drugog obraÄunskog "
"programa, onda moraš koristiti isto ime konta, koje je korišteno u tom "
@@ -12587,14 +12770,15 @@ msgid ""
"Click \"Load another file\" if you have more data to import at this time. Do "
"this if you have saved your accounts to separate QIF files.\n"
"\n"
-"Click \"Forward\" to finish loading files and move to the next step of the QIF "
-"import process. "
+"Click \"Forward\" to finish loading files and move to the next step of the "
+"QIF import process. "
msgstr ""
-"Klikni „UÄitaj drugu datoteku“, ako imaÅ¡ viÅ¡e podataka za uvoz u ovom trenutku. "
-"Koristi ovo, ako su tvoji konti spremljeni u odvojene QIF datoteke.\n"
+"Klikni „UÄitaj drugu datoteku“, ako imaÅ¡ viÅ¡e podataka za uvoz u ovom "
+"trenutku. Koristi ovo, ako su tvoji konti spremljeni u odvojene QIF "
+"datoteke.\n"
"\n"
-"Klikni „Sljedeće“ za zavrÅ¡avanje uÄitavanja datoteka i za prelazak na sljedeći "
-"korak u procesu QIF uvoza. "
+"Klikni „Sljedeće“ za zavrÅ¡avanje uÄitavanja datoteka i za prelazak na "
+"sljedeći korak u procesu QIF uvoza. "
#: gnucash/gtkbuilder/assistant-qif-import.glade:469
msgid "_Unload selected file"
@@ -12610,33 +12794,35 @@ msgstr "UÄitane QIF datoteke"
#: gnucash/gtkbuilder/assistant-qif-import.glade:521
msgid ""
-"On the next page, the accounts in your QIF files and any stocks or mutual funds "
-"you own will be matched with GnuCash accounts. If a GnuCash account already "
-"exists with the same name, or a similar name and compatible type, that account "
-"will be used as a match; otherwise, GnuCash will create a new account with the "
-"same name and type as the QIF account. If you do not like the suggested GnuCash "
-"account, double-click to change it.\n"
+"On the next page, the accounts in your QIF files and any stocks or mutual "
+"funds you own will be matched with GnuCash accounts. If a GnuCash account "
+"already exists with the same name, or a similar name and compatible type, "
+"that account will be used as a match; otherwise, GnuCash will create a new "
+"account with the same name and type as the QIF account. If you do not like "
+"the suggested GnuCash account, double-click to change it.\n"
"\n"
"Note that GnuCash will be creating many accounts that did not exist on your "
-"other personal finance program, including a separate account for each stock you "
-"own, separate accounts for the brokerage commissions, special \"Equity\" "
-"accounts (subaccounts of Retained Earnings, by default) which are the source of "
-"your opening balances, etc. All of these accounts will appear on the next page "
-"so you can change them if you want to, but it is safe to leave them alone.\n"
+"other personal finance program, including a separate account for each stock "
+"you own, separate accounts for the brokerage commissions, special \"Equity\" "
+"accounts (subaccounts of Retained Earnings, by default) which are the source "
+"of your opening balances, etc. All of these accounts will appear on the next "
+"page so you can change them if you want to, but it is safe to leave them "
+"alone.\n"
msgstr ""
"Na sljedećoj stranici, konti u tvojim QIF datotekama i bilo koje dionice ili "
-"investicijski fondovi koje poseduješ, bit će uspoređeni s GnuCash kontima. Ako "
-"GnuCash konto već postoji s istim imenom ili sa sliÄnim imenom i kompatibilnom "
-"vrstom, taj konto će biti korišten za poklapanje; u protivnom, GnuCash će "
-"stvoriti novi konto istog imena i vrste kao QIF konto. Ako ti ne odgovara "
-"predloženi GnuCash konto, klikni dva puta da ga promijeniš.\n"
+"investicijski fondovi koje poseduješ, bit će uspoređeni s GnuCash kontima. "
+"Ako GnuCash konto već postoji s istim imenom ili sa sliÄnim imenom i "
+"kompatibilnom vrstom, taj konto će biti korišten za poklapanje; u protivnom, "
+"GnuCash će stvoriti novi konto istog imena i vrste kao QIF konto. Ako ti ne "
+"odgovara predloženi GnuCash konto, klikni dva puta da ga promijeniš.\n"
"\n"
"Napominjemo, da će GnuCash napraviti mnoga konta, koji ne postoje na tvojim "
-"ostalim programima osobnih financija, ukljuÄujući zaseban konto za svaku dionicu "
-"koju poseduješ, zaseban konto za brokerske nadoknade, posebna konta za "
-"„Kapital“ (podkonta zadržane dobiti, standardno), koji su izvor tvojih poÄetnih "
-"salda, itd. Svi ovi konti će se pojaviti na sljedećoj stranici, tako da ćeš ih "
-"moći promijeniti ako želiš, ali ih isto tako možeš ostaviti kakvi jesu.\n"
+"ostalim programima osobnih financija, ukljuÄujući zaseban konto za svaku "
+"dionicu koju poseduješ, zaseban konto za brokerske nadoknade, posebna konta "
+"za „Kapital“ (podkonta zadržane dobiti, standardno), koji su izvor tvojih "
+"poÄetnih salda, itd. Svi ovi konti će se pojaviti na sljedećoj stranici, "
+"tako da ćeš ih moći promijeniti ako želiš, ali ih isto tako možeš ostaviti "
+"kakvi jesu.\n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:535
msgid "Accounts and stock holdings"
@@ -12664,20 +12850,21 @@ msgid ""
"classify your transactions. Each of the categories in your QIF file will be "
"converted to a GnuCash account. \n"
"\n"
-"On the next page, you will have an opportunity to look at the suggested matches "
-"between QIF categories and GnuCash accounts. You may change matches that you do "
-"not like by double-clicking on the line containing the category name.\n"
+"On the next page, you will have an opportunity to look at the suggested "
+"matches between QIF categories and GnuCash accounts. You may change matches "
+"that you do not like by double-clicking on the line containing the category "
+"name.\n"
"\n"
-"If you change your mind later, you can reorganize the account structure safely "
-"within GnuCash."
+"If you change your mind later, you can reorganize the account structure "
+"safely within GnuCash."
msgstr ""
"GnuCash koristi odvojena konta za prihod i rashod umjesto kategorija, za "
-"razvrstavanje tvojih transakcija. Svaka od kategorija u tvojoj QIF datoteci će "
-"biti pretvorena u GnuCash konto.\n"
+"razvrstavanje tvojih transakcija. Svaka od kategorija u tvojoj QIF datoteci "
+"će biti pretvorena u GnuCash konto.\n"
"\n"
-"Na sljedećoj stranici ćeš imati priliku pogledati predložena poklapanja između "
-"QIF kategorija i GnuCash konta. Poklapanja koja ti se ne sviđaju možeš "
-"promijeniti. Klikni dvaput na redak, koji sadrži ime kategorije.\n"
+"Na sljedećoj stranici ćeš imati priliku pogledati predložena poklapanja "
+"između QIF kategorija i GnuCash konta. Poklapanja koja ti se ne sviđaju "
+"možeš promijeniti. Klikni dvaput na redak, koji sadrži ime kategorije.\n"
"\n"
"Ako se kasnije predomisliš, možeš prerasporediti strukturu konta u GnuCashu."
@@ -12691,23 +12878,23 @@ msgstr "Usporedi QIF kategorije s GnuCash kontima"
#: gnucash/gtkbuilder/assistant-qif-import.glade:784
msgid ""
-"QIF files downloaded from banks and other financial institutions may not have "
-"information about Accounts and Categories which would allow them to be correctly "
-"assigned to GnuCash accounts. \n"
+"QIF files downloaded from banks and other financial institutions may not "
+"have information about Accounts and Categories which would allow them to be "
+"correctly assigned to GnuCash accounts. \n"
"\n"
-"In the following page, you will see the text that appears in the Payee and Memo "
-"fields of transactions with no QIF Account or Category. By default these "
-"transactions are assigned to the 'Unspecified' account in GnuCash. If you select "
-"a different account, it will be remembered for future QIF files. "
+"In the following page, you will see the text that appears in the Payee and "
+"Memo fields of transactions with no QIF Account or Category. By default "
+"these transactions are assigned to the 'Unspecified' account in GnuCash. If "
+"you select a different account, it will be remembered for future QIF files. "
msgstr ""
-"QIF datoteke preuzete od banaka i drugih financijskih institucija, ne mogu imati "
-"informacije o kontima i kategorijama, koje bi im omogućile pravilno dodeljivanje "
-"GnuCash kontima.\n"
+"QIF datoteke preuzete od banaka i drugih financijskih institucija, ne mogu "
+"imati informacije o kontima i kategorijama, koje bi im omogućile pravilno "
+"dodeljivanje GnuCash kontima.\n"
"\n"
-"Na sljedećoj stranici ćeš vidjeti tekst, koji se pojavljuje u poljima primaoca i "
-"zabilježaka transakcija bez QIF konta ili kategorije. Ove se transakcije "
-"standardno dodeljuju kontu „Neodređeno†u GnuCashu. Ako odabereš drugi konto, "
-"bit će upamćen za buduće QIF datoteke. "
+"Na sljedećoj stranici ćeš vidjeti tekst, koji se pojavljuje u poljima "
+"primaoca i zabilježaka transakcija bez QIF konta ili kategorije. Ove se "
+"transakcije standardno dodeljuju kontu „Neodređeno†u GnuCashu. Ako odabereš "
+"drugi konto, bit će upamćen za buduće QIF datoteke. "
#: gnucash/gtkbuilder/assistant-qif-import.glade:797
msgid "Payees and memos"
@@ -12722,8 +12909,8 @@ msgid ""
"The QIF importer cannot currently handle multi-currency QIF files. All the "
"accounts you are importing must be denominated in the same currency.\n"
msgstr ""
-"QIF uvoznik trenutaÄno ne zna baratati s viÅ¡evalutnim QIF datotekama. Svi konti "
-"koje uvoziš, moraju imati istu valutu.\n"
+"QIF uvoznik trenutaÄno ne zna baratati s viÅ¡evalutnim QIF datotekama. Svi "
+"konti koje uvoziš, moraju imati istu valutu.\n"
#: gnucash/gtkbuilder/assistant-qif-import.glade:929
msgid "_Select the currency to use for all imported transactions:"
@@ -12735,17 +12922,18 @@ msgstr "<b>Opcije za knjigu</b>"
#: gnucash/gtkbuilder/assistant-qif-import.glade:970
msgid ""
-"Since you are creating a new file, you will next see a dialog for setting book "
-"options. These can affect how GnuCash imports transactions. 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."
+"Since you are creating a new file, you will next see a dialog for setting "
+"book options. These can affect how GnuCash imports transactions. 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 ""
-"Budući da stvaraš novu datoteku, kao sljedeće ćeš vidjeti prozor za podešavanje "
-"opcija knjige. One mogu utjecati na GnuCashov naÄin uvoza transakcija. Ako se "
-"vratiÅ¡ na ovu stranicu bez odustajanja i ponovnog zapoÄinjanja, prozor za "
-"podešavanje opcija knjige neće biti ponovo prikazan, kad odeš naprijed. Možeš "
-"joj pristupiti direktno iz izbornika „Datoteka → Svojstva“."
+"Budući da stvaraš novu datoteku, kao sljedeće ćeš vidjeti prozor za "
+"podeÅ¡avanje opcija knjige. One mogu utjecati na GnuCashov naÄin uvoza "
+"transakcija. Ako se vratiš na ovu stranicu bez odustajanja i ponovnog "
+"zapoÄinjanja, prozor za podeÅ¡avanje opcija knjige neće biti ponovo prikazan, "
+"kad odeš naprijed. Možeš joj pristupiti direktno iz izbornika „Datoteka → "
+"Svojstva“."
#: gnucash/gtkbuilder/assistant-qif-import.glade:981
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2559
@@ -12754,30 +12942,31 @@ msgstr "Odaberi valutu QIF datoteke i odaberi opcije za knjigu"
#: gnucash/gtkbuilder/assistant-qif-import.glade:995
msgid ""
-"In the following pages you will be asked to provide information about stocks, "
-"mutual funds, and other investments that appear in the QIF file(s) you are "
-"importing. GnuCash needs some additional details about these investments that "
-"the QIF format does not provide. \n"
+"In the following pages you will be asked to provide information about "
+"stocks, mutual funds, and other investments that appear in the QIF file(s) "
+"you are importing. GnuCash needs some additional details about these "
+"investments that the QIF format does not provide. \n"
"\n"
"Each stock, mutual fund, or other investment must have a name and an "
-"abbreviation, such as a stock symbol. Because some unrelated investments have "
-"the same abbreviation, you also need to indicate what type of abbreviation you "
-"have entered. For example, you could select the exchange that assigned the "
-"symbol (NASDAQ, NYSE, etc.), or select an investment type.\n"
+"abbreviation, such as a stock symbol. Because some unrelated investments "
+"have the same abbreviation, you also need to indicate what type of "
+"abbreviation you have entered. For example, you could select the exchange "
+"that assigned the symbol (NASDAQ, NYSE, etc.), or select an investment "
+"type.\n"
"\n"
"If you don't see your exchange listed, or none of the available choices are "
"appropriate, you can enter a new one."
msgstr ""
"Na sljedećim će stranicama biti potrebno dostaviti podatke o dionicama, "
-"investicijskim fondovima i drugim ulaganjima, koja se javljaju u QIF datoteci, "
-"koju uvoziš. GnuCash treba neke dodatne detalje o ovim ulaganjima, koje QIF "
-"format ne pruža.\n"
+"investicijskim fondovima i drugim ulaganjima, koja se javljaju u QIF "
+"datoteci, koju uvoziš. GnuCash treba neke dodatne detalje o ovim ulaganjima, "
+"koje QIF format ne pruža.\n"
"\n"
-"Svaka dionica, investicijski fond ili drugo ulaganje mora imati ime i kraticu, "
-"kao što je burzovna oznaka. Budući da neke nepovezane investicije imaju isti "
-"kraticu, također moraš ukazati na vrstu unsesene kratice. Na primjer, možeš "
-"odabrati burzu koja je dodijeliia oznaku (NASDAQ, NYSE, itd.) ili odaberi vrstu "
-"ulaganja.\n"
+"Svaka dionica, investicijski fond ili drugo ulaganje mora imati ime i "
+"kraticu, kao što je burzovna oznaka. Budući da neke nepovezane investicije "
+"imaju isti kraticu, također moraš ukazati na vrstu unsesene kratice. Na "
+"primjer, možeš odabrati burzu koja je dodijeliia oznaku (NASDAQ, NYSE, itd.) "
+"ili odaberi vrstu ulaganja.\n"
"\n"
"Ako na spisku ne vidiš tvoju burzu, ili nijedan od dostupnih izbora nije "
"odgovarajući, možeš unijeti novu."
@@ -12797,23 +12986,23 @@ msgstr "QIF uvoz"
#: gnucash/gtkbuilder/assistant-qif-import.glade:1168
msgid ""
"\n"
-"If you are importing a QIF file from a bank or other financial institution, some "
-"of the transactions may already exist in your GnuCash accounts. To avoid "
-"duplication, GnuCash has tried to identify matches and needs your help to review "
-"them.\n"
+"If you are importing a QIF file from a bank or other financial institution, "
+"some of the transactions may already exist in your GnuCash accounts. To "
+"avoid duplication, GnuCash has tried to identify matches and needs your help "
+"to review them.\n"
"\n"
"On the next page you will be shown a list of imported transactions. As you "
-"select each one, a list of possible matches will be shown below it. If you find "
-"a correct match, click on it. Your selection will be confirmed by a check mark "
-"in the \"Match?\" column.\n"
+"select each one, a list of possible matches will be shown below it. If you "
+"find a correct match, click on it. Your selection will be confirmed by a "
+"check mark in the \"Match?\" column.\n"
"\n"
"Click \"Forward\" to review the possible matches."
msgstr ""
"\n"
"Ako uvoziš QIF datoteku iz banke ili druge financijske institucije, neke "
"transakcije možda već postoje u tvojim GnuCash kontima. Kako bi se izbjeglo "
-"dupliciranje, GnuCash je pokušao prepoznati poklapanja i potrebna mu je tvoja "
-"pomoć za pregled.\n"
+"dupliciranje, GnuCash je pokušao prepoznati poklapanja i potrebna mu je "
+"tvoja pomoć za pregled.\n"
"\n"
"Na sljedećoj će stranici biti prikazan popis uvezenih transakcija. Prilikom "
"odabira transakcije, popis mogućih poklapanja bit će prikazan ispod nje. Ako "
@@ -12841,22 +13030,24 @@ msgstr "Odaberi moguće duplikate"
#: gnucash/gtkbuilder/assistant-qif-import.glade:1295
msgid ""
"Click \"Apply\" to import data from the staging area and update your GnuCash "
-"accounts. The account and category matching information you have entered will be "
-"saved and used for defaults the next time you use the QIF import facility. \n"
+"accounts. The account and category matching information you have entered "
+"will be saved and used for defaults the next time you use the QIF import "
+"facility. \n"
"\n"
-"Click \"Back\" to review your account and category matchings, to change currency "
-"and security settings for new accounts, or to add more files to the staging "
-"area.\n"
+"Click \"Back\" to review your account and category matchings, to change "
+"currency and security settings for new accounts, or to add more files to the "
+"staging area.\n"
"\n"
"Click \"Cancel\" to abort the QIF import process."
msgstr ""
-"Klikni „Primijeni“ za uvoz podataka i za aktualiziranje tvojih GnuCash konta. "
-"Informacije o poklapanju unešenih konta i kategorija će biti spremljene i "
-"korištene kao standardne vrijednosti prilikom sljedećeg QIF uvoza.\n"
+"Klikni „Primijeni“ za uvoz podataka i za aktualiziranje tvojih GnuCash "
+"konta. Informacije o poklapanju unešenih konta i kategorija će biti "
+"spremljene i korištene kao standardne vrijednosti prilikom sljedećeg QIF "
+"uvoza.\n"
"\n"
"Klikni „Natrag“ za pregledavanje poklapanja tvojih konta i kategorija, za "
-"promjenu postavaka za valute i vrijednosne papire novih konta, ili za dodavanje "
-"još datoteka na polazno mesto.\n"
+"promjenu postavaka za valute i vrijednosne papire novih konta, ili za "
+"dodavanje još datoteka na polazno mesto.\n"
"\n"
"Klikni „Odustani“ za prekid procesa QIF uvoza."
@@ -12882,7 +13073,8 @@ msgid "This assistant will help you record a stock split or stock merger.\n"
msgstr "Ovaj će ti pomoćnik pomoći spremiti podjelu ili združivanje dionica.\n"
#: gnucash/gtkbuilder/assistant-stock-split.glade:39
-msgid "Select the account for which you want to record a stock split or merger."
+msgid ""
+"Select the account for which you want to record a stock split or merger."
msgstr "Odaberi konto, za koji želiš spremiti podjelu ili združivanje dionica."
#: gnucash/gtkbuilder/assistant-stock-split.glade:72
@@ -12891,10 +13083,10 @@ msgstr "Konto podjele dionice"
#: gnucash/gtkbuilder/assistant-stock-split.glade:85
msgid ""
-"Enter the date and the number of shares you gained or lost from the stock split "
-"or merger. For stock mergers (negative splits) use a negative value for the "
-"share distribution. You can also enter a description of the transaction, or "
-"accept the default one."
+"Enter the date and the number of shares you gained or lost from the stock "
+"split or merger. For stock mergers (negative splits) use a negative value "
+"for the share distribution. You can also enter a description of the "
+"transaction, or accept the default one."
msgstr ""
"Unesi datum i broj dionica, koji su zarađeni ili izgubljeni od podjele ili "
"združivanja dionica. Za združivanja dionica (negativne podjele) koristi "
@@ -12944,11 +13136,11 @@ msgstr "Detalji podjele dionice"
#: gnucash/gtkbuilder/assistant-stock-split.glade:247
msgid ""
-"If you received a cash disbursement as a result of the stock split, enter the "
-"details of that payment here. Otherwise, just click `Forward'."
+"If you received a cash disbursement as a result of the stock split, enter "
+"the details of that payment here. Otherwise, just click `Forward'."
msgstr ""
-"Ako dobijeÅ¡ novÄanu isplatu kao rezultat podjele dionica, ovdje unesi detalje "
-"tog plaćanja. U protivnom, klikni „Naprijed“."
+"Ako dobijeÅ¡ novÄanu isplatu kao rezultat podjele dionica, ovdje unesi "
+"detalje tog plaćanja. U protivnom, klikni „Naprijed“."
#: gnucash/gtkbuilder/assistant-stock-split.glade:267
msgid "_Amount:"
@@ -12977,13 +13169,13 @@ msgstr "Novac u zamjenu"
#: gnucash/gtkbuilder/assistant-stock-split.glade:420
msgid ""
-"If you are finished creating the stock split or merger, press `Apply'. You may "
-"also press `Back' to review your choices, or `Cancel' to quit without making any "
-"changes."
+"If you are finished creating the stock split or merger, press `Apply'. You "
+"may also press `Back' to review your choices, or `Cancel' to quit without "
+"making any changes."
msgstr ""
"Ako završiš stvaranje podjele dionica ili njihovog združivanje, klikni "
-"„Primijeni“. Također možeš pritisnuti „Natrag“, za pregled tvojih odabira, ili "
-"„Odustani“ za izlaz bez unošenja promjena."
+"„Primijeni“. Također možeš pritisnuti „Natrag“, za pregled tvojih odabira, "
+"ili „Odustani“ za izlaz bez unošenja promjena."
#: gnucash/gtkbuilder/assistant-stock-split.glade:425
msgid "Stock Split Finish"
@@ -13035,7 +13227,7 @@ msgstr "<b>_Odabrano kodiranje</b>"
#: gnucash/gtkbuilder/business-prefs.glade:26
#: gnucash/report/business-reports/invoice.scm:906
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1815
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1787
msgid "Printable Invoice"
msgstr "Ispisiv izlazni raÄun"
@@ -13044,19 +13236,19 @@ msgstr "Ispisiv izlazni raÄun"
#: gnucash/report/business-reports/taxinvoice.scm:322
#: gnucash/report/business-reports/taxinvoice.scm:324
#: gnucash/report/business-reports/taxinvoice.scm:336
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1816
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1788
msgid "Tax Invoice"
msgstr "Izlazni raÄun s porezom"
#: gnucash/gtkbuilder/business-prefs.glade:32
#: gnucash/report/business-reports/invoice.scm:915
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1817
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1789
msgid "Easy Invoice"
msgstr "Izlazni raÄun (jednostavni)"
#: gnucash/gtkbuilder/business-prefs.glade:35
#: gnucash/report/business-reports/invoice.scm:924
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1818
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1790
msgid "Fancy Invoice"
msgstr "Izlazni raÄun (složeni)"
@@ -13086,7 +13278,8 @@ msgstr ""
#: gnucash/gtkbuilder/business-prefs.glade:97
#: gnucash/gtkbuilder/business-prefs.glade:344
msgid "How many days in the future to warn about Bills coming due."
-msgstr "Broj dana u budućnosti, kad se upozorava o nadolazećem dospijeću raÄuna."
+msgstr ""
+"Broj dana u budućnosti, kad se upozorava o nadolazećem dospijeću raÄuna."
#: gnucash/gtkbuilder/business-prefs.glade:115
#: gnucash/gtkbuilder/business-prefs.glade:357
@@ -13115,8 +13308,8 @@ msgid ""
"Whether tax is included by default in entries on Invoices. This setting is "
"inherited by new customers and vendors."
msgstr ""
-"Da li je porez standardno ukljuÄen u unosima izlaznih raÄuna. Ova se postavka "
-"koristi za nove kupce i dobavljaÄe."
+"Da li je porez standardno ukljuÄen u unosima izlaznih raÄuna. Ova se "
+"postavka koristi za nove kupce i dobavljaÄe."
#: gnucash/gtkbuilder/business-prefs.glade:187
msgid "_Accumulate splits on post"
@@ -13124,13 +13317,13 @@ msgstr "_Kumuliraj stavke prilikom uknjiženja"
#: gnucash/gtkbuilder/business-prefs.glade:193
msgid ""
-"Whether multiple entries in an invoice which transfer to the same account should "
-"be accumulated into a single split by default. This setting can be changed in "
-"the Post dialog."
+"Whether multiple entries in an invoice which transfer to the same account "
+"should be accumulated into a single split by default. This setting can be "
+"changed in the Post dialog."
msgstr ""
-"Da li standardno združiti viÅ¡estruke unose u izlaznom raÄunu, koji se prenose na "
-"isti konto, u jednu stavku. Ova se postavka može promijeniti u dijalogu za "
-"uknjiženje."
+"Da li standardno združiti viÅ¡estruke unose u izlaznom raÄunu, koji se "
+"prenose na isti konto, u jednu stavku. Ova se postavka može promijeniti u "
+"dijalogu za uknjiženje."
#: gnucash/gtkbuilder/business-prefs.glade:206
msgid "_Open in new window"
@@ -13138,11 +13331,12 @@ msgstr "_Otvori u novom prozoru"
#: gnucash/gtkbuilder/business-prefs.glade:212
msgid ""
-"If checked, each invoice will be opened in its own top level window. If clear, "
-"the invoice will be opened in the current window."
+"If checked, each invoice will be opened in its own top level window. If "
+"clear, the invoice will be opened in the current window."
msgstr ""
-"Ako je odabrano, svaka izlazni raÄun će biti otvoren u vlastitom prozoru najviÅ¡e "
-"razine. Ako nije, izlazni raÄuni će biti otvoreni u trenutaÄnom prozoru."
+"Ako je odabrano, svaka izlazni raÄun će biti otvoren u vlastitom prozoru "
+"najviÅ¡e razine. Ako nije, izlazni raÄuni će biti otvoreni u trenutaÄnom "
+"prozoru."
#. Preferences Dialog, General Tab
#: gnucash/gtkbuilder/business-prefs.glade:228
@@ -13185,7 +13379,7 @@ msgstr "Preuzimanje boje konta"
#: gnucash/gtkbuilder/dialog-account.glade:92
#: gnucash/gtkbuilder/dialog-account.glade:1123
#: gnucash/report/report-system/html-style-sheet.scm:291
-#: gnucash/report/report-system/report.scm:261
+#: gnucash/report/report-system/report.scm:264
#: gnucash/report/stylesheets/stylesheet-plain.scm:243
msgid "Default"
msgstr "Standardno"
@@ -13195,8 +13389,8 @@ msgid ""
"If any account has an existing color it will not be replaced unless the "
"following is ticked."
msgstr ""
-"Ako ikoji konto ima postojeću boju, neće biti zamijenjena, ukoliko sljedeće nije "
-"oznaÄeno."
+"Ako ikoji konto ima postojeću boju, neće biti zamijenjena, ukoliko sljedeće "
+"nije oznaÄeno."
#: gnucash/gtkbuilder/dialog-account.glade:125
msgid "Replace any existing account colors"
@@ -13255,16 +13449,17 @@ msgstr "<b>Transakcije podkonta</b>"
#: gnucash/gtkbuilder/dialog-account.glade:527
msgid ""
-"One or more sub-accounts contain transactions. What would you like to do with "
-"these transactions?"
+"One or more sub-accounts contain transactions. What would you like to do "
+"with these transactions?"
msgstr "Jedan ili više podkonta sadrže transakcije. Što želiš s njima uraditi?"
#: gnucash/gtkbuilder/dialog-account.glade:542
msgid ""
-"One or more sub-accounts contain read-only transactions which may not be deleted."
+"One or more sub-accounts contain read-only transactions which may not be "
+"deleted."
msgstr ""
-"Jedan ili viÅ¡e podkonta sadrže transakcije samo-za-Äitanje, koje ne mogu biti "
-"izbrisane."
+"Jedan ili viÅ¡e podkonta sadrže transakcije samo-za-Äitanje, koje ne mogu "
+"biti izbrisane."
#: gnucash/gtkbuilder/dialog-account.glade:597
#: gnucash/gtkbuilder/gnc-tree-view-owner.glade:9
@@ -13386,11 +13581,11 @@ msgstr "Odnosi se na _porez"
#. Translators: use the same words here as in 'Ta_x Report Options'.
#: gnucash/gtkbuilder/dialog-account.glade:1164
msgid ""
-"Use Edit->Tax Report Options to set the tax-related flag and assign a tax code "
-"to this account."
+"Use Edit->Tax Report Options to set the tax-related flag and assign a tax "
+"code to this account."
msgstr ""
-"Koristi „Uredi → Opcije za izvještaj o porezu“ za podešavanje oznake, koja se "
-"odnosi na porez i za dodijeljivanje Å¡ifre poreza ovom kontu."
+"Koristi „Uredi → Opcije za izvještaj o porezu“ za podešavanje oznake, koja "
+"se odnosi na porez i za dodijeljivanje Å¡ifre poreza ovom kontu."
#: gnucash/gtkbuilder/dialog-account.glade:1177
msgid "Placeholde_r"
@@ -13398,12 +13593,13 @@ msgstr "_Rezervirano mjesto"
#: gnucash/gtkbuilder/dialog-account.glade:1181
msgid ""
-"This account is present solely as a placeholder in the hierarchy. Transactions "
-"may not be posted to this account, only to sub-accounts of this account."
+"This account is present solely as a placeholder in the hierarchy. "
+"Transactions may not be posted to this account, only to sub-accounts of this "
+"account."
msgstr ""
"Ovaj se konto upotrebljava samo kao rezervirano mjesto u hijerarhiji kontnog "
-"plana. Transakcije se ne mogu uknjižiti u ovaj konto, vać samo u podkonta ovog "
-"konta."
+"plana. Transakcije se ne mogu uknjižiti u ovaj konto, vać samo u podkonta "
+"ovog konta."
#: gnucash/gtkbuilder/dialog-account.glade:1194
msgid "H_idden"
@@ -13411,17 +13607,17 @@ msgstr "_Skriveno"
#: gnucash/gtkbuilder/dialog-account.glade:1198
msgid ""
-"This account (and any sub-accounts) will be hidden in the account tree and will "
-"not appear in the popup account list in the register. To reset this option, you "
-"will first need to open the \"Filter By...\" dialog for the account tree and "
-"check the \"show hidden accounts\" option. Doing so will allow you to select the "
-"account and reopen this dialog."
+"This account (and any sub-accounts) will be hidden in the account tree and "
+"will not appear in the popup account list in the register. To reset this "
+"option, you will first need to open the \"Filter By...\" dialog for the "
+"account tree and check the \"show hidden accounts\" option. Doing so will "
+"allow you to select the account and reopen this dialog."
msgstr ""
"Ovaj konto (i bilo koji podkonto) će biti skriven u kontnom planu i neće se "
-"pojaviti na skoÄnom popisu konta u registru. Za povrat ove opciju, prvo moraÅ¡ "
-"otvoriti prozor „Filtriraj …“ za kontni plan i provjeriti opciju „prikaži "
-"skrivena konta“. Na taj naÄin možeÅ¡ odabrati konto i ponovo otvoriti ovaj "
-"dijalog."
+"pojaviti na skoÄnom popisu konta u registru. Za povrat ove opciju, prvo "
+"moraš otvoriti prozor „Filtriraj …“ za kontni plan i provjeriti opciju "
+"„prikaži skrivena konta“. Na taj naÄin možeÅ¡ odabrati konto i ponovo "
+"otvoriti ovaj dijalog."
#: gnucash/gtkbuilder/dialog-account.glade:1269
msgid "Smallest fraction of this commodity that can be referenced."
@@ -13437,10 +13633,10 @@ msgstr "<b>_MatiÄni konto</b>"
#: gnucash/gtkbuilder/dialog-account.glade:1420
#: gnucash/gtkbuilder/dialog-preferences.glade:1865
-#: gnucash/report/report-system/report.scm:68
+#: gnucash/report/report-system/report.scm:67
#: gnucash/report/standard-reports/equity-statement.scm:108
#: gnucash/report/standard-reports/equity-statement.scm:112
-#: gnucash/report/standard-reports/register.scm:394
+#: gnucash/report/standard-reports/register.scm:393
#: gnucash/report/standard-reports/trial-balance.scm:188
#: gnucash/report/standard-reports/trial-balance.scm:192
#: gnucash/report/stylesheets/stylesheet-easy.scm:46
@@ -13565,10 +13761,11 @@ msgstr "_Potvrđeno"
#: gnucash/gtkbuilder/dialog-account-picker.glade:74
msgid ""
-"When the status is not specified in a QIF file, the transactions are marked as "
-"cleared."
+"When the status is not specified in a QIF file, the transactions are marked "
+"as cleared."
msgstr ""
-"Kad stanje nije navedeno u QIF datoteci, transakcije se oznaÄavaju kao potvrÄ‘ene."
+"Kad stanje nije navedeno u QIF datoteci, transakcije se oznaÄavaju kao "
+"potvrđene."
#: gnucash/gtkbuilder/dialog-account-picker.glade:88
msgid "_Not cleared"
@@ -13576,16 +13773,18 @@ msgstr "_Nepotvrđeno"
#: gnucash/gtkbuilder/dialog-account-picker.glade:94
msgid ""
-"When the status is not specified in a QIF file, the transactions are marked as "
-"not cleared."
+"When the status is not specified in a QIF file, the transactions are marked "
+"as not cleared."
msgstr ""
"Kad stanje nije navedeno u QIF datoteci, transakcije se oznaÄavaju kao "
"nepotvrđene."
#: gnucash/gtkbuilder/dialog-account-picker.glade:112
-msgid "Default transaction status (overridden by the status given by the QIF file)"
+msgid ""
+"Default transaction status (overridden by the status given by the QIF file)"
msgstr ""
-"Standardno stanje transakcije (prepisuje se stanjem, koje zadaje QIF datoteka)"
+"Standardno stanje transakcije (prepisuje se stanjem, koje zadaje QIF "
+"datoteka)"
#: gnucash/gtkbuilder/dialog-account-picker.glade:140
#: gnucash/gtkbuilder/dialog-import.glade:12
@@ -13689,8 +13888,8 @@ msgstr "Broj dana za plaćanje ulaznih raÄuna nakon datuma uknjiženja."
#: gnucash/gtkbuilder/dialog-billterms.glade:152
msgid ""
-"The number of days after the post date during which a discount will be applied "
-"for early payment."
+"The number of days after the post date during which a discount will be "
+"applied for early payment."
msgstr ""
"Broj dana nakon datuma uknjiženja, u kojima će popust biti primijenjen za "
"uranjena plaćanja."
@@ -13725,13 +13924,13 @@ msgstr "Primijenjeni postotak popusta, ako je plaćeno prerano."
#: gnucash/gtkbuilder/dialog-billterms.glade:367
msgid ""
-"The cutoff day for applying bills to the next month. After the cutoff, bills are "
-"applied to the following month. Negative values count backwards from the end of "
-"the month."
+"The cutoff day for applying bills to the next month. After the cutoff, bills "
+"are applied to the following month. Negative values count backwards from the "
+"end of the month."
msgstr ""
-"Dan prekida za primjenu ulaznih raÄuna na sljedeći mjesec. Nakon prekida, ulazni "
-"raÄuni se primijenjuju u narednom mjesecu. Negativnim vrijednostima se raÄuna "
-"unatrag od kraja mjeseca."
+"Dan prekida za primjenu ulaznih raÄuna na sljedeći mjesec. Nakon prekida, "
+"ulazni raÄuni se primijenjuju u narednom mjesecu. Negativnim vrijednostima "
+"se raÄuna unatrag od kraja mjeseca."
#: gnucash/gtkbuilder/dialog-billterms.glade:431
msgid "Table"
@@ -13875,20 +14074,21 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-commodity.glade:146
msgid ""
"Enter the ticker symbol for the commodity (e.g. CSCO or AAPL). If you are "
-"retrieving quotes online, this field must exactly match the ticker symbol used "
-"by the quote source (including case). "
+"retrieving quotes online, this field must exactly match the ticker symbol "
+"used by the quote source (including case). "
msgstr ""
-"Unesi burzovnu oznaku za robu (npr. „CSCO“ ili „AAPL“). Ako dohvaÄaÅ¡ teÄajeva s "
-"interneta, ovo polje mora u potpunosti odgovarati burzovnoj oznaci, koju izvor "
-"teÄaja koristi (ukljuÄujući pisanje velikim/malim slovima). "
+"Unesi burzovnu oznaku za robu (npr. „CSCO“ ili „AAPL“). Ako dohvaÄaÅ¡ "
+"teÄajeva s interneta, ovo polje mora u potpunosti odgovarati burzovnoj "
+"oznaci, koju izvor teÄaja koristi (ukljuÄujući pisanje velikim/malim "
+"slovima). "
#: gnucash/gtkbuilder/dialog-commodity.glade:164
msgid ""
"Enter a unique code used to identify the commodity. Or, you may safely leave "
"this field blank."
msgstr ""
-"Unesi jedinstvenu Å¡ifru, koja se koristi za prepoznavanje robe. Ili, ostavi ovo "
-"polje praznim."
+"Unesi jedinstvenu Å¡ifru, koja se koristi za prepoznavanje robe. Ili, ostavi "
+"ovo polje praznim."
#: gnucash/gtkbuilder/dialog-commodity.glade:183
msgid "1 /"
@@ -13940,11 +14140,13 @@ msgstr "PojedinaÄ_no:"
#: gnucash/gtkbuilder/dialog-commodity.glade:515
msgid ""
-"These are F::Q quote sources that retrieve information from a single site on the "
-"internet. If that site is unavailable, you will not be able to retrieve quotes."
+"These are F::Q quote sources that retrieve information from a single site on "
+"the internet. If that site is unavailable, you will not be able to retrieve "
+"quotes."
msgstr ""
-"Ovo su izvori teÄajeva za „F::Q“, koji dohvaćaju podatke s jedne web stranice. "
-"Ako ta web stranica nije dostupna, nećeÅ¡ biti u mogućnosti dohvatiti teÄajeve."
+"Ovo su izvori teÄajeva za „F::Q“, koji dohvaćaju podatke s jedne web "
+"stranice. Ako ta web stranica nije dostupna, nećeš biti u mogućnosti "
+"dohvatiti teÄajeve."
#: gnucash/gtkbuilder/dialog-commodity.glade:536
msgid "_Multiple:"
@@ -13952,9 +14154,9 @@ msgstr "_Višestruko:"
#: gnucash/gtkbuilder/dialog-commodity.glade:542
msgid ""
-"These are F::Q quote sources that retrieve information from multiple sites on "
-"the internet. If one of the sites is unavailable, F::Q will attempt to retrieve "
-"the information from another site."
+"These are F::Q quote sources that retrieve information from multiple sites "
+"on the internet. If one of the sites is unavailable, F::Q will attempt to "
+"retrieve the information from another site."
msgstr ""
"Ovo su izvori teÄajeva za „F::Q“, koji dohvaćaju podatke s viÅ¡estrukih web "
"stranica. Ako jedna od tih web stranica nije dostupna, „F::Q“ će pokušati da "
@@ -13966,12 +14168,12 @@ msgstr "_Nepoznato:"
#: gnucash/gtkbuilder/dialog-commodity.glade:569
msgid ""
-"These are quote sources that were recently added to F::Q. GnuCash does not know "
-"if these sources retrieve information from a single site or from multiple sites "
-"on the internet."
+"These are quote sources that were recently added to F::Q. GnuCash does not "
+"know if these sources retrieve information from a single site or from "
+"multiple sites on the internet."
msgstr ""
-"Ovo su izvori teÄajeva, koji su nedavno dodani u „F::Q“. GnuCash ne zna, da li "
-"ti izvori dohvaćaju podatke s jedne ili s više web stranica."
+"Ovo su izvori teÄajeva, koji su nedavno dodani u „F::Q“. GnuCash ne zna, da "
+"li ti izvori dohvaćaju podatke s jedne ili s više web stranica."
#: gnucash/gtkbuilder/dialog-commodity.glade:593
msgid "Time_zone:"
@@ -13979,8 +14181,8 @@ msgstr "Vremenska _zona:"
#: gnucash/gtkbuilder/dialog-commodity.glade:630
msgid ""
-"Enter a display symbol. This can safely be left blank, in which case the ticker "
-"symbol or the currency ISO code will be used."
+"Enter a display symbol. This can safely be left blank, in which case the "
+"ticker symbol or the currency ISO code will be used."
msgstr ""
"Unesi oznaku. Ovo možeÅ¡ ostaviti i praznim. U tom sluÄaju će se koristiti "
"burzovna oznaka ili ISO Å¡ifra valute."
@@ -14008,7 +14210,8 @@ msgstr "Ime poduzeća: "
#: gnucash/gtkbuilder/dialog-customer.glade:194
msgid ""
-"The customer ID number. If left blank a reasonable number will be chosen for you"
+"The customer ID number. If left blank a reasonable number will be chosen for "
+"you"
msgstr "Broj kupca. Ako ostaviš praznim, jedan razuman broj će biti odabran"
#: gnucash/gtkbuilder/dialog-customer.glade:243
@@ -14161,10 +14364,10 @@ msgid ""
"Configuration\" from\n"
"the Reports menu or tool bar."
msgstr ""
-"Konfiguracije spremljenih izvještaja se stvaraju prvim otvaranjem izvještaja iz "
-"izbornika izvještaja.\n"
-"Promijeni opcije izvještaja po želji, a zatim odaberi „Spremi konfiguraciju za "
-"izvještaj“ u\n"
+"Konfiguracije spremljenih izvještaja se stvaraju prvim otvaranjem izvještaja "
+"iz izbornika izvještaja.\n"
+"Promijeni opcije izvještaja po želji, a zatim odaberi „Spremi konfiguraciju "
+"za izvještaj“ u\n"
"izborniku za izvještaje ili u traci alata."
#: gnucash/gtkbuilder/dialog-date-close.glade:8
@@ -14182,8 +14385,10 @@ msgstr "KorisniÄko ime: "
#: gnucash/gtkbuilder/dialog-employee.glade:172
msgid ""
-"The employee ID number. If left blank a reasonable number will be chosen for you"
-msgstr "Broj radnika. Ako polje ostaviš praznim, odabrat će se jedan razuman broj"
+"The employee ID number. If left blank a reasonable number will be chosen for "
+"you"
+msgstr ""
+"Broj radnika. Ako polje ostaviš praznim, odabrat će se jedan razuman broj"
#: gnucash/gtkbuilder/dialog-employee.glade:511
#: gnucash/gtkbuilder/dialog-vendor.glade:505
@@ -14282,7 +14487,8 @@ msgid "Monthly"
msgstr "MjeseÄno"
#: gnucash/gtkbuilder/dialog-fincalc.glade:30
-#: gnucash/gtkbuilder/dialog-fincalc.glade:71 libgnucash/engine/Recurrence.c:704
+#: gnucash/gtkbuilder/dialog-fincalc.glade:71
+#: libgnucash/engine/Recurrence.c:704
msgid "Semi-monthly"
msgstr "PolumjeseÄno"
@@ -14443,7 +14649,8 @@ msgstr "Cjelokupno ime konta"
#: gnucash/gtkbuilder/dialog-find-account.glade:184
msgid "Case insensitive searching is available on 'Account Full Name'."
msgstr ""
-"Pretraga s razlikovanjem veliÄine slova je dostupna za „Cjelokupno ime kontaâ€."
+"Pretraga s razlikovanjem veliÄine slova je dostupna za „Cjelokupno ime "
+"kontaâ€."
#: gnucash/gtkbuilder/dialog-find-account.glade:224
msgid "_Search"
@@ -14451,7 +14658,8 @@ msgstr "_Traži"
#: gnucash/gtkbuilder/dialog-find-account.glade:258
msgid ""
-"Select a row and then press 'jump to' to jump to account in the Account Tree,\n"
+"Select a row and then press 'jump to' to jump to account in the Account "
+"Tree,\n"
"if account should not be shown, this will be temporarily overridden."
msgstr ""
"Odaberi redak i klikni „PrijeÄ‘i naâ€, za prijelaz na konto u kontnom planu.\n"
@@ -14495,11 +14703,11 @@ msgstr "KoliÄina koriÅ¡tenja „Usporedi znakovni nizâ€"
#: gnucash/gtkbuilder/dialog-imap-editor.glade:260
msgid ""
-"Case sensitive filtering is available on 'Match String' and 'Mapped to Account "
-"Name'."
+"Filter will be applied to 'Match String' and 'Mapped to Account Name' "
+"fields, case sensitive."
msgstr ""
-"Filtar će biti primijenjen na polja „Usporedi znakovni niz†i „Mapirano na ime "
-"kontaâ€, razlikuje velika/mala slova."
+"Filtar će biti primijenjen na polja „Usporedi znakovni niz†i „Mapirano na "
+"ime kontaâ€, razlikuje velika/mala slova."
#: gnucash/gtkbuilder/dialog-imap-editor.glade:299
msgid "_Filter"
@@ -14515,9 +14723,10 @@ msgstr "_Sklopi sve"
#: gnucash/gtkbuilder/dialog-imap-editor.glade:363
msgid ""
-"Multiple rows can be selected and then deleted by pressing the delete button..."
+"Multiple rows can be selected and then deleted by pressing the delete button."
msgstr ""
-"Moguće je odabrati mnogostruke retke, te ih izbrisati pomoću gumba za brisanje …"
+"Moguće je odabrati više redova istovremeno, te ih potom izbrisati pomoću "
+"gumba za brisanje."
#: gnucash/gtkbuilder/dialog-import.glade:110
msgid "Please select or create an appropriate GnuCash account for:"
@@ -14553,27 +14762,28 @@ msgstr "<b>Opći uvoznik</b>"
#: gnucash/gtkbuilder/dialog-import.glade:368
msgid ""
-"In some places commercial ATMs (not belonging to a financial institution) are "
-"installed in places like convenience stores. These ATMs add their fee directly "
-"to the amount instead of showing up as a separate transaction or in your monthly "
-"banking fees. For example, you withdraw $100, and you are charged $101,50 plus "
-"Interac fees. If you manually entered that $100, the amounts won't match. You "
-"should set this to whatever is the maximum such fee in your area (in units of "
-"your local currency), so the transaction will be recognised as a match."
+"In some places commercial ATMs (not belonging to a financial institution) "
+"are installed in places like convenience stores. These ATMs add their fee "
+"directly to the amount instead of showing up as a separate transaction or in "
+"your monthly banking fees. For example, you withdraw $100, and you are "
+"charged $101,50 plus Interac fees. If you manually entered that $100, the "
+"amounts won't match. You should set this to whatever is the maximum such fee "
+"in your area (in units of your local currency), so the transaction will be "
+"recognised as a match."
msgstr ""
"U nekim mjestima, komercijalni bankomati (koji ne pripadaju financijskoj "
-"instituciji) su instalirani na mjestima, kao što su dućani. Ovi bankomati dodaju "
-"svoju naknadu direktno na iznos, umjesto da je prikažu kao zasebnu transakciju "
-"ili u tvojim mjeseÄnim bankovnim naknadama. Na primjer, podigneÅ¡ 100 kn, a "
-"naplaćeno ti je 101,50 kn, plus naknada za interakciju. Ako tih 100 kn uneseš "
-"ruÄno, iznosi se neće poklopiti. Postavi ovo na najveću takvu naknadu u tvom "
-"podruÄju (u jedinicama tvoje lokalne valute), kako bi se transakcija prepoznala "
-"kao poklapajuća."
+"instituciji) su instalirani na mjestima, kao što su dućani. Ovi bankomati "
+"dodaju svoju naknadu direktno na iznos, umjesto da je prikažu kao zasebnu "
+"transakciju ili u tvojim mjeseÄnim bankovnim naknadama. Na primjer, podigneÅ¡ "
+"100 kn, a naplaćeno ti je 101,50 kn, plus naknada za interakciju. Ako tih "
+"100 kn uneseÅ¡ ruÄno, iznosi se neće poklopiti. Postavi ovo na najveću takvu "
+"naknadu u tvom podruÄju (u jedinicama tvoje lokalne valute), kako bi se "
+"transakcija prepoznala kao poklapajuća."
#: gnucash/gtkbuilder/dialog-import.glade:389
msgid ""
-"A transaction whose best match's score is in the green zone (above or equal to "
-"the Auto-CLEAR threshold) will be CLEARed by default."
+"A transaction whose best match's score is in the green zone (above or equal "
+"to the Auto-CLEAR threshold) will be CLEARed by default."
msgstr ""
"Transakcija, Äiji se najbolji rezultat poklapanja nalazi je u zelenoj zoni "
"(iznad ili jednak pragu za „Automatsko usklađivanje“), će standardno biti "
@@ -14582,15 +14792,17 @@ msgstr ""
#: gnucash/gtkbuilder/dialog-import.glade:409
msgid ""
"A transaction whose best match's score is in the red zone (above the display "
-"threshold but below or equal to the Auto-ADD threshold) will be ADDed by default."
+"threshold but below or equal to the Auto-ADD threshold) will be ADDed by "
+"default."
msgstr ""
"Transakcija, Äiji se najbolji rezultat poklapanja nalazi je u crvenoj zoni "
-"(iznad praga prikaza, ali ispod ili jednako pragu za „automatsko dodavanje“), će "
-"standardno biti dodana."
+"(iznad praga prikaza, ali ispod ili jednako pragu za „automatsko "
+"dodavanje“), će standardno biti dodana."
#: gnucash/gtkbuilder/dialog-import.glade:429
msgid ""
-"The minimum score a potential match must have to be displayed in the match list."
+"The minimum score a potential match must have to be displayed in the match "
+"list."
msgstr ""
"Najmanji rezultat, koji moguće poklapanje mora imati, da bi bilo prikazano u "
"popisu poklapanja."
@@ -14621,9 +14833,11 @@ msgid "Use _bayesian matching"
msgstr "Koristi _Bayesov aloritam"
#: gnucash/gtkbuilder/dialog-import.glade:511
-msgid "Use bayesian algorithms to match new transactions with existing accounts."
+msgid ""
+"Use bayesian algorithms to match new transactions with existing accounts."
msgstr ""
-"Koristi Bayesov algoritam za poklapanje novih transakcija s postojećim kontima."
+"Koristi Bayesov algoritam za poklapanje novih transakcija s postojećim "
+"kontima."
#: gnucash/gtkbuilder/dialog-import.glade:553
msgid "Select matching existing transaction"
@@ -14649,13 +14863,13 @@ msgid ""
"This transaction probably requires your intervention or it will be imported "
"unbalanced."
msgstr ""
-"Ova transakcija vjerovatno zahtijeva tvoju intervenciju. InaÄe će biti uvezena "
-"nebilancirano."
+"Ova transakcija vjerovatno zahtijeva tvoju intervenciju. InaÄe će biti "
+"uvezena nebilancirano."
#: gnucash/gtkbuilder/dialog-import.glade:714
msgid ""
-"This transaction will be imported balanced (you may still want to double check "
-"the match or destination account)."
+"This transaction will be imported balanced (you may still want to double "
+"check the match or destination account)."
msgstr ""
"Ova će transakcija biti uvezena bilancirano (ako želiš, možeš provjeriti "
"podudarna konta ili konta odredišta)."
@@ -14666,11 +14880,12 @@ msgstr "Ova transakcija zahtijeva tvoju intervenciju. InaÄe NEĆE biti uvezena.
#: gnucash/gtkbuilder/dialog-import.glade:720
msgid ""
-"Double click on the transaction to change the matching transaction to reconcile, "
-"or the destination account of the auto-balance split (if required)."
+"Double click on the transaction to change the matching transaction to "
+"reconcile, or the destination account of the auto-balance split (if "
+"required)."
msgstr ""
-"Dvoklik na transakciju za promjenu poklapajuće transakcije koju želiš uskladiti "
-"ili odredišnog konta automatski usklađene stavke (ako je potrebno)."
+"Dvoklik na transakciju za promjenu poklapajuće transakcije koju želiš "
+"uskladiti ili odredišnog konta automatski usklađene stavke (ako je potrebno)."
#: gnucash/gtkbuilder/dialog-import.glade:725
msgid "Transaction List Help"
@@ -14716,8 +14931,8 @@ msgstr "Za usklađivanje poklopljene transakciju, odaberi „Uskl“."
#: gnucash/gtkbuilder/dialog-import.glade:963
msgid "Select neither to skip the transaction (it won't be imported at all)."
msgstr ""
-"Za preskakanje transakcije (neće uopće biti uvezena), nemoj odabrati ni jedno ni "
-"drugo."
+"Za preskakanje transakcije (neće uopće biti uvezena), nemoj odabrati ni "
+"jedno ni drugo."
#: gnucash/gtkbuilder/dialog-import.glade:974
msgid "(none)"
@@ -14788,8 +15003,10 @@ msgstr "Unosi za izlazni raÄun"
#: gnucash/gtkbuilder/dialog-invoice.glade:902
msgid ""
-"The invoice ID number. If left blank a reasonable number will be chosen for you."
-msgstr "Broj raÄuna. Ako ga ostaviÅ¡ praznim, bit će odabran jedan razuman broj."
+"The invoice ID number. If left blank a reasonable number will be chosen for "
+"you."
+msgstr ""
+"Broj raÄuna. Ako ga ostaviÅ¡ praznim, bit će odabran jedan razuman broj."
#: gnucash/gtkbuilder/dialog-invoice.glade:1365
msgid ""
@@ -14816,7 +15033,8 @@ msgid "Job Dialog"
msgstr "Dijalog za nalog"
#: gnucash/gtkbuilder/dialog-job.glade:149
-msgid "The job ID number. If left blank a reasonable number will be chosen for you"
+msgid ""
+"The job ID number. If left blank a reasonable number will be chosen for you"
msgstr "Broj naloga. Ako ga ostaviš praznim, bit će odabran jedan razuman broj"
#: gnucash/gtkbuilder/dialog-job.glade:191
@@ -14904,16 +15122,17 @@ msgid "_Yes"
msgstr "_Da"
#: gnucash/gtkbuilder/dialog-new-user.glade:86
-msgid "<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ponovo prikazati dijalog s dobrodošlicom?</"
-"span>"
+"<span weight=\"bold\" size=\"larger\">Ponovo prikazati dijalog s "
+"dobrodošlicom?</span>"
#: gnucash/gtkbuilder/dialog-new-user.glade:100
msgid ""
-"If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be "
-"displayed again next time you start GnuCash. If you press the <i>No</i> button, "
-"it will not be displayed again."
+"If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog "
+"will be displayed again next time you start GnuCash. If you press the <i>No</"
+"i> button, it will not be displayed again."
msgstr ""
"Ako klikneš <i>Da</i>, prozor <i>Dobro došli u GnuCash</i> će se ponovo "
"prikazati, kad sljedeći put pokreneš GnuCash. Ako klikneš <i>Ne</i>, neće se "
@@ -14925,14 +15144,15 @@ msgstr "<span size=\"x-large\" weight=\"bold\">GnuCash dobrodošlica!</span>"
#: gnucash/gtkbuilder/dialog-new-user.glade:231
msgid ""
-"There are some predefined actions available that most new users prefer to get "
-"started with GnuCash. Select one of these actions from below and click the "
-"<i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform "
-"any of them."
+"There are some predefined actions available that most new users prefer to "
+"get started with GnuCash. Select one of these actions from below and click "
+"the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to "
+"perform any of them."
msgstr ""
"Dostupne se neke unaprijed određene radnje, koje većina novih korisnika želi "
-"koristiti prilikom pokretanja GnuCasha. Odaberi jednu od ovih radnji i klikni "
-"<i>U redu</i> ili klikni <i>Odustani</i>, ako ne želiš obaviti nijednu od njih."
+"koristiti prilikom pokretanja GnuCasha. Odaberi jednu od ovih radnji i "
+"klikni <i>U redu</i> ili klikni <i>Odustani</i>, ako ne želiš obaviti "
+"nijednu od njih."
#: gnucash/gtkbuilder/dialog-new-user.glade:245
msgid "C_reate a new set of accounts"
@@ -14990,7 +15210,8 @@ msgstr "Unosi za narudžbu"
#: gnucash/gtkbuilder/dialog-order.glade:671
msgid ""
"The order ID number. If left blank a reasonable number will be chosen for you"
-msgstr "Broj narudžbe. Ako ga ostaviš praznim bit će odabran jedan razuman broj"
+msgstr ""
+"Broj narudžbe. Ako ga ostaviš praznim bit će odabran jedan razuman broj"
#: gnucash/gtkbuilder/dialog-payment.glade:151
#: gnucash/gtkbuilder/dialog-payment.glade:185
@@ -15019,17 +15240,19 @@ msgstr "Dokumenti"
msgid ""
"The amount to pay for this invoice.\n"
"\n"
-"If you have selected an invoice, GnuCash will propose the amount still due for "
-"it. You can change this amount to create a partial payment or an over-payment.\n"
+"If you have selected an invoice, GnuCash will propose the amount still due "
+"for it. You can change this amount to create a partial payment or an over-"
+"payment.\n"
"\n"
"In case of an over-payment or if no invoice was selected, GnuCash will "
-"automatically assign the remaining amount to the first unpaid invoice for this "
-"company."
+"automatically assign the remaining amount to the first unpaid invoice for "
+"this company."
msgstr ""
"Iznos ovog izlaznog raÄuna, koji treba platiti.\n"
"\n"
-"Ako je izlazni raÄun odabran, GnuCash će predložiti joÅ¡ nepodmireni iznos. MožeÅ¡ "
-"promijeniti taj iznos za stvaranje djelimiÄnog plaćanja ili preplaćivanja.\n"
+"Ako je izlazni raÄun odabran, GnuCash će predložiti joÅ¡ nepodmireni iznos. "
+"MožeÅ¡ promijeniti taj iznos za stvaranje djelimiÄnog plaćanja ili "
+"preplaćivanja.\n"
"\n"
"U sluÄaju preplaćivanja ili ako nije odabran izlazni raÄun, GnuCash će "
"samostalno dodijelit preostali iznos prvom neplaćenom izlaznom raÄunu za ovo "
@@ -15116,7 +15339,8 @@ msgstr "UkljuÄi _sveukupni iznos"
msgid ""
"Show a grand total of all accounts converted to the default report currency."
msgstr ""
-"Prikaži sveukupni iznos svih konta, pretvorenih u standardnu valutu izvještaja."
+"Prikaži sveukupni iznos svih konta, pretvorenih u standardnu valutu "
+"izvještaja."
#: gnucash/gtkbuilder/dialog-preferences.glade:202
msgid "Include _non-currency totals"
@@ -15124,11 +15348,11 @@ msgstr "UkljuÄi _ne-valutne ukupne iznose"
#: gnucash/gtkbuilder/dialog-preferences.glade:208
msgid ""
-"If checked, non-currency commodities will be shown in the summary bar. If clear, "
-"only currencies will be shown."
+"If checked, non-currency commodities will be shown in the summary bar. If "
+"clear, only currencies will be shown."
msgstr ""
-"Ukoliko je oznaÄeno, nevalutna roba će biti prikazana u traci sažetka. Ako nije, "
-"bit će prikazane samo valute."
+"Ukoliko je oznaÄeno, nevalutna roba će biti prikazana u traci sažetka. Ako "
+"nije, bit će prikazane samo valute."
#: gnucash/gtkbuilder/dialog-preferences.glade:224
msgid "<b>Start Date</b>"
@@ -15144,7 +15368,8 @@ msgstr "_Relativno:"
#: gnucash/gtkbuilder/dialog-preferences.glade:253
msgid "Use the specified relative starting date for profit/loss calculations."
-msgstr "Koristi navedeni relativni poÄetni datum za izraÄunavanja dobiti/gubitka."
+msgstr ""
+"Koristi navedeni relativni poÄetni datum za izraÄunavanja dobiti/gubitka."
#: gnucash/gtkbuilder/dialog-preferences.glade:267
msgid "_Absolute:"
@@ -15152,7 +15377,8 @@ msgstr "_Apsolutno:"
#: gnucash/gtkbuilder/dialog-preferences.glade:273
msgid "Use the specified absolute starting date for profit/loss calculations."
-msgstr "Koristi navedeni apsolutni poÄetni datum za izraÄunavanja dobiti/gubitka."
+msgstr ""
+"Koristi navedeni apsolutni poÄetni datum za izraÄunavanja dobiti/gubitka."
#: gnucash/gtkbuilder/dialog-preferences.glade:287
msgid "Re_lative:"
@@ -15160,8 +15386,8 @@ msgstr "_Relativno:"
#: gnucash/gtkbuilder/dialog-preferences.glade:293
msgid ""
-"Use the specified relative ending date for profit/loss calculations. Also use "
-"this date for net assets calculations."
+"Use the specified relative ending date for profit/loss calculations. Also "
+"use this date for net assets calculations."
msgstr ""
"Koristi navedeni relativni zavrÅ¡ni datum za izraÄunavanja dobiti/gubitka. "
"Koristi ovaj datum i za izraÄunavanje neto imovine."
@@ -15172,8 +15398,8 @@ msgstr "_Apsolutno:"
#: gnucash/gtkbuilder/dialog-preferences.glade:313
msgid ""
-"Use the specified absolute ending date for profit/loss calculations. Also use "
-"this date for net assets calculations."
+"Use the specified absolute ending date for profit/loss calculations. Also "
+"use this date for net assets calculations."
msgstr ""
"Koristi navedeni apsolutni zavrÅ¡ni datum za izraÄunavanja dobiti/gubitka. "
"Koristi ovaj datum i za izraÄunavanje neto imovine."
@@ -15265,13 +15491,14 @@ msgstr "J_ezik:"
#: gnucash/gtkbuilder/dialog-preferences.glade:796
msgid ""
-"The character that will be used between components of an account name. A legal "
-"value is any single character except letters and numbers, or any of the "
-"following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and \"period\"."
+"The character that will be used between components of an account name. A "
+"legal value is any single character except letters and numbers, or any of "
+"the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and "
+"\"period\"."
msgstr ""
-"Znak koji će se koristiti između dijelova imena konta. Dozvoljena vrijednost je "
-"svaki znak osim slova i brojeva, ili bilo koji od sljedećih znakovnih nizova: "
-"„dvotoÄka†„kosa crtaâ€, „obrnuta kosa crtaâ€, „crtica†i „toÄka“."
+"Znak koji će se koristiti između dijelova imena konta. Dozvoljena vrijednost "
+"je svaki znak osim slova i brojeva, ili bilo koji od sljedećih znakovnih "
+"nizova: „dvotoÄka†„kosa crtaâ€, „obrnuta kosa crtaâ€, „crtica†i „toÄka“."
#: gnucash/gtkbuilder/dialog-preferences.glade:880
msgid "<b>Fancy Date Format</b>"
@@ -15302,8 +15529,10 @@ msgid "When a date is entered without year, it should be taken:"
msgstr "Kad se unese datum bez godine, koristit će se:"
#: gnucash/gtkbuilder/dialog-preferences.glade:988
-msgid "Dates will be completed so that they are within the current calendar year."
-msgstr "Datumi će biti dovršeni, tako da budu unutar tekuće kalendarske godine."
+msgid ""
+"Dates will be completed so that they are within the current calendar year."
+msgstr ""
+"Datumi će biti dovršeni, tako da budu unutar tekuće kalendarske godine."
#: gnucash/gtkbuilder/dialog-preferences.glade:1002
msgid ""
@@ -15328,7 +15557,8 @@ msgstr "Datum/vrijeme"
#: gnucash/gtkbuilder/dialog-preferences.glade:1141
msgid "Perform account list _setup on new file"
msgstr ""
-"Otvori dijalog za po_stavljanje kontnog plana prilikom otvaranja nove datoteke"
+"Otvori dijalog za po_stavljanje kontnog plana prilikom otvaranja nove "
+"datoteke"
#: gnucash/gtkbuilder/dialog-preferences.glade:1147
msgid "Present the new account list dialog when you choose File -> New File."
@@ -15348,7 +15578,8 @@ msgid "How many days to keep old log/backup files."
msgstr "Broj dana Äuvanja log-datoteke/sigurnosne kopije."
#: gnucash/gtkbuilder/dialog-preferences.glade:1225
-#: gnucash/gtkbuilder/dialog-sx.glade:655 gnucash/gtkbuilder/dialog-sx.glade:694
+#: gnucash/gtkbuilder/dialog-sx.glade:655
+#: gnucash/gtkbuilder/dialog-sx.glade:694
msgid "days"
msgstr "dana"
@@ -15382,7 +15613,8 @@ msgstr "_Automatski decimalni zarez"
#: gnucash/gtkbuilder/dialog-preferences.glade:1337
msgid ""
-"Automatically insert a decimal point into values that are entered without one."
+"Automatically insert a decimal point into values that are entered without "
+"one."
msgstr ""
"Automatski umetni decimalni zarez u vrijednosti, koje su unesene bez zareza."
@@ -15412,7 +15644,8 @@ msgstr "OgraniÄenje za novu _pretragu:"
#: gnucash/gtkbuilder/dialog-preferences.glade:1443
msgid "Default to 'new search' if fewer than this number of items is returned."
-msgstr "Vraća se na „Nova pretraga“, ako je dobijeno manje stavaka od ovog broja."
+msgstr ""
+"Vraća se na „Nova pretraga“, ako je dobijeno manje stavaka od ovog broja."
#: gnucash/gtkbuilder/dialog-preferences.glade:1457
msgid "Show splash scree_n"
@@ -15436,11 +15669,11 @@ msgstr "Prikaži _potvrdu za automatsko spremanje"
#: gnucash/gtkbuilder/dialog-preferences.glade:1539
msgid ""
-"If active, GnuCash shows a confirmation question each time the auto-save feature "
-"is started. Otherwise no extra explanation is shown."
+"If active, GnuCash shows a confirmation question each time the auto-save "
+"feature is started. Otherwise no extra explanation is shown."
msgstr ""
-"Ako je aktivirano, GnuCash prikazuje pitanje za potvrđivanje, svaki put kad se "
-"pokrene funkcija automatskog spremanja. U protivnom ne prikazuje dodatna "
+"Ako je aktivirano, GnuCash prikazuje pitanje za potvrđivanje, svaki put kad "
+"se pokrene funkcija automatskog spremanja. U protivnom ne prikazuje dodatna "
"objašnjenja."
#: gnucash/gtkbuilder/dialog-preferences.glade:1581
@@ -15475,11 +15708,11 @@ msgstr "UkljuÄi prikaz vodoravnih mrežnih linija u tablici"
#: gnucash/gtkbuilder/dialog-preferences.glade:1756
msgid ""
-"Enable horizontal grid lines on table displays. These will mainly be tree views "
-"like the Accounts page."
+"Enable horizontal grid lines on table displays. These will mainly be tree "
+"views like the Accounts page."
msgstr ""
-"UkljuÄi prikaz vodoravnih mrežnih linija u tablici. Ove se uglavnom koriste u "
-"stablastom pogledu stranica konta/kontnog plana."
+"UkljuÄi prikaz vodoravnih mrežnih linija u tablici. Ove se uglavnom koriste "
+"u stablastom pogledu stranica konta/kontnog plana."
#: gnucash/gtkbuilder/dialog-preferences.glade:1770
msgid "Enable vertical grid lines on table displays"
@@ -15487,11 +15720,11 @@ msgstr "UkljuÄi prikaz uspravnih mrežnih linija u tablicama"
#: gnucash/gtkbuilder/dialog-preferences.glade:1774
msgid ""
-"Enable vertical grid lines on table displays. These will mainly be tree views "
-"like the Accounts page."
+"Enable vertical grid lines on table displays. These will mainly be tree "
+"views like the Accounts page."
msgstr ""
-"UkljuÄi prikaz uspravnih mrežnih linija u tablicama. Ove se uglavnom koriste u "
-"stablastom pogledu stranica konta/kontnog plana."
+"UkljuÄi prikaz uspravnih mrežnih linija u tablicama. Ove se uglavnom koriste "
+"u stablastom pogledu stranica konta/kontnog plana."
#: gnucash/gtkbuilder/dialog-preferences.glade:1883
msgid "<b>Checks</b>"
@@ -15532,12 +15765,12 @@ msgstr "„_Enter“ te premješta na praznu transakciju"
#: gnucash/gtkbuilder/dialog-preferences.glade:2031
msgid ""
"If checked, pressing the 'Enter' key will move to the location of the blank "
-"transaction in the register. If clear, pressing the 'Enter' key will move down "
-"one row."
+"transaction in the register. If clear, pressing the 'Enter' key will move "
+"down one row."
msgstr ""
-"Ako je postavljeno, pritiskom na „Enterâ€, premjeÅ¡ta se na praznu transakciju u "
-"registru. Ako nije postavljeno, pritiskom na „Enterâ€, premjeÅ¡ta se za jedan "
-"redak naniže."
+"Ako je postavljeno, pritiskom na „Enterâ€, premjeÅ¡ta se na praznu transakciju "
+"u registru. Ako nije postavljeno, pritiskom na „Enterâ€, premjeÅ¡ta se za "
+"jedan redak naniže."
#: gnucash/gtkbuilder/dialog-preferences.glade:2054
msgid "_Auto-raise lists"
@@ -15572,8 +15805,8 @@ msgid ""
"After reconciling a credit card statement, prompt the user to enter a credit "
"card payment."
msgstr ""
-"Nakon usklađivanja stanja kreditne kartice, traži od korisnika da unese uplatu s "
-"kreditnom karticom."
+"Nakon usklađivanja stanja kreditne kartice, traži od korisnika da unese "
+"uplatu s kreditnom karticom."
#: gnucash/gtkbuilder/dialog-preferences.glade:2154
msgid "Always reconcile to t_oday"
@@ -15584,8 +15817,8 @@ msgid ""
"Always open the reconcile dialog using today's date for the statement date, "
"regardless of previous reconciliations."
msgstr ""
-"Uvijek otvori prozor za usklađivanje, koristeći današnji datum za datum stanja, "
-"bez obzira na prethodna usklađivanja."
+"Uvijek otvori prozor za usklađivanje, koristeći današnji datum za datum "
+"stanja, bez obzira na prethodna usklađivanja."
#: gnucash/gtkbuilder/dialog-preferences.glade:2173
msgid "Draw _vertical lines between columns"
@@ -15609,9 +15842,9 @@ msgid ""
"bottom of the register after the blank transaction. If clear, the blank "
"transaction will be at the bottom of the register after all transactions."
msgstr ""
-"Ako je aktivirano, transakcije u budućnosti će biti prikazane na dnu registra, "
-"ispod prazne transakcije. U protivnom će prazna transakcija biti na dnu "
-"registra, ispod svih transakcija."
+"Ako je aktivirano, transakcije u budućnosti će biti prikazane na dnu "
+"registra, ispod prazne transakcije. U protivnom će prazna transakcija biti "
+"na dnu registra, ispod svih transakcija."
#: gnucash/gtkbuilder/dialog-preferences.glade:2234
msgid "Draw hori_zontal lines between rows"
@@ -15630,8 +15863,8 @@ msgid ""
"Alternate the primary and secondary colors by transaction instead of by "
"alternating by row."
msgstr ""
-"NaizmjeniÄno oboji polja tablice primarnom i sekundarnom bojom po transakcijama, "
-"umjesto po redcima."
+"NaizmjeniÄno oboji polja tablice primarnom i sekundarnom bojom po "
+"transakcijama, umjesto po redcima."
#: gnucash/gtkbuilder/dialog-preferences.glade:2272
msgid "_Use GnuCash built-in color theme"
@@ -15639,8 +15872,8 @@ msgstr "_Koristi GnuCash-ugraÄ‘ene boje suÄelja"
#: gnucash/gtkbuilder/dialog-preferences.glade:2278
msgid ""
-"GnuCash uses a yellow/green theme by default for register windows. Uncheck this "
-"if you want to use the system color theme instead."
+"GnuCash uses a yellow/green theme by default for register windows. Uncheck "
+"this if you want to use the system color theme instead."
msgstr ""
"GnuCash standardno koristi zelenu/žutu boju za prikaz u prozorima registra. "
"Ukloni oznaku, ako umjesto toga želiš koristiti prikazne boje sustava."
@@ -15656,7 +15889,8 @@ msgstr "Redoslijed kartica _ukljuÄuje prijenos na zapamćene transakcije"
#: gnucash/gtkbuilder/dialog-preferences.glade:2310
msgid "Move to Transfer field when memorised transaction auto filled."
msgstr ""
-"Premjesti u polje prijenosa, kad je upamćena transakcija automatski popunjena."
+"Premjesti u polje prijenosa, kad je upamćena transakcija automatski "
+"popunjena."
#: gnucash/gtkbuilder/dialog-preferences.glade:2359
msgid "<b>Default Style</b>"
@@ -15696,8 +15930,8 @@ msgstr "Otvori registar u novom _prozoru"
#: gnucash/gtkbuilder/dialog-preferences.glade:2513
msgid ""
-"If checked, each register will be opened in its own top level window. If clear, "
-"the register will be opened in the current window."
+"If checked, each register will be opened in its own top level window. If "
+"clear, the register will be opened in the current window."
msgstr ""
"Ako je odabrano, svaki registar će biti otvoren u vlastitom prozoru najviše "
"razine. Ako nije, registar će biti otvoren u trenutaÄnom prozoru."
@@ -15708,15 +15942,15 @@ msgstr "_Prikaži samo imena konta"
#: gnucash/gtkbuilder/dialog-preferences.glade:2532
msgid ""
-"If checked, only the names of the leaf accounts are displayed in the register "
-"and in the account selection popup. The default behaviour is to display the full "
-"name, including the path in the account tree. Checking this option implies that "
-"you use unique leaf names."
+"If checked, only the names of the leaf accounts are displayed in the "
+"register and in the account selection popup. The default behaviour is to "
+"display the full name, including the path in the account tree. Checking this "
+"option implies that you use unique leaf names."
msgstr ""
-"Ako je odabrano, prikazat će se samo imena konta u registru i u oblaÄiću izbora "
-"konta. Standardni naÄin je prikazivanje cjelokupnog imena, ukljuÄujući i stazu u "
-"kontnom planu. Aktiviranje ove opcije implicira, da koristiš jedinstvena imena "
-"konta."
+"Ako je odabrano, prikazat će se samo imena konta u registru i u oblaÄiću "
+"izbora konta. Standardni naÄin je prikazivanje cjelokupnog imena, "
+"ukljuÄujući i stazu u kontnom planu. Aktiviranje ove opcije implicira, da "
+"koristiš jedinstvena imena konta."
#. Register2 feature
#: gnucash/gtkbuilder/dialog-preferences.glade:2549
@@ -15761,8 +15995,8 @@ msgstr "Izvještaj se otvara u novom _prozoru"
#: gnucash/gtkbuilder/dialog-preferences.glade:2816
msgid ""
-"If checked, each report will be opened in its own top level window. If clear, "
-"the report will be opened in the current window."
+"If checked, each report will be opened in its own top level window. If "
+"clear, the report will be opened in the current window."
msgstr ""
"Ako je odabrano, svaki izvještaj će biti otvoren u vlastitom prozoru najviše "
"razine. Ako nije, izvjeÅ¡taj će biti otvoren u trenutaÄnom prozoru."
@@ -15833,8 +16067,8 @@ msgid ""
"Show a close button on each notebook tab. These function identically to the "
"'Close' menu item."
msgstr ""
-"Prikaži gumb za zatvaranje na svakoj kartici. Ovi gumbovi rade ne isti naÄin, "
-"kao stavka izbornika „Zatvori“."
+"Prikaži gumb za zatvaranje na svakoj kartici. Ovi gumbovi rade ne isti "
+"naÄin, kao stavka izbornika „Zatvori“."
#: gnucash/gtkbuilder/dialog-preferences.glade:3192
msgid "_Width:"
@@ -15842,8 +16076,8 @@ msgstr "_Å irina:"
#: gnucash/gtkbuilder/dialog-preferences.glade:3213
msgid ""
-"If the text in the tab is longer than this value (the test is approximate) then "
-"the tab label will have the middle cut and replaced with an ellipsis."
+"If the text in the tab is longer than this value (the test is approximate) "
+"then the tab label will have the middle cut and replaced with an ellipsis."
msgstr ""
"Ako je tekst u kartici duži od ove vrijednosti (test je približan), onda će "
"oznaka kartice biti odrezana po sredini i zamenjena elipsom."
@@ -15869,7 +16103,7 @@ msgid "Ask"
msgstr "Ponuđena cijena u prodaji"
#: gnucash/gtkbuilder/dialog-price.glade:18
-#: gnucash/report/standard-reports/budget.scm:134
+#: gnucash/report/standard-reports/budget.scm:128
msgid "Last"
msgstr "Posljednje"
@@ -15927,8 +16161,8 @@ msgstr "Zadnja u _kvartalu"
#: gnucash/gtkbuilder/dialog-price.glade:500
msgid ""
-"Keep the last price of each fiscal quarter if present before date. The fiscal "
-"quarter is derived from the accounting period end date."
+"Keep the last price of each fiscal quarter if present before date. The "
+"fiscal quarter is derived from the accounting period end date."
msgstr ""
"Zadrži zadnju cijenu svakog fiskalnog kvartala, ako postoji, prije datuma. "
"Fiskalni kvartal se izvodi iz zavrÅ¡nog datuma obraÄunavanja."
@@ -15951,13 +16185,13 @@ msgstr "_Skalirano"
#: gnucash/gtkbuilder/dialog-price.glade:534
msgid ""
-"With the scaled option, prices are removed relative to the date selected. 'One a "
-"month' is used for dates older than a year and 'One a week' is used for dates "
-"older than six months to a year."
+"With the scaled option, prices are removed relative to the date selected. "
+"'One a month' is used for dates older than a year and 'One a week' is used "
+"for dates older than six months to a year."
msgstr ""
-"S ovom opcijom skaliranja, cijene se uklanjaju relativno u odnosu na odabrani "
-"datum. „Jedna u mjesecu†se koristi za datume od prije godinu dana, a „Jedna u "
-"tjednuâ€, za datume od prije Å¡est mjeseci do godinu dana."
+"S ovom opcijom skaliranja, cijene se uklanjaju relativno u odnosu na "
+"odabrani datum. „Jedna u mjesecu†se koristi za datume od prije godinu dana, "
+"a „Jedna u tjednuâ€, za datume od prije Å¡est mjeseci do godinu dana."
#: gnucash/gtkbuilder/dialog-price.glade:582
msgid "First Date"
@@ -15999,15 +16233,17 @@ msgstr "_UkljuÄeno programom"
msgid ""
"If activated, include application added prices.\n"
"\n"
-"These prices were added so that there's always a \"nearest in time\" price for "
-"every multi-commodity transaction so that the Accounts page and reports are able "
-"to correctly report values so removing them may make this less reliable."
+"These prices were added so that there's always a \"nearest in time\" price "
+"for every multi-commodity transaction so that the Accounts page and reports "
+"are able to correctly report values so removing them may make this less "
+"reliable."
msgstr ""
"Ako je aktivirano, ukljuÄi cijene dodane programom.\n"
"\n"
-"Ove su cijene dodane, kako bi uvijek postojala „najnovija†cijena za svaku mnogo-"
-"robnu transakciju. Time se omogućava toÄno navoÄ‘enje vrijednosti na stranicama "
-"konta i u izvještajima. Uklanjanjem cijena se smanjuje ta sigurnost."
+"Ove su cijene dodane, kako bi uvijek postojala „najnovija†cijena za svaku "
+"mnogo-robnu transakciju. Time se omogućava toÄno navoÄ‘enje vrijednosti na "
+"stranicama konta i u izvještajima. Uklanjanjem cijena se smanjuje ta "
+"sigurnost."
#: gnucash/gtkbuilder/dialog-price.glade:744
msgid "Before _Date:"
@@ -16057,8 +16293,8 @@ msgid ""
"custom format will cause that format to be overwritten."
msgstr ""
"Unesi naslov za ovaj proizvoljni format. Ovaj naslov će se pojaviti u biraÄu "
-"formata Äeka u prozoru za ispis Äeka. KoriÅ¡tenje naslova postojećeg proizvoljnog "
-"formata, dovest će do prepisivanja tog formata."
+"formata Äeka u prozoru za ispis Äeka. KoriÅ¡tenje naslova postojećeg "
+"proizvoljnog formata, dovest će do prepisivanja tog formata."
#: gnucash/gtkbuilder/dialog-print-check.glade:225
msgid "Inches"
@@ -16284,9 +16520,9 @@ msgstr "Vrati upozorenja"
#: gnucash/gtkbuilder/dialog-reset-warnings.glade:85
msgid ""
-"You have requested that the following warning dialogs not be presented. To re-"
-"enable any of these dialogs, select the check box next to the dialog, then click "
-"OK."
+"You have requested that the following warning dialogs not be presented. To "
+"re-enable any of these dialogs, select the check box next to the dialog, "
+"then click OK."
msgstr ""
"Postavljeno je, da se sljedeći dijalozi upozorenja ne prikazuju. Za ponovo "
"prikazivanje ovih dijaloga, odaberi polje za potvrdu pored dijaloga, zatim "
@@ -16357,10 +16593,11 @@ msgid "Search only active data"
msgstr "Traži samo aktivne podatke"
#: gnucash/gtkbuilder/dialog-search.glade:421
-msgid "Choose whether to search all your data or only that marked as \"active\"."
+msgid ""
+"Choose whether to search all your data or only that marked as \"active\"."
msgstr ""
-"Odaberi, da li pretraživati sve tvoje podatke ili samo one, koji su oznaÄeni kao "
-"„aktivni“."
+"Odaberi, da li pretraživati sve tvoje podatke ili samo one, koji su oznaÄeni "
+"kao „aktivni“."
#: gnucash/gtkbuilder/dialog-search.glade:439
msgid "Type of search"
@@ -16372,11 +16609,11 @@ msgstr "Brisanje konta"
#: gnucash/gtkbuilder/dialog-sx.glade:55
msgid ""
-"The following Scheduled Transactions reference the deleted account and must now "
-"be corrected. Press OK to edit them."
+"The following Scheduled Transactions reference the deleted account and must "
+"now be corrected. Press OK to edit them."
msgstr ""
-"Sljedeće terminirane transakcije se pozivaju na izbrisani konto i sad se moraju "
-"ispraviti. Za uređivanje, klikni „U redu“."
+"Sljedeće terminirane transakcije se pozivaju na izbrisani konto i sad se "
+"moraju ispraviti. Za uređivanje, klikni „U redu“."
#: gnucash/gtkbuilder/dialog-sx.glade:123
#: gnucash/gtkbuilder/gnc-frequency.glade:171
@@ -16440,11 +16677,11 @@ msgstr "_Prikaži prozor s obavijestima"
#: gnucash/gtkbuilder/dialog-sx.glade:556
msgid ""
-"Show the notification window for the \"since last run\" process when a file is "
-"opened."
+"Show the notification window for the \"since last run\" process when a file "
+"is opened."
msgstr ""
-"Prikaži obavještajni prozor za proces „od posljednjeg pokretanja“, kad se otvori "
-"datoteka."
+"Prikaži obavještajni prozor za proces „od posljednjeg pokretanja“, kad se "
+"otvori datoteka."
#: gnucash/gtkbuilder/dialog-sx.glade:570
msgid "_Auto-create new transactions"
@@ -16499,7 +16736,8 @@ msgstr "Stvori unaprijed:"
msgid "Remind in advance:"
msgstr "Podsjeti unaprijed:"
-#: gnucash/gtkbuilder/dialog-sx.glade:977 gnucash/gtkbuilder/dialog-sx.glade:1036
+#: gnucash/gtkbuilder/dialog-sx.glade:977
+#: gnucash/gtkbuilder/dialog-sx.glade:1036
msgid " days"
msgstr " dani"
@@ -16699,11 +16937,11 @@ msgstr "_Pronađi poveznicu"
msgid "Association"
msgstr "Poveznica"
-#: gnucash/gtkbuilder/dialog-trans-assoc.glade:165
+#: gnucash/gtkbuilder/dialog-trans-assoc.glade:167
msgid "Available ?"
msgstr "Dostupno?"
-#: gnucash/gtkbuilder/dialog-trans-assoc.glade:190
+#: gnucash/gtkbuilder/dialog-trans-assoc.glade:192
msgid ""
" To jump to the Transaction, double click on the entry in the\n"
"Description column or Association column to open the Association"
@@ -16785,8 +17023,10 @@ msgstr "Broj dobavljaÄa: "
#: gnucash/gtkbuilder/dialog-vendor.glade:195
msgid ""
-"The vendor ID number. If left blank a reasonable number will be chosen for you"
-msgstr "Broj dobavljaÄa. Ako ostaviÅ¡ praznim, bit će odabran jedan razuman broj"
+"The vendor ID number. If left blank a reasonable number will be chosen for "
+"you"
+msgstr ""
+"Broj dobavljaÄa. Ako ostaviÅ¡ praznim, bit će odabran jedan razuman broj"
#: gnucash/gtkbuilder/dialog-vendor.glade:629
msgid "Tax Included:"
@@ -16850,25 +17090,29 @@ msgstr "Format datuma:"
#: gnucash/gtkbuilder/gnc-frequency.glade:40
#: gnucash/gtkbuilder/gnc-frequency.glade:208
-#: gnucash/gtkbuilder/gnc-frequency.glade:434 libgnucash/engine/Recurrence.c:659
+#: gnucash/gtkbuilder/gnc-frequency.glade:434
+#: libgnucash/engine/Recurrence.c:659
msgid "1st"
msgstr "1."
#: gnucash/gtkbuilder/gnc-frequency.glade:43
#: gnucash/gtkbuilder/gnc-frequency.glade:211
-#: gnucash/gtkbuilder/gnc-frequency.glade:437 libgnucash/engine/Recurrence.c:659
+#: gnucash/gtkbuilder/gnc-frequency.glade:437
+#: libgnucash/engine/Recurrence.c:659
msgid "2nd"
msgstr "2."
#: gnucash/gtkbuilder/gnc-frequency.glade:46
#: gnucash/gtkbuilder/gnc-frequency.glade:214
-#: gnucash/gtkbuilder/gnc-frequency.glade:440 libgnucash/engine/Recurrence.c:659
+#: gnucash/gtkbuilder/gnc-frequency.glade:440
+#: libgnucash/engine/Recurrence.c:659
msgid "3rd"
msgstr "3."
#: gnucash/gtkbuilder/gnc-frequency.glade:49
#: gnucash/gtkbuilder/gnc-frequency.glade:217
-#: gnucash/gtkbuilder/gnc-frequency.glade:443 libgnucash/engine/Recurrence.c:659
+#: gnucash/gtkbuilder/gnc-frequency.glade:443
+#: libgnucash/engine/Recurrence.c:659
msgid "4th"
msgstr "4."
@@ -17083,7 +17327,8 @@ msgid "Last Sunday"
msgstr "Prošlu nedjelju"
#: gnucash/gtkbuilder/gnc-frequency.glade:168
-#: gnucash/gtkbuilder/gnc-frequency.glade:706 libgnucash/engine/Recurrence.c:731
+#: gnucash/gtkbuilder/gnc-frequency.glade:706
+#: libgnucash/engine/Recurrence.c:731
msgid "Once"
msgstr "Jednom"
@@ -17251,22 +17496,22 @@ msgid "weeks."
msgstr "tjedna."
#: gnucash/gtkbuilder/gnc-frequency.glade:869
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Saturday"
msgstr "Subota"
#: gnucash/gtkbuilder/gnc-frequency.glade:884
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Friday"
msgstr "Petak"
#: gnucash/gtkbuilder/gnc-frequency.glade:899
-#: gnucash/report/standard-reports/daily-reports.scm:345
+#: gnucash/report/standard-reports/daily-reports.scm:194
msgid "Wednesday"
msgstr "Srijeda"
#: gnucash/gtkbuilder/gnc-frequency.glade:914
-#: gnucash/report/standard-reports/daily-reports.scm:346
+#: gnucash/report/standard-reports/daily-reports.scm:195
msgid "Thursday"
msgstr "ÄŒetvrtak"
@@ -17277,17 +17522,17 @@ msgstr "ÄŒetvrtak"
#. the normal translations, which show up in the glade
#. file src/gnome-utils/gtkbuilder/gnc-frequency.glade anyway.
#: gnucash/gtkbuilder/gnc-frequency.glade:929
-#: gnucash/report/standard-reports/daily-reports.scm:344
+#: gnucash/report/standard-reports/daily-reports.scm:193
msgid "Sunday"
msgstr "Nedjelja"
#: gnucash/gtkbuilder/gnc-frequency.glade:944
-#: gnucash/report/standard-reports/daily-reports.scm:344
+#: gnucash/report/standard-reports/daily-reports.scm:193
msgid "Monday"
msgstr "Ponedjeljak"
#: gnucash/gtkbuilder/gnc-frequency.glade:959
-#: gnucash/report/standard-reports/daily-reports.scm:345
+#: gnucash/report/standard-reports/daily-reports.scm:194
msgid "Tuesday"
msgstr "Utorak"
@@ -17363,7 +17608,8 @@ msgstr "Razdoblje proraÄuna:"
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:395
msgid "Note: Use View->'Filter By...' to control visible accounts."
-msgstr "Napomena: Koristi „Pogled → Filtriraj†za upravljanje vidljivim kontima."
+msgstr ""
+"Napomena: Koristi „Pogled → Filtriraj†za upravljanje vidljivim kontima."
#: gnucash/gtkbuilder/gnc-plugin-page-budget.glade:413
msgid "Budget List"
@@ -17652,8 +17898,8 @@ msgstr "UkljuÄi _podkonta"
#: gnucash/gtkbuilder/window-reconcile.glade:145
msgid ""
-"Include all descendant accounts in the reconcile. All of them must use the same "
-"commodity as this one."
+"Include all descendant accounts in the reconcile. All of them must use the "
+"same commodity as this one."
msgstr ""
"UkljuÄi sva podreÄ‘ena konta prilikom usklaÄ‘ivanja. Svi moraju koristiti istu "
"robu kao ovaj."
@@ -17669,8 +17915,8 @@ msgstr "Nije moguće uÄitati navedenu URL-adresu."
#: gnucash/html/gnc-html-webkit1.c:547 gnucash/html/gnc-html-webkit1.c:963
#: gnucash/html/gnc-html-webkit2.c:562 gnucash/html/gnc-html-webkit2.c:930
msgid ""
-"Secure HTTP access is disabled. You can enable it in the Network section of the "
-"Preferences dialog."
+"Secure HTTP access is disabled. You can enable it in the Network section of "
+"the Preferences dialog."
msgstr ""
"Sigurni HTTP pristup je iskljuÄen. MožeÅ¡ ga ukljuÄiti u odeljku za mreže u "
"postavkama."
@@ -17678,11 +17924,11 @@ msgstr ""
#: gnucash/html/gnc-html-webkit1.c:557 gnucash/html/gnc-html-webkit1.c:975
#: gnucash/html/gnc-html-webkit2.c:572 gnucash/html/gnc-html-webkit2.c:942
msgid ""
-"Network HTTP access is disabled. You can enable it in the Network section of the "
-"Preferences dialog."
+"Network HTTP access is disabled. You can enable it in the Network section of "
+"the Preferences dialog."
msgstr ""
-"Mrežni HTTP pristup je iskljuÄen. MožeÅ¡ ga ukljuÄiti u odeljku mreže u dijalogu "
-"za postavke."
+"Mrežni HTTP pristup je iskljuÄen. MožeÅ¡ ga ukljuÄiti u odeljku mreže u "
+"dijalogu za postavke."
#. %s is a URL (some location somewhere).
#: gnucash/html/gnc-html-webkit1.c:896 gnucash/html/gnc-html-webkit2.c:863
@@ -17697,71 +17943,22 @@ msgstr "Došlo je do greške prilikom dohvaćanja „%s“."
msgid "Export to PDF File"
msgstr "Izvezi u PDF datoteku"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:381
-#, c-format
-msgid ""
-"The external program \"AqBanking Setup Wizard\" has not been found. \n"
-"\n"
-"The %s package should include the program \"qt3-wizard\". Please check your "
-"installation to ensure this program is present. On some distributions this may "
-"require installing additional packages."
-msgstr ""
-"Vanjski program „Čarobnjak za postavljanje AqBanking“ nije nađen. \n"
-"\n"
-"Program „qt3-wizard“ bi trebao biti ukljuÄen u „%s“. Provjeri prisutnost ovog "
-"programa u tvojoj instalaciji. U nekim distribucijama ovo može zahtijevati "
-"instalaciju dodatnih paketa."
-
-#: gnucash/import-export/aqb/assistant-ab-initial.c:538
-msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully "
-"because the additional software \"Qt\" was not found. Please install the \"Qt/"
-"Windows Open Source Edition\" from Trolltech by downloading it from www."
-"trolltech.com\n"
-"\n"
-"If you have installed Qt already, you will have to adapt the PATH variable of "
-"your system appropriately. Contact the GnuCash developers if you need further "
-"assistance on how to install Qt correctly.\n"
-"\n"
-"Online Banking cannot be setup without Qt. Press \"Close\" now, then \"Cancel\" "
-"to cancel the Online Banking setup."
-msgstr ""
-"Vanjski program „Čarobnjak za postavljanje AqBanking“ nije uspješno pokrenut, "
-"jer dodatni softver „Qt“ nije nađen. Instaliraj „Qt/Windows Open Source Edition“ "
-"od Trolltech, preuzimajući ga s „www.trolltech.com“.\n"
-"\n"
-"Ako je Qt već instaliran, morat ćeš prilagoditi varijablu „PATH“ na tvom "
-"sustavu. Obrati se GnuCash programerima, ako ti je potrebna dodatna pomoć o "
-"tome, kako ispravno instalirati Qt.\n"
-"Internet bankarstvo se ne može podesiti bez Qt-a. Sad klikni „Zatvori“, zatim "
-"„Odustani“, za odustajanje od podešavanja internet bankarstva."
-
-#: gnucash/import-export/aqb/assistant-ab-initial.c:559
-msgid ""
-"The external program \"AqBanking Setup Wizard\" failed to run successfully. "
-"Online Banking can only be setup if this wizard has run successfully. Please try "
-"running the \"AqBanking Setup Wizard\" again."
-msgstr ""
-"Vanjski program „Čarobnjak za postavljanje AqBanking“ nije uspješno pokrenut. "
-"Internet bankarstvo može biti postavljeno samo, ako se ovaj Äarobnjak uspjeÅ¡no "
-"pokrene. Pokušaj ponovo pokrenuti „Čarobnjak za postavljanje AqBanking“."
-
#. Translators: Strings are 1. Bank code, 2. Bank name,
#. * 3. Account Number, 4. Subaccount ID
-#: gnucash/import-export/aqb/assistant-ab-initial.c:591
+#: gnucash/import-export/aqb/assistant-ab-initial.c:408
#, c-format
msgid "Bank code %s (%s), Account %s (%s)"
msgstr "Å ifra banke %s (%s), konto %s (%s)"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:883
+#: gnucash/import-export/aqb/assistant-ab-initial.c:719
msgid "Online Banking Account Name"
msgstr "Internet bankarstvo – ime konta"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:888
+#: gnucash/import-export/aqb/assistant-ab-initial.c:724
msgid "GnuCash Account Name"
msgstr "Ime GnuCash konta"
-#: gnucash/import-export/aqb/assistant-ab-initial.c:894
+#: gnucash/import-export/aqb/assistant-ab-initial.c:730
#: gnucash/import-export/qif-imp/assistant-qif-import.c:553
#: gnucash/import-export/qif-imp/dialog-account-picker.c:380
msgid "New?"
@@ -17777,8 +17974,9 @@ msgid ""
"This assistant helps you setting up your Online Banking connection with your "
"bank.\n"
"\n"
-"You first need to apply for Online Banking access at your bank. If your bank "
-"decides to grant you electronic access, they will send you a letter containing \n"
+"You first need to apply for Online Banking access at your bank. If your "
+"bank decides to grant you electronic access, they will send you a letter "
+"containing \n"
"\n"
"* The bank code of your bank\n"
"* The user ID that identifies you to your bank\n"
@@ -17789,18 +17987,20 @@ msgid ""
"This information will be needed in the following. Press \"Forward\" now.\n"
"\n"
"NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online "
-"Banking server. You should not rely on time-critical transfers through Online "
-"Banking, because sometimes the bank does not give you correct feedback when a "
-"transfer is rejected.\n"
+"Banking server. You should not rely on time-critical transfers through "
+"Online Banking, because sometimes the bank does not give you correct "
+"feedback when a transfer is rejected.\n"
"\n"
-"Press \"Cancel\" if you do not wish to setup any Online Banking connection now.\n"
+"Press \"Cancel\" if you do not wish to setup any Online Banking connection "
+"now.\n"
msgstr ""
"\n"
"Ovaj ti pomoćnik pomaže u postavljanju veze s tvojom bankom za internet "
"bankarstvo.\n"
"\n"
-"U tvojoj banci se najprije moraš prijaviti za pristup internet bankarstvu. Ako "
-"ti banka odluÄi odobriti elektronski pristup, poslat će ti pismo, koje sadrži: \n"
+"U tvojoj banci se najprije moraš prijaviti za pristup internet bankarstvu. "
+"Ako ti banka odluÄi odobriti elektronski pristup, poslat će ti pismo, koje "
+"sadrži: \n"
"\n"
"* Bankovnu Å¡ifru tvoje banke\n"
"* KorisniÄki identifikacijski broj, s kojim te banka identificira\n"
@@ -17810,9 +18010,10 @@ msgstr ""
"\n"
"Ove će informacije biti potrebne u nastavku. Sad klikni „Sljedeće“.\n"
"\n"
-"NAPOMENA: BEZ GARANCIJE. Neke banke pokreću slabo opremljeni server za internet "
-"bankarstvo. Za vremenski kritiÄne prijenose, ne oslanjaj se na internet "
-"bankarstvo, jer banke ponekad ne daju toÄan odgovor o odbijenom prijenosu.\n"
+"NAPOMENA: BEZ GARANCIJE. Neke banke pokreću slabo opremljeni server za "
+"internet bankarstvo. Za vremenski kritiÄne prijenose, ne oslanjaj se na "
+"internet bankarstvo, jer banke ponekad ne daju toÄan odgovor o odbijenom "
+"prijenosu.\n"
"\n"
"Klikni „Odustani“, ako sad ne želiš postaviti vezu za internet bankarstvo.\n"
@@ -17822,11 +18023,13 @@ msgstr "Postavljanje internet bankarstva"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:55
msgid ""
-"The Setup of your Online Banking connection is handled by the external program "
-"\"AqBanking Setup Wizard\". Please press the button below to start this program."
+"The Setup of your Online Banking connection is handled by the external "
+"program \"AqBanking Setup Wizard\". Please press the button below to start "
+"this program."
msgstr ""
-"Postavkama veze tvojeg internet bankarstva upravlja vanjski program „Čarobnjak "
-"za postavljanje AqBanking“. Klikni gumb ispod za pokretanje ovog programa."
+"Postavkama veze tvojeg internet bankarstva upravlja vanjski program "
+"„Čarobnjak za postavljanje AqBanking“. Klikni gumb ispod za pokretanje ovog "
+"programa."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:71
msgid "_Start AqBanking Wizard"
@@ -17838,11 +18041,12 @@ msgstr "Pokreni Äarobnjaka za internet bankarstvo"
#: gnucash/import-export/aqb/assistant-ab-initial.glade:130
msgid ""
-"Double Click on the line of an Online Banking account name if you want to match "
-"it to a GnuCash account. Click \"Next\" when all desired accounts are matching."
+"Double Click on the line of an Online Banking account name if you want to "
+"match it to a GnuCash account. Click \"Next\" when all desired accounts are "
+"matching."
msgstr ""
-"Dvoklik na redak s imenom konta internet bankarstva, ako ga želiš poklopiti s "
-"GnuCash kontom. Klikni „Daljeâ€, kad su svi željeni konti poklopljeni."
+"Dvoklik na redak s imenom konta internet bankarstva, ako ga želiš poklopiti "
+"s GnuCash kontom. Klikni „Daljeâ€, kad su svi željeni konti poklopljeni."
#: gnucash/import-export/aqb/assistant-ab-initial.glade:148
msgid "Match Online accounts with GnuCash accounts"
@@ -17853,16 +18057,16 @@ msgid ""
"The setup for matching Online Banking accounts to GnuCash accounts is now "
"finished. You can now invoke Online Banking actions on those accounts.\n"
"\n"
-"If you want to add another bank, user, or account, you can start this assistant "
-"again anytime.\n"
+"If you want to add another bank, user, or account, you can start this "
+"assistant again anytime.\n"
"\n"
"Press \"Apply\" now."
msgstr ""
"Podešavanje za usklađivanje konta internet bankarstva s kontima GnuCasha je "
"završeno. Sad možeš pokrenuti radnje internet bankarstva nad tim kontima.\n"
"\n"
-"Ako želiš dodati neku drugu banku, korisnika ili konto, pomoćnika možeš ponovo "
-"pokrenuti u bilo kojem trenutku.\n"
+"Ako želiš dodati neku drugu banku, korisnika ili konto, pomoćnika možeš "
+"ponovo pokrenuti u bilo kojem trenutku.\n"
"\n"
"Sad klikni „Primijeni“."
@@ -17960,12 +18164,12 @@ msgstr "Zapamti _PIN u memoriji"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:21
msgid ""
"If active, the PIN for HBCI/AqBanking actions will be remembered in memory "
-"during a session. Otherwise it will have to be entered again each time during a "
-"session when it is needed."
+"during a session. Otherwise it will have to be entered again each time "
+"during a session when it is needed."
msgstr ""
-"Ako je aktivirano, PIN za HBCI/AqBanking radnje će biti zapamćen u memoriji za "
-"vrijeme sesije. U protivnom ćeš ga u tijeku sesije, svaki put morati ponovo "
-"unijeti."
+"Ako je aktivirano, PIN za HBCI/AqBanking radnje će biti zapamćen u memoriji "
+"za vrijeme sesije. U protivnom ćeš ga u tijeku sesije, svaki put morati "
+"ponovo unijeti."
#: gnucash/import-export/aqb/dialog-ab.glade:800
msgid "Name for new template"
@@ -17987,90 +18191,91 @@ msgstr "Unesi internetsku transakciju"
msgid "Recipient Account Number"
msgstr "Broj bankovnog raÄuna primatelja"
-#: gnucash/import-export/aqb/dialog-ab.glade:993
+#: gnucash/import-export/aqb/dialog-ab.glade:992
msgid "Recipient Bank Code"
msgstr "Å ifra banke primatelja"
-#: gnucash/import-export/aqb/dialog-ab.glade:1027
+#: gnucash/import-export/aqb/dialog-ab.glade:1026
msgid "Recipient Name"
msgstr "Ime primatelja"
-#: gnucash/import-export/aqb/dialog-ab.glade:1041
-#: gnucash/import-export/aqb/dialog-ab.glade:1150
+#: gnucash/import-export/aqb/dialog-ab.glade:1040
+#: gnucash/import-export/aqb/dialog-ab.glade:1149
msgid "at Bank"
msgstr "u banci"
-#: gnucash/import-export/aqb/dialog-ab.glade:1056
+#: gnucash/import-export/aqb/dialog-ab.glade:1055
msgid "(filled in automatically)"
msgstr "(popunjava se automatski)"
-#: gnucash/import-export/aqb/dialog-ab.glade:1087
+#: gnucash/import-export/aqb/dialog-ab.glade:1086
msgid "Payment Purpose (only for recipient)"
msgstr "Svrha plaćanja (samo za primatelja)"
-#: gnucash/import-export/aqb/dialog-ab.glade:1103
+#: gnucash/import-export/aqb/dialog-ab.glade:1102
msgid "Payment Purpose continued"
msgstr "Svrha plaćanja, nastavak"
-#: gnucash/import-export/aqb/dialog-ab.glade:1119
+#: gnucash/import-export/aqb/dialog-ab.glade:1118
msgid "Originator Name"
msgstr "Ime platitelja"
-#: gnucash/import-export/aqb/dialog-ab.glade:1164
-#: gnucash/import-export/aqb/dialog-ab.glade:1194
-#: gnucash/import-export/aqb/dialog-ab.glade:1226
+#: gnucash/import-export/aqb/dialog-ab.glade:1163
+#: gnucash/import-export/aqb/dialog-ab.glade:1193
+#: gnucash/import-export/aqb/dialog-ab.glade:1225
msgid "something"
msgstr "nešto"
-#: gnucash/import-export/aqb/dialog-ab.glade:1178
+#: gnucash/import-export/aqb/dialog-ab.glade:1177
msgid "Originator Account Number"
msgstr "Broj bankovnog raÄuna platitelja"
-#: gnucash/import-export/aqb/dialog-ab.glade:1210
+#: gnucash/import-export/aqb/dialog-ab.glade:1209
msgid "Bank Code"
msgstr "Å ifra banke"
-#: gnucash/import-export/aqb/dialog-ab.glade:1450
+#: gnucash/import-export/aqb/dialog-ab.glade:1449
msgid "Add the current online transaction as a new transaction template"
-msgstr "Dodaj trenutaÄnu internetsku transakciju kao novi predložak za transakcije"
+msgstr ""
+"Dodaj trenutaÄnu internetsku transakciju kao novi predložak za transakcije"
-#: gnucash/import-export/aqb/dialog-ab.glade:1480
+#: gnucash/import-export/aqb/dialog-ab.glade:1479
msgid "Add current"
msgstr "Dodaj trenutaÄnu"
-#: gnucash/import-export/aqb/dialog-ab.glade:1508
+#: gnucash/import-export/aqb/dialog-ab.glade:1507
msgid "Move the selected transaction template one row up"
msgstr "Premjesti odabrani predložak transakcije jedan redak prema gore"
-#: gnucash/import-export/aqb/dialog-ab.glade:1527
+#: gnucash/import-export/aqb/dialog-ab.glade:1526
msgid "Move the selected transaction template one row down"
msgstr "Premjesti odabrani predložak transakcije jedan redak prema dolje"
-#: gnucash/import-export/aqb/dialog-ab.glade:1545
+#: gnucash/import-export/aqb/dialog-ab.glade:1544
msgid "Sort the list of transaction templates alphabetically"
msgstr "Razvrstaj popis predložaka za transakcije abecednim redom"
-#: gnucash/import-export/aqb/dialog-ab.glade:1575
+#: gnucash/import-export/aqb/dialog-ab.glade:1574
msgid "Sort"
msgstr "Razvrstaj"
-#: gnucash/import-export/aqb/dialog-ab.glade:1603
+#: gnucash/import-export/aqb/dialog-ab.glade:1602
msgid "Delete the currently selected transaction template"
msgstr "IzbriÅ¡i trenutaÄno odabrani predložak za transakcije"
-#: gnucash/import-export/aqb/dialog-ab.glade:1653
+#: gnucash/import-export/aqb/dialog-ab.glade:1652
msgid "Templates"
msgstr "Predlošci"
-#: gnucash/import-export/aqb/dialog-ab.glade:1688
+#: gnucash/import-export/aqb/dialog-ab.glade:1687
msgid "Execute later (unimpl.)"
msgstr "Izvrši kasnije (nije ugrađeno)"
-#: gnucash/import-export/aqb/dialog-ab.glade:1726
+#: gnucash/import-export/aqb/dialog-ab.glade:1725
msgid "Execute this online transaction now"
msgstr "Izvrši ovu internetsku transakciju sad"
-#: gnucash/import-export/aqb/dialog-ab.glade:1755
+#: gnucash/import-export/aqb/dialog-ab.glade:1754
msgid "Execute Now"
msgstr "Izvrši sad"
@@ -18109,19 +18314,17 @@ msgstr "Koristi Ne-SWIFTni tekst _transakcije"
#: gnucash/import-export/aqb/dialog-ab-pref.glade:90
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:26
msgid ""
-"Some banks place part of transaction description as \"transaction text\" in the "
-"MT940 file. Normally GNUcash ignores this text. However by activating this "
-"option, the transaction text is used for the transaction description too."
+"Some banks place part of transaction description as \"transaction text\" in "
+"the MT940 file. Normally GNUcash ignores this text. However by activating "
+"this option, the transaction text is used for the transaction description "
+"too."
msgstr ""
-"Neke banke stavljaju dio opisa transakcije kao „tekst transakcije“ u datoteku "
-"MT940. ObiÄno GnuCash zanemaruje ovaj tekst. MeÄ‘utim, aktiviranjem ove opcije, "
-"tekst transakcije se koristi također i za opis transakcije."
+"Neke banke stavljaju dio opisa transakcije kao „tekst transakcije“ u "
+"datoteku MT940. ObiÄno GnuCash zanemaruje ovaj tekst. MeÄ‘utim, aktiviranjem "
+"ove opcije, tekst transakcije se koristi također i za opis transakcije."
-#. Conversion was erroneous, so don't use the string
-#: gnucash/import-export/aqb/dialog-ab-trans.c:294
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1073
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1076
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1082
+#: gnucash/import-export/aqb/dialog-ab-trans.c:293
+#: gnucash/import-export/aqb/dialog-ab-trans.c:302
msgid "(unknown)"
msgstr "(nepoznato)"
@@ -18135,188 +18338,152 @@ msgstr "(nepoznato)"
#. * country, you may safely ignore strings
#. * from the import-export/hbci
#. * subdirectory.
-#: gnucash/import-export/aqb/dialog-ab-trans.c:371
+#: gnucash/import-export/aqb/dialog-ab-trans.c:376
msgid "Enter a SEPA Online Transfer"
msgstr "Unesi internetski SEPA prijenos"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:373
+#: gnucash/import-export/aqb/dialog-ab-trans.c:378
msgid "Recipient IBAN (International Account Number)"
msgstr "IBAN primatelja (meÄ‘unarodni broj bankovnog raÄuna)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:375
+#: gnucash/import-export/aqb/dialog-ab-trans.c:380
msgid "Recipient BIC (Bank Code)"
msgstr "BIC primatelja (Å¡ifra banke)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:378
+#: gnucash/import-export/aqb/dialog-ab-trans.c:383
msgid "Originator IBAN (International Account Number)"
msgstr "IBAN platitelja (meÄ‘unarodni broj bankovnog raÄuna)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:380
+#: gnucash/import-export/aqb/dialog-ab-trans.c:385
msgid "Originator BIC (Bank Code)"
msgstr "BIC platitelja (Å¡ifra banke)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:385
-msgid "Enter an Online Direct Debit Note"
-msgstr "Unesi internetsko izravno terećenje"
+#: gnucash/import-export/aqb/dialog-ab-trans.c:394
+msgid "Enter a SEPA Online Direct Debit Note"
+msgstr "Unesi internetsko SEPA izravno terećenje"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:388
-#: gnucash/import-export/aqb/dialog-ab-trans.c:407
+#: gnucash/import-export/aqb/dialog-ab-trans.c:397
msgid "Debited Account Owner"
msgstr "Vlasnik dužniÄkog raÄuna"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:390
-msgid "Debited Account Number"
-msgstr "Broj dužniÄkog konta"
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:392
-msgid "Debited Account Bank Code"
-msgstr "Å ifra banke dužniÄkog konta"
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:395
-#: gnucash/import-export/aqb/dialog-ab-trans.c:414
-msgid "Credited Account Owner"
-msgstr "Vlasnik vjerovniÄkog konta"
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:397
-msgid "Credited Account Number"
-msgstr "Broj vjerovniÄkog konta"
-
#: gnucash/import-export/aqb/dialog-ab-trans.c:399
-msgid "Credited Account Bank Code"
-msgstr "Å ifra banke vjerovniÄkog konta"
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:404
-msgid "Enter a SEPA Online Direct Debit Note"
-msgstr "Unesi internetsko SEPA izravno terećenje"
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:409
msgid "Debited IBAN (International Account Number)"
msgstr "IBAN dužnika (MeÄ‘unarodni broj bankovnog raÄuna)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:411
+#: gnucash/import-export/aqb/dialog-ab-trans.c:401
msgid "Debited BIC (Bank Code)"
msgstr "BIC dužnika (Šifra banke)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:416
+#: gnucash/import-export/aqb/dialog-ab-trans.c:404
+msgid "Credited Account Owner"
+msgstr "Vlasnik vjerovniÄkog konta"
+
+#: gnucash/import-export/aqb/dialog-ab-trans.c:406
msgid "Credited IBAN (International Account Number)"
msgstr "IBAN vjerovnika (MeÄ‘unarodni broj bankovnog raÄuna)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:418
+#: gnucash/import-export/aqb/dialog-ab-trans.c:408
msgid "Credited BIC (Bank Code)"
msgstr "BIC vjerovnika (Å ifra banke)"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:497
+#: gnucash/import-export/aqb/dialog-ab-trans.c:493
#, c-format
msgid ""
-"The internal check of the destination IBAN '%s' failed. This means the account "
-"number might contain an error."
+"The internal check of the destination IBAN '%s' failed. This means the "
+"account number might contain an error."
msgstr ""
"Interna provjera odrediÅ¡nog IBAN-a „%s“ nije uspela. To znaÄi, da broj konta "
"možda sadrži grešku."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:537
+#: gnucash/import-export/aqb/dialog-ab-trans.c:548
#, c-format
msgid ""
-"The internal check of the destination account number '%s' at the specified bank "
-"with bank code '%s' failed. This means the account number might contain an error."
+"Your local bank account does not yet have the SEPA account information "
+"stored. We are sorry, but in this development version one additional step is "
+"necessary which has not yet been implemented directly in gnucash. Please "
+"execute the command line program \"aqhbci-tool\" for your account, as "
+"follows: aqhbci-tool4 getaccsepa -b %s -a %s"
msgstr ""
-"Interna provjera broja konta odredišta „%s“ u navedenoj banci sa šifrom banke "
-"„%s“ nije uspela. To znaÄi, da broj konta možda sadrži greÅ¡ku."
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:610
-#, c-format
-msgid ""
-"Your local bank account does not yet have the SEPA account information stored. "
-"We are sorry, but in this development version one additional step is necessary "
-"which has not yet been implemented directly in gnucash. Please execute the "
-"command line program \"aqhbci-tool\" for your account, as follows: aqhbci-tool4 "
+"Tvoj lokalni bankovni konto još uvijek nema spremljene informacije SEPA "
+"konta. Žao nam je, ali u ovom razvojnom izdanju neophodan je dodatni korak, "
+"koji još nije direktno primijenjen u GnuCashu. Izvrši program linijske "
+"naredbe „aqhbci-tool“ za tvoj konto, kao što slijedi: aqhbci-tool4 "
"getaccsepa -b %s -a %s"
-msgstr ""
-"Tvoj lokalni bankovni konto još uvijek nema spremljene informacije SEPA konta. "
-"Žao nam je, ali u ovom razvojnom izdanju neophodan je dodatni korak, koji još "
-"nije direktno primijenjen u GnuCashu. Izvrši program linijske naredbe „aqhbci-"
-"tool“ za tvoj konto, kao što slijedi: aqhbci-tool4 getaccsepa -b %s -a %s"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:625
+#: gnucash/import-export/aqb/dialog-ab-trans.c:563
msgid ""
-"You did not enter a recipient name. A recipient name is required for an online "
-"transfer.\n"
+"You did not enter a recipient name. A recipient name is required for an "
+"online transfer.\n"
msgstr ""
"Nije unijeto ime primatelja. Ime primatelja je potrebno za prijenos na "
"internetu.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:645
+#: gnucash/import-export/aqb/dialog-ab-trans.c:583
msgid ""
-"You did not enter a recipient account. A recipient account is required for an "
-"online transfer.\n"
+"You did not enter a recipient account. A recipient account is required for "
+"an online transfer.\n"
msgstr ""
"Nije unijet konto primatelja. Konto primatelja je potreban za prijenos na "
"internetu.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:661
+#: gnucash/import-export/aqb/dialog-ab-trans.c:599
msgid ""
-"You did not enter a recipient bank. A recipient bank is required for an online "
-"transfer.\n"
+"You did not enter a recipient bank. A recipient bank is required for an "
+"online transfer.\n"
msgstr ""
"Nije unijeta banka primatelja. Banka primatelja je potrebna za prijenos na "
"internetu.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:679
+#: gnucash/import-export/aqb/dialog-ab-trans.c:617
msgid ""
-"The amount is zero or the amount field could not be interpreted correctly. You "
-"might have mixed up decimal point and comma, compared to your locale settings. "
-"This does not result in a valid online transfer job."
+"The amount is zero or the amount field could not be interpreted correctly. "
+"You might have mixed up decimal point and comma, compared to your locale "
+"settings. This does not result in a valid online transfer job."
msgstr ""
-"Iznos je nula ili polje iznosa nije bilo moguće pravilno protumaÄiti. Možda su "
-"pomijeÅ¡ani decimalni zarez i toÄka, u odnosu na tvoje jeziÄne postavke. Rezultat "
-"toga je nevaljani nalog za internetski prijenos."
+"Iznos je nula ili polje iznosa nije bilo moguće pravilno protumaÄiti. Možda "
+"su pomijeÅ¡ani decimalni zarez i toÄka, u odnosu na tvoje jeziÄne postavke. "
+"Rezultat toga je nevaljani nalog za internetski prijenos."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:696
+#: gnucash/import-export/aqb/dialog-ab-trans.c:634
msgid ""
-"You did not enter any transaction purpose. A purpose is required for an online "
-"transfer.\n"
+"You did not enter any transaction purpose. A purpose is required for an "
+"online transfer.\n"
msgstr ""
"Nije unijeta svrha transakcije. Svrha je potrebna za internetski prijenos.\n"
-#: gnucash/import-export/aqb/dialog-ab-trans.c:718
+#: gnucash/import-export/aqb/dialog-ab-trans.c:1047
msgid ""
-"The text you entered contained at least one character that is invalid for a SEPA "
-"transaction. In SEPA, unfortunately only exactly the following characters are "
-"allowed: a...z, A...Z, 0...9, and the following punctuations: ' : ? , - "
-"( + . ) / \n"
-"\n"
-"In particular, neither Umlauts nor an ampersand (&) is allowed, neither in the "
-"recipient or sender name nor in any purpose line."
-msgstr ""
-"Unijeti tekst je sadržao barem jedan znak, koji nije valjan za SEPA transakciju. "
-"U SEPA-i, su nažalost dozvoljeni samo sljedeći znakovi: a…z, A…Z, 0…9, ' : ? , - "
-"( + . ) / \n"
-"\n"
-"Nikako nisu dozvoljene niti glasovne oznake (ä, ö, ü, ß, Ä, ć, Ä‘, Å¡, ž), niti "
-"ampersand (&), kako u imenu primatelja i pošiljaoca, tako niti u bilo kojem "
-"retku svrhe."
-
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1172
-msgid "A template with the given name already exists. Please enter another name."
+"A template with the given name already exists. Please enter another name."
msgstr "Već postoji predložak s danim imenom. Koristi neko drugo ime."
-#: gnucash/import-export/aqb/dialog-ab-trans.c:1307
+#: gnucash/import-export/aqb/dialog-ab-trans.c:1182
#, c-format
msgid "Do you really want to delete the template with the name \"%s\"?"
msgstr "Zaista želiš izbrisati predložak s imenom „%s“?"
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:83
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:136
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:116
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:86
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:137
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:113
msgid "No valid online banking account assigned."
msgstr "Nije dodijeljen valjani konto internet bankarstva."
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:97
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:100
msgid "Online action \"Get Balance\" not available for this account."
msgstr "Internetska radnja „Dobavi saldo“ nije dostupna za ovaj konto."
-#: gnucash/import-export/aqb/gnc-ab-getbalance.c:130
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:194
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:146
+#, c-format
+msgid ""
+"Error on executing job.\n"
+"\n"
+"Status: %s"
+msgstr ""
+"Greška prilikom izvršavanja naloga.\n"
+"\n"
+"Stanje: %s"
+
+#: gnucash/import-export/aqb/gnc-ab-getbalance.c:150
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:234
#, c-format
msgid ""
"Error on executing job.\n"
@@ -18327,108 +18494,120 @@ msgstr ""
"\n"
"Stanje: %s – %s"
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:159
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:160
msgid "Online action \"Get Transactions\" not available for this account."
msgstr "Internetska radnja „Dobavi transakcije“ nije dostupna za ovaj konto."
-#: gnucash/import-export/aqb/gnc-ab-gettrans.c:212
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:229
+#, c-format
+msgid ""
+"Error on executing job.\n"
+"\n"
+"Status: %s (%d)"
+msgstr ""
+"Greška prilikom izvršavanja naloga.\n"
+"\n"
+"Stanje: %s (%d)"
+
+#: gnucash/import-export/aqb/gnc-ab-gettrans.c:253
msgid ""
-"The Online Banking import returned no transactions for the selected time period."
+"The Online Banking import returned no transactions for the selected time "
+"period."
msgstr ""
"Uvoz internet bankarstva nije dao nijednu transakciju za odabrano razdoblje."
#: gnucash/import-export/aqb/gnc-ab-transfer.c:61
msgid ""
-"You have changed the list of online transfer templates, but you cancelled the "
-"transfer dialog. Do you nevertheless want to store the changes?"
+"You have changed the list of online transfer templates, but you cancelled "
+"the transfer dialog. Do you nevertheless want to store the changes?"
msgstr ""
"Promijenjen je popis predložaka za internetski prijenos, ali je odustano od "
"dijaloga prijenosa. Da li ipak želiš spremiti promjene?"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:185
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:182
msgid ""
-"The backend found an error during the preparation of the job. It is not possible "
-"to execute this job. \n"
+"The backend found an error during the preparation of the job. It is not "
+"possible to execute this job. \n"
"\n"
-"Most probable the bank does not support your chosen job or your Online Banking "
-"account does not have the permission to execute this job. More error messages "
-"might be visible on your console log.\n"
+"Most probable the bank does not support your chosen job or your Online "
+"Banking account does not have the permission to execute this job. More error "
+"messages might be visible on your console log.\n"
"\n"
"Do you want to enter the job again?"
msgstr ""
-"Pozadinski sustav je pronašao grešku tijekom pripreme naloga. Izvršavanje ovog "
-"naloga nije moguće. \n"
+"Pozadinski sustav je pronašao grešku tijekom pripreme naloga. Izvršavanje "
+"ovog naloga nije moguće. \n"
"\n"
-"Najverojatnije banka ne podržava tvoju odabrani nalog ili tvoj konto internet "
-"bankarstva nema dozvolu za izvršavanje ovog naloga. Daljnje poruke o greškama "
-"možeš naći u dnevniku tvoje konzole.\n"
+"Najverojatnije banka ne podržava tvoju odabrani nalog ili tvoj konto "
+"internet bankarstva nema dozvolu za izvršavanje ovog naloga. Daljnje poruke "
+"o greškama možeš naći u dnevniku tvoje konzole.\n"
"\n"
"Želiš li ponovo unijeti nalog?"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:207
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:208
msgid "Online Banking Direct Debit Note"
msgstr "Internet bankarstvo – izravno terećenje"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:212
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:213
msgid "Online Banking Bank-Internal Transfer"
msgstr "Internet bankarstvo – bankovno-interni prijenos"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:217
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:218
msgid "Online Banking European (SEPA) Transfer"
msgstr "Internet bankarstvo – SEPA prijenos"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:222
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:223
msgid "Online Banking European (SEPA) Debit Note"
msgstr "Internet bankarstvo – SEPA terećenje"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:228
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:229
msgid "Online Banking Transaction"
msgstr "Internet bankarstvo – transakcija"
-#: gnucash/import-export/aqb/gnc-ab-transfer.c:294
+#: gnucash/import-export/aqb/gnc-ab-transfer.c:300
msgid ""
-"An error occurred while executing the job. Please check the log window for the "
-"exact error message.\n"
+"An error occurred while executing the job. Please check the log window for "
+"the exact error message.\n"
"\n"
"Do you want to enter the job again?"
msgstr ""
-"Došlo je do greške prilikom izvršavanja naloga. Provjeri log-prozor za uvid u "
-"toÄnu poruku greÅ¡ke.\n"
+"Došlo je do greške prilikom izvršavanja naloga. Provjeri log-prozor za uvid "
+"u toÄnu poruku greÅ¡ke.\n"
"\n"
"Želiš li ponovo unijeti nalog?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:422
+#: gnucash/import-export/aqb/gnc-ab-utils.c:425
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:90
msgid "Unspecified"
msgstr "Neodređeno"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:473
+#: gnucash/import-export/aqb/gnc-ab-utils.c:476
#: gnucash/report/report-system/report-utilities.scm:108
-#: libgnucash/engine/Account.cpp:4093
+#: libgnucash/engine/Account.cpp:4091
msgid "Bank"
msgstr "Banka"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:721
+#: gnucash/import-export/aqb/gnc-ab-utils.c:738
msgid ""
-"The backend found an error during the preparation of the job. It is not possible "
-"to execute this job. \n"
+"The backend found an error during the preparation of the job. It is not "
+"possible to execute this job. \n"
"\n"
-"Most probably the bank does not support your chosen job or your Online Banking "
-"account does not have the permission to execute this job. More error messages "
-"might be visible on your console log.\n"
+"Most probably the bank does not support your chosen job or your Online "
+"Banking account does not have the permission to execute this job. More error "
+"messages might be visible on your console log.\n"
"\n"
"Do you want to enter the job again?"
msgstr ""
-"Pozadinski sustav je pronašao grešku tijekom pripreme naloga. Izvršavanje ovog "
-"naloga nije moguće. \n"
+"Pozadinski sustav je pronašao grešku tijekom pripreme naloga. Izvršavanje "
+"ovog naloga nije moguće. \n"
"\n"
-"Najverojatnije banka ne podržava tvoju odabrani nalog ili tvoj konto internet "
-"bankarstva nema dozvolu za izvršavanje ovog naloga. Daljnje poruke o greškama "
-"možeš naći u dnevniku tvoje konzole.\n"
+"Najverojatnije banka ne podržava tvoju odabrani nalog ili tvoj konto "
+"internet bankarstva nema dozvolu za izvršavanje ovog naloga. Daljnje poruke "
+"o greškama možeš naći u dnevniku tvoje konzole.\n"
"\n"
"Želiš li ponovo unijeti nalog?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:814
+#: gnucash/import-export/aqb/gnc-ab-utils.c:852
msgid ""
"The bank has sent transaction information in its response.\n"
"Do you want to import it?"
@@ -18436,7 +18615,7 @@ msgstr ""
"Banka je poslala podatke o transakciji u svom odgovoru?\n"
"Da li ih želiš uvesti?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:841
+#: gnucash/import-export/aqb/gnc-ab-utils.c:879
msgid ""
"No Online Banking account found for this gnucash account. These transactions "
"will not be executed by Online Banking."
@@ -18444,7 +18623,7 @@ msgstr ""
"Nije nađen internetski konto za ovaj GnuCash konto. Internet bankarstvo neće "
"izvršiti ove transakcije."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:918
+#: gnucash/import-export/aqb/gnc-ab-utils.c:974
msgid ""
"The bank has sent balance information in its response.\n"
"Do you want to import it?"
@@ -18459,14 +18638,15 @@ msgstr ""
#. * (Switzerland). If none of these techniques are available
#. * in your country, you may safely ignore strings from the
#. * import-export/hbci subdirectory.
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1006
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1072
msgid ""
"The downloaded Online Banking Balance was zero.\n"
"\n"
"Either this is the correct balance, or your bank does not support Balance "
-"download in this Online Banking version. In the latter case you should choose a "
-"different Online Banking version number in the Online Banking (AqBanking or "
-"HBCI) Setup. After that, try again to download the Online Banking Balance."
+"download in this Online Banking version. In the latter case you should "
+"choose a different Online Banking version number in the Online Banking "
+"(AqBanking or HBCI) Setup. After that, try again to download the Online "
+"Banking Balance."
msgstr ""
"Preuzeti saldo internet bankarstva je bio nula.\n"
"\n"
@@ -18475,7 +18655,7 @@ msgstr ""
"izdanje internet bankarstva u postavkama (AqBanking ili HBCI). Nakon toga, "
"pokušaj ponovo preuzeti saldo internet bankarstva."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1023
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1089
#, c-format
msgid ""
"Result of Online Banking job: \n"
@@ -18484,51 +18664,57 @@ msgstr ""
"Rezultat naloga internet bankarstva: \n"
"Uknjiženi saldo konta je %s"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1029
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1095
#, c-format
msgid "For your information: This account also has a noted balance of %s\n"
msgstr "Samo da znaš: Ovaj konto ima još i bilježeni saldo od %s\n"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1036
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1102
msgid ""
-"The booked balance is identical to the current reconciled balance of the account."
+"The booked balance is identical to the current reconciled balance of the "
+"account."
msgstr "Ukžinjeni saldo je identiÄan trenutaÄno usklaÄ‘enom saldu konta."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1051
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1117
msgid "Reconcile account now?"
msgstr "Sad uskladiti konto?"
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1117
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1204
msgid "The bank has sent a message in its response."
msgstr "Banka je poslala poruku u svom odgovoru."
-#: gnucash/import-export/aqb/gnc-ab-utils.c:1118
+#: gnucash/import-export/aqb/gnc-ab-utils.c:1205
msgid "Subject:"
msgstr "Predmet:"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:100
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:94
msgid "Select a file to import"
msgstr "Odaberi datoteku za uvoz"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:146
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:138
msgid "Import module for DTAUS import not found."
msgstr "Nije nađen modul za uvoz, za DTAUS uvoz."
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:299
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:289
#, c-format
-msgid "Job %d status %d - %s: %s \n"
-msgstr "Nalog „%d“ stanje „%d“ – %s: %s \n"
+msgid "Job %d status %d - %s\n"
+msgstr "Nalog %d stanje %d – %s\n"
+
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:291
+#, c-format
+msgid "Job %d status %d - %s: %s\n"
+msgstr "Nalog %d stanje %d – %s: %s \n"
#. indicate that additional failures exist
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:310
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:311
msgid "...\n"
msgstr "...\n"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:324
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:332
#, c-format
msgid ""
-"An error occurred while executing jobs: %d of %d failed. Please check the log "
-"window or gnucash.trace for the exact error message.\n"
+"An error occurred while executing jobs: %d of %d failed. Please check the "
+"log window or gnucash.trace for the exact error message.\n"
"\n"
"%s"
msgstr ""
@@ -18537,18 +18723,18 @@ msgstr ""
"\n"
"%s"
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:334
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:342
msgid "No jobs to be sent."
msgstr "Nema naloga, koji bi se mogli poslati."
-#: gnucash/import-export/aqb/gnc-file-aqb-import.c:340
+#: gnucash/import-export/aqb/gnc-file-aqb-import.c:348
#, c-format
msgid ""
"The job was executed successfully, but as a precaution please check the log "
"window for potential errors."
msgid_plural ""
-"All %d jobs were executed successfully, but as a precaution please check the log "
-"window for potential errors."
+"All %d jobs were executed successfully, but as a precaution please check the "
+"log window for potential errors."
msgstr[0] ""
"%d nalog je uspjeÅ¡no izvrÅ¡en, ali za svaki sluÄaj provjeri log-prozor zbog "
"potencijalnih grešaka."
@@ -18559,7 +18745,7 @@ msgstr[2] ""
"Svih %d naloga je uspjeÅ¡no izvrÅ¡eno, ali za svaki sluÄaj provjeri log-prozor "
"zbog potencijalnih grešaka."
-#: gnucash/import-export/aqb/gnc-gwen-gui.c:1089
+#: gnucash/import-export/aqb/gnc-gwen-gui.c:1087
#, c-format
msgid ""
"The PIN needs to be at least %d characters \n"
@@ -18568,26 +18754,28 @@ msgstr ""
"PIN mora imati barem %d znakova\n"
"Želiš li ponovo pokušati?"
-#: gnucash/import-export/aqb/gnc-gwen-gui.c:1591
-msgid "The Online Banking job is still running; are you sure you want to cancel?"
-msgstr "Nalog internet bankarstva još uvijek radi; da li stvarno želiš odustati?"
+#: gnucash/import-export/aqb/gnc-gwen-gui.c:1589
+msgid ""
+"The Online Banking job is still running; are you sure you want to cancel?"
+msgstr ""
+"Nalog internet bankarstva još uvijek radi; da li stvarno želiš odustati?"
#: gnucash/import-export/aqb/gncmod-aqbanking.c:79
#: gnucash/import-export/gncmod-generic-import.c:79
-#: gnucash/import-export/qif-imp/gnc-plugin-qif-import.c:162
+#: gnucash/import-export/qif-imp/gnc-plugin-qif-import.c:134
msgid "Online Banking"
msgstr "Internet bankarstvo"
#. Menus
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:94
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:92
msgid "_Online Actions"
msgstr "_Internetske radnje"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:98
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:96
msgid "_Online Banking Setup..."
msgstr "Postavljanje _internet bankarstva …"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:99
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:97
msgid ""
"Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using "
"AqBanking)"
@@ -18595,111 +18783,98 @@ msgstr ""
"Izvorne postavke za pristup internet bankarstvu (HBCI, ili OFX DirektKonekt, "
"koristeći AqBanking)"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:103
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:101
msgid "Get _Balance"
msgstr "Preuzmi _saldo"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:104
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:102
msgid "Get the account balance online through Online Banking"
msgstr "Preuzmi saldo konta putem internet bankarstva"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:108
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:106
msgid "Get _Transactions..."
msgstr "Preuzmi _transakcije …"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:109
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:107
msgid "Get the transactions online through Online Banking"
msgstr "Preuzmi transakcije putem internet bankarstva"
+#. Translators: https://en.wikipedia.org/wiki/Single_Euro_Payments_Area
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:113
-msgid "_Issue Transaction..."
-msgstr "_Izdaj transakciju …"
+msgid "Issue _SEPA Transaction..."
+msgstr "Izdaj _SEPA transakciju …"
#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:114
-msgid "Issue a new transaction online through Online Banking"
-msgstr "Izdaj novu transakciju, putem internet bankarstva"
-
-#. Translators: https://en.wikipedia.org/wiki/Single_Euro_Payments_Area
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:120
-msgid "_Issue SEPA Transaction..."
-msgstr "_Izdaj SEPA transakciju …"
-
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:121
msgid ""
"Issue a new international European (SEPA) transaction online through Online "
"Banking"
msgstr "Izdaj novu međunarodnu SEPA transakciju, putem internet bankarstva"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:125
-msgid "I_nternal Transaction..."
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:118
+msgid "_Internal Transaction..."
msgstr "_Interna transakcija …"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:126
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:119
msgid "Issue a new bank-internal transaction online through Online Banking"
msgstr "Izdaj novu bankovno-internu transakciju, putem internet bankarstva"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:130
-msgid "_Direct Debit..."
-msgstr "_Izravno terećenje …"
-
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:131
-msgid "Issue a new direct debit note online through Online Banking"
-msgstr "Izdaj novo izravno terećenje, putem internet bankarstva"
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:123
+msgid "Issue SEPA Direct _Debit..."
+msgstr "Izdaj izravno SEPA _terećenje …"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:135
-msgid "_Issue SEPA Direct Debit..."
-msgstr "_Izdaj izravno SEPA terećenje …"
-
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:136
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:124
msgid ""
"Issue a new international European (SEPA) direct debit note online through "
"Online Banking"
-msgstr "Izdaj novo međunarodno SEPA izravno terećenje, putem internet bankarstva"
+msgstr ""
+"Izdaj novo međunarodno SEPA izravno terećenje, putem internet bankarstva"
#. Translators: Message types MTxxxx are exchange formats used by the SWIFT network
#. https://en.wikipedia.org/wiki/Society_for_Worldwide_Interbank_Financial_Telecommunication
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:145
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:133
msgid "Import _MT940"
msgstr "Uvezi _MT940"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:146
-msgid "Import a MT940 file into GnuCash"
-msgstr "Uvezi datoteku MT940 u GnuCash"
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:134
+msgid ""
+"Import an end-of-day account statement in SWIFT MT940 format into GnuCash."
+msgstr ""
+"Uvezi izvadak konta sa završnim stanjem u formatu SWIFT MT940 u GnuCash."
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:150
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:138
msgid "Import MT94_2"
msgstr "Uvezi MT94_2"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:151
-msgid "Import a MT942 file into GnuCash"
-msgstr "Uvezi datoteku MT942 u GnuCash"
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:139
+msgid "Import an interim account statement in SWIFT MT942 format into GnuCash."
+msgstr "Uvezi privremeni izvadak konta u formatu SWIFT MT942 u GnuCash."
#. Translators: DTAUS is a traditional german exchange format.
#. https://de.wikipedia.org/wiki/Datentr%C3%A4geraustauschverfahren
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:158
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:146
msgid "Import _DTAUS"
msgstr "Uvezi _DTAUS"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:159
-msgid "Import a DTAUS file into GnuCash"
-msgstr "Uvezi datoteku DTAUS u GnuCash"
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:147
+msgid "Import a traditional german DTAUS file into GnuCash."
+msgstr "Uvezi uobiÄajenu njemaÄku DTAUS datoteku u GnuCash."
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:171
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:159
msgid "Import DTAUS and _send..."
msgstr "Uvezi DTAUS i _pošalji …"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:172
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:160
msgid ""
-"Import a DTAUS file into GnuCash and send the transfers online through Online "
-"Banking"
+"Import a DTAUS file into GnuCash and transmit its orders by Online Banking."
msgstr ""
-"Uvezi DTAUS datoteku u GnuCash i pošalji prijenose putem internet bankarstva"
+"Uvezi DTAUS datoteku u GnuCash i pošalji njene podatke putem internet "
+"bankarstva."
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:182
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:170
msgid "Show _log window"
msgstr "Prikaži prozor _log-podataka"
-#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:183
+#: gnucash/import-export/aqb/gnc-plugin-aqbanking.c:171
msgid "Show the online banking log window."
msgstr "Prikaži log-prozor internet bankarstva."
@@ -18717,7 +18892,7 @@ msgstr "Postavi tekst transakcije ispred svrhe transakcije."
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:30
msgid "Verbose HBCI debug messages"
-msgstr "Opširne HBCI poruke ispravljanja grešaka"
+msgstr "Opširne HBCI poruke o ispravljanju grešaka"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:35
msgid "DTAUS import data format"
@@ -18725,9 +18900,9 @@ msgstr "Format podataka DTAUS uvoza"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:36
msgid ""
-"This setting specifies the data format when importing DTAUS files. The AqBanking "
-"library offers various import formats (called \"profiles\") of which you can "
-"choose one here."
+"This setting specifies the data format when importing DTAUS files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
msgstr ""
"Ova postavka navodi format podataka prilikom uvoza DTAUS datoteka. AqBanking "
"biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih ovdje možeš "
@@ -18739,9 +18914,9 @@ msgstr "Format podataka CSV uvoza"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:41
msgid ""
-"This setting specifies the data format when importing CSV files. The AqBanking "
-"library offers various import formats (called \"profiles\") of which you can "
-"choose one here."
+"This setting specifies the data format when importing CSV files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
msgstr ""
"Ova postavka navodi format podataka prilikom uvoza CSV datoteka. AqBanking "
"biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih ovdje možeš "
@@ -18754,12 +18929,12 @@ msgstr "SWIFT MT940 uvozni format"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:46
msgid ""
"This setting specifies the data format when importing SWIFT MT940 files. The "
-"AqBanking library offers various import formats (called \"profiles\") of which "
-"you can choose one here."
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
msgstr ""
"Ova postavka navodi format podataka prilikom uvoza SWIFT MT940 datoteka. "
-"AqBanking biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih ovdje "
-"možeš jedan odabrati."
+"AqBanking biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih "
+"ovdje možeš jedan odabrati."
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:50
msgid "SWIFT MT942 import data format"
@@ -18768,12 +18943,12 @@ msgstr "SWIFT MT942 uvozni format"
#: gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in:51
msgid ""
"This setting specifies the data format when importing SWIFT MT942 files. The "
-"AqBanking library offers various import formats (called \"profiles\") of which "
-"you can choose one here."
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
msgstr ""
"Ova postavka navodi format podataka prilikom uvoza SWIFT MT942 datoteka. "
-"AqBanking biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih ovdje "
-"možeš jedan odabrati."
+"AqBanking biblioteka nudi razne formate uvoza (zvanih „profili“) od kojih "
+"ovdje možeš jedan odabrati."
#: gnucash/import-export/bi-import/dialog-bi-import.c:282
#, c-format
@@ -18827,7 +19002,8 @@ msgstr "Izlazni raÄun %s NIJE uknjižen, jer se valute ne poklapaju.\n"
#, c-format
msgid "Cannot post invoice %s because account name \"%s\" is invalid!\n"
msgstr ""
-"Nije moguće uknjižiti izlazni raÄun „%s“, jer je konto s imenom „%s“ nevaljan!\n"
+"Nije moguće uknjižiti izlazni raÄun „%s“, jer je konto s imenom „%s“ "
+"nevaljan!\n"
#: gnucash/import-export/bi-import/dialog-bi-import.c:827
#, c-format
@@ -18872,22 +19048,22 @@ msgstr "Nije moguće otvoriti ulaznu datoteku."
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:353
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:304
-#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:325
+#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:323
msgid "Adjust regular expression used for import"
msgstr "Podesi regularni izraz, korišten za uvoz"
#: gnucash/import-export/bi-import/dialog-bi-import-gui.c:353
#: gnucash/import-export/csv-imp/assistant-csv-account-import.c:305
-#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:325
+#: gnucash/import-export/customer-import/dialog-customer-import-gui.c:323
msgid ""
-"This regular expression is used to parse the import file. Modify according to "
-"your needs.\n"
+"This regular expression is used to parse the import file. Modify according "
+"to your needs.\n"
msgstr ""
"Ovaj se regularni izraz koristi za obradu uvozne datoteke. Izmijeni ga prema "
"potrebama.\n"
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
-msgid "Import Bills & Invoices..."
+msgid "Import Bills & _Invoices..."
msgstr "Uvezi ulazne i izlazne raÄune …"
#: gnucash/import-export/bi-import/gnc-plugin-bi-import.c:57
@@ -18900,8 +19076,8 @@ msgstr "Uvezi ulazne i izlazne raÄune iz tekstualne CSV datoteke"
msgid ""
"The account tree will be exported to the file '%s' when you click 'Apply'.\n"
"\n"
-"You can also verify your selections by clicking on 'Back' or 'Cancel' to Abort "
-"Export.\n"
+"You can also verify your selections by clicking on 'Back' or 'Cancel' to "
+"Abort Export.\n"
msgstr ""
"Pritiskom na „Primijeniâ€, ovaj kontni plan će se izvesti u datoteku „%sâ€.\n"
"\n"
@@ -18912,11 +19088,11 @@ msgstr ""
#: gnucash/import-export/csv-exp/assistant-csv-export.c:86
#, 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"
+"When you click 'Apply', the transactions will be exported to the file '%s' "
+"and the number of accounts exported will be %u.\n"
"\n"
-"You can also verify your selections by clicking on 'Back' or 'Cancel' to Abort "
-"Export.\n"
+"You can also verify your selections by clicking on 'Back' or 'Cancel' to "
+"Abort Export.\n"
msgstr ""
"Pritiskom na „Primijeniâ€, transakcije će se izvesti u datoteku „%sâ€, a broj "
"izvezenih konta će biti %u.\n"
@@ -18930,8 +19106,8 @@ msgstr ""
msgid ""
"When you click 'Apply', the transactions will be exported to the file '%s'.\n"
"\n"
-"You can also verify your selections by clicking on 'Back' or 'Cancel' to Abort "
-"Export.\n"
+"You can also verify your selections by clicking on 'Back' or 'Cancel' to "
+"Abort Export.\n"
msgstr ""
"Pritiskom na „Primijeniâ€, transakcije će se izvesti u datoteku „%sâ€.\n"
"\n"
@@ -18943,14 +19119,14 @@ msgid ""
"This assistant will help you export the Account Tree to a file\n"
" with the separator specified below.\n"
"\n"
-"Select the settings you require for the file and then click 'Forward' to proceed "
-"or 'Cancel' to Abort Export.\n"
+"Select the settings you require for the file and then click 'Forward' to "
+"proceed or 'Cancel' to Abort Export.\n"
msgstr ""
"Ovaj će ti pomoćnik pomoći izvesti kontni plan u datoteku\n"
"s ispod određenim razdvojnim znakom.\n"
"\n"
-"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za nastavljanje "
-"ili „Odustani“ za prekid izvoza.\n"
+"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za "
+"nastavljanje ili „Odustani“ za prekid izvoza.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:102
msgid ""
@@ -18960,23 +19136,23 @@ msgid ""
"There will be multiple rows for each transaction and may require further "
"manipulation to get them in a format you can use.\n"
"\n"
-"Each Transaction will appear once in the export and will be listed in the order "
-"the accounts were processed\n"
+"Each Transaction will appear once in the export and will be listed in the "
+"order the accounts were processed\n"
"\n"
-"Select the settings you require for the file and then click 'Forward' to proceed "
-"or 'Cancel' to Abort Export.\n"
+"Select the settings you require for the file and then click 'Forward' to "
+"proceed or 'Cancel' to Abort Export.\n"
msgstr ""
"Ovaj će ti pomoćnik pomoći izvesti transakcije u datoteku\n"
"s ispod određenim razdvojnim znakom.\n"
"\n"
-"Za svaku transakciju će se stvoriti višestruki redci, te će možda biti potrebna "
-"njihova daljnja obrada u format, koji možeš koristiti.\n"
+"Za svaku transakciju će se stvoriti višestruki redci, te će možda biti "
+"potrebna njihova daljnja obrada u format, koji možeš koristiti.\n"
"\n"
"Svaka transakcija će se pojaviti jednom u izvještaju, poredano u popisu po "
"redoslijedu obrade.\n"
"\n"
-"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za nastavljanje "
-"ili „Odustani“ za prekid izvoza.\n"
+"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za "
+"nastavljanje ili „Odustani“ za prekid izvoza.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:112
msgid ""
@@ -18984,27 +19160,29 @@ msgid ""
" with the separator specified below.\n"
"\n"
"There will be multiple rows for each transaction and may require further "
-"manipulation to get them in a format you can use. Each Transaction will appear "
-"once in the export and will be listed in the order the accounts were processed\n"
+"manipulation to get them in a format you can use. Each Transaction will "
+"appear once in the export and will be listed in the order the accounts were "
+"processed\n"
"\n"
-"By selecting the simple layout, the output will be equivalent to a single row "
-"register view and as such some of the transfer detail could be lost.\n"
+"By selecting the simple layout, the output will be equivalent to a single "
+"row register view and as such some of the transfer detail could be lost.\n"
"\n"
-"Select the settings you require for the file and then click 'Forward' to proceed "
-"or 'Cancel' to Abort Export.\n"
+"Select the settings you require for the file and then click 'Forward' to "
+"proceed or 'Cancel' to Abort Export.\n"
msgstr ""
"Ovaj će ti pomoćnik pomoći izvesti transakcije u datoteku\n"
"s ispod određenim razdvojnim znakom.\n"
"\n"
-"Za svaku transakciju će se stvoriti višestruki redci, te će možda biti potrebna "
-"njihova daljnja obrada u format, koji možeš koristiti. Svaka transakcija će se u "
-"izvještaju pojaviti jednom, i bit će upisana u popis po redoslijedu obrade.\n"
+"Za svaku transakciju će se stvoriti višestruki redci, te će možda biti "
+"potrebna njihova daljnja obrada u format, koji možeš koristiti. Svaka "
+"transakcija će se u izvještaju pojaviti jednom, i bit će upisana u popis po "
+"redoslijedu obrade.\n"
"\n"
"Odabirom jednostavnog rasporeda, rezultat će biti jednak pogledu jednorednog "
"registra, zbog Äega će se neki detalji prijenosa možda izgubiti.\n"
"\n"
-"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za nastavljanje "
-"ili „Odustani“ za prekid izvoza.\n"
+"Odaberi potrebne postavke za datoteku, a zatim klikni „Sljedeće“ za "
+"nastavljanje ili „Odustani“ za prekid izvoza.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:732
msgid ""
@@ -19014,8 +19192,8 @@ msgid ""
"You may need to enable debugging.\n"
msgstr ""
"Došlo je do problema s izvozom. Možda se radi o nedostatku mjesta na tvrdom "
-"disku, korisniÄkim pravima ili o nemogućnosti pristupa mapi. Provjeri datoteku "
-"praćenja sa zabilješkama!\n"
+"disku, korisniÄkim pravima ili o nemogućnosti pristupa mapi. Provjeri "
+"datoteku praćenja sa zabilješkama!\n"
"Možda ćeÅ¡ morati ukljuÄiti ispravljanje greÅ¡aka.\n"
#: gnucash/import-export/csv-exp/assistant-csv-export.c:736
@@ -19126,10 +19304,11 @@ msgid "Export the Transactions to a CSV file"
msgstr "Izvezi transakcije u CSV datoteku"
#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:64
-msgid "Export _Active Register to CSV..."
+msgid "Export A_ctive Register to CSV..."
msgstr "Izvezi _aktivni registar u CSV …"
-#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:65
+#. _A is already used by Export Accounts
+#: gnucash/import-export/csv-exp/gnc-plugin-csv-export.c:66
msgid "Export the Active Register to a CSV file"
msgstr "Izvezi aktivni registar u CSV datoteku"
@@ -19154,11 +19333,11 @@ msgid ""
"You can verify your selections by clicking on 'Back' or 'Cancel' to Abort "
"Import.\n"
"\n"
-"If this is your initial import into a new file, you will first see a dialog for "
-"setting book options, since these can affect how imported data is converted to "
-"GnuCash transactions.\n"
-"Note: After import, you may need to use 'View / Filter By / Other' menu option "
-"and select to show unused Accounts.\n"
+"If this is your initial import into a new file, you will first see a dialog "
+"for setting book options, since these can affect how imported data is "
+"converted to GnuCash transactions.\n"
+"Note: After import, you may need to use 'View / Filter By / Other' menu "
+"option and select to show unused Accounts.\n"
msgstr ""
"Kad klikneÅ¡ „Primijeniâ€, konti će se uvesti iz datoteke „%sâ€.\n"
"\n"
@@ -19166,8 +19345,8 @@ msgstr ""
"odustajanje od uvoza.\n"
"\n"
"AKo je ovo tvoj izvorni uvoz u datoteku, najprije ćeš vidjeti dijalog za "
-"postavljanje opcija knjige, budući da one utjeÄu na naÄin konvertiranja uvoza u "
-"GnuCash transakcije.\n"
+"postavljanje opcija knjige, budući da one utjeÄu na naÄin konvertiranja "
+"uvoza u GnuCash transakcije.\n"
"Napomena: Nakon uvoza možda moraš primijeniti opciju u izborniku „Pogled → "
"Filtriraj / Ostalo†i odabrati prikazivanje nekorištenih konta.\n"
@@ -19198,7 +19377,7 @@ msgstr ""
"Broj dodanih konta: %u. Broj aktualiziranih konta: %u.\n"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:830
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:835
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:836
msgid ""
"There were problems reading some saved settings, continuing to load.\n"
"Please review and save again."
@@ -19207,53 +19386,53 @@ msgstr ""
"Pregledaj i ponovo spremi."
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:853
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:858
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:859
msgid "Delete the Import Settings."
msgstr "Izbriši postavke za uvoz."
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:887
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:892
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:893
msgid "Setting name already exists, over write?"
msgstr "Ime postavke već postoji. Želiš li ga prepisati?"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:901
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:906
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:907
msgid "The settings have been saved."
msgstr "Postavke su spremljene."
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:926
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:931
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:932
msgid "There was a problem saving the settings, please try again."
msgstr "Došlo je do problema prilikom spremanja postavaka. Pokušaj ponovo."
#. If it fails, change back to the old encoding.
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1092
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1105
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1106
msgid "Invalid encoding selected"
msgstr "Odabrano je nevaljano kodiranje"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1251
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1215
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1216
msgid "Merge with column on _left"
msgstr "Spoji s _lijevim stupcem"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1255
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1219
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1220
msgid "Merge with column on _right"
msgstr "Spoji s _desnim stupcem"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1260
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1224
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1225
msgid "_Split this column"
msgstr "_Podijeli ovaj stupac"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1265
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1229
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1230
msgid "_Widen this column"
msgstr "_Proširi ovaj stupac"
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1269
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1233
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1234
msgid "_Narrow this column"
msgstr "_Suzi ovu stupac"
@@ -19304,49 +19483,50 @@ msgstr ""
#: gnucash/import-export/csv-imp/assistant-csv-price-import.cpp:1877
#, c-format
msgid ""
-"An unexpected error has occurred while creating prices. Please report this as a "
-"bug.\n"
+"An unexpected error has occurred while creating prices. Please report this "
+"as a bug.\n"
"\n"
"Error message:\n"
"%s"
msgstr ""
-"DoÅ¡lo je do neoÄekivane greÅ¡ke prilikom stvaranja cijena. Molimo te, da prijaviÅ¡ "
-"ovu grešku.\n"
+"DoÅ¡lo je do neoÄekivane greÅ¡ke prilikom stvaranja cijena. Molimo te, da "
+"prijaviš ovu grešku.\n"
"\n"
"Poruka o grešci:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1722
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1735
msgid "No Linked Account"
msgstr "Nema povezanih konta"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1944
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1957
msgid ""
-"To change mapping, double click on a row or select a row and press the button..."
+"To change mapping, double click on a row or select a row and press the "
+"button..."
msgstr ""
"Za promjenu mapiranja, upotrijebi dvoklik na redak ili odaberi redak i zatim "
"klikni gumb …"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1988
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2001
#, c-format
msgid ""
-"An unexpected error has occurred while mapping accounts. Please report this as a "
-"bug.\n"
+"An unexpected error has occurred while mapping accounts. Please report this "
+"as a bug.\n"
"\n"
"Error message:\n"
"%s"
msgstr ""
-"DoÅ¡lo je do neoÄekivane greÅ¡ke prilikom mapiranja konta. Molimo te, da prijaviÅ¡ "
-"ovu grešku.\n"
+"DoÅ¡lo je do neoÄekivane greÅ¡ke prilikom mapiranja konta. Molimo te, da "
+"prijaviš ovu grešku.\n"
"\n"
"Poruka o grešci:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2022
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2035
#, c-format
msgid ""
-"An unexpected error has occurred while creating transactions. Please report this "
-"as a bug.\n"
+"An unexpected error has occurred while creating transactions. Please report "
+"this as a bug.\n"
"\n"
"Error message:\n"
"%s"
@@ -19357,12 +19537,13 @@ msgstr ""
"Poruka o grešci:\n"
"%s"
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2031
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2044
msgid "Double click on rows to change, then click on Apply to Import"
-msgstr "Dvoklik na retke koje želiš promijeniti, zatim klikni „Primijeni“ za uvoz"
+msgstr ""
+"Dvoklik na retke koje želiš promijeniti, zatim klikni „Primijeni“ za uvoz"
#. Translators: {1} will be replaced with a filename
-#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2069
+#: gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:2084
msgid "The transactions were imported from file '{1}'."
msgstr "Transakcije su uvezene iz datoteke „{1}â€."
@@ -19416,6 +19597,7 @@ msgid ""
msgstr "Odaberi stupac „Roba iz†ili postavi jednu robu u polje „Roba izâ€."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:456
+#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:237
msgid "'Commodity From' can not be the same as 'Currency To'."
msgstr "„Roba iz†ne može biti ista, kao „Valuta uâ€."
@@ -19431,17 +19613,18 @@ msgstr ""
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:484
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:522
msgid ""
-"No lines are selected for importing. Please reduce the number of lines to skip."
+"No lines are selected for importing. Please reduce the number of lines to "
+"skip."
msgstr "Nijedan redak nije odabran za uvoz. Smanji broj redaka za preskakanje."
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:503
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:541
msgid ""
-"Not all fields could be parsed. Please correct the issues reported for each line "
-"or adjust the lines to skip."
+"Not all fields could be parsed. Please correct the issues reported for each "
+"line or adjust the lines to skip."
msgstr ""
-"Nije bilo moguće obraditi sva polja. Izpravi greške u izvještaju za svaki redak "
-"ili podesi retke, kako bi se preskoÄili."
+"Nije bilo moguće obraditi sva polja. Izpravi greške u izvještaju za svaki "
+"redak ili podesi retke, kako bi se preskoÄili."
#. Oops - the user didn't select a 'currency to' column *and* we didn't get a selected value either!
#. Note if you get here this suggests a bug in the code!
@@ -19457,7 +19640,8 @@ msgstr ""
#. Note if you get here this suggests a bug in the code!
#: gnucash/import-export/csv-imp/gnc-import-price.cpp:571
msgid ""
-"No 'Commodity from' column selected and no selected Commodity specified either.\n"
+"No 'Commodity from' column selected and no selected Commodity specified "
+"either.\n"
"This should never happen. Please report this as a bug."
msgstr ""
"Nije odabran stupac „Roba izâ€, kao ni roba.\n"
@@ -19468,7 +19652,8 @@ msgid "Please select an account column."
msgstr "Odaberi stupac konta."
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:472
-msgid "Please select an account column or set a base account in the Account field."
+msgid ""
+"Please select an account column or set a base account in the Account field."
msgstr "Odaberi stupac konta ili postavi osnovni konto u polje za konto."
#: gnucash/import-export/csv-imp/gnc-import-tx.cpp:478
@@ -19483,7 +19668,8 @@ msgstr "Odaberi stupac uplate ili isplate."
msgid ""
"Please select a transfer account column or remove the other transfer related "
"columns."
-msgstr "Odaberi stupac konta prijenosa ili ukloni ostale stupce konta prijenosa."
+msgstr ""
+"Odaberi stupac konta prijenosa ili ukloni ostale stupce konta prijenosa."
#. Oops - the user didn't select an Account column *and* we didn't get a default value either!
#. Note if you get here this suggests a bug in the code!
@@ -19565,10 +19751,6 @@ msgstr "Nema stupca za „Valuta uâ€."
msgid "No 'Commodity from' column."
msgstr "Nema stupca za „Roba izâ€."
-#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:237
-msgid "'Commodity from' can not be the same as 'Currency to'."
-msgstr "„Roba iz†ne može biti ista, kao „Valuta uâ€."
-
#: gnucash/import-export/csv-imp/gnc-imp-props-price.cpp:328
msgid "Failed to create price from selected columns."
msgstr "Greška u stvaranju cijene iz odabranih stupaca."
@@ -19621,12 +19803,13 @@ msgstr "Nema stupca dugovanja ili potraživanja."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:517
msgid "Split is reconciled but reconcile date column is missing or invalid."
msgstr ""
-"Podjela je usklađena, ali stupac datuma usklađivanja nedostaje ili je nevaljan."
+"Podjela je usklađena, ali stupac datuma usklađivanja nedostaje ili je "
+"nevaljan."
#: gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp:524
msgid ""
-"Transfer split is reconciled but transfer reconcile date column is missing or "
-"invalid."
+"Transfer split is reconciled but transfer reconcile date column is missing "
+"or invalid."
msgstr ""
"Podjela prijenosa je usklađena, ali sutpac za datum usklađivanja prijenosa "
"nedostaje ili je nevaljan."
@@ -19710,10 +19893,11 @@ msgstr "Uvezi kupce ili dobavljaÄe iz CSV tekstualne datoteke."
#: gnucash/import-export/import-account-matcher.c:378
#, c-format
msgid ""
-"The account %s is a placeholder account and does not allow transactions. Please "
-"choose a different account."
+"The account %s is a placeholder account and does not allow transactions. "
+"Please choose a different account."
msgstr ""
-"Konto „%s“ je rezervirani konto i ne dopušta transakcije. Odaberi drugi konto."
+"Konto „%s“ je rezervirani konto i ne dopušta transakcije. Odaberi drugi "
+"konto."
#: gnucash/import-export/import-account-matcher.c:336
#: gnucash/import-export/import-account-matcher.c:523
@@ -19727,11 +19911,12 @@ msgstr "_Novi konto"
#: gnucash/import-export/import-commodity-matcher.c:113
msgid ""
-"Please select a commodity to match the following exchange specific code. Please "
-"note that the exchange code of the commodity you select will be overwritten."
+"Please select a commodity to match the following exchange specific code. "
+"Please note that the exchange code of the commodity you select will be "
+"overwritten."
msgstr ""
-"Odaberi robu za poklapanje sa sljedećom specifiÄnom burzovnom Å¡ifrom. Zamijeti, "
-"da će Å¡ifra teÄaja robe koju izabereÅ¡ biti prepisana."
+"Odaberi robu za poklapanje sa sljedećom specifiÄnom burzovnom Å¡ifrom. "
+"Zamijeti, da će Å¡ifra teÄaja robe koju izabereÅ¡ biti prepisana."
#: gnucash/import-export/import-format-dialog.c:78
msgid "m/d/y"
@@ -19825,7 +20010,8 @@ msgstr "Poverljivost"
msgid "Pending Action"
msgstr "Radnja još traje"
-#: gnucash/import-export/import-pending-matches.c:194 libgnucash/engine/policy.c:61
+#: gnucash/import-export/import-pending-matches.c:194
+#: libgnucash/engine/policy.c:61
msgid "Manual"
msgstr "RuÄno"
@@ -19861,7 +20047,8 @@ msgstr "Odabrana log-datoteka je bila prazna."
msgid ""
"The log file you selected cannot be read. The file header was not recognized."
msgstr ""
-"Nije moguće uÄitati odabranu log-datoteku. Zaglavlje datoteke nije prepoznato."
+"Nije moguće uÄitati odabranu log-datoteku. Zaglavlje datoteke nije "
+"prepoznato."
#: gnucash/import-export/log-replay/gnc-plugin-log-replay.c:48
msgid "_Replay GnuCash .log file..."
@@ -19944,27 +20131,28 @@ msgstr "Ime GnuCash konta"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:841
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2713
msgid "Enter a name or short description, such as \"Red Hat Stock\"."
-msgstr "Unesi proizvoljno ime ili kratak opis, npr. „Dionice bakinog restorana“."
+msgstr ""
+"Unesi proizvoljno ime ili kratak opis, npr. „Dionice bakinog restorana“."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:843
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2720
msgid ""
-"Enter the ticker symbol or other well known abbreviation, such as \"RHT\". If "
-"there isn't one, or you don't know it, create your own."
+"Enter the ticker symbol or other well known abbreviation, such as \"RHT\". "
+"If there isn't one, or you don't know it, create your own."
msgstr ""
-"Unesi burzovnu oznaku ili drugu dobro poznatu kraticu, kao što je „ZSE“. Ako ne "
-"postoj ili je ne znaš, stvori vlastitu."
+"Unesi burzovnu oznaku ili drugu dobro poznatu kraticu, kao što je „ZSE“. Ako "
+"ne postoj ili je ne znaš, stvori vlastitu."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:846
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2728
msgid ""
"Select the exchange on which the symbol is traded, or select the type of "
-"investment (such as FUND for mutual funds.) If you don't see your exchange or an "
-"appropriate investment type, you can enter a new one."
+"investment (such as FUND for mutual funds.) If you don't see your exchange "
+"or an appropriate investment type, you can enter a new one."
msgstr ""
-"Odaberi burzu na kojoj se trguje oznakom ili odaberi vrstu ulaganja (kao Å¡to je "
-"„FOND“ za investicijske fondove.) Ako ne vidiš svoju burzu ili odgovarajuću "
-"vrstu ulaganja, možeš unijeti novu."
+"Odaberi burzu na kojoj se trguje oznakom ili odaberi vrstu ulaganja (kao Å¡to "
+"je „FOND“ za investicijske fondove.) Ako ne vidiš svoju burzu ili "
+"odgovarajuću vrstu ulaganja, možeš unijeti novu."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:872
msgid "Enter information about"
@@ -19994,8 +20182,8 @@ msgstr "Odaberi datoteku za uÄitavanje."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:1551
msgid "File not found or read permission denied. Please select another file."
msgstr ""
-"Datoteka nije naÄ‘ena ili su odbijena korisniÄka prava za Äitanje. Odaberi drugu "
-"datoteku."
+"Datoteka nije naÄ‘ena ili su odbijena korisniÄka prava za Äitanje. Odaberi "
+"drugu datoteku."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:1562
msgid "That QIF file is already loaded. Please select another file."
@@ -20066,13 +20254,13 @@ msgstr "UÄitavanje je zavrÅ¡eno"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:1988
msgid ""
-"When you press the Start Button, GnuCash will load your QIF file. If there are "
-"no errors or warnings, you will automatically proceed to the next step. "
+"When you press the Start Button, GnuCash will load your QIF file. If there "
+"are no errors or warnings, you will automatically proceed to the next step. "
"Otherwise, the details will be shown below for your review."
msgstr ""
"Kad klikneÅ¡ gumb za poÄetak, GnuCash će uÄitati tvoju QIF datoteku. Ako nema "
-"grešaka ili upozorenja, nastavit će do sljedećeg koraka. U protivnom će ispod "
-"biti prikazani detalji, koje možeš pregledati."
+"grešaka ili upozorenja, nastavit će do sljedećeg koraka. U protivnom će "
+"ispod biti prikazani detalji, koje možeš pregledati."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:2566
msgid "Choose the QIF file currency"
@@ -20103,13 +20291,13 @@ msgstr "Konverzija je završena"
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3049
msgid ""
-"When you press the Start Button, GnuCash will import your QIF data. If there are "
-"no errors or warnings, you will automatically proceed to the next step. "
+"When you press the Start Button, GnuCash will import your QIF data. If there "
+"are no errors or warnings, you will automatically proceed to the next step. "
"Otherwise, the details will be shown below for your review."
msgstr ""
"Kad klikneÅ¡ gumb za poÄetak, GnuCash će uvesti tvoju QIF datoteku. Ako nema "
-"grešaka ili upozorenja, nastavit će do sljedećeg koraka. U protivnom će ispod "
-"biti prikazani detalji, koje možeš pregledati."
+"grešaka ili upozorenja, nastavit će do sljedećeg koraka. U protivnom će "
+"ispod biti prikazani detalji, koje možeš pregledati."
#: gnucash/import-export/qif-imp/assistant-qif-import.c:3250
msgid "GnuCash was unable to save your mapping preferences."
@@ -20180,7 +20368,7 @@ msgstr "Kapitalna dobit (kratkoroÄno)"
#: gnucash/import-export/qif-imp/qif-dialog-utils.scm:77
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:195
#: gnucash/report/standard-reports/balance-sheet.scm:673
-#: libgnucash/app-utils/gnc-ui-util.c:816
+#: libgnucash/app-utils/gnc-ui-util.c:976
msgid "Retained Earnings"
msgstr "Zadržana dobit"
@@ -20397,8 +20585,8 @@ msgstr "Spremiti trenutaÄni unos?"
#: gnucash/register/ledger-core/gncEntryLedger.c:916
msgid ""
-"The current transaction has been changed. Would you like to record the changes "
-"before duplicating this entry, or cancel the duplication?"
+"The current transaction has been changed. Would you like to record the "
+"changes before duplicating this entry, or cancel the duplication?"
msgstr ""
"TrenutaÄna transakcija je promijenjena. ŽeliÅ¡ li spremiti promjene prije "
"dupliciranja ovog unosa ili odustati od dupliciranja?"
@@ -20424,11 +20612,12 @@ msgstr "Ne postoji porezna tablica „%s“. Želiš li je stvoriti?"
#: gnucash/register/ledger-core/gncEntryLedgerControl.c:878
msgid ""
-"The current entry has been changed. However, this entry is part of an existing "
-"order. Would you like to record the change and effectively change your order?"
+"The current entry has been changed. However, this entry is part of an "
+"existing order. Would you like to record the change and effectively change "
+"your order?"
msgstr ""
-"TrenutaÄni unos je promijenjen. MeÄ‘utim, ovaj unos je dio postojeće narudžbe. "
-"Želiš li spremiti promjenu i time promijeniti narudžbu?"
+"TrenutaÄni unos je promijenjen. MeÄ‘utim, ovaj unos je dio postojeće "
+"narudžbe. Želiš li spremiti promjenu i time promijeniti narudžbu?"
#: gnucash/register/ledger-core/gncEntryLedgerControl.c:896
msgid "_Don't Record"
@@ -20533,7 +20722,7 @@ msgstr ">"
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:527
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:1091
#: gnucash/report/report-system/report-utilities.scm:109
-#: libgnucash/engine/Account.cpp:4094
+#: libgnucash/engine/Account.cpp:4092
msgid "Cash"
msgstr "Gotovina"
@@ -20608,7 +20797,8 @@ msgid "Billable?"
msgstr "Naplativo?"
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:545
-msgid "Enter the income/expense account for the Entry, or choose one from the list"
+msgid ""
+"Enter the income/expense account for the Entry, or choose one from the list"
msgstr "Unesi konto prihoda/rashoda za unos, ili odaberi jedan konto s popisa"
#: gnucash/register/ledger-core/gncEntryLedgerModel.c:558
@@ -20729,21 +20919,22 @@ msgstr "Spremiti transakciju prije dupliciranja?"
#: gnucash/register/ledger-core/split-register.c:452
msgid ""
-"The current transaction has been changed. Would you like to record the changes "
-"before duplicating the transaction, or cancel the duplication?"
+"The current transaction has been changed. Would you like to record the "
+"changes before duplicating the transaction, or cancel the duplication?"
msgstr ""
"TrenutaÄna transakcija je promijenjena. ŽeliÅ¡ li spremiti promjene prije "
"dupliciranja transakcije ili odustati od dupliciranja?"
#: gnucash/register/ledger-core/split-register.c:922
msgid ""
-"You are about to overwrite an existing split. Are you sure you want to do that?"
+"You are about to overwrite an existing split. Are you sure you want to do "
+"that?"
msgstr "Ovime ćeÅ¡ prepisati postojeću stavku. Sigurno to želiÅ¡ uÄiniti?"
#: gnucash/register/ledger-core/split-register.c:955
msgid ""
-"You are about to overwrite an existing transaction. Are you sure you want to do "
-"that?"
+"You are about to overwrite an existing transaction. Are you sure you want to "
+"do that?"
msgstr "Ovime ćeÅ¡ prepisati postojeću transakciju. Sigurno to želiÅ¡ uÄiniti?"
#: gnucash/register/ledger-core/split-register-control.c:1352
@@ -20760,9 +20951,9 @@ msgstr "Iznos stavke je nula, tako da teÄaj nije potreban."
#: gnucash/register/ledger-core/split-register-control.c:1529
msgid ""
-"The current transaction has been changed. Would you like to record the changes "
-"before moving to a new transaction, discard the changes, or return to the "
-"changed transaction?"
+"The current transaction has been changed. Would you like to record the "
+"changes before moving to a new transaction, discard the changes, or return "
+"to the changed transaction?"
msgstr ""
"TrenutaÄna transakcija je promijenjena. ŽeliÅ¡ li: spremiti promjene prije "
"prelaska na novu transakciju, odbaciti ih ili se vratiti na izmijenjenu "
@@ -20788,7 +20979,7 @@ msgstr "sample:Opis transakcije"
#. translate the portion after the ':' and
#. leave the rest ("Associate:") as is.
#: gnucash/register/ledger-core/split-register-layout.c:711
-#: gnucash/register/ledger-core/split-register-model.c:326
+#: gnucash/register/ledger-core/split-register-model.c:328
msgid "Associate:A"
msgstr "Associate:P"
@@ -20833,132 +21024,135 @@ msgstr "sample:(x + 0,33 * y + (x+y) )"
#: gnucash/register/ledger-core/split-register-load.c:278
msgid ""
-"Could not determine the account currency. Using the default currency provided by "
-"your system."
+"Could not determine the account currency. Using the default currency "
+"provided by your system."
msgstr ""
-"Nije moguće utvrditi valutu konta. Korist se standardna valuta tvojeg sustava."
+"Nije moguće utvrditi valutu konta. Korist se standardna valuta tvojeg "
+"sustava."
#. Column label for Invoice IDs in A/P & A/R accounts
-#: gnucash/register/ledger-core/split-register-model.c:245
+#: gnucash/register/ledger-core/split-register-model.c:247
msgid "Ref"
msgstr "Ref"
-#: gnucash/register/ledger-core/split-register-model.c:261
+#: gnucash/register/ledger-core/split-register-model.c:263
msgid "T-Ref"
msgstr "T-ref."
-#: gnucash/register/ledger-core/split-register-model.c:270
-#: gnucash/report/standard-reports/register.scm:134
+#: gnucash/register/ledger-core/split-register-model.c:272
+#: gnucash/report/standard-reports/register.scm:133
msgid "T-Num"
msgstr "T-broj"
-#: gnucash/register/ledger-core/split-register-model.c:396
+#: gnucash/register/ledger-core/split-register-model.c:398
msgid "Exch. Rate"
msgstr "TeÄaj"
-#: gnucash/register/ledger-core/split-register-model.c:413
+#: gnucash/register/ledger-core/split-register-model.c:415
msgid "Oth. Curr."
msgstr "Dr. val."
-#: gnucash/register/ledger-core/split-register-model.c:430
-#: gnucash/register/ledger-core/split-register-model.c:454
+#: gnucash/register/ledger-core/split-register-model.c:432
+#: gnucash/register/ledger-core/split-register-model.c:456
#, c-format
msgid "Tot %s"
msgstr "Ukupno %s"
-#: gnucash/register/ledger-core/split-register-model.c:436
+#: gnucash/register/ledger-core/split-register-model.c:438
msgid "Tot Credit"
msgstr "Ukupno potražuje"
-#: gnucash/register/ledger-core/split-register-model.c:460
+#: gnucash/register/ledger-core/split-register-model.c:462
msgid "Tot Debit"
msgstr "Ukupno duguje"
-#: gnucash/register/ledger-core/split-register-model.c:469
+#: gnucash/register/ledger-core/split-register-model.c:471
msgid "Tot Shares"
msgstr "Ukupno dionica"
-#: gnucash/register/ledger-core/split-register-model.c:528
+#: gnucash/register/ledger-core/split-register-model.c:530
#, c-format
msgid "Reconciled on %s"
msgstr "Usklađeno %s"
#. This seems to be the one that initially gets used, the InactiveDateCell
#. is set to, and subsequently displayed.
-#: gnucash/register/ledger-core/split-register-model.c:993
+#: gnucash/register/ledger-core/split-register-model.c:1013
msgid "Scheduled"
msgstr "Terminirano"
-#: gnucash/register/ledger-core/split-register-model.c:1042
+#: gnucash/register/ledger-core/split-register-model.c:1062
msgid ""
-"Enter a reference, such as an invoice or check number, common to all entry lines "
-"(splits)"
+"Enter a reference, such as an invoice or check number, common to all entry "
+"lines (splits)"
msgstr ""
"Unesi referencu, npr. izlazni raÄun ili broj Äeka, koja je zajedniÄka svim "
"redcima (stavkama)"
-#: gnucash/register/ledger-core/split-register-model.c:1044
+#: gnucash/register/ledger-core/split-register-model.c:1064
msgid ""
-"Enter a reference, such as an invoice or check number, unique to each entry line "
-"(split)"
+"Enter a reference, such as an invoice or check number, unique to each entry "
+"line (split)"
msgstr ""
"Unesi referencu, npr. izlazni raÄun ili broj Äeka, jedinstvenu za sve redak "
"(stavku)"
-#: gnucash/register/ledger-core/split-register-model.c:1049
+#: gnucash/register/ledger-core/split-register-model.c:1069
msgid ""
"Enter a reference, such as a check number, common to all entry lines (splits)"
msgstr ""
-"Unesi referencu, npr. broj Äeka, koja je zajedniÄka za sve retke unosa (stavke)"
+"Unesi referencu, npr. broj Äeka, koja je zajedniÄka za sve retke unosa "
+"(stavke)"
-#: gnucash/register/ledger-core/split-register-model.c:1051
+#: gnucash/register/ledger-core/split-register-model.c:1071
msgid ""
"Enter a reference, such as a check number, unique to each entry line (split)"
msgstr "Unesi referencu, npr. broj Äeka, jedinstvenu za sve redak (stavku)"
-#: gnucash/register/ledger-core/split-register-model.c:1072
+#: gnucash/register/ledger-core/split-register-model.c:1092
msgid ""
-"Enter a transaction reference, such as an invoice or check number, common to all "
-"entry lines (splits)"
+"Enter a transaction reference, such as an invoice or check number, common to "
+"all entry lines (splits)"
msgstr ""
"Unesi referencu transakcije, kao Å¡to je izlazni raÄun ili broj Äeka, koja je "
"zajedniÄka svim redcima (stavkama)"
-#: gnucash/register/ledger-core/split-register-model.c:1076
+#: gnucash/register/ledger-core/split-register-model.c:1096
msgid ""
"Enter a transaction reference that will be common to all entry lines (splits)"
msgstr ""
"Unesi referencu transakcije, koja će biti zajedniÄka svim redcima (stavkama)"
-#: gnucash/register/ledger-core/split-register-model.c:1280
+#: gnucash/register/ledger-core/split-register-model.c:1300
msgid "Enter an action type, or choose one from the list"
msgstr "Unesi vrstu radnje ili odaberi jednu is popisa"
-#: gnucash/register/ledger-core/split-register-model.c:1281
+#: gnucash/register/ledger-core/split-register-model.c:1301
msgid ""
"Enter a reference number, such as the next check number, or choose an action "
"type from the list"
msgstr ""
-"Unesi referencirajući broj, npr. broj sljedećeg broja Äeka, ili odaberi vrstu "
-"radnje is popisa"
+"Unesi referencirajući broj, npr. broj sljedećeg broja Äeka, ili odaberi "
+"vrstu radnje is popisa"
-#: gnucash/register/ledger-core/split-register-model.c:1548
+#: gnucash/register/ledger-core/split-register-model.c:1568
msgid ""
"This transaction has multiple splits; press the Split button to see them all"
msgstr ""
"Ova se transakcija sastoji od višestrukih stavaka; klikni gumb „Proširi†za "
"prikaz svih"
-#: gnucash/register/ledger-core/split-register-model.c:1551
-msgid "This transaction is a stock split; press the Split button to see details"
+#: gnucash/register/ledger-core/split-register-model.c:1571
+msgid ""
+"This transaction is a stock split; press the Split button to see details"
msgstr ""
"Ova je transakcija podjela dionice; klikni gumb „Proširi†za prikaz detalja"
-#: gnucash/register/ledger-core/split-register-model.c:2038
+#: gnucash/register/ledger-core/split-register-model.c:2058
#, c-format
msgid ""
-"Cannot modify or delete this transaction. This transaction is marked read-only "
-"because:\n"
+"Cannot modify or delete this transaction. This transaction is marked read-"
+"only because:\n"
"\n"
"'%s'"
msgstr ""
@@ -20967,11 +21161,11 @@ msgstr ""
"\n"
"„%s“"
-#: gnucash/register/ledger-core/split-register-model.c:2155
+#: gnucash/register/ledger-core/split-register-model.c:2175
msgid "Change transaction containing a reconciled split?"
msgstr "Promijeniti transakciju, koja sadrži usklađenu stavku?"
-#: gnucash/register/ledger-core/split-register-model.c:2157
+#: gnucash/register/ledger-core/split-register-model.c:2177
#, c-format
msgid ""
"The transaction you are about to change is protected because it contains "
@@ -20982,36 +21176,36 @@ msgid ""
"unreconciled. This might make future reconciliation difficult! Continue with "
"this change?"
msgstr ""
-"Transakcija koju mijenjaš je zaštićena, jer sadrži usklađene stavke u sljedećim "
-"kontima:\n"
+"Transakcija koju mijenjaš je zaštićena, jer sadrži usklađene stavke u "
+"sljedećim kontima:\n"
"%s\n"
"\n"
-"Ako nastaviš uređivati ovu transakciju, sve stavke će postati neusklađene. To "
-"može otežati buduće usklađivanje! Želiš li nastaviti s ovom promjenom?"
+"Ako nastaviš uređivati ovu transakciju, sve stavke će postati neusklađene. "
+"To može otežati buduće usklađivanje! Želiš li nastaviti s ovom promjenom?"
-#: gnucash/register/ledger-core/split-register-model.c:2169
+#: gnucash/register/ledger-core/split-register-model.c:2189
msgid ""
-"You are about to change a protected field of a reconciled split. If you continue "
-"editing this split it will be unreconciled. This might make future "
+"You are about to change a protected field of a reconciled split. If you "
+"continue editing this split it will be unreconciled. This might make future "
"reconciliation difficult! Continue with this change?"
msgstr ""
-"Ovime ćeš promijeniti zaštićeno polje usklađene stavke. Ako nastaviš uređivati "
-"ovu stavku, ona će postati neusklađena. To može otežati buduće usklađivanje! "
-"Želiš li nastaviti s ovom promjenom?"
+"Ovime ćeš promijeniti zaštićeno polje usklađene stavke. Ako nastaviš "
+"uređivati ovu stavku, ona će postati neusklađena. To može otežati buduće "
+"usklađivanje! Želiš li nastaviti s ovom promjenom?"
-#: gnucash/register/ledger-core/split-register-model.c:2194
+#: gnucash/register/ledger-core/split-register-model.c:2214
msgid "Chan_ge Transaction"
msgstr "_Promijeni transakciju"
#: gnucash/register/register-gnome/datecell-gnome.c:103
msgid ""
-"The entered date of the transaction is older than the \"Read-Only Threshold\" "
-"set for this book. This setting can be changed in File -> Properties -> "
+"The entered date of the transaction is older than the \"Read-Only Threshold"
+"\" set for this book. This setting can be changed in File -> Properties -> "
"Accounts, resetting to the threshold."
msgstr ""
-"Uneseni datum transakcije je stariji od „Prag samo-za-Äitanje“, postavljenog za "
-"ovu knjigu. Ovu postavku možeš izmijeniti u izborniku „Datoteka → Svojstva → "
-"Konti“."
+"Uneseni datum transakcije je stariji od „Prag samo-za-Äitanje“, postavljenog "
+"za ovu knjigu. Ovu postavku možeš izmijeniti u izborniku „Datoteka → "
+"Svojstva → Konti“."
#: gnucash/register/register-gnome/gnucash-item-list.c:468
msgid "List"
@@ -21023,7 +21217,7 @@ msgstr "Popis"
#: gnucash/report/business-reports/job-report.scm:543
#: gnucash/report/business-reports/owner-report.scm:41
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:148
-#: gnucash/report/locale-specific/us/taxtxf.scm:169
+#: gnucash/report/locale-specific/us/taxtxf.scm:176
msgid "To"
msgstr "Do"
@@ -21032,7 +21226,7 @@ msgid "Sort By"
msgstr "Razvrstaj prema"
#: gnucash/report/business-reports/aging.scm:40
-#: gnucash/report/business-reports/customer-summary.scm:95
+#: gnucash/report/business-reports/customer-summary.scm:86
msgid "Sort Order"
msgstr "Redoslijed razvrstavanja"
@@ -21042,14 +21236,15 @@ msgstr "Redoslijed razvrstavanja"
#: gnucash/report/standard-reports/account-summary.scm:114
#: gnucash/report/standard-reports/advanced-portfolio.scm:75
#: gnucash/report/standard-reports/average-balance.scm:41
+#: gnucash/report/standard-reports/balance-forecast.scm:44
#: gnucash/report/standard-reports/balance-sheet.scm:138
#: gnucash/report/standard-reports/budget-balance-sheet.scm:103
#: gnucash/report/standard-reports/budget-flow.scm:46
#: gnucash/report/standard-reports/budget-income-statement.scm:117
-#: gnucash/report/standard-reports/cashflow-barchart.scm:61
+#: gnucash/report/standard-reports/cashflow-barchart.scm:58
#: gnucash/report/standard-reports/cash-flow.scm:52
#: gnucash/report/standard-reports/category-barchart.scm:69
-#: gnucash/report/standard-reports/daily-reports.scm:55
+#: gnucash/report/standard-reports/daily-reports.scm:54
#: gnucash/report/standard-reports/equity-statement.scm:77
#: gnucash/report/standard-reports/income-statement.scm:110
#: gnucash/report/standard-reports/net-charts.scm:43
@@ -21067,15 +21262,16 @@ msgstr "Valuta izvještaja"
#: gnucash/report/standard-reports/account-summary.scm:115
#: gnucash/report/standard-reports/advanced-portfolio.scm:39
#: gnucash/report/standard-reports/average-balance.scm:42
+#: gnucash/report/standard-reports/balance-forecast.scm:45
#: gnucash/report/standard-reports/balance-sheet.scm:139
#: gnucash/report/standard-reports/budget-balance-sheet.scm:104
#: gnucash/report/standard-reports/budget-flow.scm:43
#: gnucash/report/standard-reports/budget-income-statement.scm:118
-#: gnucash/report/standard-reports/budget.scm:53
-#: gnucash/report/standard-reports/cashflow-barchart.scm:62
+#: gnucash/report/standard-reports/budget.scm:51
+#: gnucash/report/standard-reports/cashflow-barchart.scm:59
#: gnucash/report/standard-reports/cash-flow.scm:53
#: gnucash/report/standard-reports/category-barchart.scm:70
-#: gnucash/report/standard-reports/daily-reports.scm:56
+#: gnucash/report/standard-reports/daily-reports.scm:55
#: gnucash/report/standard-reports/equity-statement.scm:78
#: gnucash/report/standard-reports/income-statement.scm:111
#: gnucash/report/standard-reports/net-charts.scm:44
@@ -21120,11 +21316,11 @@ msgstr "E-pošta adrese"
#: gnucash/report/business-reports/aging.scm:225
#, scheme-format
msgid ""
-"Transactions relating to '~a' contain more than one currency. This report is not "
-"designed to cope with this possibility."
+"Transactions relating to '~a' contain more than one currency. This report is "
+"not designed to cope with this possibility."
msgstr ""
-"Transkacije, koje se odnose na „~aâ€, sadrže viÅ¡e od jedne valute. Ovaj izvjeÅ¡taj "
-"nije izrađen za rad s takvom mogućnošću."
+"Transkacije, koje se odnose na „~aâ€, sadrže viÅ¡e od jedne valute. Ovaj "
+"izvještaj nije izrađen za rad s takvom mogućnošću."
#: gnucash/report/business-reports/aging.scm:364
msgid "Sort companies by."
@@ -21149,7 +21345,8 @@ msgstr "Stavi ukupno dugovanje u zagrade"
#: gnucash/report/business-reports/aging.scm:369
msgid "Amount owed in oldest bracket - if same go to next oldest."
msgstr ""
-"Iznos dugovanja u najstarijoj zagradi; ako je isti, idi na sljedeću najstariju."
+"Iznos dugovanja u najstarijoj zagradi; ako je isti, idi na sljedeću "
+"najstariju."
#: gnucash/report/business-reports/aging.scm:376
msgid "Sort order."
@@ -21240,7 +21437,7 @@ msgstr "Prikaži aktivno stanje."
#: gnucash/report/business-reports/aging.scm:558
#: gnucash/report/business-reports/owner-report.scm:260
-#: gnucash/report/standard-reports/budget.scm:126
+#: gnucash/report/standard-reports/budget.scm:122
msgid "Current"
msgstr "TrenutaÄno"
@@ -21284,11 +21481,11 @@ msgstr "Ne"
#: gnucash/report/business-reports/aging.scm:857
#: gnucash/report/business-reports/job-report.scm:594
msgid ""
-"No valid account selected. Click on the Options button and select the account to "
-"use."
+"No valid account selected. Click on the Options button and select the "
+"account to use."
msgstr ""
-"Nije odabran valjani konto. Klikni gumb „Opcije†i odaberi konto, koji ćeš "
-"koristiti."
+"Nije odabran nijedan valjani konto. Klikni gumb „Opcije†i odaberi konto, "
+"koji ćeš koristiti."
#: gnucash/report/business-reports/balsheet-eg.eguile.scm:173
msgid "Assets Accounts"
@@ -21367,11 +21564,11 @@ msgstr "JednostupÄani ili dvostupÄani izvjeÅ¡taj"
#: gnucash/report/business-reports/balsheet-eg.scm:250
msgid ""
-"The balance sheet can be displayed with either 1 or 2 columns. 'auto' means that "
-"the layout will be adjusted to fit the width of the page."
+"The balance sheet can be displayed with either 1 or 2 columns. 'auto' means "
+"that the layout will be adjusted to fit the width of the page."
msgstr ""
-"Bilanca se može prikazati jednstupÄano ili dvostupÄano. „Automatski“ znaÄi, da "
-"će raspored biti podešen, kako bi se ispunila širina stranice."
+"Bilanca se može prikazati jednstupÄano ili dvostupÄano. „Automatski“ znaÄi, "
+"da će raspored biti podešen, kako bi se ispunila širina stranice."
#: gnucash/report/business-reports/balsheet-eg.scm:252
#: gnucash/report/standard-reports/account-summary.scm:78
@@ -21401,7 +21598,7 @@ msgstr "Najveći broj razina kontnog plana, koje se prikazuju."
#: gnucash/report/standard-reports/balance-sheet.scm:94
#: gnucash/report/standard-reports/budget-balance-sheet.scm:59
#: gnucash/report/standard-reports/budget-income-statement.scm:82
-#: gnucash/report/standard-reports/budget.scm:95
+#: gnucash/report/standard-reports/budget.scm:93
#: gnucash/report/standard-reports/income-statement.scm:69
msgid "Flatten list to depth limit"
msgstr "Rasklopi popis na ograniÄenu razinu"
@@ -21410,7 +21607,7 @@ msgstr "Rasklopi popis na ograniÄenu razinu"
#: gnucash/report/standard-reports/balance-sheet.scm:96
#: gnucash/report/standard-reports/budget-balance-sheet.scm:61
#: gnucash/report/standard-reports/budget-income-statement.scm:84
-#: gnucash/report/standard-reports/budget.scm:97
+#: gnucash/report/standard-reports/budget.scm:95
#: gnucash/report/standard-reports/income-statement.scm:71
msgid "Displays accounts which exceed the depth limit at the depth limit."
msgstr "Prikazuje konta, koji se nalaze izvan zadane ograniÄene razine."
@@ -21421,10 +21618,11 @@ msgstr "IskljuÄi konta, Äija su ukupna salda nula"
#: gnucash/report/business-reports/balsheet-eg.scm:260
msgid ""
-"Exclude non-top-level accounts with zero balance and no non-zero sub-accounts."
+"Exclude non-top-level accounts with zero balance and no non-zero sub-"
+"accounts."
msgstr ""
-"IskljuÄi konta podreÄ‘enih razina, Äija su salda nula, kao i podkonta, Äija salda "
-"nisu nula."
+"IskljuÄi konta podreÄ‘enih razina, Äija su salda nula, kao i podkonta, Äija "
+"salda nisu nula."
#: gnucash/report/business-reports/balsheet-eg.scm:262
#: gnucash/report/standard-reports/account-summary.scm:99
@@ -21455,8 +21653,8 @@ msgstr "Format negativnih iznosa"
#: gnucash/report/business-reports/balsheet-eg.scm:267
msgid ""
-"The formatting to use for negative amounts: with a leading sign, or enclosing "
-"brackets."
+"The formatting to use for negative amounts: with a leading sign, or "
+"enclosing brackets."
msgstr ""
"Formatiranje koje će se koristiti za negativne iznose: s predznakom ili "
"zatvarajućim zagradama."
@@ -21485,13 +21683,13 @@ msgstr "Datoteka predloška"
#: gnucash/report/business-reports/balsheet-eg.scm:275
msgid ""
-"The file name of the eguile template part of this report. This file must be in "
-"your .gnucash directory, or else in its proper place within the GnuCash "
+"The file name of the eguile template part of this report. This file must be "
+"in your .gnucash directory, or else in its proper place within the GnuCash "
"installation directories."
msgstr ""
-"Ime datoteke eguile-predloška za ovaj izvještaj. Ova se datoteka mora nalaziti u "
-"tvojem „.gnucash“ direktoriju, ili na svojem odgovarajućem mjestu u direktoriju "
-"GnuCash instalacije."
+"Ime datoteke eguile-predloška za ovaj izvještaj. Ova se datoteka mora "
+"nalaziti u tvojem „.gnucash“ direktoriju, ili na svojem odgovarajućem mjestu "
+"u direktoriju GnuCash instalacije."
#: gnucash/report/business-reports/balsheet-eg.scm:276
#: gnucash/report/business-reports/receipt.scm:83
@@ -21501,12 +21699,12 @@ msgstr "CSS stilski predložak"
#: gnucash/report/business-reports/balsheet-eg.scm:278
msgid ""
-"The file name of the CSS stylesheet to use with this report. If specified, this "
-"file should be in your .gnucash directory, or else in its proper place within "
-"the GnuCash installation directories."
+"The file name of the CSS stylesheet to use with this report. If specified, "
+"this file should be in your .gnucash directory, or else in its proper place "
+"within the GnuCash installation directories."
msgstr ""
-"Ime datoteke CSS stilskog predloška za ovaj izvještaj. Ako je određena, ova se "
-"datoteka mora nalaziti u tvojem „.gnucash“ direktoriju ili na svojem "
+"Ime datoteke CSS stilskog predloška za ovaj izvještaj. Ako je određena, ova "
+"se datoteka mora nalaziti u tvojem „.gnucash“ direktoriju ili na svojem "
"odgovarajućem mjestu u direktoriju GnuCash instalacije."
#: gnucash/report/business-reports/balsheet-eg.scm:279
@@ -21593,13 +21791,15 @@ msgstr "Stavi negativne iznose u zagrade, npr. (100,00 kn)."
#: gnucash/report/business-reports/balsheet-eg.scm:357
msgid ""
-"(Development version -- don't rely on the numbers on this report without double-"
-"checking them.<br>Change the 'Extra Notes' option to get rid of this message)"
+"(Development version -- don't rely on the numbers on this report without "
+"double-checking them.<br>Change the 'Extra Notes' option to get rid of this "
+"message)"
msgstr ""
"(Razvojno izdanje – ne oslanjaj se na brojeve u ovom izvještaju bez provjere."
"<br>Promijeni opciju „Dodatne napomene“ za neprikazivanje ove poruke)"
-#: gnucash/report/business-reports/balsheet-eg.scm:502 libgnucash/engine/Scrub.c:91
+#: gnucash/report/business-reports/balsheet-eg.scm:502
+#: libgnucash/engine/Scrub.c:91
msgid "Orphan"
msgstr "Nepovezano"
@@ -21617,7 +21817,7 @@ msgstr "Prikaži bilancu (koristeći eguile predložak)"
#: gnucash/report/business-reports/job-report.scm:540
#: gnucash/report/business-reports/owner-report.scm:40
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:148
-#: gnucash/report/locale-specific/us/taxtxf.scm:169
+#: gnucash/report/locale-specific/us/taxtxf.scm:176
msgid "From"
msgstr "Od"
@@ -21643,11 +21843,11 @@ msgstr "Konti rashoda"
#: gnucash/report/business-reports/customer-summary.scm:62
msgid ""
-"The expense accounts where the expenses are recorded which are subtracted from "
-"the sales to give the profit."
+"The expense accounts where the expenses are recorded which are subtracted "
+"from the sales to give the profit."
msgstr ""
-"Konti rashoda u kojima su zabilježeni rashodi, koji su oduzeti od prometa, kako "
-"bi se dobila dobit."
+"Konti rashoda u kojima su zabilježeni rashodi, koji su oduzeti od prometa, "
+"kako bi se dobila dobit."
#: gnucash/report/business-reports/customer-summary.scm:64
msgid "Show Expense Column"
@@ -21694,116 +21894,128 @@ msgstr "Prikaži adresu tvojeg poduzeća i datum ispisa."
msgid "Display Columns"
msgstr "Prikaži stupce"
-#: gnucash/report/business-reports/customer-summary.scm:88
+#: gnucash/report/business-reports/customer-summary.scm:79
msgid "Show Lines with All Zeros"
msgstr "Prikaži retke s vrijednostima od nula"
-#: gnucash/report/business-reports/customer-summary.scm:89
+#: gnucash/report/business-reports/customer-summary.scm:80
msgid ""
-"Show the table lines with customers which did not have any transactions in the "
-"reporting period, hence would show all zeros in the columns."
+"Show the table lines with customers which did not have any transactions in "
+"the reporting period, hence would show all zeros in the columns."
msgstr ""
-"Prikaži retke tablice s kupcima, koji nisu imali nijednu transakciju u razdoblju "
-"izvještavanja, pa bi se stoga u stupcima sve vrijednosti prikazale s nulama."
+"Prikaži retke tablice s kupcima, koji nisu imali nijednu transakciju u "
+"razdoblju izvještavanja, pa bi se stoga u stupcima sve vrijednosti prikazale "
+"s nulama."
-#: gnucash/report/business-reports/customer-summary.scm:90
+#: gnucash/report/business-reports/customer-summary.scm:81
msgid "Show Inactive Customers"
msgstr "Prikaži neaktivne kupce"
-#: gnucash/report/business-reports/customer-summary.scm:91
+#: gnucash/report/business-reports/customer-summary.scm:82
msgid "Include customers that have been marked inactive."
msgstr "UkljuÄi kupce, koji su deaktivirani."
-#: gnucash/report/business-reports/customer-summary.scm:93
+#: gnucash/report/business-reports/customer-summary.scm:84
msgid "Sort Column"
msgstr "Stupac razvrstavanja"
-#: gnucash/report/business-reports/customer-summary.scm:94
+#: gnucash/report/business-reports/customer-summary.scm:85
msgid "Choose the column by which the result table is sorted."
msgstr "Odaberi stupac, prema kojem se razvrstava rezultirajuća tablica."
-#: gnucash/report/business-reports/customer-summary.scm:96
+#: gnucash/report/business-reports/customer-summary.scm:87
msgid "Choose the ordering of the column sort: Either ascending or descending."
msgstr "Odaberi redoslijed razvrstavanja u stupcu: uzlazno ili silazno."
-#: gnucash/report/business-reports/customer-summary.scm:445
+#: gnucash/report/business-reports/customer-summary.scm:144
msgid "Customer Name"
msgstr "Ime kupca"
-#: gnucash/report/business-reports/customer-summary.scm:446
+#: gnucash/report/business-reports/customer-summary.scm:145
msgid "Sort alphabetically by customer name."
msgstr "Razvrstaj abecednim redom prema imenu kupca."
-#: gnucash/report/business-reports/customer-summary.scm:448
-#: gnucash/report/business-reports/customer-summary.scm:832
+#: gnucash/report/business-reports/customer-summary.scm:147
+#: gnucash/report/business-reports/customer-summary.scm:462
#: gnucash/report/standard-reports/average-balance.scm:128
#: gnucash/report/standard-reports/average-balance.scm:149
msgid "Profit"
msgstr "Dobit"
-#: gnucash/report/business-reports/customer-summary.scm:449
+#: gnucash/report/business-reports/customer-summary.scm:148
msgid "Sort by profit amount."
msgstr "Razvrstaj prema iznosu dobiti."
#. Translators: "Markup" is profit amount divided by sales amount
-#: gnucash/report/business-reports/customer-summary.scm:452
-#: gnucash/report/business-reports/customer-summary.scm:834
+#: gnucash/report/business-reports/customer-summary.scm:151
+#: gnucash/report/business-reports/customer-summary.scm:464
msgid "Markup"
msgstr "Marža"
-#: gnucash/report/business-reports/customer-summary.scm:453
+#: gnucash/report/business-reports/customer-summary.scm:152
msgid "Sort by markup (which is profit amount divided by sales)."
msgstr "Razvrstaj prema marži (to je iznos dobiti, podijeljen s prometom)."
-#: gnucash/report/business-reports/customer-summary.scm:455
-#: gnucash/report/business-reports/customer-summary.scm:834
+#: gnucash/report/business-reports/customer-summary.scm:154
+#: gnucash/report/business-reports/customer-summary.scm:464
msgid "Sales"
msgstr "Promet"
-#: gnucash/report/business-reports/customer-summary.scm:456
+#: gnucash/report/business-reports/customer-summary.scm:155
msgid "Sort by sales amount."
msgstr "Razvrstaj prema iznosu prometa."
-#: gnucash/report/business-reports/customer-summary.scm:459
+#: gnucash/report/business-reports/customer-summary.scm:158
msgid "Sort by expense amount."
msgstr "Razvrstaj prema iznosu rashoda."
-#: gnucash/report/business-reports/customer-summary.scm:469
+#: gnucash/report/business-reports/customer-summary.scm:168
msgid "A to Z, smallest to largest."
msgstr "A do Z, od manjeg k većem."
-#: gnucash/report/business-reports/customer-summary.scm:472
+#: gnucash/report/business-reports/customer-summary.scm:171
msgid "Z to A, largest to smallest."
msgstr "Z do A, od većeg k manjem."
-#: gnucash/report/business-reports/customer-summary.scm:513
-#: gnucash/report/business-reports/job-report.scm:418
-msgid "Expense Report"
-msgstr "Izvještaj o rashodu"
-
-#: gnucash/report/business-reports/customer-summary.scm:729
+#: gnucash/report/business-reports/customer-summary.scm:359
#: gnucash/report/business-reports/owner-report.scm:759
#: gnucash/report/report-gnome/dialog-report-column-view.c:412
#: gnucash/report/report-gnome/report-gnome.scm:51
msgid "Report"
msgstr "Izvještaj"
-#: gnucash/report/business-reports/customer-summary.scm:918
+#: gnucash/report/business-reports/customer-summary.scm:548
msgid "No Customer"
msgstr "Nema kupca"
-#: gnucash/report/business-reports/customer-summary.scm:993
+#: gnucash/report/business-reports/customer-summary.scm:623
#, scheme-format
msgid "~a ~a - ~a"
msgstr "~a ~a – ~a"
-#: gnucash/report/business-reports/customer-summary.scm:1013
-#: gnucash/report/business-reports/job-report.scm:625
-#, scheme-format
-msgid "No valid ~a selected. Click on the Options button to select a company."
-msgstr "Nije odabran valjani ~a. Klikni gumb „Opcije†za odabir poduzeća."
+#: gnucash/report/business-reports/customer-summary.scm:645
+#: gnucash/report/business-reports/job-report.scm:627
+#: gnucash/report/business-reports/owner-report.scm:81
+msgid "No valid customer selected."
+msgstr "Nije odabran nijedan valjani kupac."
-#: gnucash/report/business-reports/customer-summary.scm:1026
+#: gnucash/report/business-reports/customer-summary.scm:647
+#: gnucash/report/business-reports/job-report.scm:631
+msgid "No valid vendor selected."
+msgstr "Nije odabran nijedan valjani dobavljaÄ."
+
+#: gnucash/report/business-reports/customer-summary.scm:649
+#: gnucash/report/business-reports/job-report.scm:633
+#: gnucash/report/business-reports/owner-report.scm:82
+msgid "No valid employee selected."
+msgstr "Nije odabran nijedan valjani radnik."
+
+#: gnucash/report/business-reports/customer-summary.scm:651
+#: gnucash/report/business-reports/job-report.scm:636
+msgid "Click on the \"Options\" button to select a company."
+msgstr "Za odabir poduzeća, klikni gumb „Opcijeâ€."
+
+#: gnucash/report/business-reports/customer-summary.scm:663
msgid "Customer Summary"
msgstr "Sažetak kupaca"
@@ -21873,8 +22085,8 @@ msgstr "Proizvoljan naslov"
#: gnucash/report/business-reports/invoice.scm:205
msgid "A custom string to replace Invoice, Bill or Expense Voucher."
msgstr ""
-"Proizvoljni znakovni niz, koji zamijenjuje „Izlazni raÄunâ€, „Ulazni raÄun†ili "
-"„Rashodni vauÄerâ€."
+"Proizvoljni znakovni niz, koji zamijenjuje „Izlazni raÄunâ€, „Ulazni raÄun†"
+"ili „Rashodni vauÄerâ€."
#: gnucash/report/business-reports/invoice.scm:210
#: gnucash/report/business-reports/invoice.scm:216
@@ -21898,14 +22110,14 @@ msgstr "Mjesto za sliku"
#. Elements page options
#: gnucash/report/business-reports/invoice.scm:222
#: gnucash/report/business-reports/taxinvoice.scm:161
-#: gnucash/report/standard-reports/register.scm:401
-#: gnucash/report/standard-reports/transaction.scm:890
+#: gnucash/report/standard-reports/register.scm:400
+#: gnucash/report/standard-reports/transaction.scm:900
msgid "Display the date?"
msgstr "Prikazati datum?"
#: gnucash/report/business-reports/invoice.scm:227
-#: gnucash/report/standard-reports/register.scm:416
-#: gnucash/report/standard-reports/transaction.scm:895
+#: gnucash/report/standard-reports/register.scm:415
+#: gnucash/report/standard-reports/transaction.scm:905
msgid "Display the description?"
msgstr "Prikazati opis?"
@@ -21956,20 +22168,20 @@ msgstr "Prikazati vrijednost za unos?"
#: gnucash/report/business-reports/invoice.scm:356
#: gnucash/report/business-reports/receipt.scm:77
#: gnucash/report/business-reports/taxinvoice.scm:84
-#: gnucash/report/report-system/report.scm:70
-#: gnucash/report/standard-reports/register.scm:400
-#: gnucash/report/standard-reports/register.scm:406
-#: gnucash/report/standard-reports/register.scm:410
-#: gnucash/report/standard-reports/register.scm:415
-#: gnucash/report/standard-reports/register.scm:420
-#: gnucash/report/standard-reports/register.scm:425
-#: gnucash/report/standard-reports/register.scm:430
-#: gnucash/report/standard-reports/register.scm:435
-#: gnucash/report/standard-reports/register.scm:440
-#: gnucash/report/standard-reports/register.scm:445
-#: gnucash/report/standard-reports/register.scm:454
-#: gnucash/report/standard-reports/register.scm:459
-#: gnucash/report/standard-reports/register.scm:464
+#: gnucash/report/report-system/report.scm:69
+#: gnucash/report/standard-reports/register.scm:399
+#: gnucash/report/standard-reports/register.scm:405
+#: gnucash/report/standard-reports/register.scm:409
+#: gnucash/report/standard-reports/register.scm:414
+#: gnucash/report/standard-reports/register.scm:419
+#: gnucash/report/standard-reports/register.scm:424
+#: gnucash/report/standard-reports/register.scm:429
+#: gnucash/report/standard-reports/register.scm:434
+#: gnucash/report/standard-reports/register.scm:439
+#: gnucash/report/standard-reports/register.scm:444
+#: gnucash/report/standard-reports/register.scm:453
+#: gnucash/report/standard-reports/register.scm:458
+#: gnucash/report/standard-reports/register.scm:463
msgid "Display"
msgstr "Prikaz"
@@ -22035,8 +22247,8 @@ msgstr "Koristi detaljizirani sažetak poreza"
#: gnucash/report/business-reports/invoice.scm:315
msgid ""
-"Display all tax categories separately (one per line) instead of one single tax "
-"line.?"
+"Display all tax categories separately (one per line) instead of one single "
+"tax line.?"
msgstr ""
"Prikaži sve porezne kategorije pojedinaÄno (jedan po retku), umjesto jednog "
"retka s porezima?"
@@ -22124,8 +22336,8 @@ msgstr "Treći redak desno"
#: gnucash/report/business-reports/invoice.scm:450
#: gnucash/report/business-reports/job-report.scm:242
-msgid "Payment, thank you"
-msgstr "Zahvaljujemo Vam na plaćanju"
+msgid "Payment, thank you!"
+msgstr "Zahvaljujemo Vam na plaćanju!"
# P = Porez
#. Translators: This "T" is displayed in the taxable column, if this entry contains tax
@@ -22184,11 +22396,11 @@ msgstr "REF"
#: gnucash/report/business-reports/invoice.scm:783
msgid ""
-"No valid invoice selected. Click on the Options button and select the invoice to "
-"use."
+"No valid invoice selected. Click on the Options button and select the "
+"invoice to use."
msgstr ""
-"Nije odabran valjan izlazni raÄun. Klikni gumb „Opcije†i odaberi raÄun, koji "
-"ćeš koristiti."
+"Nije odabran nijedan valjani izlazni raÄun. Klikni gumb „Opcije†i odaberi "
+"raÄun, koji ćeÅ¡ koristiti."
#. Translators: This is the format of the invoice title.
#. The first ~a is "Invoice", "Credit Note"... and the second the number.
@@ -22244,26 +22456,26 @@ msgstr "Prikazati opis transakcije?"
msgid "Display the transaction amount?"
msgstr "Prikazati iznos transakcije?"
+#: gnucash/report/business-reports/job-report.scm:418
+msgid "Expense Report"
+msgstr "Izvještaj o rashodu"
+
#: gnucash/report/business-reports/job-report.scm:555
-#: gnucash/report/business-reports/job-report.scm:667
+#: gnucash/report/business-reports/job-report.scm:677
msgid "Job Report"
msgstr "Izvještaj o nalogu"
+#: gnucash/report/business-reports/job-report.scm:629
+msgid "No valid job selected."
+msgstr "Nije odabran nijedan valjani nalog."
+
#: gnucash/report/business-reports/owner-report.scm:56
msgid "Sale"
msgstr "Prodaja"
-#: gnucash/report/business-reports/owner-report.scm:81
-msgid "No valid customer selected."
-msgstr "Nije odabran valjani kupac."
-
-#: gnucash/report/business-reports/owner-report.scm:82
-msgid "No valid employee selected."
-msgstr "Nije odabran ispravan radnik."
-
#: gnucash/report/business-reports/owner-report.scm:85
msgid "No valid company selected."
-msgstr "Nije odabrano valjano poduzeće."
+msgstr "Nije odabrano nijedno valjano poduzeće."
#: gnucash/report/business-reports/owner-report.scm:88
msgid "This report requires a customer to be selected."
@@ -22279,7 +22491,7 @@ msgstr "Za ovaj izvještaj je potrebno odabrati poduzeće."
#: gnucash/report/business-reports/owner-report.scm:108
msgid "No valid account selected"
-msgstr "Nije odabran valjani konto"
+msgstr "Nije odabran nijedan valjani konto"
#: gnucash/report/business-reports/owner-report.scm:109
msgid "This report requires a valid account to be selected."
@@ -22335,7 +22547,8 @@ msgstr "Opis"
#: gnucash/report/business-reports/receipt.eguile.scm:293
#: gnucash/report/business-reports/taxinvoice.eguile.scm:448
-msgid "No invoice has been selected -- please use the Options menu to select one."
+msgid ""
+"No invoice has been selected -- please use the Options menu to select one."
msgstr ""
"Nije odabran nijedan izlazni raÄun. Za odabir raÄuna, koristi „Opcije†u "
"izborniku."
@@ -22469,14 +22682,14 @@ msgid ""
"GnuCash installation directories."
msgstr ""
"Ime datoteke eguile-predloška za ovaj izvještaj. Ova bi se datoteka morala "
-"nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem mjestu u "
-"direktoriju GnuCash instalacije."
+"nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem mjestu "
+"u direktoriju GnuCash instalacije."
#: gnucash/report/business-reports/receipt.scm:136
msgid ""
-"The file name of the CSS stylesheet to use with this report. This file should "
-"either be in your .gnucash directory, or else in its proper place within the "
-"GnuCash installation directories."
+"The file name of the CSS stylesheet to use with this report. This file "
+"should either be in your .gnucash directory, or else in its proper place "
+"within the GnuCash installation directories."
msgstr ""
"Ime datoteke CSS stilskog predloška za ovaj izvještaj. Ova bi se datoteka "
"morala nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem "
@@ -22497,12 +22710,12 @@ msgstr "Ime datoteke logotipa, koji se koristi u zaglavlju izvještaja"
#: gnucash/report/business-reports/receipt.scm:149
msgid ""
"Width of the header logo in CSS format, e.g. 10% or 32px. Leave blank to "
-"display the logo at its natural width. The height of the logo will be scaled "
-"accordingly."
+"display the logo at its natural width. The height of the logo will be "
+"scaled accordingly."
msgstr ""
-"Å irina logotipa u zaglavlju u CSS formatu, npr. 10 % ili 32 px. Ostavi prazno, "
-"za prikaz logotipa u prirodnoj širini. Visina logotipa će se skalirati "
-"proporcionalno."
+"Å irina logotipa u zaglavlju u CSS formatu, npr. 10 % ili 32 px. Ostavi "
+"prazno, za prikaz logotipa u prirodnoj širini. Visina logotipa će se "
+"skalirati proporcionalno."
#: gnucash/report/business-reports/receipt.scm:152
msgid "Name of a file containing a logo to be used on the footer of the report"
@@ -22511,20 +22724,21 @@ msgstr "Ime datoteke logotipa, koji se koristi u podnožju izvještaja"
#: gnucash/report/business-reports/receipt.scm:155
msgid ""
"Width of the footer logo in CSS format, e.g. 10% or 32px. Leave blank to "
-"display the logo at its natural width. The height of the logo will be scaled "
-"accordingly."
+"display the logo at its natural width. The height of the logo will be "
+"scaled accordingly."
msgstr ""
-"Širina logotipa u podnožju u CSS formatu, npr. 10 % ili 32 px. Ostavi prazno, za "
-"prikaz logotipa u prirodnoj širini. Visina logotipa će se skalirati "
-"proporcionalno."
+"Širina logotipa u podnožju u CSS formatu, npr. 10 % ili 32 px. Ostavi "
+"prazno, za prikaz logotipa u prirodnoj širini. Visina logotipa će se "
+"skalirati proporcionalno."
#: gnucash/report/business-reports/receipt.scm:158
msgid "The format for the date->string conversion for today's date."
msgstr "Format konverzije datuma u znakovni niz, za današnji datum."
#: gnucash/report/business-reports/receipt.scm:188
-msgid "Payment received, thank you"
-msgstr "Zahvaljujemo Vam na plaćanju"
+#: gnucash/report/business-reports/taxinvoice.scm:224
+msgid "Payment received, thank you!"
+msgstr "Zahvaljujemo Vam na plaćanju!"
#: gnucash/report/business-reports/receipt.scm:192
msgid "Notes added at end of invoice -- may contain HTML markup"
@@ -22718,18 +22932,18 @@ msgid ""
"GnuCash installation directories."
msgstr ""
"Ime datoteke eguile-predloška za ovaj izvještaj. Ova bi se datoteka morala "
-"nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem mjestu u "
-"direktoriju GnuCash instalacije."
+"nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem mjestu "
+"u direktoriju GnuCash instalacije."
#: gnucash/report/business-reports/taxinvoice.scm:178
msgid ""
-"The file name of the CSS stylesheet to use with this report. This file should "
-"either be in your .gnucash directory, or else in its proper place within the "
-"GnuCash installation directories."
+"The file name of the CSS stylesheet to use with this report. This file "
+"should either be in your .gnucash directory, or else in its proper place "
+"within the GnuCash installation directories."
msgstr ""
-"Ime datoteke CSS stilskog predloška za ovaj izvještaj. Ova bi se datoteka morala "
-"nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem mjestu u "
-"direktoriju GnuCash instalacije."
+"Ime datoteke CSS stilskog predloška za ovaj izvještaj. Ova bi se datoteka "
+"morala nalaziti u tvojem „.gnucash“ direktoriju ili na svojem odgovarajućem "
+"mjestu u direktoriju GnuCash instalacije."
#: gnucash/report/business-reports/taxinvoice.scm:182
msgid "Font to use for the main heading."
@@ -22745,12 +22959,13 @@ msgstr "Ime datoteke logotipa, koji će se koristiti u izvještajima."
#: gnucash/report/business-reports/taxinvoice.scm:191
msgid ""
-"Width of the logo in CSS format, e.g. 10% or 32px. Leave blank to display the "
-"logo at its natural width. The height of the logo will be scaled accordingly."
+"Width of the logo in CSS format, e.g. 10% or 32px. Leave blank to display "
+"the logo at its natural width. The height of the logo will be scaled "
+"accordingly."
msgstr ""
-"Å irina logotipa u CSS formatu, npr. 10 % ili 32 px. Ostavi polje prazno, kako bi "
-"se logotip prikazao u svojoj prirodnoj širini. Visina logotipa će biti "
-"proporcijonalno skalirana."
+"Å irina logotipa u CSS formatu, npr. 10 % ili 32 px. Ostavi polje prazno, "
+"kako bi se logotip prikazao u svojoj prirodnoj širini. Visina logotipa će "
+"biti proporcijonalno skalirana."
#: gnucash/report/business-reports/taxinvoice.scm:192
msgid "Border-collapse?"
@@ -22761,10 +22976,6 @@ msgstr "Border-collapse?"
msgid "CSS color."
msgstr "CSS boja."
-#: gnucash/report/business-reports/taxinvoice.scm:224
-msgid "Payment received, thank you."
-msgstr "Zahvaljujemo Vam na plaćanju."
-
#: gnucash/report/business-reports/taxinvoice.scm:226
msgid "Invoice number: "
msgstr "RaÄun br.: "
@@ -22792,7 +23003,8 @@ msgstr "Ugrađeni CSS."
#: gnucash/report/business-reports/taxinvoice.scm:325
msgid "Display a customer invoice with tax columns (using eguile template)"
msgstr ""
-"Prikaži izlazni raÄun za kupca s poreznim stupcima (koristeći eguile predložak)"
+"Prikaži izlazni raÄun za kupca s poreznim stupcima (koristeći eguile "
+"predložak)"
#. (gnc:warn "title: " (gnc:option-value title-op))
#: gnucash/report/business-reports/taxinvoice.scm:338
@@ -22831,52 +23043,53 @@ msgstr "Australski izlazni raÄun s poreznim podacima"
#: gnucash/report/business-reports/taxinvoice.scm:354
msgid ""
-"Display an Australian customer invoice with tax columns (using eguile template)"
+"Display an Australian customer invoice with tax columns (using eguile "
+"template)"
msgstr ""
-"Prikaži australski izlazni raÄun za kupca s poreznim stupcima (koristeći eguile "
-"predložak)"
+"Prikaži australski izlazni raÄun za kupca s poreznim stupcima (koristeći "
+"eguile predložak)"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:80
msgid "Tax Report / TXF Export"
msgstr "Izvještaj o porezu / TXF izvoz"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:152
-#: gnucash/report/locale-specific/us/taxtxf.scm:173
+#: gnucash/report/locale-specific/us/taxtxf.scm:180
msgid "Alternate Period"
msgstr "NaizmjeniÄno razdoblje"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:153
-#: gnucash/report/locale-specific/us/taxtxf.scm:174
+#: gnucash/report/locale-specific/us/taxtxf.scm:181
msgid "Override or modify From: & To:."
msgstr "Zanemari ili promijeni „od:“ i „do:“."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:156
-#: gnucash/report/locale-specific/us/taxtxf.scm:177
+#: gnucash/report/locale-specific/us/taxtxf.scm:184
msgid "Use From - To"
msgstr "Koristi „od – doâ€"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:156
-#: gnucash/report/locale-specific/us/taxtxf.scm:177
+#: gnucash/report/locale-specific/us/taxtxf.scm:184
msgid "Use From - To period."
msgstr "Koristi razdoblje „od – doâ€."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:158
-#: gnucash/report/locale-specific/us/taxtxf.scm:179
+#: gnucash/report/locale-specific/us/taxtxf.scm:186
msgid "1st Est Tax Quarter"
msgstr "Procijenjeni porez 1. kvartala"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:158
-#: gnucash/report/locale-specific/us/taxtxf.scm:179
+#: gnucash/report/locale-specific/us/taxtxf.scm:186
msgid "Jan 1 - Mar 31."
msgstr "1. sijeÄnja – 31. ožujka."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:160
-#: gnucash/report/locale-specific/us/taxtxf.scm:181
+#: gnucash/report/locale-specific/us/taxtxf.scm:188
msgid "2nd Est Tax Quarter"
msgstr "Procijenjeni porez 2. kvartala"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:160
-#: gnucash/report/locale-specific/us/taxtxf.scm:181
+#: gnucash/report/locale-specific/us/taxtxf.scm:188
msgid "Apr 1 - May 31."
msgstr "1. travnja – 31. svibnja."
@@ -22884,57 +23097,57 @@ msgstr "1. travnja – 31. svibnja."
#. actual year's quarters! See the definition of
#. tax-qtr-real-qtr-year variable above.
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:165
-#: gnucash/report/locale-specific/us/taxtxf.scm:186
+#: gnucash/report/locale-specific/us/taxtxf.scm:193
msgid "3rd Est Tax Quarter"
msgstr "Procijenjeni porez 3. kvartala"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:165
-#: gnucash/report/locale-specific/us/taxtxf.scm:186
+#: gnucash/report/locale-specific/us/taxtxf.scm:193
msgid "Jun 1 - Aug 31."
msgstr "1. lipnja – 31. kolovoza."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:167
-#: gnucash/report/locale-specific/us/taxtxf.scm:188
+#: gnucash/report/locale-specific/us/taxtxf.scm:195
msgid "4th Est Tax Quarter"
msgstr "Procijenjeni porez 4. kvartala"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:167
-#: gnucash/report/locale-specific/us/taxtxf.scm:188
+#: gnucash/report/locale-specific/us/taxtxf.scm:195
msgid "Sep 1 - Dec 31."
msgstr "1. rujna – 31. prosinca."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:169
-#: gnucash/report/locale-specific/us/taxtxf.scm:190
+#: gnucash/report/locale-specific/us/taxtxf.scm:197
msgid "Last Year"
msgstr "Prošle godine"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:169
-#: gnucash/report/locale-specific/us/taxtxf.scm:190
+#: gnucash/report/locale-specific/us/taxtxf.scm:197
msgid "Last Year."
msgstr "Prošle godine."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:171
-#: gnucash/report/locale-specific/us/taxtxf.scm:192
+#: gnucash/report/locale-specific/us/taxtxf.scm:199
msgid "Last Yr 1st Est Tax Qtr"
msgstr "Procijenjeni porez 1. kvartala prošle godine"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:172
-#: gnucash/report/locale-specific/us/taxtxf.scm:193
+#: gnucash/report/locale-specific/us/taxtxf.scm:200
msgid "Jan 1 - Mar 31, Last year."
msgstr "1. sijeÄnja – 31. ožujka, proÅ¡le godine."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:174
-#: gnucash/report/locale-specific/us/taxtxf.scm:195
+#: gnucash/report/locale-specific/us/taxtxf.scm:202
msgid "Last Yr 2nd Est Tax Qtr"
msgstr "Procijenjeni porez 2. kvartala prošle godine"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:175
-#: gnucash/report/locale-specific/us/taxtxf.scm:196
+#: gnucash/report/locale-specific/us/taxtxf.scm:203
msgid "Apr 1 - May 31, Last year."
msgstr "1. travnja – 31. svibnja, prošle godine."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:177
-#: gnucash/report/locale-specific/us/taxtxf.scm:198
+#: gnucash/report/locale-specific/us/taxtxf.scm:205
msgid "Last Yr 3rd Est Tax Qtr"
msgstr "Procijenjeni porez 3. kvartala prošle godine"
@@ -22942,32 +23155,32 @@ msgstr "Procijenjeni porez 3. kvartala prošle godine"
#. actual year's quarters! See the definition of
#. tax-qtr-real-qtr-year variable above.
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:178
-#: gnucash/report/locale-specific/us/taxtxf.scm:202
+#: gnucash/report/locale-specific/us/taxtxf.scm:209
msgid "Jun 1 - Aug 31, Last year."
msgstr "1. lipnja – 31. kolovoza, prošle godine."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:180
-#: gnucash/report/locale-specific/us/taxtxf.scm:204
+#: gnucash/report/locale-specific/us/taxtxf.scm:211
msgid "Last Yr 4th Est Tax Qtr"
msgstr "Procijenjeni porez 4. kvartala prošle godine"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:181
-#: gnucash/report/locale-specific/us/taxtxf.scm:205
+#: gnucash/report/locale-specific/us/taxtxf.scm:212
msgid "Sep 1 - Dec 31, Last year."
msgstr "1. rujna – 31. prosinca, prošle godine."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:185
-#: gnucash/report/locale-specific/us/taxtxf.scm:209
+#: gnucash/report/locale-specific/us/taxtxf.scm:216
msgid "Select Accounts (none = all)"
msgstr "Odaberi konta (ništa = sve)"
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:186
-#: gnucash/report/locale-specific/us/taxtxf.scm:210
+#: gnucash/report/locale-specific/us/taxtxf.scm:217
msgid "Select accounts."
msgstr "Odaberi konta."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:192
-#: gnucash/report/locale-specific/us/taxtxf.scm:216
+#: gnucash/report/locale-specific/us/taxtxf.scm:223
msgid "Suppress $0.00 values"
msgstr "Ne prikazuj vrijednosti od 0,00 kn"
@@ -22985,11 +23198,11 @@ msgstr "IspiÅ¡i sva imena matiÄnih konta."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:276
msgid ""
-"WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF codes "
-"with payer sources may be repeated."
+"WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF "
+"codes with payer sources may be repeated."
msgstr ""
-"UPOZORENJE: Postoje duple TXF Å¡ifre, dodijeljene nekim kontima. Ponavljati se "
-"smiju samo TXF Å¡ifre s izvorima platilaca."
+"UPOZORENJE: Postoje duple TXF Å¡ifre, dodijeljene nekim kontima. Ponavljati "
+"se smiju samo TXF Å¡ifre s izvorima platilaca."
#: gnucash/report/locale-specific/us/taxtxf-de_DE.scm:853
#, scheme-format
@@ -23022,120 +23235,123 @@ msgstr "XML"
msgid "This page shows your Taxable Income and Deductible Expenses."
msgstr "Ova stranica prikazuje tvoje oporezive prihode i umanjive rashode."
-#: gnucash/report/locale-specific/us/taxtxf.scm:111
+#: gnucash/report/locale-specific/us/taxtxf.scm:118
msgid "Tax Schedule Report/TXF Export"
msgstr "Izvještaj o terminiranom porezu/TXF izvoz"
-#: gnucash/report/locale-specific/us/taxtxf.scm:217
+#: gnucash/report/locale-specific/us/taxtxf.scm:224
msgid "$0.00 valued Tax codes won't be printed."
msgstr "Porezna polja s vrijednosti od 0,00 kn se neće ispisivati."
-#: gnucash/report/locale-specific/us/taxtxf.scm:221
+#: gnucash/report/locale-specific/us/taxtxf.scm:228
msgid "Do not print full account names"
msgstr "Ne ispisuj cjelokupna imena konta"
-#: gnucash/report/locale-specific/us/taxtxf.scm:222
+#: gnucash/report/locale-specific/us/taxtxf.scm:229
msgid "Do not print all Parent account names."
msgstr "Ne ispisuj imena svih matiÄnih konta."
-#: gnucash/report/locale-specific/us/taxtxf.scm:226
+#: gnucash/report/locale-specific/us/taxtxf.scm:233
msgid "Print all Transfer To/From Accounts"
msgstr "Ispiši sva konta prijenosa u/iz"
-#: gnucash/report/locale-specific/us/taxtxf.scm:227
+#: gnucash/report/locale-specific/us/taxtxf.scm:234
msgid "Print all split details for multi-split transactions."
msgstr "Ispiši detalje svih stavaka za višedjelne transakcije."
-#: gnucash/report/locale-specific/us/taxtxf.scm:231
+#: gnucash/report/locale-specific/us/taxtxf.scm:238
msgid "Print TXF export parameters"
msgstr "Ispiši parametre TXF izvoza"
-#: gnucash/report/locale-specific/us/taxtxf.scm:232
+#: gnucash/report/locale-specific/us/taxtxf.scm:239
msgid "Show TXF export parameters for each TXF code/account on report."
msgstr "Prikaži parametre TXF izvoza za svaku TXF šifru/konto u izvještaju."
-#: gnucash/report/locale-specific/us/taxtxf.scm:237
+#: gnucash/report/locale-specific/us/taxtxf.scm:244
msgid "Do not print T-Num:Memo data"
msgstr "Do not print T-Num:Podaci zabilješke"
-#: gnucash/report/locale-specific/us/taxtxf.scm:238
+#: gnucash/report/locale-specific/us/taxtxf.scm:245
msgid "Do not print T-Num:Memo data for transactions."
msgstr "Do not print T-Num:Podaci zabilješke za transakcije."
-#: gnucash/report/locale-specific/us/taxtxf.scm:241
+#: gnucash/report/locale-specific/us/taxtxf.scm:248
msgid "Do not print Action:Memo data"
msgstr "Do not print Action:Podaci zabilješke"
-#: gnucash/report/locale-specific/us/taxtxf.scm:242
+#: gnucash/report/locale-specific/us/taxtxf.scm:249
msgid "Do not print Action:Memo data for transactions."
msgstr "Do not print Action:Podaci zabilješke za transakcije."
-#: gnucash/report/locale-specific/us/taxtxf.scm:246
+#: gnucash/report/locale-specific/us/taxtxf.scm:253
msgid "Do not print transaction detail"
msgstr "Ne ispisuj detalje transakcije"
-#: gnucash/report/locale-specific/us/taxtxf.scm:247
+#: gnucash/report/locale-specific/us/taxtxf.scm:254
msgid "Do not print transaction detail for accounts."
msgstr "Ne ispisuj detalje transakcije za konta."
-#: gnucash/report/locale-specific/us/taxtxf.scm:251
+#: gnucash/report/locale-specific/us/taxtxf.scm:258
msgid "Do not use special date processing"
msgstr "Ne koristi specijalnu obradu datuma"
-#: gnucash/report/locale-specific/us/taxtxf.scm:252
+#: gnucash/report/locale-specific/us/taxtxf.scm:259
msgid "Do not print transactions out of specified dates."
msgstr "Ne ispisuj transakcije, koje se nalaze izvan određenih datuma."
-#: gnucash/report/locale-specific/us/taxtxf.scm:256
+#: gnucash/report/locale-specific/us/taxtxf.scm:263
msgid "Currency conversion date"
msgstr "Datum konvertiranja valute"
-#: gnucash/report/locale-specific/us/taxtxf.scm:257
+#: gnucash/report/locale-specific/us/taxtxf.scm:264
msgid "Select date to use for PriceDB lookups."
msgstr "Odaberi datum za pretraživanje baze podataka cijena."
-#: gnucash/report/locale-specific/us/taxtxf.scm:260
+#: gnucash/report/locale-specific/us/taxtxf.scm:267
msgid "Nearest transaction date"
msgstr "Najbliži datum transakcije"
-#: gnucash/report/locale-specific/us/taxtxf.scm:260
+#: gnucash/report/locale-specific/us/taxtxf.scm:267
msgid "Use nearest to transaction date."
msgstr "Koristi najbliži datumu transakcije."
-#: gnucash/report/locale-specific/us/taxtxf.scm:262
+#: gnucash/report/locale-specific/us/taxtxf.scm:269
msgid "Nearest report date"
msgstr "Najbliži datum izvještaja"
-#: gnucash/report/locale-specific/us/taxtxf.scm:262
+#: gnucash/report/locale-specific/us/taxtxf.scm:269
msgid "Use nearest to report date."
msgstr "Koristi najbliži datumu izvještaja."
-#: gnucash/report/locale-specific/us/taxtxf.scm:3444
+#: gnucash/report/locale-specific/us/taxtxf.scm:3453
msgid "Tax Schedule Report & TXF Export"
msgstr "Izvještaj o terminiranom porezu i TXF izvoz"
#. 'menu-path (list gnc:menuname-taxes)
-#: gnucash/report/locale-specific/us/taxtxf.scm:3446
+#: gnucash/report/locale-specific/us/taxtxf.scm:3455
msgid ""
-"Taxable Income/Deductible Expenses with Transaction Detail/Export to .TXF file"
+"Taxable Income/Deductible Expenses with Transaction Detail/Export to .TXF "
+"file"
msgstr ""
"Oporezivi prihod/umanjivi rashod s detaljem transakcije/izvoz u .TXF datoteku"
-#: gnucash/report/locale-specific/us/taxtxf.scm:3450
#: gnucash/report/locale-specific/us/taxtxf.scm:3459
+#: gnucash/report/locale-specific/us/taxtxf.scm:3468
msgid "Taxable Income/Deductible Expenses"
msgstr "Oporezivi prihod/Umanjivi rashod"
-#: gnucash/report/locale-specific/us/taxtxf.scm:3451
+#: gnucash/report/locale-specific/us/taxtxf.scm:3460
msgid ""
-"This report shows transaction detail for your accounts related to Income Taxes."
+"This report shows transaction detail for your accounts related to Income "
+"Taxes."
msgstr ""
-"Ovaj izvještaj prikazuje detalj transakcije za tvoja konta, koji se odnose na "
-"porez na prihod."
+"Ovaj izvještaj prikazuje detalj transakcije za tvoja konta, koji se odnose "
+"na porez na prihod."
-#: gnucash/report/locale-specific/us/taxtxf.scm:3460
+#: gnucash/report/locale-specific/us/taxtxf.scm:3469
msgid "This page shows transaction detail for relevant Income Tax accounts."
-msgstr "Ova stranica prikazuje detalj transakcije za bitna konta poreza na prihod."
+msgstr ""
+"Ova stranica prikazuje detalj transakcije za bitna konta poreza na prihod."
#. we must confirm the user wants to delete their precious custom report!
#: gnucash/report/report-gnome/dialog-custom-report.c:318
@@ -23160,8 +23376,8 @@ msgid ""
"A saved report configuration with this name already exists, please choose "
"another name."
msgstr ""
-"SaÄuvano podeÅ¡avanje izvjeÅ¡taja pod ovim imenom već postoji, odaberi neko drugo "
-"ime."
+"SaÄuvano podeÅ¡avanje izvjeÅ¡taja pod ovim imenom već postoji, odaberi neko "
+"drugo ime."
#: gnucash/report/report-gnome/dialog-custom-report.c:486
msgid "Load report configuration"
@@ -23202,143 +23418,143 @@ msgstr "Moraš zadati ime za novi stilski predložak."
msgid "Style Sheet Name"
msgstr "Ime stilskog predloška"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:335
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:336
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:307
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:308
msgid "The numeric ID of the report."
msgstr "NumeriÄki broj izvjeÅ¡taja."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1123
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1095
msgid "Print"
msgstr "Ispiši"
#. Translators: This string is meant to be a short alternative for "Save Report Configuration"
#. * to be used as toolbar button label.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1128
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1100
msgid "Save Config"
msgstr "Spremi konfiguraciju"
#. Translators: This string is meant to be a short alternative for "Save Report Configuration As..."
#. * to be used as toolbar button label.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1131
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1103
msgid "Save Config As..."
msgstr "Spremi konfiguraciju kao …"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1132
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1104
msgid "Make Pdf"
msgstr "Stvori PDF"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1184
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1156
#, c-format
msgid ""
-"Update the current report's saved configuration. The report will be saved in the "
-"file %s. "
+"Update the current report's saved configuration. The report will be saved in "
+"the file %s. "
msgstr ""
-"Aktualiziraj trenutaÄnu konfiguraciju spremljenog izvjeÅ¡taja. IzvjeÅ¡taj će biti "
-"spremljen u datoteku %s. "
+"Aktualiziraj trenutaÄnu konfiguraciju spremljenog izvjeÅ¡taja. IzvjeÅ¡taj će "
+"biti spremljen u datoteku %s. "
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1187
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1159
#, c-format
msgid ""
"Add the current report's configuration to the `Saved Report Configurations' "
"menu. The report will be saved in the file %s. "
msgstr ""
-"Dodaj trenutaÄnu konfiguraciju izvjeÅ¡taja u izbornik „Konfiguracije spremljenih "
-"izvjeÅ¡tajaâ€. IzvjeÅ¡taj će biti spremljen u datoteku %s. "
+"Dodaj trenutaÄnu konfiguraciju izvjeÅ¡taja u izbornik „Konfiguracije "
+"spremljenih izvjeÅ¡tajaâ€. IzvjeÅ¡taj će biti spremljen u datoteku %s. "
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1193
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1165
msgid "_Print Report..."
msgstr "_Ispiši izvještaj …"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1194
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1166
msgid "Print the current report"
msgstr "IspiÅ¡i trenutaÄni izvjeÅ¡taj"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1198
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1170
msgid "Export as P_DF..."
msgstr "Izvezi kao _PDF …"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1199
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1171
msgid "Export the current report as a PDF document"
msgstr "Izvezi trenutaÄni izvjeÅ¡taj kao PDF dokument"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1223
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1195
msgid "Save _Report Configuration"
msgstr "Spremi _konfiguraciju za izvještaj"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1227
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1199
msgid "Save Report Configuration As..."
msgstr "Spremi _konfiguraciju za izvještaj kao …"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1231
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1203
msgid "Export _Report"
msgstr "Izvezi _izvještaj"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1232
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1204
msgid "Export HTML-formatted report to file"
msgstr "Izvezi HTML-oblikovani izvještaj u datoteku"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1236
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1208
msgid "_Report Options"
msgstr "_Opcije za izvještaj"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1237
-#: gnucash/report/report-system/html-utilities.scm:817
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1209
+#: gnucash/report/report-system/html-utilities.scm:786
msgid "Edit report options"
msgstr "Uredi opcije izvještaja"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1242
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1214
msgid "Back"
msgstr "Natrag"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1243
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1215
msgid "Move back one step in the history"
msgstr "Idi jedan korak natrag u popisu prethodnih"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1247
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1219
msgid "Forward"
msgstr "Naprijed"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1248
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1220
msgid "Move forward one step in the history"
msgstr "Idi jedan korak naprijed u popisu prethodnih"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1252
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1224
msgid "Reload"
msgstr "Osvježi"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1253
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1225
msgid "Reload the current page"
msgstr "Ponovo uÄitaj trenutaÄnu stranicu"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1257
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1229
msgid "Stop"
msgstr "Zaustavi"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1258
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1230
msgid "Cancel outstanding HTML requests"
msgstr "Odustani od neispunjenih HTML zahtjeva"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1505
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1538
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1477
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1510
msgid "HTML"
msgstr "HTML"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1508
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1480
msgid "Choose export format"
msgstr "Odaberi format za izvoz"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1509
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1481
msgid "Choose the export format for this report:"
msgstr "Odaberi format izvoza za ovaj izvještaj:"
#. %s is the type of what is about to be saved, e.g. "HTML".
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1549
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1521
#, c-format
msgid "Save %s To File"
msgstr "Spremi „%s“ u datoteku"
#. %s is the strerror(3) string of the error that occurred.
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1578
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1550
#, c-format
msgid ""
"You cannot save to that filename.\n"
@@ -23349,16 +23565,16 @@ msgstr ""
"\n"
"%s"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1588
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1560
msgid "You cannot save to that file."
msgstr "Ne možeš spremiti u tu datoteku."
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1718
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1690
#, c-format
msgid "Could not open the file %s. The error is: %s"
msgstr "Nije moguće otvoriti datoteku „%s“. Greška: %s"
-#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1758
+#: gnucash/report/report-gnome/gnc-plugin-page-report.c:1730
msgid "GnuCash-Report"
msgstr "GnuCash izvještaj"
@@ -23369,7 +23585,8 @@ msgstr "Prikaži ~a izvještaj"
#: gnucash/report/report-gnome/report-gnome.scm:116
msgid "Manage and run saved report configurations"
-msgstr "Upravljaj spremljenim konfiguracijama izvještaja, te pokreni izvještaje"
+msgstr ""
+"Upravljaj spremljenim konfiguracijama izvještaja, te pokreni izvještaje"
#: gnucash/report/report-gnome/report-gnome.scm:137
msgid "Welcome Sample Report"
@@ -23422,83 +23639,83 @@ msgstr "Nije moguće uÄitati datoteku predloÅ¡ka „~aâ€"
msgid "Adjusting Entries"
msgstr "Podešavajući unosi"
-#: gnucash/report/report-system/html-fonts.scm:88
-#: gnucash/report/report-system/html-fonts.scm:93
-#: gnucash/report/report-system/html-fonts.scm:98
-#: gnucash/report/report-system/html-fonts.scm:103
-#: gnucash/report/report-system/html-fonts.scm:108
-#: gnucash/report/report-system/html-fonts.scm:113
-#: gnucash/report/report-system/html-fonts.scm:118
-#: gnucash/report/report-system/html-fonts.scm:123
-#: gnucash/report/report-system/html-fonts.scm:128
+#: gnucash/report/report-system/html-fonts.scm:71
+#: gnucash/report/report-system/html-fonts.scm:76
+#: gnucash/report/report-system/html-fonts.scm:81
+#: gnucash/report/report-system/html-fonts.scm:86
+#: gnucash/report/report-system/html-fonts.scm:91
+#: gnucash/report/report-system/html-fonts.scm:96
+#: gnucash/report/report-system/html-fonts.scm:101
+#: gnucash/report/report-system/html-fonts.scm:106
+#: gnucash/report/report-system/html-fonts.scm:111
msgid "Fonts"
msgstr "Fontovi"
-#: gnucash/report/report-system/html-fonts.scm:89
+#: gnucash/report/report-system/html-fonts.scm:72
msgid "Font info for the report title."
msgstr "Font informacije za naslov izvještaja."
-#: gnucash/report/report-system/html-fonts.scm:94
+#: gnucash/report/report-system/html-fonts.scm:77
msgid "Account link"
msgstr "Poveznica konta"
-#: gnucash/report/report-system/html-fonts.scm:94
+#: gnucash/report/report-system/html-fonts.scm:77
msgid "Font info for account name."
msgstr "Font informacije za ime konta."
-#: gnucash/report/report-system/html-fonts.scm:99
+#: gnucash/report/report-system/html-fonts.scm:82
msgid "Number cell"
msgstr "Polje iznosa"
-#: gnucash/report/report-system/html-fonts.scm:99
+#: gnucash/report/report-system/html-fonts.scm:82
msgid "Font info for regular number cells."
msgstr "Font informacije za polja iznosa."
-#: gnucash/report/report-system/html-fonts.scm:104
+#: gnucash/report/report-system/html-fonts.scm:87
msgid "Negative Values in Red"
msgstr "Negativne vrijednosti crvenom bojom"
-#: gnucash/report/report-system/html-fonts.scm:104
+#: gnucash/report/report-system/html-fonts.scm:87
msgid "Display negative values in red."
msgstr "Prikaži negativne vrijednosti crvenom bojom."
-#: gnucash/report/report-system/html-fonts.scm:109
+#: gnucash/report/report-system/html-fonts.scm:92
msgid "Number header"
msgstr "Zaglavlje iznosa"
-#: gnucash/report/report-system/html-fonts.scm:109
+#: gnucash/report/report-system/html-fonts.scm:92
msgid "Font info for number headers."
msgstr "Font informacije za zaglavlja."
-#: gnucash/report/report-system/html-fonts.scm:114
+#: gnucash/report/report-system/html-fonts.scm:97
msgid "Text cell"
msgstr "Polje teksta"
-#: gnucash/report/report-system/html-fonts.scm:114
+#: gnucash/report/report-system/html-fonts.scm:97
msgid "Font info for regular text cells."
msgstr "Font informacije za polja teksta."
-#: gnucash/report/report-system/html-fonts.scm:119
+#: gnucash/report/report-system/html-fonts.scm:102
msgid "Total number cell"
msgstr "Polje ukupnih iznosa"
-#: gnucash/report/report-system/html-fonts.scm:119
+#: gnucash/report/report-system/html-fonts.scm:102
msgid "Font info for number cells containing a total."
msgstr "Font informacije za polja ukupnih iznosa."
-#: gnucash/report/report-system/html-fonts.scm:124
+#: gnucash/report/report-system/html-fonts.scm:107
msgid "Total label cell"
msgstr "Polje sveukupnih iznosa"
-#: gnucash/report/report-system/html-fonts.scm:124
+#: gnucash/report/report-system/html-fonts.scm:107
msgid "Font info for cells containing total labels."
msgstr "Font informacije za polja sveukupnih iznosa."
-#: gnucash/report/report-system/html-fonts.scm:129
+#: gnucash/report/report-system/html-fonts.scm:112
msgid "Centered label cell"
msgstr "Centrirano polje"
-#: gnucash/report/report-system/html-fonts.scm:129
+#: gnucash/report/report-system/html-fonts.scm:112
msgid "Font info for centered label cells."
msgstr "Font informacije za centrirano polje."
@@ -23510,46 +23727,46 @@ msgstr "Nije moguće spremiti stilski predložak"
msgid "Account name"
msgstr "Ime konta"
-#: gnucash/report/report-system/html-utilities.scm:788
+#: gnucash/report/report-system/html-utilities.scm:758
msgid "Exchange rate"
msgstr "TeÄaj"
-#: gnucash/report/report-system/html-utilities.scm:789
+#: gnucash/report/report-system/html-utilities.scm:759
msgid "Exchange rates"
msgstr "TeÄajevi"
-#: gnucash/report/report-system/html-utilities.scm:797
+#: gnucash/report/report-system/html-utilities.scm:766
msgid "No budgets exist. You must create at least one budget."
msgstr "Ne postoje proraÄuni. MoraÅ¡ stvoriti barem jedan proraÄun."
-#: gnucash/report/report-system/html-utilities.scm:833
+#: gnucash/report/report-system/html-utilities.scm:802
msgid "Disabled"
msgstr "IskljuÄeno"
-#: gnucash/report/report-system/html-utilities.scm:896
+#: gnucash/report/report-system/html-utilities.scm:865
msgid "This report requires you to specify certain report options."
msgstr "Za ovaj izvještaj je potrebno odrediti određene opcije za izvještaj."
-#: gnucash/report/report-system/html-utilities.scm:903
+#: gnucash/report/report-system/html-utilities.scm:872
msgid "No accounts selected"
msgstr "Nema odabranih konta"
-#: gnucash/report/report-system/html-utilities.scm:904
+#: gnucash/report/report-system/html-utilities.scm:873
msgid "This report requires accounts to be selected in the report options."
msgstr "Za ovaj izvještaj je potrebno odabrati konta u opcijama za izvještaj."
-#: gnucash/report/report-system/html-utilities.scm:911
+#: gnucash/report/report-system/html-utilities.scm:880
#: gnucash/report/standard-reports/price-scatter.scm:330
msgid "No data"
msgstr "Nema podataka"
-#: gnucash/report/report-system/html-utilities.scm:912
+#: gnucash/report/report-system/html-utilities.scm:881
msgid ""
"The selected accounts contain no data/transactions (or only zeroes) for the "
"selected time period"
msgstr ""
-"Odabrani konti ne sadrže podatke/transakcije (ili sadrže samo nule) za odabrano "
-"razdoblje"
+"Odabrani konti ne sadrže podatke/transakcije (ili sadrže samo nule) za "
+"odabrano razdoblje"
#: gnucash/report/report-system/options-utilities.scm:33
msgid "Select a date to report on."
@@ -23661,7 +23878,8 @@ msgid "Show accounts to this depth, overriding any other option."
msgstr "Prikaži konta do ove dubine, zanemarujući sve druge opcije."
#: gnucash/report/report-system/options-utilities.scm:104
-msgid "Override account-selection and show sub-accounts of all selected accounts?"
+msgid ""
+"Override account-selection and show sub-accounts of all selected accounts?"
msgstr "Zanemariti odabir konta i prikazati podkonta svih odabranih konta?"
#: gnucash/report/report-system/options-utilities.scm:117
@@ -23842,11 +24060,11 @@ msgstr "Prikaži samo salda u matiÄnom kontu, iskljuÄujući salda svih podkont
#: gnucash/report/report-system/options-utilities.scm:270
msgid ""
-"Calculate the subtotal for this parent account and all of its subaccounts, and "
-"show this as the parent account balance."
+"Calculate the subtotal for this parent account and all of its subaccounts, "
+"and show this as the parent account balance."
msgstr ""
-"IzraÄunaj podzbroj za ovaj matiÄni konto i za sva njegova podkonta, i prikaži ga "
-"kao saldo matiÄnog konta."
+"IzraÄunaj podzbroj za ovaj matiÄni konto i za sva njegova podkonta, i "
+"prikaži ga kao saldo matiÄnog konta."
#: gnucash/report/report-system/options-utilities.scm:272
#: gnucash/report/report-system/options-utilities.scm:287
@@ -23883,42 +24101,42 @@ msgid ""
"Show parent account subtotals, indented per accounting text book practice "
"(experimental)."
msgstr ""
-"Prikaži podzbrojeve matiÄnog konta uvuÄeno, prema ustaljenom naÄinu prikaza za "
-"tekstualne knjige u kjnigovodstvu (eksperimentalno)."
+"Prikaži podzbrojeve matiÄnog konta uvuÄeno, prema ustaljenom naÄinu prikaza "
+"za tekstualne knjige u kjnigovodstvu (eksperimentalno)."
-#: gnucash/report/report-system/report.scm:62
+#: gnucash/report/report-system/report.scm:61
msgid "_Assets & Liabilities"
msgstr "_Imovina i obveze"
-#: gnucash/report/report-system/report.scm:63
+#: gnucash/report/report-system/report.scm:62
msgid "_Income & Expense"
msgstr "_Prihod i rashod"
-#: gnucash/report/report-system/report.scm:65
+#: gnucash/report/report-system/report.scm:64
msgid "_Taxes"
msgstr "_Porezi"
-#: gnucash/report/report-system/report.scm:66
+#: gnucash/report/report-system/report.scm:65
msgid "_Sample & Custom"
msgstr "_Uzorak i proizvoljno"
-#: gnucash/report/report-system/report.scm:67
+#: gnucash/report/report-system/report.scm:66
msgid "_Custom"
msgstr "_Proizvoljno"
-#: gnucash/report/report-system/report.scm:71
+#: gnucash/report/report-system/report.scm:70
msgid "Report name"
msgstr "Ime izvještaja"
-#: gnucash/report/report-system/report.scm:72
+#: gnucash/report/report-system/report.scm:71
msgid "Stylesheet"
msgstr "Stilski predložak"
-#: gnucash/report/report-system/report.scm:74
+#: gnucash/report/report-system/report.scm:73
msgid "Invoice Number"
msgstr "Broj izlaznog raÄuna"
-#: gnucash/report/report-system/report.scm:144
+#: gnucash/report/report-system/report.scm:91
msgid ""
"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-"
@@ -23928,50 +24146,50 @@ msgstr ""
"sistemu izvjeÅ¡taja, a naroÄito u spremljenim izvjeÅ¡tajima, da li postoji "
"izvještaj s ovim guid-om izvještaja: "
-#: gnucash/report/report-system/report.scm:176
+#: gnucash/report/report-system/report.scm:93
msgid ""
-"The GnuCash report system has been upgraded. Your old saved reports have been "
-"transferred into a new format. If you experience trouble with saved reports, "
-"please contact the GnuCash development team."
+"The GnuCash report system has been upgraded. Your old saved reports have "
+"been transferred into a new format. If you experience trouble with saved "
+"reports, please contact the GnuCash development team."
msgstr ""
-"GnuCash je nadogradio sustav za stvaranje izvještaja. Tvoji su stari izvještaji "
-"prebaÄeni u novi format. Ako doÄ‘e do poteÅ¡koća prilikom spremanja izvjeÅ¡taja, "
-"stupi u kontakt s GnuCash razvijateljima."
+"GnuCash je nadogradio sustav za stvaranje izvještaja. Tvoji su stari "
+"izvjeÅ¡taji prebaÄeni u novi format. Ako doÄ‘e do poteÅ¡koća prilikom spremanja "
+"izvještaja, stupi u kontakt s GnuCash razvijateljima."
-#: gnucash/report/report-system/report.scm:183
+#: gnucash/report/report-system/report.scm:94
msgid "Wrong report definition: "
msgstr "Kriva definicija izvještaja: "
-#: gnucash/report/report-system/report.scm:185
+#: gnucash/report/report-system/report.scm:95
msgid " Report is missing a GUID."
msgstr " Izvještaju nedostaje GUID-broj."
-#: gnucash/report/report-system/report.scm:255
+#: gnucash/report/report-system/report.scm:97
+msgid ""
+"Some reports stored in a legacy format were found. This format is not "
+"supported anymore so these reports may not have been restored properly."
+msgstr ""
+"Nađeni su neki izvještaji spremljeni u starom zapisu. Ovaj se format više ne "
+"podržava, tako da ovi izvještaji nisu mogli biti pravilno vraćeni."
+
+#: gnucash/report/report-system/report.scm:258
msgid "Enter a descriptive name for this report."
msgstr "Unesi opisno ime za ovaj izvještaj."
-#: gnucash/report/report-system/report.scm:260
+#: gnucash/report/report-system/report.scm:263
msgid "Select a stylesheet for the report."
msgstr "Odaberi stilski predložak za izvještaj."
-#: gnucash/report/report-system/report.scm:268
+#: gnucash/report/report-system/report.scm:271
msgid "stylesheet."
msgstr "stilski predložak."
-#: gnucash/report/report-system/report.scm:935
-msgid ""
-"Some reports stored in a legacy format were found. This format is not supported "
-"anymore so these reports may not have been restored properly."
-msgstr ""
-"Nađeni su neki izvještaji spremljeni u starom zapisu. Ovaj se format više ne "
-"podržava, tako da ovi izvještaji nisu mogli biti pravilno vraćeni."
-
#: gnucash/report/report-system/report-utilities.scm:111
#: gnucash/report/standard-reports/account-piecharts.scm:60
#: gnucash/report/standard-reports/balance-sheet.scm:638
#: gnucash/report/standard-reports/budget-balance-sheet.scm:754
-#: gnucash/report/standard-reports/net-charts.scm:404
-#: gnucash/report/standard-reports/net-charts.scm:484
+#: gnucash/report/standard-reports/net-charts.scm:410
+#: gnucash/report/standard-reports/net-charts.scm:490
msgid "Assets"
msgstr "Imovina"
@@ -23979,8 +24197,8 @@ msgstr "Imovina"
#: gnucash/report/standard-reports/account-piecharts.scm:62
#: gnucash/report/standard-reports/balance-sheet.scm:439
#: gnucash/report/standard-reports/budget-balance-sheet.scm:784
-#: gnucash/report/standard-reports/net-charts.scm:404
-#: gnucash/report/standard-reports/net-charts.scm:484
+#: gnucash/report/standard-reports/net-charts.scm:410
+#: gnucash/report/standard-reports/net-charts.scm:490
msgid "Liabilities"
msgstr "Obveze"
@@ -24024,12 +24242,12 @@ msgstr "Konti dugovanja"
msgid "Credit Lines"
msgstr "Kreditne linije"
-#: gnucash/report/report-system/report-utilities.scm:675
+#: gnucash/report/report-system/report-utilities.scm:681
#, scheme-format
msgid "Building '~a' report ..."
msgstr "Izrada izvještaja '~a' ..."
-#: gnucash/report/report-system/report-utilities.scm:681
+#: gnucash/report/report-system/report-utilities.scm:687
#, scheme-format
msgid "Rendering '~a' report ..."
msgstr "Iscrtavanje izvještaja „~a†…"
@@ -24068,7 +24286,8 @@ msgstr "Prikazuje kružni dijagram sa saldom imovine u određenom trenutku"
#: gnucash/report/standard-reports/account-piecharts.scm:50
msgid "Shows a piechart with distribution of assets over securities"
-msgstr "Prikaži kružni dijagram s distribucijom imovine po vrijednosnim papirima"
+msgstr ""
+"Prikaži kružni dijagram s distribucijom imovine po vrijednosnim papirima"
#: gnucash/report/standard-reports/account-piecharts.scm:52
msgid "Shows a piechart with the Liabilities balance at a given time"
@@ -24081,11 +24300,12 @@ msgstr "Prikaži kružni dijagram sa saldom obveza u određenom trenutku"
#. General
#: gnucash/report/standard-reports/account-piecharts.scm:64
#: gnucash/report/standard-reports/average-balance.scm:38
+#: gnucash/report/standard-reports/balance-forecast.scm:40
#: gnucash/report/standard-reports/budget-barchart.scm:46
-#: gnucash/report/standard-reports/cashflow-barchart.scm:58
+#: gnucash/report/standard-reports/cashflow-barchart.scm:55
#: gnucash/report/standard-reports/cash-flow.scm:45
#: gnucash/report/standard-reports/category-barchart.scm:66
-#: gnucash/report/standard-reports/daily-reports.scm:53
+#: gnucash/report/standard-reports/daily-reports.scm:52
#: gnucash/report/standard-reports/equity-statement.scm:65
#: gnucash/report/standard-reports/income-statement.scm:59
#: gnucash/report/standard-reports/net-charts.scm:40
@@ -24097,11 +24317,12 @@ msgstr "Datum poÄetka"
#: gnucash/report/standard-reports/account-piecharts.scm:65
#: gnucash/report/standard-reports/average-balance.scm:39
+#: gnucash/report/standard-reports/balance-forecast.scm:41
#: gnucash/report/standard-reports/budget-barchart.scm:47
-#: gnucash/report/standard-reports/cashflow-barchart.scm:59
+#: gnucash/report/standard-reports/cashflow-barchart.scm:56
#: gnucash/report/standard-reports/cash-flow.scm:46
#: gnucash/report/standard-reports/category-barchart.scm:67
-#: gnucash/report/standard-reports/daily-reports.scm:54
+#: gnucash/report/standard-reports/daily-reports.scm:53
#: gnucash/report/standard-reports/equity-statement.scm:66
#: gnucash/report/standard-reports/income-statement.scm:60
#: gnucash/report/standard-reports/net-charts.scm:41
@@ -24113,7 +24334,7 @@ msgstr "Datum završetka"
#: gnucash/report/standard-reports/account-piecharts.scm:70
#: gnucash/report/standard-reports/category-barchart.scm:73
-#: gnucash/report/standard-reports/daily-reports.scm:59
+#: gnucash/report/standard-reports/daily-reports.scm:58
msgid "Show Accounts until level"
msgstr "Prikaži konta do razine"
@@ -24122,7 +24343,7 @@ msgid "Show long names"
msgstr "Prikaži cjelokupna imena"
#: gnucash/report/standard-reports/account-piecharts.scm:73
-#: gnucash/report/standard-reports/daily-reports.scm:63
+#: gnucash/report/standard-reports/daily-reports.scm:62
msgid "Show Totals"
msgstr "Prikaži ukupne iznose"
@@ -24131,16 +24352,17 @@ msgid "Show Percents"
msgstr "Prikaži postotke"
#: gnucash/report/standard-reports/account-piecharts.scm:75
-#: gnucash/report/standard-reports/daily-reports.scm:64
+#: gnucash/report/standard-reports/daily-reports.scm:63
msgid "Maximum Slices"
msgstr "Najveći broj odsjeÄaka"
#: gnucash/report/standard-reports/account-piecharts.scm:76
#: gnucash/report/standard-reports/average-balance.scm:45
+#: gnucash/report/standard-reports/balance-forecast.scm:47
#: gnucash/report/standard-reports/budget-barchart.scm:44
-#: gnucash/report/standard-reports/cashflow-barchart.scm:55
+#: gnucash/report/standard-reports/cashflow-barchart.scm:52
#: gnucash/report/standard-reports/category-barchart.scm:81
-#: gnucash/report/standard-reports/daily-reports.scm:65
+#: gnucash/report/standard-reports/daily-reports.scm:64
#: gnucash/report/standard-reports/net-charts.scm:54
#: gnucash/report/standard-reports/price-scatter.scm:57
msgid "Plot Width"
@@ -24148,10 +24370,11 @@ msgstr "Å irina iscrtavanja"
#: gnucash/report/standard-reports/account-piecharts.scm:77
#: gnucash/report/standard-reports/average-balance.scm:46
+#: gnucash/report/standard-reports/balance-forecast.scm:48
#: gnucash/report/standard-reports/budget-barchart.scm:45
-#: gnucash/report/standard-reports/cashflow-barchart.scm:56
+#: gnucash/report/standard-reports/cashflow-barchart.scm:53
#: gnucash/report/standard-reports/category-barchart.scm:82
-#: gnucash/report/standard-reports/daily-reports.scm:66
+#: gnucash/report/standard-reports/daily-reports.scm:65
#: gnucash/report/standard-reports/net-charts.scm:55
#: gnucash/report/standard-reports/price-scatter.scm:58
msgid "Plot Height"
@@ -24159,7 +24382,7 @@ msgstr "Visina iscrtavanja"
#: gnucash/report/standard-reports/account-piecharts.scm:78
#: gnucash/report/standard-reports/category-barchart.scm:84
-#: gnucash/report/standard-reports/daily-reports.scm:67
+#: gnucash/report/standard-reports/daily-reports.scm:66
msgid "Sort Method"
msgstr "NaÄin razvrstavanja"
@@ -24171,8 +24394,8 @@ msgstr "Prikaži prosjek"
#: gnucash/report/standard-reports/account-piecharts.scm:81
#: gnucash/report/standard-reports/category-barchart.scm:87
msgid ""
-"Select whether the amounts should be shown over the full time period or rather "
-"as the average e.g. per month."
+"Select whether the amounts should be shown over the full time period or "
+"rather as the average e.g. per month."
msgstr ""
"Odaberi, da li prikazivati iznose tijekom cijelog razdoblja ili rađe kao "
"prosjek, npr. mjeseÄno."
@@ -24203,14 +24426,14 @@ msgstr "Prikaži prosjek tjednog iznosa za razdoblje izvještavanja."
#: gnucash/report/standard-reports/account-piecharts.scm:136
#: gnucash/report/standard-reports/category-barchart.scm:139
-#: gnucash/report/standard-reports/daily-reports.scm:98
+#: gnucash/report/standard-reports/daily-reports.scm:97
#: gnucash/report/standard-reports/net-charts.scm:93
msgid "Report on these accounts, if chosen account level allows."
msgstr "Izvijesti o ovim kontima, ako odabrana razina konta to dozvoljava."
#: gnucash/report/standard-reports/account-piecharts.scm:151
#: gnucash/report/standard-reports/category-barchart.scm:151
-#: gnucash/report/standard-reports/daily-reports.scm:112
+#: gnucash/report/standard-reports/daily-reports.scm:111
msgid "Show accounts to this depth and not further."
msgstr "Prikaži konta do ove dubine i ne dalje."
@@ -24224,7 +24447,7 @@ msgid "Show the full security name in the legend?"
msgstr "Prikazati cjelokupno ime vrijednosnih papira u legendi?"
#: gnucash/report/standard-reports/account-piecharts.scm:166
-#: gnucash/report/standard-reports/daily-reports.scm:118
+#: gnucash/report/standard-reports/daily-reports.scm:117
msgid "Show the total balance in legend?"
msgstr "Prikazati ukupni saldo u legendi?"
@@ -24251,16 +24474,18 @@ msgid "Weekly Average"
msgstr "Tjedni prosjek"
#: gnucash/report/standard-reports/account-piecharts.scm:565
-#: gnucash/report/standard-reports/cashflow-barchart.scm:297
-#: gnucash/report/standard-reports/cash-flow.scm:166
-#: gnucash/report/standard-reports/category-barchart.scm:529
-#: gnucash/report/standard-reports/category-barchart.scm:555
-#: gnucash/report/standard-reports/daily-reports.scm:475
+#: gnucash/report/standard-reports/balance-forecast.scm:258
+#: gnucash/report/standard-reports/budget.scm:464
+#: gnucash/report/standard-reports/cashflow-barchart.scm:294
+#: gnucash/report/standard-reports/cash-flow.scm:193
+#: gnucash/report/standard-reports/category-barchart.scm:535
+#: gnucash/report/standard-reports/category-barchart.scm:561
+#: gnucash/report/standard-reports/daily-reports.scm:305
#: gnucash/report/standard-reports/equity-statement.scm:363
#: gnucash/report/standard-reports/income-statement.scm:474
-#: gnucash/report/standard-reports/net-charts.scm:365
+#: gnucash/report/standard-reports/net-charts.scm:371
#: gnucash/report/standard-reports/price-scatter.scm:202
-#: gnucash/report/standard-reports/trial-balance.scm:431
+#: gnucash/report/standard-reports/trial-balance.scm:482
#: libgnucash/app-utils/date-utilities.scm:94
#, scheme-format
msgid "~a to ~a"
@@ -24352,7 +24577,8 @@ msgstr "UkljuÄi konta, Äija su ukupna salda nula"
#: gnucash/report/standard-reports/sx-summary.scm:69
#: gnucash/report/standard-reports/trial-balance.scm:123
msgid "Include accounts with zero total (recursive) balances in this report."
-msgstr "U ovaj izvjeÅ¡taj ukljuÄi konta, Äija su ukupna (rekurzivna) salda nula."
+msgstr ""
+"U ovaj izvjeÅ¡taj ukljuÄi konta, Äija su ukupna (rekurzivna) salda nula."
#: gnucash/report/standard-reports/account-summary.scm:91
#: gnucash/report/standard-reports/balance-sheet.scm:104
@@ -24392,7 +24618,8 @@ msgstr "Prikaži pravila u stilu raÄunovodstva"
#: gnucash/report/standard-reports/income-statement.scm:85
#: gnucash/report/standard-reports/sx-summary.scm:76
msgid "Use rules beneath columns of added numbers like accountants do."
-msgstr "Koristi pravila ispod stupaca dodanih brojeva, kao Å¡to to rade raÄunovoÄ‘e."
+msgstr ""
+"Koristi pravila ispod stupaca dodanih brojeva, kao Å¡to to rade raÄunovoÄ‘e."
#: gnucash/report/standard-reports/account-summary.scm:103
#: gnucash/report/standard-reports/sx-summary.scm:82
@@ -24433,7 +24660,7 @@ msgstr "Prikaži napomene konta."
#: gnucash/report/standard-reports/balance-sheet.scm:143
#: gnucash/report/standard-reports/budget-balance-sheet.scm:108
#: gnucash/report/standard-reports/budget-income-statement.scm:122
-#: gnucash/report/standard-reports/budget.scm:54
+#: gnucash/report/standard-reports/budget.scm:52
#: gnucash/report/standard-reports/cash-flow.scm:54
#: gnucash/report/standard-reports/equity-statement.scm:82
#: gnucash/report/standard-reports/income-statement.scm:115
@@ -24462,8 +24689,8 @@ msgstr "Rekurzivni saldo"
#: gnucash/report/standard-reports/account-summary.scm:176
#: gnucash/report/standard-reports/sx-summary.scm:154
msgid ""
-"Show the total balance, including balances in subaccounts, of any account at the "
-"depth limit."
+"Show the total balance, including balances in subaccounts, of any account at "
+"the depth limit."
msgstr ""
"Prikaži ukupni saldo bilo kojeg konta ograniÄene dubine, ukljuÄujući salda u "
"podkontima."
@@ -24542,7 +24769,7 @@ msgstr "NaÄin izraÄunavanja osnove."
#: gnucash/report/standard-reports/advanced-portfolio.scm:94
#: gnucash/report/standard-reports/average-balance.scm:127
#: gnucash/report/standard-reports/average-balance.scm:147
-#: gnucash/report/standard-reports/transaction.scm:1788
+#: gnucash/report/standard-reports/transaction.scm:1800
#: libgnucash/engine/policy.c:58
msgid "Average"
msgstr "Prosjek"
@@ -24575,7 +24802,8 @@ msgstr ""
#: gnucash/report/standard-reports/advanced-portfolio.scm:113
msgid "How to report commissions and other brokerage fees."
-msgstr "Odaberi naÄin izvjeÅ¡tavanja o provizijama i drugim brokerskim nadoknadama."
+msgstr ""
+"Odaberi naÄin izvjeÅ¡tavanja o provizijama i drugim brokerskim nadoknadama."
#: gnucash/report/standard-reports/advanced-portfolio.scm:115
msgid "Include in basis"
@@ -24642,16 +24870,16 @@ msgid "Basis"
msgstr "Osnova"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1086
-#: gnucash/report/standard-reports/cashflow-barchart.scm:316
-#: gnucash/report/standard-reports/cashflow-barchart.scm:341
-#: gnucash/report/standard-reports/cash-flow.scm:308
+#: gnucash/report/standard-reports/cashflow-barchart.scm:313
+#: gnucash/report/standard-reports/cashflow-barchart.scm:338
+#: gnucash/report/standard-reports/cash-flow.scm:286
msgid "Money In"
msgstr "Primici"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1087
-#: gnucash/report/standard-reports/cashflow-barchart.scm:317
-#: gnucash/report/standard-reports/cashflow-barchart.scm:342
-#: gnucash/report/standard-reports/cash-flow.scm:353
+#: gnucash/report/standard-reports/cashflow-barchart.scm:314
+#: gnucash/report/standard-reports/cashflow-barchart.scm:339
+#: gnucash/report/standard-reports/cash-flow.scm:307
msgid "Money Out"
msgstr "Izdaci"
@@ -24685,14 +24913,15 @@ msgstr "Stopa prinosa/povrata"
#: gnucash/report/standard-reports/advanced-portfolio.scm:1195
msgid ""
-"* this commodity data was built using transaction pricing instead of the price "
-"list."
+"* this commodity data was built using transaction pricing instead of the "
+"price list."
msgstr ""
"* podaci ove dionice su izgrađeni korištenjem cijene transakcije, umjesto "
"cjenika."
#: gnucash/report/standard-reports/advanced-portfolio.scm:1197
-msgid "If you are in a multi-currency situation, the exchanges may not be correct."
+msgid ""
+"If you are in a multi-currency situation, the exchanges may not be correct."
msgstr "Ako imaÅ¡ sluÄaj s viÅ¡estrukim valuta, teÄajevi možda neće biti toÄni."
#: gnucash/report/standard-reports/advanced-portfolio.scm:1202
@@ -24704,7 +24933,7 @@ msgid "Average Balance"
msgstr "ProsjeÄni saldo"
#: gnucash/report/standard-reports/average-balance.scm:40
-#: gnucash/report/standard-reports/cashflow-barchart.scm:60
+#: gnucash/report/standard-reports/cashflow-barchart.scm:57
#: gnucash/report/standard-reports/category-barchart.scm:68
#: gnucash/report/standard-reports/net-charts.scm:42
#: gnucash/report/standard-reports/price-scatter.scm:37
@@ -24712,7 +24941,7 @@ msgid "Step Size"
msgstr "VeliÄina koraka"
#: gnucash/report/standard-reports/average-balance.scm:43
-#: gnucash/report/standard-reports/daily-reports.scm:60
+#: gnucash/report/standard-reports/daily-reports.scm:59
msgid "Include Sub-Accounts"
msgstr "UkljuÄi podkonta"
@@ -24721,24 +24950,24 @@ msgid "Exclude transactions between selected accounts"
msgstr "IskljuÄi transakcije izmeÄ‘u odabranih konta"
#: gnucash/report/standard-reports/average-balance.scm:78
-#: gnucash/report/standard-reports/daily-reports.scm:92
+#: gnucash/report/standard-reports/daily-reports.scm:91
msgid "Include sub-accounts of all selected accounts."
msgstr "UkljuÄi podkonta svih odabranih konta."
#: gnucash/report/standard-reports/average-balance.scm:84
msgid ""
-"Exclude transactions that only involve two accounts, both of which are selected "
-"below. This only affects the profit and loss columns of the table."
+"Exclude transactions that only involve two accounts, both of which are "
+"selected below. This only affects the profit and loss columns of the table."
msgstr ""
-"IskljuÄi transakcije koje ukljuÄuju samo dva konta, koji su oba odabrana ispod. "
-"Ovo utjeÄe samo na stupce dobiti i gubitka u tablici."
+"IskljuÄi transakcije koje ukljuÄuju samo dva konta, koji su oba odabrana "
+"ispod. Ovo utjeÄe samo na stupce dobiti i gubitka u tablici."
#: gnucash/report/standard-reports/average-balance.scm:91
msgid "Do transaction report on this account."
msgstr "Obavi izvještaj o transakcijama za ovaj konto."
#: gnucash/report/standard-reports/average-balance.scm:114
-#: gnucash/report/standard-reports/average-balance.scm:341
+#: gnucash/report/standard-reports/average-balance.scm:187
#: gnucash/report/standard-reports/category-barchart.scm:188
#: gnucash/report/standard-reports/category-barchart.scm:260
#: gnucash/report/standard-reports/net-charts.scm:134
@@ -24747,14 +24976,14 @@ msgid "Show table"
msgstr "Prikaži tablicu"
#: gnucash/report/standard-reports/average-balance.scm:115
-#: gnucash/report/standard-reports/cashflow-barchart.scm:128
+#: gnucash/report/standard-reports/cashflow-barchart.scm:125
#: gnucash/report/standard-reports/category-barchart.scm:189
#: gnucash/report/standard-reports/net-charts.scm:135
msgid "Display a table of the selected data."
msgstr "Prikaži tablicu odabranih podataka."
#: gnucash/report/standard-reports/average-balance.scm:119
-#: gnucash/report/standard-reports/average-balance.scm:340
+#: gnucash/report/standard-reports/average-balance.scm:186
msgid "Show plot"
msgstr "Prikaži dijagram"
@@ -24763,7 +24992,7 @@ msgid "Display a graph of the selected data."
msgstr "Prikaži dijagram za odabrane podatke."
#: gnucash/report/standard-reports/average-balance.scm:124
-#: gnucash/report/standard-reports/average-balance.scm:339
+#: gnucash/report/standard-reports/average-balance.scm:185
msgid "Plot Type"
msgstr "Vrsta iscrtavanja"
@@ -24798,6 +25027,7 @@ msgid "Maximum"
msgstr "Najviše"
#: gnucash/report/standard-reports/average-balance.scm:148
+#: gnucash/report/standard-reports/balance-forecast.scm:233
msgid "Minimum"
msgstr "Najmanje"
@@ -24809,8 +25039,87 @@ msgstr "Dobit"
msgid "Loss"
msgstr "Gubitak"
+#. Name definitions
+#: gnucash/report/standard-reports/balance-forecast.scm:35
+msgid "Balance Forecast"
+msgstr "Prognoza za saldo"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:38
+#: gnucash/report/standard-reports/budget-barchart.scm:76
+#: gnucash/report/standard-reports/budget-flow.scm:88
+#: gnucash/report/standard-reports/cashflow-barchart.scm:88
+#: gnucash/report/standard-reports/income-gst-statement.scm:86
+#: gnucash/report/standard-reports/transaction.scm:624
+#: gnucash/report/standard-reports/trial-balance.scm:78
+msgid "Report on these accounts."
+msgstr "Izvijesti o ovim kontima."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:42
+msgid "Interval"
+msgstr "Interval"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:49
+#: gnucash/report/standard-reports/net-charts.scm:60
+msgid "Data markers?"
+msgstr "Oznake za podatke?"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:50
+#: gnucash/report/standard-reports/net-charts.scm:166
+msgid "Display a mark for each data point."
+msgstr "Prikaži oznaku za svaki podatak."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:52
+#: gnucash/report/standard-reports/balance-forecast.scm:53
+msgid "Show reserve line"
+msgstr "Prikaži liniju rezerve"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:55
+msgid "Reserve amount"
+msgstr "Iznos rezerve"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:56
+msgid "The reserve amount is set to a minimum balance desired"
+msgstr "Iznos rezerve je postavljen na željeni minimalni saldo"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:59
+#: gnucash/report/standard-reports/balance-forecast.scm:60
+msgid "Show target line"
+msgstr "Prikaži liniju namjene"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:62
+msgid "Target amount above reserve"
+msgstr "Iznos namjene iznad rezerve"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:63
+msgid ""
+"The target is used to plan for a future large purchase, which will be added "
+"as a line above the reserve amount."
+msgstr ""
+"Namjena se koristi za planiranje kupovine u budućnosti, za koju su potrebna "
+"veća sredstva. Bit će dodan u retku iznad iznosa rezerve."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:67
+msgid "Show future minimum"
+msgstr "Prikaži budući minimum"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:68
+msgid ""
+"The future minimum will add, for each date point, a projected minimum "
+"balance including scheduled transactions."
+msgstr ""
+"Budući minimum će, za svaki datum, dodati projicirani minimalni saldo, "
+"ukljuÄujući terminirane transakcije."
+
+#: gnucash/report/standard-reports/balance-forecast.scm:245
+msgid "Target"
+msgstr "Namjena"
+
+#: gnucash/report/standard-reports/balance-forecast.scm:251
+msgid "Reserve"
+msgstr "Rezerva"
+
#: gnucash/report/standard-reports/balance-sheet.scm:72
-#: gnucash/report/standard-reports/trial-balance.scm:659
+#: gnucash/report/standard-reports/trial-balance.scm:710
msgid "Balance Sheet"
msgstr "Bilanca"
@@ -24822,11 +25131,11 @@ msgstr "JednostupÄana bilanca"
#: gnucash/report/standard-reports/balance-sheet.scm:85
#: gnucash/report/standard-reports/budget-balance-sheet.scm:50
msgid ""
-"Print liability/equity section in the same column under the assets section as "
-"opposed to a second column right of the assets section."
+"Print liability/equity section in the same column under the assets section "
+"as opposed to a second column right of the assets section."
msgstr ""
-"Ispiši odjeljak obveza/kapitala u istom stupcu ispod odjeljka imovine, umjesto u "
-"drugom stupcu desno od odjeljka imovine."
+"Ispiši odjeljak obveza/kapitala u istom stupcu ispod odjeljka imovine, "
+"umjesto u drugom stupcu desno od odjeljka imovine."
#: gnucash/report/standard-reports/balance-sheet.scm:115
#: gnucash/report/standard-reports/budget-balance-sheet.scm:80
@@ -24921,14 +25230,14 @@ msgstr "Gubici burzovnog trgovanja"
#: gnucash/report/standard-reports/balance-sheet.scm:685
#: gnucash/report/standard-reports/budget-balance-sheet.scm:848
#: gnucash/report/standard-reports/equity-statement.scm:631
-#: gnucash/report/standard-reports/trial-balance.scm:892
+#: gnucash/report/standard-reports/trial-balance.scm:943
msgid "Unrealized Gains"
msgstr "Neostvareni dobici"
#: gnucash/report/standard-reports/balance-sheet.scm:686
#: gnucash/report/standard-reports/budget-balance-sheet.scm:849
#: gnucash/report/standard-reports/equity-statement.scm:632
-#: gnucash/report/standard-reports/trial-balance.scm:893
+#: gnucash/report/standard-reports/trial-balance.scm:944
msgid "Unrealized Losses"
msgstr "Neostvareni gubici"
@@ -24952,15 +25261,17 @@ msgstr "UkljuÄi nove/postojeće ukupne iznose"
#: gnucash/report/standard-reports/budget-balance-sheet.scm:100
msgid ""
-"Whether or not to include lines indicating change in totals introduced by budget."
+"Whether or not to include lines indicating change in totals introduced by "
+"budget."
msgstr ""
-"Da li ukljuÄiti retke, koji pokazuju promjenu u iznosima, nastalih proraÄunom."
+"Da li ukljuÄiti retke, koji pokazuju promjenu u iznosima, nastalih "
+"proraÄunom."
#: gnucash/report/standard-reports/budget-balance-sheet.scm:112
#: gnucash/report/standard-reports/budget-barchart.scm:66
#: gnucash/report/standard-reports/budget-flow.scm:57
#: gnucash/report/standard-reports/budget-income-statement.scm:59
-#: gnucash/report/standard-reports/budget.scm:149
+#: gnucash/report/standard-reports/budget.scm:141
msgid "Budget to use."
msgstr "ProraÄun, koji će se koristiti."
@@ -25029,15 +25340,6 @@ msgstr "Tekući zbroj"
msgid "Chart Type"
msgstr "Vrsta dijagrama"
-#: gnucash/report/standard-reports/budget-barchart.scm:76
-#: gnucash/report/standard-reports/budget-flow.scm:88
-#: gnucash/report/standard-reports/cashflow-barchart.scm:91
-#: gnucash/report/standard-reports/income-gst-statement.scm:86
-#: gnucash/report/standard-reports/transaction.scm:624
-#: gnucash/report/standard-reports/trial-balance.scm:78
-msgid "Report on these accounts."
-msgstr "Izvijesti o ovim kontima."
-
#: gnucash/report/standard-reports/budget-barchart.scm:93
msgid "Calculate as running sum?"
msgstr "IzraÄunati kao tekući zbroj?"
@@ -25090,25 +25392,25 @@ msgstr "Razdoblje"
msgid "Period number."
msgstr "Broj razdoblja."
-#: gnucash/report/standard-reports/budget-flow.scm:319
+#: gnucash/report/standard-reports/budget-flow.scm:306
#, scheme-format
msgid "~a: ~a - ~a"
msgstr "~a: ~a – ~a"
#: gnucash/report/standard-reports/budget-income-statement.scm:62
-#: gnucash/report/standard-reports/budget.scm:72
+#: gnucash/report/standard-reports/budget.scm:70
msgid "Report for range of budget periods"
msgstr "IzvjeÅ¡taj za vremenski raspon proraÄunskih razdoblja"
#: gnucash/report/standard-reports/budget-income-statement.scm:64
-#: gnucash/report/standard-reports/budget.scm:74
+#: gnucash/report/standard-reports/budget.scm:72
msgid "Create report for a budget period range instead of the entire budget."
msgstr ""
-"Stvori izvjeÅ¡taj za vremenski raspon proraÄunskih razdoblja, umjesto za cijeli "
-"proraÄun."
+"Stvori izvjeÅ¡taj za vremenski raspon proraÄunskih razdoblja, umjesto za "
+"cijeli proraÄun."
#: gnucash/report/standard-reports/budget-income-statement.scm:66
-#: gnucash/report/standard-reports/budget.scm:76
+#: gnucash/report/standard-reports/budget.scm:74
msgid "Range start"
msgstr "PoÄetak raspona"
@@ -25117,7 +25419,7 @@ msgid "Select a budget period that begins the reporting range."
msgstr "Odaberi proraÄunsko razdoblje, s kojim poÄinje raspon izvjeÅ¡tavanja."
#: gnucash/report/standard-reports/budget-income-statement.scm:70
-#: gnucash/report/standard-reports/budget.scm:83
+#: gnucash/report/standard-reports/budget.scm:81
msgid "Range end"
msgstr "Kraj raspona"
@@ -25192,7 +25494,8 @@ msgstr ""
#: gnucash/report/standard-reports/budget-income-statement.scm:477
msgid "Reporting range end period cannot be less than start period."
msgstr ""
-"Krajnje vrijeme u rasponu izvjeÅ¡tavanja ne može biti manje od poÄetnog vremena."
+"Krajnje vrijeme u rasponu izvjeÅ¡tavanja ne može biti manje od poÄetnog "
+"vremena."
#: gnucash/report/standard-reports/budget-income-statement.scm:507
#, scheme-format
@@ -25249,122 +25552,122 @@ msgstr "ProraÄun dobiti i gubitka"
msgid "Budget Report"
msgstr "ProraÄunski izvjeÅ¡taj"
-#: gnucash/report/standard-reports/budget.scm:49
+#: gnucash/report/standard-reports/budget.scm:47
#: gnucash/report/standard-reports/cash-flow.scm:48
msgid "Account Display Depth"
msgstr "Dubina prikaza konta"
-#: gnucash/report/standard-reports/budget.scm:50
+#: gnucash/report/standard-reports/budget.scm:48
#: gnucash/report/standard-reports/cash-flow.scm:49
msgid "Always show sub-accounts"
msgstr "Uvijek prikaži podkonta"
-#: gnucash/report/standard-reports/budget.scm:55
+#: gnucash/report/standard-reports/budget.scm:53
#: gnucash/report/standard-reports/cash-flow.scm:55
msgid "Show Full Account Names"
msgstr "Prikaži cjelokupna imena konta"
-#: gnucash/report/standard-reports/budget.scm:56
+#: gnucash/report/standard-reports/budget.scm:54
msgid "Select Columns"
msgstr "Odaberi stupce"
-#: gnucash/report/standard-reports/budget.scm:57
+#: gnucash/report/standard-reports/budget.scm:55
msgid "Show Budget"
msgstr "Prikaži proraÄun"
-#: gnucash/report/standard-reports/budget.scm:58
+#: gnucash/report/standard-reports/budget.scm:56
msgid "Display a column for the budget values."
msgstr "Prikaži stupac za vrijednosti proraÄuna."
-#: gnucash/report/standard-reports/budget.scm:59
+#: gnucash/report/standard-reports/budget.scm:57
msgid "Show Actual"
msgstr "Prikaži stvarno"
-#: gnucash/report/standard-reports/budget.scm:60
+#: gnucash/report/standard-reports/budget.scm:58
msgid "Display a column for the actual values."
msgstr "Prikaži stupac za stvarne vrijednosti."
-#: gnucash/report/standard-reports/budget.scm:61
+#: gnucash/report/standard-reports/budget.scm:59
msgid "Show Difference"
msgstr "Prikaži razliku"
-#: gnucash/report/standard-reports/budget.scm:62
+#: gnucash/report/standard-reports/budget.scm:60
msgid "Display the difference as budget - actual."
msgstr "Prikaži razliku kao: proraÄun − stvarno."
-#: gnucash/report/standard-reports/budget.scm:63
+#: gnucash/report/standard-reports/budget.scm:61
msgid "Show Column with Totals"
msgstr "Prikaži stupac s ukupnim iznosima"
-#: gnucash/report/standard-reports/budget.scm:64
+#: gnucash/report/standard-reports/budget.scm:62
msgid "Display a column with the row totals."
msgstr "Prikaži stupac s redcima ukupnih iznosa."
-#: gnucash/report/standard-reports/budget.scm:65
+#: gnucash/report/standard-reports/budget.scm:63
msgid "Roll up budget amounts to parent"
msgstr "Akumuliraj proraÄunske iznose na matiÄni"
-#: gnucash/report/standard-reports/budget.scm:66
+#: gnucash/report/standard-reports/budget.scm:64
msgid ""
-"If parent account does not have its own budget value, use the sum of the child "
-"account budget values."
+"If parent account does not have its own budget value, use the sum of the "
+"child account budget values."
msgstr ""
-"Ako matiÄni konto nema vlastitu vrijednost proraÄuna, koristi zbroj vrijednosti "
-"proraÄuna podkonta."
+"Ako matiÄni konto nema vlastitu vrijednost proraÄuna, koristi zbroj "
+"vrijednosti proraÄuna podkonta."
-#: gnucash/report/standard-reports/budget.scm:67
+#: gnucash/report/standard-reports/budget.scm:65
msgid "Include accounts with zero total balances and budget values"
msgstr "UkljuÄi konta, Äija su ukupna salda, kao i vrijednosti proraÄuna, nula"
-#: gnucash/report/standard-reports/budget.scm:68
+#: gnucash/report/standard-reports/budget.scm:66
msgid ""
-"Include accounts with zero total (recursive) balances and budget values in this "
-"report."
+"Include accounts with zero total (recursive) balances and budget values in "
+"this report."
msgstr ""
"U ovaj izvjeÅ¡taj ukljuÄi konta, Äija su ukupna (rekurzivna) salda, kao i "
"vrijednosti proraÄuna, nula."
-#: gnucash/report/standard-reports/budget.scm:78
+#: gnucash/report/standard-reports/budget.scm:76
msgid "Select a budget period type that starts the reporting range."
msgstr "Odaberi vrstu razdoblja proraÄuna s kojim zapoÄinje izvjeÅ¡tavanje."
-#: gnucash/report/standard-reports/budget.scm:79
+#: gnucash/report/standard-reports/budget.scm:77
msgid "Exact start period"
msgstr "PoÄetak razdoblja"
-#: gnucash/report/standard-reports/budget.scm:81
+#: gnucash/report/standard-reports/budget.scm:79
msgid "Select exact period that starts the reporting range."
msgstr "Odaberi trenutak s kojim zapoÄinje razdoblje izvjeÅ¡tavanja."
-#: gnucash/report/standard-reports/budget.scm:85
+#: gnucash/report/standard-reports/budget.scm:83
msgid "Select a budget period type that ends the reporting range."
msgstr "Odaberi vrstu razdoblja proraÄuna s kojim zavrÅ¡ava izvjeÅ¡tavanje."
-#: gnucash/report/standard-reports/budget.scm:86
+#: gnucash/report/standard-reports/budget.scm:84
msgid "Exact end period"
msgstr "Kraj razdoblja"
-#: gnucash/report/standard-reports/budget.scm:88
+#: gnucash/report/standard-reports/budget.scm:86
msgid "Select exact period that ends the reporting range."
msgstr "Odaberi trenutak s kojim završava razdoblje izvještavanja."
-#: gnucash/report/standard-reports/budget.scm:90
+#: gnucash/report/standard-reports/budget.scm:88
msgid "Include collapsed periods before selected."
msgstr "UkljuÄi sklopljena razdoblja prije odabranih."
-#: gnucash/report/standard-reports/budget.scm:91
+#: gnucash/report/standard-reports/budget.scm:89
msgid ""
"Include in report previous periods as single collapsed column (one for all "
"periods before starting)"
msgstr ""
-"U izvjeÅ¡taj ukljuÄi prethodna razdoblja u jednom sklopljenom stupcu (jedan za "
-"svako razdoblje prije poÄetka)"
+"U izvjeÅ¡taj ukljuÄi prethodna razdoblja u jednom sklopljenom stupcu (jedan "
+"za svako razdoblje prije poÄetka)"
-#: gnucash/report/standard-reports/budget.scm:92
+#: gnucash/report/standard-reports/budget.scm:90
msgid "Include collapsed periods after selected."
msgstr "UkljuÄi sklopljena razdoblja nakon odabranih."
-#: gnucash/report/standard-reports/budget.scm:93
+#: gnucash/report/standard-reports/budget.scm:91
msgid ""
"Include in report further periods as single collapsed column (one for all "
"periods after ending and to the end of budget range)"
@@ -25372,124 +25675,124 @@ msgstr ""
"U izvjeÅ¡taj ukljuÄi sljedeća razdoblja u jednom sklopljenom stupcu (jedan za "
"svako razdoblje nakon kraja, kao i na kraj proraÄunskog raspona)"
-#: gnucash/report/standard-reports/budget.scm:118
+#: gnucash/report/standard-reports/budget.scm:116
msgid "First"
msgstr "Prvo"
-#: gnucash/report/standard-reports/budget.scm:119
+#: gnucash/report/standard-reports/budget.scm:117
msgid "The first period of the budget"
msgstr "Prvo razdoblje proraÄuna"
-#: gnucash/report/standard-reports/budget.scm:122
+#: gnucash/report/standard-reports/budget.scm:119
msgid "Previous"
msgstr "Prethodno"
-#: gnucash/report/standard-reports/budget.scm:123
+#: gnucash/report/standard-reports/budget.scm:120
msgid ""
"Budget period was before current period, according to report evaluation date"
msgstr ""
-"Razdoblje proraÄuna je prije trenutaÄnog razdoblja, na osnovi izraÄunatog datuma "
-"izvještaja"
+"Razdoblje proraÄuna je prije trenutaÄnog razdoblja, na osnovi izraÄunatog "
+"datuma izvještaja"
-#: gnucash/report/standard-reports/budget.scm:127
+#: gnucash/report/standard-reports/budget.scm:123
msgid "Current period, according to report evaluation date"
msgstr "Tekuće razdoblje, na osnovi izraÄunatog datuma izvjeÅ¡taja"
-#: gnucash/report/standard-reports/budget.scm:130
+#: gnucash/report/standard-reports/budget.scm:125
msgid "Next"
msgstr "Sljedeće"
-#: gnucash/report/standard-reports/budget.scm:131
+#: gnucash/report/standard-reports/budget.scm:126
msgid "Next period, according to report evaluation date"
msgstr "Slijedeće razdoblje, po izraÄunatom datumu izvjeÅ¡taja"
-#: gnucash/report/standard-reports/budget.scm:135
+#: gnucash/report/standard-reports/budget.scm:129
msgid "Last budget period"
msgstr "Zadnje razdoblje proraÄuna"
-#: gnucash/report/standard-reports/budget.scm:138
+#: gnucash/report/standard-reports/budget.scm:131
msgid "Manual period selection"
msgstr "RuÄni odabir razdoblja"
-#: gnucash/report/standard-reports/budget.scm:139
+#: gnucash/report/standard-reports/budget.scm:132
msgid "Explicitly select period value with spinner below"
msgstr "Odaberi razdoblje datumskim odabiraÄem ispod"
-#: gnucash/report/standard-reports/budget.scm:169
+#: gnucash/report/standard-reports/budget.scm:150
#: gnucash/report/standard-reports/cash-flow.scm:86
msgid "Show full account names (including parent accounts)."
msgstr "Prikaži cjelokupna imena konta (ukljuÄujući matiÄna konta)"
-#: gnucash/report/standard-reports/budget.scm:594
+#: gnucash/report/standard-reports/budget.scm:487
msgid "Bgt"
msgstr "ProraÄun"
-#: gnucash/report/standard-reports/budget.scm:602
+#: gnucash/report/standard-reports/budget.scm:491
msgid "Act"
msgstr "Stvarno"
-#: gnucash/report/standard-reports/budget.scm:610
+#: gnucash/report/standard-reports/budget.scm:495
msgid "Diff"
msgstr "Razlika"
-#: gnucash/report/standard-reports/budget.scm:878
+#: gnucash/report/standard-reports/budget.scm:718
#, scheme-format
msgid "~a: ~a"
msgstr "~a: ~a"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:43
+#: gnucash/report/standard-reports/cashflow-barchart.scm:40
msgid "Cash Flow Barchart"
msgstr "NovÄani tijek (stupÄani dijagram)"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:49
+#: gnucash/report/standard-reports/cashflow-barchart.scm:46
#: gnucash/report/standard-reports/cash-flow.scm:56
msgid "Include Trading Accounts in report"
msgstr "UkljuÄi konta burzovnog trgovanja u izvjeÅ¡taj"
#. Display
-#: gnucash/report/standard-reports/cashflow-barchart.scm:51
+#: gnucash/report/standard-reports/cashflow-barchart.scm:48
msgid "Show Money In"
msgstr "Prikaži primitke"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:52
+#: gnucash/report/standard-reports/cashflow-barchart.scm:49
msgid "Show Money Out"
msgstr "Prikaži izdatke"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:53
+#: gnucash/report/standard-reports/cashflow-barchart.scm:50
msgid "Show Net Flow"
msgstr "Prikaži neto novÄani tijek"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:54
+#: gnucash/report/standard-reports/cashflow-barchart.scm:51
msgid "Show Table"
msgstr "Prikaži tablicu"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:103
+#: gnucash/report/standard-reports/cashflow-barchart.scm:100
#: gnucash/report/standard-reports/cash-flow.scm:105
msgid "Include transfers to and from Trading Accounts in the report."
msgstr "UkljuÄi u izvjeÅ¡taj prijenose u i iz konta burzovnog trgovanja."
-#: gnucash/report/standard-reports/cashflow-barchart.scm:110
+#: gnucash/report/standard-reports/cashflow-barchart.scm:107
msgid "Show money in?"
msgstr "Prikazati primitke?"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:116
+#: gnucash/report/standard-reports/cashflow-barchart.scm:113
msgid "Show money out?"
msgstr "Prikazati izdatke?"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:122
+#: gnucash/report/standard-reports/cashflow-barchart.scm:119
msgid "Show net money flow?"
msgstr "Prikazati neto novÄani tijek?"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:318
-#: gnucash/report/standard-reports/cashflow-barchart.scm:343
+#: gnucash/report/standard-reports/cashflow-barchart.scm:315
+#: gnucash/report/standard-reports/cashflow-barchart.scm:340
msgid "Net Flow"
msgstr "Neto novÄani tijek"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:347
+#: gnucash/report/standard-reports/cashflow-barchart.scm:344
msgid "Overview:"
msgstr "Pregled:"
-#: gnucash/report/standard-reports/cashflow-barchart.scm:510
+#: gnucash/report/standard-reports/cashflow-barchart.scm:387
msgid "Shows a barchart with cash flow over time"
msgstr "Prikazuje stupÄani dijagram novÄanog tijeka"
@@ -25497,25 +25800,25 @@ msgstr "Prikazuje stupÄani dijagram novÄanog tijeka"
msgid "Cash Flow"
msgstr "NovÄani tijek"
-#: gnucash/report/standard-reports/cash-flow.scm:240
+#: gnucash/report/standard-reports/cash-flow.scm:210
#, scheme-format
msgid "~a and subaccounts"
msgstr "~a i podkonti"
-#: gnucash/report/standard-reports/cash-flow.scm:241
+#: gnucash/report/standard-reports/cash-flow.scm:211
#, scheme-format
msgid "~a and selected subaccounts"
msgstr "~a i odabrani podkonti"
-#: gnucash/report/standard-reports/cash-flow.scm:273
+#: gnucash/report/standard-reports/cash-flow.scm:277
msgid "Money into selected accounts comes from"
msgstr "Primici odabranih konta dolaze iz"
-#: gnucash/report/standard-reports/cash-flow.scm:318
+#: gnucash/report/standard-reports/cash-flow.scm:298
msgid "Money out of selected accounts goes to"
msgstr "Izdaci odabranih konta idu u"
-#: gnucash/report/standard-reports/cash-flow.scm:363
+#: gnucash/report/standard-reports/cash-flow.scm:319
msgid "Difference"
msgstr "Razlika"
@@ -25575,7 +25878,7 @@ msgid "Liabilities Over Time"
msgstr "Razvoj obveza"
#: gnucash/report/standard-reports/category-barchart.scm:75
-#: gnucash/report/standard-reports/daily-reports.scm:62
+#: gnucash/report/standard-reports/daily-reports.scm:61
msgid "Show long account names"
msgstr "Prikaži cjelokupna imena konta"
@@ -25619,36 +25922,36 @@ msgstr "Najveći broj naslaganja u stupÄanom dijagramu."
msgid "Daily Average"
msgstr "Dnevni prosjek"
-#: gnucash/report/standard-reports/category-barchart.scm:530
-#: gnucash/report/standard-reports/category-barchart.scm:556
+#: gnucash/report/standard-reports/category-barchart.scm:536
+#: gnucash/report/standard-reports/category-barchart.scm:562
#, scheme-format
msgid "Balances ~a to ~a"
msgstr "Salda ~a do ~a"
-#: gnucash/report/standard-reports/category-barchart.scm:733
-#: gnucash/report/standard-reports/transaction.scm:1518
-#: gnucash/report/standard-reports/transaction.scm:1777
+#: gnucash/report/standard-reports/category-barchart.scm:743
+#: gnucash/report/standard-reports/transaction.scm:1532
+#: gnucash/report/standard-reports/transaction.scm:1789
msgid "Grand Total"
msgstr "Sveukupno"
#. The names here are used 1. for internal identification, 2. as
#. tab labels, 3. as default for the 'Report name' option which
#. in turn is used for the printed report title.
-#: gnucash/report/standard-reports/daily-reports.scm:38
-#: gnucash/report/standard-reports/daily-reports.scm:50
+#: gnucash/report/standard-reports/daily-reports.scm:37
+#: gnucash/report/standard-reports/daily-reports.scm:49
msgid "Income vs. Day of Week"
msgstr "Prihod po danu u tjednu"
-#: gnucash/report/standard-reports/daily-reports.scm:39
-#: gnucash/report/standard-reports/daily-reports.scm:51
+#: gnucash/report/standard-reports/daily-reports.scm:38
+#: gnucash/report/standard-reports/daily-reports.scm:50
msgid "Expenses vs. Day of Week"
msgstr "Rashod po danu u tjednu"
-#: gnucash/report/standard-reports/daily-reports.scm:43
+#: gnucash/report/standard-reports/daily-reports.scm:42
msgid "Shows a piechart with the total income for each day of the week"
msgstr "Prikaži kružni dijagram s ukupnim prihodom za svaki dan u tjednu"
-#: gnucash/report/standard-reports/daily-reports.scm:45
+#: gnucash/report/standard-reports/daily-reports.scm:44
msgid "Shows a piechart with the total expenses for each day of the week"
msgstr "Prikaži kružni dijagram s ukupnim rashodom za svaki dan u tjednu"
@@ -25693,20 +25996,21 @@ msgstr "Uzorak zakljuÄnih unosa je regularni izraz"
#: gnucash/report/standard-reports/equity-statement.scm:96
#: gnucash/report/standard-reports/income-statement.scm:129
#: gnucash/report/standard-reports/trial-balance.scm:114
-msgid "Causes the Closing Entries Pattern to be treated as a regular expression."
+msgid ""
+"Causes the Closing Entries Pattern to be treated as a regular expression."
msgstr "Ovime će se uzorak zakljuÄnih unosa obraditi kao regularni izraz."
#: gnucash/report/standard-reports/equity-statement.scm:298
#: gnucash/report/standard-reports/income-statement.scm:434
#: gnucash/report/standard-reports/sx-summary.scm:313
-#: gnucash/report/standard-reports/trial-balance.scm:443
+#: gnucash/report/standard-reports/trial-balance.scm:494
#, scheme-format
msgid "For Period Covering ~a to ~a"
msgstr "Za razdoblje od ~a do ~a"
#: gnucash/report/standard-reports/equity-statement.scm:362
#: gnucash/report/standard-reports/income-statement.scm:473
-#: gnucash/report/standard-reports/trial-balance.scm:430
+#: gnucash/report/standard-reports/trial-balance.scm:481
msgid "for Period"
msgstr "za razdoblje"
@@ -25732,169 +26036,159 @@ msgid "Decrease in capital"
msgstr "Smanjenje kapitala"
#: gnucash/report/standard-reports/general-journal.scm:109
-#: gnucash/report/standard-reports/general-ledger.scm:78
-#: gnucash/report/standard-reports/register.scm:135
-#: gnucash/report/standard-reports/register.scm:406
-#: gnucash/report/standard-reports/transaction.scm:893
-#: gnucash/report/standard-reports/transaction.scm:1017
+#: gnucash/report/standard-reports/general-ledger.scm:75
+#: gnucash/report/standard-reports/register.scm:134
+#: gnucash/report/standard-reports/register.scm:405
+#: gnucash/report/standard-reports/transaction.scm:903
+#: gnucash/report/standard-reports/transaction.scm:1027
msgid "Num/Action"
msgstr "Broj/Radnja"
#: gnucash/report/standard-reports/general-journal.scm:117
-#: gnucash/report/standard-reports/general-ledger.scm:92
-#: gnucash/report/standard-reports/general-ledger.scm:112
-#: gnucash/report/standard-reports/register.scm:459
+#: gnucash/report/standard-reports/general-ledger.scm:89
+#: gnucash/report/standard-reports/general-ledger.scm:109
+#: gnucash/report/standard-reports/register.scm:458
#: gnucash/report/standard-reports/transaction.scm:450
-#: gnucash/report/standard-reports/transaction.scm:907
-#: gnucash/report/standard-reports/transaction.scm:1035
-#: gnucash/report/standard-reports/transaction.scm:1279
+#: gnucash/report/standard-reports/transaction.scm:917
+#: gnucash/report/standard-reports/transaction.scm:1045
+#: gnucash/report/standard-reports/transaction.scm:1293
msgid "Running Balance"
msgstr "Tekući saldo"
#: gnucash/report/standard-reports/general-journal.scm:118
-#: gnucash/report/standard-reports/general-ledger.scm:93
-#: gnucash/report/standard-reports/general-ledger.scm:113
-#: gnucash/report/standard-reports/register.scm:464
-#: gnucash/report/standard-reports/transaction.scm:908
+#: gnucash/report/standard-reports/general-ledger.scm:90
+#: gnucash/report/standard-reports/general-ledger.scm:110
+#: gnucash/report/standard-reports/register.scm:463
+#: gnucash/report/standard-reports/transaction.scm:918
msgid "Totals"
msgstr "Ukupno"
-#: gnucash/report/standard-reports/general-ledger.scm:40
+#: gnucash/report/standard-reports/general-ledger.scm:41
msgid "General Ledger"
msgstr "Opća glavna knjiga"
#. Sorting
-#: gnucash/report/standard-reports/general-ledger.scm:58
+#: gnucash/report/standard-reports/general-ledger.scm:57
#: gnucash/report/standard-reports/income-gst-statement.scm:39
#: gnucash/report/standard-reports/transaction.scm:67
msgid "Sorting"
msgstr "Razvrstavanje"
-#: gnucash/report/standard-reports/general-ledger.scm:65
-#: gnucash/report/standard-reports/transaction.scm:60
-msgid "Filter Type"
-msgstr "Vrsta filtra"
-
-#: gnucash/report/standard-reports/general-ledger.scm:67
-#: gnucash/report/standard-reports/transaction.scm:99
-msgid "Void Transactions"
-msgstr "Stornirane transakcije"
-
-#: gnucash/report/standard-reports/general-ledger.scm:77
-#: gnucash/report/standard-reports/general-ledger.scm:98
+#: gnucash/report/standard-reports/general-ledger.scm:74
+#: gnucash/report/standard-reports/general-ledger.scm:95
#: gnucash/report/standard-reports/transaction.scm:155
#: gnucash/report/standard-reports/transaction.scm:449
-#: gnucash/report/standard-reports/transaction.scm:891
-#: gnucash/report/standard-reports/transaction.scm:1015
-#: gnucash/report/standard-reports/transaction.scm:1093
+#: gnucash/report/standard-reports/transaction.scm:901
+#: gnucash/report/standard-reports/transaction.scm:1025
+#: gnucash/report/standard-reports/transaction.scm:1103
msgid "Reconciled Date"
msgstr "Datum usklađivanja"
-#: gnucash/report/standard-reports/general-ledger.scm:79
-#: gnucash/report/standard-reports/transaction.scm:913
-#: gnucash/report/standard-reports/transaction.scm:1103
-#: gnucash/report/standard-reports/transaction.scm:1110
+#: gnucash/report/standard-reports/general-ledger.scm:76
+#: gnucash/report/standard-reports/transaction.scm:923
+#: gnucash/report/standard-reports/transaction.scm:1113
+#: gnucash/report/standard-reports/transaction.scm:1120
msgid "Trans Number"
msgstr "Broj transakcije"
#. account name option appears here
-#: gnucash/report/standard-reports/general-ledger.scm:83
-#: gnucash/report/standard-reports/general-ledger.scm:103
-#: gnucash/report/standard-reports/transaction.scm:851
-#: gnucash/report/standard-reports/transaction.scm:898
-#: gnucash/report/standard-reports/transaction.scm:1036
+#: gnucash/report/standard-reports/general-ledger.scm:80
+#: gnucash/report/standard-reports/general-ledger.scm:100
+#: gnucash/report/standard-reports/transaction.scm:861
+#: gnucash/report/standard-reports/transaction.scm:908
+#: gnucash/report/standard-reports/transaction.scm:1046
msgid "Use Full Account Name"
msgstr "Koristi cjelokupno ime konta"
-#: gnucash/report/standard-reports/general-ledger.scm:85
-#: gnucash/report/standard-reports/general-ledger.scm:105
+#: gnucash/report/standard-reports/general-ledger.scm:82
+#: gnucash/report/standard-reports/general-ledger.scm:102
#: gnucash/report/standard-reports/transaction.scm:180
-#: gnucash/report/standard-reports/transaction.scm:855
-#: gnucash/report/standard-reports/transaction.scm:940
-#: gnucash/report/standard-reports/transaction.scm:1022
+#: gnucash/report/standard-reports/transaction.scm:865
+#: gnucash/report/standard-reports/transaction.scm:950
+#: gnucash/report/standard-reports/transaction.scm:1032
msgid "Other Account Name"
msgstr "Ime drugog konta"
#. other account name option appears here
-#: gnucash/report/standard-reports/general-ledger.scm:86
-#: gnucash/report/standard-reports/general-ledger.scm:106
-#: gnucash/report/standard-reports/transaction.scm:871
-#: gnucash/report/standard-reports/transaction.scm:901
-#: gnucash/report/standard-reports/transaction.scm:1042
+#: gnucash/report/standard-reports/general-ledger.scm:83
+#: gnucash/report/standard-reports/general-ledger.scm:103
+#: gnucash/report/standard-reports/transaction.scm:881
+#: gnucash/report/standard-reports/transaction.scm:911
+#: gnucash/report/standard-reports/transaction.scm:1052
msgid "Use Full Other Account Name"
msgstr "Koristi cjelokupno ime drugog konta"
-#: gnucash/report/standard-reports/general-ledger.scm:87
-#: gnucash/report/standard-reports/general-ledger.scm:107
+#: gnucash/report/standard-reports/general-ledger.scm:84
+#: gnucash/report/standard-reports/general-ledger.scm:104
#: gnucash/report/standard-reports/transaction.scm:186
-#: gnucash/report/standard-reports/transaction.scm:875
-#: gnucash/report/standard-reports/transaction.scm:902
-#: gnucash/report/standard-reports/transaction.scm:1040
+#: gnucash/report/standard-reports/transaction.scm:885
+#: gnucash/report/standard-reports/transaction.scm:912
+#: gnucash/report/standard-reports/transaction.scm:1050
msgid "Other Account Code"
msgstr "Å ifra drugog konta"
-#: gnucash/report/standard-reports/general-ledger.scm:94
-#: gnucash/report/standard-reports/general-ledger.scm:114
-#: gnucash/report/standard-reports/transaction.scm:859
-#: gnucash/report/standard-reports/transaction.scm:984
-#: gnucash/report/standard-reports/transaction.scm:1071
+#: gnucash/report/standard-reports/general-ledger.scm:91
+#: gnucash/report/standard-reports/general-ledger.scm:111
+#: gnucash/report/standard-reports/transaction.scm:869
+#: gnucash/report/standard-reports/transaction.scm:994
+#: gnucash/report/standard-reports/transaction.scm:1081
msgid "Sign Reverses"
msgstr "Suprotni predznak"
#. Display
-#: gnucash/report/standard-reports/general-ledger.scm:121
+#: gnucash/report/standard-reports/general-ledger.scm:118
#: gnucash/report/standard-reports/transaction.scm:63
msgid "Detail Level"
msgstr "Razina detalja"
-#: gnucash/report/standard-reports/general-ledger.scm:134
+#: gnucash/report/standard-reports/general-ledger.scm:131
#: gnucash/report/standard-reports/transaction.scm:68
msgid "Primary Key"
msgstr "Primarni kljuÄ"
-#: gnucash/report/standard-reports/general-ledger.scm:135
+#: gnucash/report/standard-reports/general-ledger.scm:132
#: gnucash/report/standard-reports/transaction.scm:72
-#: gnucash/report/standard-reports/transaction.scm:1044
+#: gnucash/report/standard-reports/transaction.scm:1054
msgid "Show Full Account Name"
msgstr "Prikaži cjelokupno ime konta"
-#: gnucash/report/standard-reports/general-ledger.scm:136
+#: gnucash/report/standard-reports/general-ledger.scm:133
#: gnucash/report/standard-reports/transaction.scm:73
-#: gnucash/report/standard-reports/transaction.scm:1043
+#: gnucash/report/standard-reports/transaction.scm:1053
msgid "Show Account Code"
msgstr "Prikaži šifru konta"
-#: gnucash/report/standard-reports/general-ledger.scm:137
+#: gnucash/report/standard-reports/general-ledger.scm:134
#: gnucash/report/standard-reports/transaction.scm:69
msgid "Primary Subtotal"
msgstr "Primarni podzbroj"
-#: gnucash/report/standard-reports/general-ledger.scm:138
+#: gnucash/report/standard-reports/general-ledger.scm:135
#: gnucash/report/standard-reports/transaction.scm:71
msgid "Primary Subtotal for Date Key"
msgstr "Primarni podzbroj na kljuÄni datum"
-#: gnucash/report/standard-reports/general-ledger.scm:139
+#: gnucash/report/standard-reports/general-ledger.scm:136
#: gnucash/report/standard-reports/transaction.scm:70
msgid "Primary Sort Order"
msgstr "Primarni redoslijed razvrstavanja"
-#: gnucash/report/standard-reports/general-ledger.scm:140
+#: gnucash/report/standard-reports/general-ledger.scm:137
#: gnucash/report/standard-reports/transaction.scm:78
msgid "Secondary Key"
msgstr "Sekundarni kljuÄ"
-#: gnucash/report/standard-reports/general-ledger.scm:141
+#: gnucash/report/standard-reports/general-ledger.scm:138
#: gnucash/report/standard-reports/transaction.scm:79
msgid "Secondary Subtotal"
msgstr "Sekundarni podzbroj"
-#: gnucash/report/standard-reports/general-ledger.scm:142
+#: gnucash/report/standard-reports/general-ledger.scm:139
#: gnucash/report/standard-reports/transaction.scm:81
msgid "Secondary Subtotal for Date Key"
msgstr "Sekundarni podzbroj za kljuÄni datum"
-#: gnucash/report/standard-reports/general-ledger.scm:143
+#: gnucash/report/standard-reports/general-ledger.scm:140
#: gnucash/report/standard-reports/transaction.scm:80
msgid "Secondary Sort Order"
msgstr "Sekundarni redoslijed razvrstavanja"
@@ -25914,47 +26208,49 @@ msgstr "Filtar"
msgid ""
"This report is useful to calculate periodic business tax payable/receivable "
"from\n"
-" authorities. From 'Edit report options' above, choose your Business Income and "
-"Business Expense accounts.\n"
-" Each transaction may contain, in addition to the accounts payable/receivable or "
-"bank accounts,\n"
+" authorities. From 'Edit report options' above, choose your Business Income "
+"and Business Expense accounts.\n"
+" Each transaction may contain, in addition to the accounts payable/"
+"receivable or bank accounts,\n"
" a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -"
"$100, Asset:Bank $1100."
msgstr ""
"Ovaj je izvjeÅ¡taj koristan za izraÄunavanje periodiÄnih poslovnih dugovanja/"
"potraživanja od strane porezne uprave.\n"
-"U gornjoj opciji „Uredi opcije izvjeÅ¡tajaâ€, odaberi konta prihoda i rashoda za "
-"tvoje poduzeće.\n"
-"Svaka transakcija smije sadržati – dodatno uz dugovna/potražna konta ili konta "
-"banke – stavku za\n"
+"U gornjoj opciji „Uredi opcije izvjeÅ¡tajaâ€, odaberi konta prihoda i rashoda "
+"za tvoje poduzeće.\n"
+"Svaka transakcija smije sadržati – dodatno uz dugovna/potražna konta ili "
+"konta banke – stavku za\n"
"konto poreza, npr. Prihod:Promet −1000 kn, Obveze:PDV −100 kn, Imovina:Banka "
"1100 kn."
#: gnucash/report/standard-reports/income-gst-statement.scm:49
msgid ""
-"These tax accounts can either be populated using the standard register, or from "
-"Business Invoices and Bills\n"
+"These tax accounts can either be populated using the standard register, or "
+"from Business Invoices and Bills\n"
" which will require Tax Tables to be set up correctly. Please see the "
"documentation."
msgstr ""
-"Ovi se konti poreza mogu popuniti u standardnom registru ili putem izlaznih i "
-"ulaznih poslovnih raÄuna,\n"
-"za koje će biti potrebno postaviti toÄne porezne tablice. ProÄitaj dokumentaciju."
+"Ovi se konti poreza mogu popuniti u standardnom registru ili putem izlaznih "
+"i ulaznih poslovnih raÄuna,\n"
+"za koje će biti potrebno postaviti toÄne porezne tablice. ProÄitaj "
+"dokumentaciju."
#: gnucash/report/standard-reports/income-gst-statement.scm:53
msgid ""
-"From the Report Options, you will need to select the accounts which will hold "
-"the GST/VAT taxes collected or paid. These accounts must contain splits which "
-"document the monies which are wholly sent or claimed from tax authorities during "
-"periodic GST/VAT returns. These accounts must be of type ASSET for taxes paid on "
-"expenses, and type LIABILITY for taxes collected on sales."
+"From the Report Options, you will need to select the accounts which will "
+"hold the GST/VAT taxes collected or paid. These accounts must contain splits "
+"which document the monies which are wholly sent or claimed from tax "
+"authorities during periodic GST/VAT returns. These accounts must be of type "
+"ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on "
+"sales."
msgstr ""
-"U opcijama za izvještaj, odaberi konta, koja sadrže primljeni ili plaćeni PDV. "
-"Nađi i odaberi konta, koja sadrže primljeni ili plaćeni porez. Ovi konti moraju "
-"sadržati stavke, koje dokumentiraju novac, koji se iskljuÄivo Å¡alju ili "
-"potražuju od porezne uprave, prilikom periodiÄnih povrata PDV-a. Ovi konti "
-"moraju biti konti IMOVINE za plaćeni porez na rashode, i konti OBVEZA za "
-"sakljupljeni porez na promet."
+"U opcijama za izvještaj, odaberi konta, koja sadrže primljeni ili plaćeni "
+"PDV. Nađi i odaberi konta, koja sadrže primljeni ili plaćeni porez. Ovi "
+"konti moraju sadržati stavke, koje dokumentiraju novac, koji se iskljuÄivo "
+"Å¡alju ili potražuju od porezne uprave, prilikom periodiÄnih povrata PDV-a. "
+"Ovi konti moraju biti konti IMOVINE za plaćeni porez na rashode, i konti "
+"OBVEZA za sakljupljeni porez na promet."
#: gnucash/report/standard-reports/income-gst-statement.scm:93
msgid "Tax Accounts"
@@ -25962,20 +26258,20 @@ msgstr "Konti poreza"
#: gnucash/report/standard-reports/income-gst-statement.scm:94
msgid ""
-"Please find and select the accounts which will hold the tax collected or paid. "
-"These accounts must contain splits which document the monies which are wholly "
-"sent or claimed from tax authorities during periodic GST/VAT returns. These "
-"accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY "
-"for taxes collected on sales."
+"Please find and select the accounts which will hold the tax collected or "
+"paid. These accounts must contain splits which document the monies which are "
+"wholly sent or claimed from tax authorities during periodic GST/VAT returns. "
+"These accounts must be of type ASSET for taxes paid on expenses, and type "
+"LIABILITY for taxes collected on sales."
msgstr ""
-"Nađi i odaberi konta, koja sadrže primljeni ili plaćeni porez. Ovi konti moraju "
-"sadržati stavke, koje dokumentiraju novac, koji se iskljuÄivo Å¡alje ili "
-"potražuje od porezne uprave, prilikom periodiÄnih povrata PDV-a. Ovi konti "
-"moraju biti konti IMOVINE za plaćeni porez na rashode, i konti OBVEZA za "
-"sakljupljeni porez na promet."
+"Nađi i odaberi konta, koja sadrže primljeni ili plaćeni porez. Ovi konti "
+"moraju sadržati stavke, koje dokumentiraju novac, koji se iskljuÄivo Å¡alje "
+"ili potražuje od porezne uprave, prilikom periodiÄnih povrata PDV-a. Ovi "
+"konti moraju biti konti IMOVINE za plaćeni porez na rashode, i konti OBVEZA "
+"za sakljupljeni porez na promet."
#: gnucash/report/standard-reports/income-gst-statement.scm:108
-#: gnucash/report/standard-reports/income-gst-statement.scm:210
+#: gnucash/report/standard-reports/income-gst-statement.scm:211
msgid "Individual sales columns"
msgstr "PojedinaÄni stupci prometa"
@@ -25984,7 +26280,7 @@ msgid "Display individual sales columns rather than their sum"
msgstr "Prikaži stupce prometa pojedinaÄno, umjesto ukupno"
#: gnucash/report/standard-reports/income-gst-statement.scm:109
-#: gnucash/report/standard-reports/income-gst-statement.scm:235
+#: gnucash/report/standard-reports/income-gst-statement.scm:236
msgid "Individual purchases columns"
msgstr "PojedinaÄni stupci kupovine"
@@ -25993,8 +26289,8 @@ msgid "Display individual purchases columns rather than their sum"
msgstr "Prikaži stupce kupovine pojedinaÄno, umjesto ukupno"
#: gnucash/report/standard-reports/income-gst-statement.scm:110
-#: gnucash/report/standard-reports/income-gst-statement.scm:220
-#: gnucash/report/standard-reports/income-gst-statement.scm:245
+#: gnucash/report/standard-reports/income-gst-statement.scm:221
+#: gnucash/report/standard-reports/income-gst-statement.scm:246
msgid "Individual tax columns"
msgstr "PojedinaÄni stupci poreza"
@@ -26004,8 +26300,8 @@ msgstr "Prikaži stupce poreza pojedinaÄno, umjesto ukupno"
#. Translators: "Gross Balance" refer to "Gross Sales - Gross Purchases" in GST Report
#: gnucash/report/standard-reports/income-gst-statement.scm:111
-#: gnucash/report/standard-reports/income-gst-statement.scm:255
-#: gnucash/report/standard-reports/income-gst-statement.scm:257
+#: gnucash/report/standard-reports/income-gst-statement.scm:256
+#: gnucash/report/standard-reports/income-gst-statement.scm:258
msgid "Gross Balance"
msgstr "Bruto saldo"
@@ -26016,8 +26312,8 @@ msgstr "Prikaži bruto saldo (bruto promet − bruto kupovina)"
#. Note: Net income = net balance - other costs
#. Translators: "Net Balance" refer to Net Sales - Net Purchases in GST Report
#: gnucash/report/standard-reports/income-gst-statement.scm:112
-#: gnucash/report/standard-reports/income-gst-statement.scm:263
-#: gnucash/report/standard-reports/income-gst-statement.scm:265
+#: gnucash/report/standard-reports/income-gst-statement.scm:264
+#: gnucash/report/standard-reports/income-gst-statement.scm:266
msgid "Net Balance"
msgstr "Neto saldo"
@@ -26026,7 +26322,7 @@ msgid "Display the net balance (sales without tax - purchases without tax)"
msgstr "Prikaži neto saldo (promet bez PDV-a − kupovina bez PDV-a)"
#: gnucash/report/standard-reports/income-gst-statement.scm:113
-#: gnucash/report/standard-reports/income-gst-statement.scm:270
+#: gnucash/report/standard-reports/income-gst-statement.scm:271
msgid "Tax payable"
msgstr "Porezna dugovanja"
@@ -26034,41 +26330,34 @@ msgstr "Porezna dugovanja"
msgid "Display the tax payable (tax on sales - tax on purchases)"
msgstr "Prikaži porezna dugovanja (PDV na promet − PDV na kupovinu)"
-#. each column will be a vector
-#. (vector heading ;; string
-#. calculator-function ;; (calculator-function split) to obtain amount
-#. reverse-column? ;; #t for sales, #f for purchases
-#. subtotal? ;; #t - all columns need subtotals
-#. start-dual-column? ;; unused in GST report
-#. friendly-heading-fn ;; unused in GST report
#. Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales
-#: gnucash/report/standard-reports/income-gst-statement.scm:206
+#: gnucash/report/standard-reports/income-gst-statement.scm:207
msgid "Gross Sales"
msgstr "Bruto promet"
-#: gnucash/report/standard-reports/income-gst-statement.scm:216
+#: gnucash/report/standard-reports/income-gst-statement.scm:217
msgid "Net Sales"
msgstr "Neto promet"
-#: gnucash/report/standard-reports/income-gst-statement.scm:226
+#: gnucash/report/standard-reports/income-gst-statement.scm:227
msgid "Tax on Sales"
msgstr "PDV na promet"
#. Translators: "Gross Purchases" refer to Net Purchase + GST/VAT on Purchase
-#: gnucash/report/standard-reports/income-gst-statement.scm:231
+#: gnucash/report/standard-reports/income-gst-statement.scm:232
msgid "Gross Purchases"
msgstr "Bruto kupovina"
-#: gnucash/report/standard-reports/income-gst-statement.scm:241
+#: gnucash/report/standard-reports/income-gst-statement.scm:242
msgid "Net Purchases"
msgstr "Neto kupovina"
-#: gnucash/report/standard-reports/income-gst-statement.scm:251
+#: gnucash/report/standard-reports/income-gst-statement.scm:252
msgid "Tax on Purchases"
msgstr "PDV na kupovinu"
#. Translators: "Tax Payable" refer to the difference GST Sales - GST Purchases
-#: gnucash/report/standard-reports/income-gst-statement.scm:272
+#: gnucash/report/standard-reports/income-gst-statement.scm:273
msgid "Tax Payable"
msgstr "Porezna dugovanja"
@@ -26085,11 +26374,12 @@ msgid "Include trading accounts total"
msgstr "UkljuÄi ukupni iznos konta burzovnog trgovanja"
#: gnucash/report/standard-reports/income-statement.scm:101
-msgid "Whether or not to include a line indicating total trading accounts balance."
+msgid ""
+"Whether or not to include a line indicating total trading accounts balance."
msgstr "Da li ukljuÄiti redak, koji pokazuje ukupni saldo konta trgovanja."
#: gnucash/report/standard-reports/income-statement.scm:621
-#: libgnucash/engine/Account.cpp:4107 libgnucash/engine/Scrub.c:430
+#: libgnucash/engine/Account.cpp:4105 libgnucash/engine/Scrub.c:430
#: libgnucash/engine/Scrub.c:495
msgid "Trading"
msgstr "Burzovno trgovanje"
@@ -26099,7 +26389,7 @@ msgid "Total Trading"
msgstr "Ukupno burzovno trgovanje"
#: gnucash/report/standard-reports/income-statement.scm:718
-#: gnucash/report/standard-reports/trial-balance.scm:658
+#: gnucash/report/standard-reports/trial-balance.scm:709
msgid "Income Statement"
msgstr "Stanje prihoda"
@@ -26128,10 +26418,6 @@ msgstr "Å irina retka"
msgid "Set line width in pixels."
msgstr "Postavi Å¡irinu linije u pikselima."
-#: gnucash/report/standard-reports/net-charts.scm:60
-msgid "Data markers?"
-msgstr "Oznake za podatke?"
-
#. (define optname-x-grid (N_ "X grid"))
#: gnucash/report/standard-reports/net-charts.scm:63
msgid "Grid"
@@ -26157,38 +26443,34 @@ msgstr "Prikazati stupac neto vrijednosti?"
msgid "Add grid lines."
msgstr "Dodaj linije mreže."
-#: gnucash/report/standard-reports/net-charts.scm:166
-msgid "Display a mark for each data point."
-msgstr "Prikaži oznaku za svaki podatak."
-
-#: gnucash/report/standard-reports/net-charts.scm:408
-#: gnucash/report/standard-reports/net-charts.scm:488
+#: gnucash/report/standard-reports/net-charts.scm:414
+#: gnucash/report/standard-reports/net-charts.scm:494
msgid "Net Profit"
msgstr "Neto dobit"
-#: gnucash/report/standard-reports/net-charts.scm:409
-#: gnucash/report/standard-reports/net-charts.scm:489
+#: gnucash/report/standard-reports/net-charts.scm:415
+#: gnucash/report/standard-reports/net-charts.scm:495
msgid "Net Worth"
msgstr "Neto vrijednost"
-#: gnucash/report/standard-reports/net-charts.scm:536
+#: gnucash/report/standard-reports/net-charts.scm:542
msgid "Net Worth Barchart"
msgstr "Neto vrijednost (stupÄani dijagram)"
-#: gnucash/report/standard-reports/net-charts.scm:544
+#: gnucash/report/standard-reports/net-charts.scm:550
msgid "Income/Expense Chart"
msgstr "Prihod/rashod (dijagram)"
-#: gnucash/report/standard-reports/net-charts.scm:546
+#: gnucash/report/standard-reports/net-charts.scm:552
msgid "Income & Expense Barchart"
msgstr "Prihod i rashod (stupÄani dijagram)"
-#: gnucash/report/standard-reports/net-charts.scm:553
+#: gnucash/report/standard-reports/net-charts.scm:559
msgid "Net Worth Linechart"
msgstr "Neto vrijednost (linijski dijagram)"
-#: gnucash/report/standard-reports/net-charts.scm:563
-#: gnucash/report/standard-reports/net-charts.scm:565
+#: gnucash/report/standard-reports/net-charts.scm:569
+#: gnucash/report/standard-reports/net-charts.scm:571
msgid "Income & Expense Linechart"
msgstr "Prihod i rashod (linijski dijagram)"
@@ -26254,8 +26536,8 @@ msgstr "Sve cijene su jednake"
#: gnucash/report/standard-reports/price-scatter.scm:312
msgid ""
-"All the prices found are equal. This would result in a plot with one straight "
-"line. Unfortunately, the plotting tool can't handle that."
+"All the prices found are equal. This would result in a plot with one "
+"straight line. Unfortunately, the plotting tool can't handle that."
msgstr ""
"Sve pronađene cijene su jednake. To bi rezultiralo iscrtavanjem jedne ravne "
"linije. Nažalost, crtaÄi alat to ne može odraditi."
@@ -26266,8 +26548,8 @@ msgstr "Sve cijene su istog datuma"
#: gnucash/report/standard-reports/price-scatter.scm:318
msgid ""
-"All the prices found are from the same date. This would result in a plot with "
-"one straight line. Unfortunately, the plotting tool can't handle that."
+"All the prices found are from the same date. This would result in a plot "
+"with one straight line. Unfortunately, the plotting tool can't handle that."
msgstr ""
"Sve pronađene cijene imaju isti datum. To bi rezultiralo iscrtavanjem jedne "
"ravne linije. Nažalost, crtaÄi alat to ne može odraditi."
@@ -26288,7 +26570,8 @@ msgstr ""
msgid ""
"There is no price information available for the selected commodities in the "
"selected time period."
-msgstr "Nema dostupnih podataka o cijeni za odabranu robu, u odabranom razdoblju."
+msgstr ""
+"Nema dostupnih podataka o cijeni za odabranu robu, u odabranom razdoblju."
#: gnucash/report/standard-reports/price-scatter.scm:336
msgid "Identical commodities"
@@ -26296,144 +26579,145 @@ msgstr "Ista roba"
#: gnucash/report/standard-reports/price-scatter.scm:337
msgid ""
-"Your selected commodity and the currency of the report are identical. It doesn't "
-"make sense to show prices for identical commodities."
+"Your selected commodity and the currency of the report are identical. It "
+"doesn't make sense to show prices for identical commodities."
msgstr ""
-"Tvoja odabrana roba i valuta izvještaja su isti. Nema smisla prikazati cijene za "
-"istu robu."
+"Tvoja odabrana roba i valuta izvještaja su isti. Nema smisla prikazati "
+"cijene za istu robu."
#: gnucash/report/standard-reports/price-scatter.scm:349
msgid "Price Scatterplot"
msgstr "Raspršeni dijagram cijena"
-#: gnucash/report/standard-reports/register.scm:148
-#: gnucash/report/standard-reports/register.scm:435 libgnucash/engine/gnc-lot.c:765
+#: gnucash/report/standard-reports/register.scm:147
+#: gnucash/report/standard-reports/register.scm:434
+#: libgnucash/engine/gnc-lot.c:763
msgid "Lot"
msgstr "Paket"
-#: gnucash/report/standard-reports/register.scm:160
+#: gnucash/report/standard-reports/register.scm:159
msgid "Debit Value"
msgstr "Vrijednost dugovanja"
-#: gnucash/report/standard-reports/register.scm:162
+#: gnucash/report/standard-reports/register.scm:161
msgid "Credit Value"
msgstr "Vrijednost potraživanja"
-#: gnucash/report/standard-reports/register.scm:395
+#: gnucash/report/standard-reports/register.scm:394
msgid "The title of the report."
msgstr "Naslov izvještaja."
-#: gnucash/report/standard-reports/register.scm:407
+#: gnucash/report/standard-reports/register.scm:406
msgid "Display the check number/action?"
msgstr "Prikazati broj Äeka/radnje?"
-#: gnucash/report/standard-reports/register.scm:411
-#: gnucash/report/standard-reports/transaction.scm:893
-#: gnucash/report/standard-reports/transaction.scm:894
+#: gnucash/report/standard-reports/register.scm:410
+#: gnucash/report/standard-reports/transaction.scm:903
+#: gnucash/report/standard-reports/transaction.scm:904
msgid "Display the check number?"
msgstr "Prikazati broj Äeka?"
-#: gnucash/report/standard-reports/register.scm:421
-#: gnucash/report/standard-reports/transaction.scm:921
+#: gnucash/report/standard-reports/register.scm:420
+#: gnucash/report/standard-reports/transaction.scm:931
msgid "Display the memo?"
msgstr "Prikazati zabilješku?"
-#: gnucash/report/standard-reports/register.scm:426
+#: gnucash/report/standard-reports/register.scm:425
msgid "Display the account?"
msgstr "Prikazati konto?"
-#: gnucash/report/standard-reports/register.scm:431
-#: gnucash/report/standard-reports/transaction.scm:903
+#: gnucash/report/standard-reports/register.scm:430
+#: gnucash/report/standard-reports/transaction.scm:913
msgid "Display the number of shares?"
msgstr "Prikazati broj dionica?"
-#: gnucash/report/standard-reports/register.scm:436
+#: gnucash/report/standard-reports/register.scm:435
msgid "Display the name of lot the shares are in?"
msgstr "Prikazati ime paketa u kojem se nalaze dionice?"
-#: gnucash/report/standard-reports/register.scm:441
-#: gnucash/report/standard-reports/transaction.scm:904
+#: gnucash/report/standard-reports/register.scm:440
+#: gnucash/report/standard-reports/transaction.scm:914
msgid "Display the shares price?"
msgstr "Prikazati cijenu dionica?"
-#: gnucash/report/standard-reports/register.scm:446
-#: gnucash/report/standard-reports/transaction.scm:966
+#: gnucash/report/standard-reports/register.scm:445
+#: gnucash/report/standard-reports/transaction.scm:976
msgid "Display the amount?"
msgstr "Prikazati iznos?"
-#: gnucash/report/standard-reports/register.scm:449
-#: gnucash/report/standard-reports/transaction.scm:956
-#: gnucash/report/standard-reports/transaction.scm:970
+#: gnucash/report/standard-reports/register.scm:448
+#: gnucash/report/standard-reports/transaction.scm:966
+#: gnucash/report/standard-reports/transaction.scm:980
msgid "Single"
msgstr "PojedinaÄno"
-#: gnucash/report/standard-reports/register.scm:449
-#: gnucash/report/standard-reports/transaction.scm:970
+#: gnucash/report/standard-reports/register.scm:448
+#: gnucash/report/standard-reports/transaction.scm:980
msgid "Single Column Display."
msgstr "Prikaz u jednoj stupcu."
-#: gnucash/report/standard-reports/register.scm:450
-#: gnucash/report/standard-reports/transaction.scm:971
+#: gnucash/report/standard-reports/register.scm:449
+#: gnucash/report/standard-reports/transaction.scm:981
msgid "Double"
msgstr "Dvostruko"
-#: gnucash/report/standard-reports/register.scm:450
-#: gnucash/report/standard-reports/transaction.scm:971
+#: gnucash/report/standard-reports/register.scm:449
+#: gnucash/report/standard-reports/transaction.scm:981
msgid "Two Column Display."
msgstr "Prikaz u dva stupca."
-#: gnucash/report/standard-reports/register.scm:455
+#: gnucash/report/standard-reports/register.scm:454
msgid "Display the value in transaction currency?"
msgstr "Prikazati vrijednost u valuti transakcije?"
-#: gnucash/report/standard-reports/register.scm:460
-#: gnucash/report/standard-reports/transaction.scm:907
+#: gnucash/report/standard-reports/register.scm:459
+#: gnucash/report/standard-reports/transaction.scm:917
msgid "Display a running balance?"
msgstr "Prikazati tekući saldo?"
-#: gnucash/report/standard-reports/register.scm:465
-#: gnucash/report/standard-reports/transaction.scm:908
+#: gnucash/report/standard-reports/register.scm:464
+#: gnucash/report/standard-reports/transaction.scm:918
msgid "Display the totals?"
msgstr "Prikazati sveukupne iznose?"
-#: gnucash/report/standard-reports/register.scm:613
+#: gnucash/report/standard-reports/register.scm:616
msgid "Total Debits"
msgstr "Ukupno dugovanja"
-#: gnucash/report/standard-reports/register.scm:615
+#: gnucash/report/standard-reports/register.scm:618
msgid "Total Credits"
msgstr "Ukupno potraživanja"
-#: gnucash/report/standard-reports/register.scm:617
+#: gnucash/report/standard-reports/register.scm:620
msgid "Total Value Debits"
msgstr "Ukupno vrijednost dugovanja"
-#: gnucash/report/standard-reports/register.scm:619
+#: gnucash/report/standard-reports/register.scm:622
msgid "Total Value Credits"
msgstr "Ukupno vrijednost potraživanja"
-#: gnucash/report/standard-reports/register.scm:622
+#: gnucash/report/standard-reports/register.scm:625
msgid "Net Change"
msgstr "Neto promjena"
-#: gnucash/report/standard-reports/register.scm:625
+#: gnucash/report/standard-reports/register.scm:627
msgid "Value Change"
msgstr "Vrijednosna promjena"
-#: gnucash/report/standard-reports/register.scm:784
-msgid "Client"
-msgstr "Klijent"
-
#: gnucash/report/standard-reports/sx-summary.scm:43
msgid "Future Scheduled Transactions Summary"
msgstr "Sažetak budućih terminiranih transakcija"
+#: gnucash/report/standard-reports/transaction.scm:60
+msgid "Filter Type"
+msgstr "Vrsta filtra"
+
#: gnucash/report/standard-reports/transaction.scm:64
msgid "Subtotal Table"
msgstr "Tablica podzbrojeva"
#: gnucash/report/standard-reports/transaction.scm:74
-#: gnucash/report/standard-reports/transaction.scm:1045
+#: gnucash/report/standard-reports/transaction.scm:1055
msgid "Show Account Description"
msgstr "Prikaži opis konta"
@@ -26485,6 +26769,10 @@ msgstr "Koristi regularne izraze za filtar transkacija"
msgid "Reconcile Status"
msgstr "Stanje usklađenosti"
+#: gnucash/report/standard-reports/transaction.scm:99
+msgid "Void Transactions"
+msgstr "Stornirane transakcije"
+
#: gnucash/report/standard-reports/transaction.scm:100
msgid "Closing transactions"
msgstr "ZakljuÄne transakcije"
@@ -26495,11 +26783,11 @@ msgstr "Nisu nađene odgovarajuće transakcije"
#: gnucash/report/standard-reports/transaction.scm:110
msgid ""
-"No transactions were found that match the time interval and account selection "
-"specified in the Options panel."
+"No transactions were found that match the time interval and account "
+"selection specified in the Options panel."
msgstr ""
"Nisu pronađene transakcije, koje odgovaraju odabiru vremenskog intervala i "
-"konta, navedenih u panelu opcija."
+"konta navedenih u panelu opcija."
#: gnucash/report/standard-reports/transaction.scm:138
msgid "Sort & subtotal by account name."
@@ -26699,8 +26987,8 @@ msgstr "Konti potraživanja"
#: gnucash/report/standard-reports/transaction.scm:404
msgid ""
-"Reverse amount display for Liability, Payable, Equity, Credit Card, and Income "
-"accounts."
+"Reverse amount display for Liability, Payable, Equity, Credit Card, and "
+"Income accounts."
msgstr ""
"Preokreni predznak prikazanih iznosa za konta obveza, dugovanja, kapitala, "
"kreditnih kartica i prihoda."
@@ -26709,8 +26997,8 @@ msgstr ""
msgid ""
"The reconcile report is designed to be similar to the formal reconciliation "
"tool.\n"
-"Please select the account from Report Options. Please note the dates specified "
-"in the options\n"
+"Please select the account from Report Options. Please note the dates "
+"specified in the options\n"
"will apply to the Reconciliation Date."
msgstr ""
"IzvjeÅ¡taj o usklaÄ‘enosti radi na sliÄan naÄin kao alat za usklaÄ‘ivanje.\n"
@@ -26757,29 +27045,31 @@ msgstr "IskljuÄi stvaranje sažetka."
#: gnucash/report/standard-reports/transaction.scm:562
msgid ""
-"Show only accounts whose full name matches this filter e.g. ':Travel' will match "
-"Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, "
-"which will disable the filter."
+"Show only accounts whose full name matches this filter e.g. ':Travel' will "
+"match Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left "
+"blank, which will disable the filter."
msgstr ""
"Prikaži samo konta, Äija se cjelokupna imena poklapaju s filtrom, npr. "
-"„Putovanje†će se poklopiti s „Rashod:Putovanje:Praznici†i s „Rashod:Poslovanje:"
-"Putovanjeâ€. Može se ostaviti praznim, Äime se rad filtra onemogućuje."
+"„Putovanje†će se poklopiti s „Rashod:Putovanje:Praznici†i s „Rashod:"
+"Poslovanje:Putovanjeâ€. Može se ostaviti praznim, Äime se rad filtra "
+"onemogućuje."
#: gnucash/report/standard-reports/transaction.scm:571
msgid ""
-"By default the account filter will search substring only. Set this to true to "
-"enable full POSIX regular expressions capabilities. 'Car|Flights' will match "
-"both Expenses:Car and Expenses:Flights. Use a period (.) to match a single "
-"character e.g. '20../.' will match 'Travel 2017/1 London'. "
+"By default the account filter will search substring only. Set this to true "
+"to enable full POSIX regular expressions capabilities. 'Car|Flights' will "
+"match both Expenses:Car and Expenses:Flights. Use a period (.) to match a "
+"single character e.g. '20../.' will match 'Travel 2017/1 London'. "
msgstr ""
"Filtar konta standardno traži samo znakovne podnizove. UkljuÄi ovo, za "
-"korištenje svih mogućnosti POSIX regularanih izraza. „Auto|Letovi†će pronaći "
-"oba Rashod:Auto i Rashod:Letovi. Koristi toÄku (.) za poklapanje pojedinaÄnih "
-"slova. Npr. „20../.†će pronaći „Putovanje 2017/1 Londonâ€. "
+"korištenje svih mogućnosti POSIX regularanih izraza. „Auto|Letovi†će "
+"pronaći oba Rashod:Auto i Rashod:Letovi. Koristi toÄku (.) za poklapanje "
+"pojedinaÄnih slova. Npr. „20../.†će pronaći „Putovanje 2017/1 Londonâ€. "
#: gnucash/report/standard-reports/transaction.scm:580
msgid ""
-"Show only transactions where description, notes, or memo matches this filter.\n"
+"Show only transactions where description, notes, or memo matches this "
+"filter.\n"
"e.g. '#gift' will find all transactions with #gift in description, notes or "
"memo. It can be left blank, which will disable the filter."
msgstr ""
@@ -26790,9 +27080,9 @@ msgstr ""
#: gnucash/report/standard-reports/transaction.scm:589
msgid ""
-"By default the transaction filter will search substring only. Set this to true "
-"to enable full POSIX regular expressions capabilities. '#work|#family' will "
-"match both tags within description, notes or memo. "
+"By default the transaction filter will search substring only. Set this to "
+"true to enable full POSIX regular expressions capabilities. '#work|#family' "
+"will match both tags within description, notes or memo. "
msgstr ""
"Filtar transakcija standardno traži samo znakovne podnizove. UkljuÄi ovo, za "
"korištenje svih mogućnosti POSIX regularanih izraza. „#posao|#obitelj†će "
@@ -26808,13 +27098,15 @@ msgstr "Å to raditi sa storniranim transakcijama."
#: gnucash/report/standard-reports/transaction.scm:611
msgid ""
-"By default most users should not include closing transactions in a transaction "
-"report. Closing transactions are transfers from income and expense accounts to "
-"equity, and must usually be excluded from periodic reporting."
+"By default most users should not include closing transactions in a "
+"transaction report. Closing transactions are transfers from income and "
+"expense accounts to equity, and must usually be excluded from periodic "
+"reporting."
msgstr ""
"Većina korisnika ne bi trebali ukljuÄiti zakljuÄne transakcije u izvjeÅ¡taj o "
-"transakciji. ZakljuÄne transakcije su prijenosi iz konta prihoda i rashoda na "
-"konto kapitala, te uobiÄajeno moraju biti iskljuÄeni iz periodiÄnih izvjeÅ¡taja."
+"transakciji. ZakljuÄne transakcije su prijenosi iz konta prihoda i rashoda "
+"na konto kapitala, te uobiÄajeno moraju biti iskljuÄeni iz periodiÄnih "
+"izvještaja."
#: gnucash/report/standard-reports/transaction.scm:637
msgid "Filter on these accounts."
@@ -26824,164 +27116,165 @@ msgstr "Filtriraj ova konta."
msgid "Filter account."
msgstr "Filtriraj konto."
-#: gnucash/report/standard-reports/transaction.scm:732
+#: gnucash/report/standard-reports/transaction.scm:736
msgid "Sort by this criterion first."
msgstr "Razvrstaj najprije po ovom kriteriju."
-#: gnucash/report/standard-reports/transaction.scm:743
+#: gnucash/report/standard-reports/transaction.scm:747
msgid "Show the full account name for subtotals and subheadings?"
msgstr "Prikazati cjelokupno ime konta za podzbrojeve i podnaslove?"
-#: gnucash/report/standard-reports/transaction.scm:750
+#: gnucash/report/standard-reports/transaction.scm:754
msgid "Show the account code for subtotals and subheadings?"
msgstr "Prikazati Å¡ifru konta za podzbrojeve i podnaslove?"
-#: gnucash/report/standard-reports/transaction.scm:757
+#: gnucash/report/standard-reports/transaction.scm:761
msgid "Show the account description for subheadings?"
msgstr "Prikazati opis konta za pod-zaglavlja?"
-#: gnucash/report/standard-reports/transaction.scm:764
+#: gnucash/report/standard-reports/transaction.scm:768
msgid "Show the informal headers for debit/credit accounts?"
msgstr "Prikazati neslužbene nazive zaglavlja za konta duguje/potražuje?"
-#: gnucash/report/standard-reports/transaction.scm:771
+#: gnucash/report/standard-reports/transaction.scm:775
msgid "Add indenting columns with grouping and subtotals?"
msgstr "Dodati uvuÄene stupce s grupiranjem i podzbrojevima?"
-#: gnucash/report/standard-reports/transaction.scm:778
+#: gnucash/report/standard-reports/transaction.scm:782
msgid "Show subtotals only, hiding transactional detail?"
msgstr "Prikazati samo podzbrojeve, skrivajući detalje o transakciji?"
-#: gnucash/report/standard-reports/transaction.scm:785
+#: gnucash/report/standard-reports/transaction.scm:789
msgid "Subtotal according to the primary key?"
msgstr "Podzbroj u skladu s primarnim kljuÄem?"
-#: gnucash/report/standard-reports/transaction.scm:794
-#: gnucash/report/standard-reports/transaction.scm:830
+#: gnucash/report/standard-reports/transaction.scm:798
+#: gnucash/report/standard-reports/transaction.scm:837
msgid "Do a date subtotal."
msgstr "IzraÄunaj podzbroj na datum."
-#: gnucash/report/standard-reports/transaction.scm:801
+#: gnucash/report/standard-reports/transaction.scm:808
msgid "Order of primary sorting."
msgstr "Redoslijed primarnog razvrstavanja."
-#: gnucash/report/standard-reports/transaction.scm:810
+#: gnucash/report/standard-reports/transaction.scm:817
msgid "Sort by this criterion second."
msgstr "Razvrstaj zatim prema ovom kriteriju."
-#: gnucash/report/standard-reports/transaction.scm:821
+#: gnucash/report/standard-reports/transaction.scm:828
msgid "Subtotal according to the secondary key?"
msgstr "Podzbroj u skladu sa sekundarnim kljuÄem?"
-#: gnucash/report/standard-reports/transaction.scm:837
+#: gnucash/report/standard-reports/transaction.scm:847
msgid "Order of Secondary sorting."
msgstr "Redoslijed sekundarnog razvrstavanja."
-#: gnucash/report/standard-reports/transaction.scm:891
+#: gnucash/report/standard-reports/transaction.scm:901
msgid "Display the reconciled date?"
msgstr "Prikazati datum usklađivanja?"
-#: gnucash/report/standard-reports/transaction.scm:896
+#: gnucash/report/standard-reports/transaction.scm:906
msgid "Display the notes if the memo is unavailable?"
msgstr "Prikazati napomene, ako zabilješke nisu dostupne?"
-#: gnucash/report/standard-reports/transaction.scm:898
-#: gnucash/report/standard-reports/transaction.scm:901
+#: gnucash/report/standard-reports/transaction.scm:908
+#: gnucash/report/standard-reports/transaction.scm:911
msgid "Display the full account name?"
msgstr "Prikazati cjelokupno ime konta?"
-#: gnucash/report/standard-reports/transaction.scm:899
+#: gnucash/report/standard-reports/transaction.scm:909
msgid "Display the account code?"
msgstr "Prikazati Å¡ifru konta?"
-#: gnucash/report/standard-reports/transaction.scm:902
+#: gnucash/report/standard-reports/transaction.scm:912
msgid "Display the other account code?"
msgstr "Prikazati Å¡ifru drugog konta?"
#. note the "Amount" multichoice option in between here
-#: gnucash/report/standard-reports/transaction.scm:906
+#: gnucash/report/standard-reports/transaction.scm:916
msgid ""
"Display a subtotal summary table. This requires Display/Amount being 'single"
msgstr ""
"Prikaži sažetak tablice podzbrojeva. Prikaz/Iznos moraju biti postavljeni na "
"„PojedinaÄnoâ€"
-#: gnucash/report/standard-reports/transaction.scm:914
+#: gnucash/report/standard-reports/transaction.scm:924
msgid "Display the trans number?"
msgstr "Prikazati broj transakcije?"
-#: gnucash/report/standard-reports/transaction.scm:931
+#: gnucash/report/standard-reports/transaction.scm:941
msgid "Display the account name?"
msgstr "Prikazati ime konta?"
-#: gnucash/report/standard-reports/transaction.scm:941
+#: gnucash/report/standard-reports/transaction.scm:951
msgid ""
-"Display the other account name? (if this is a split transaction, this parameter "
-"is guessed)."
+"Display the other account name? (if this is a split transaction, this "
+"parameter is guessed)."
msgstr ""
-"Prikaži ime drugog konta? (ako je ovo višedjelna transakcija, ovaj se parametar "
-"pogađa.)"
+"Prikaži ime drugog konta? (ako je ovo višedjelna transakcija, ovaj se "
+"parametar pogađa.)"
-#: gnucash/report/standard-reports/transaction.scm:950
+#: gnucash/report/standard-reports/transaction.scm:960
msgid "Amount of detail to display per transaction."
msgstr "Detaljiziranost, koja se prikazuju za transakciju."
-#: gnucash/report/standard-reports/transaction.scm:953
+#: gnucash/report/standard-reports/transaction.scm:963
msgid "Multi-Line"
msgstr "Višeredno"
-#: gnucash/report/standard-reports/transaction.scm:954
+#: gnucash/report/standard-reports/transaction.scm:964
msgid "Display all splits in a transaction on a separate line."
msgstr "Prikaži svaku stavku transakcije u vlastitom retku."
-#: gnucash/report/standard-reports/transaction.scm:957
-msgid "Display one line per transaction, merging multiple splits where required."
+#: gnucash/report/standard-reports/transaction.scm:967
+msgid ""
+"Display one line per transaction, merging multiple splits where required."
msgstr ""
"Prikaži jedan redak po transakciji, spajajući mnogostruke stavke po potrebi."
-#: gnucash/report/standard-reports/transaction.scm:969
+#: gnucash/report/standard-reports/transaction.scm:979
msgid "No amount display."
msgstr "Neprikazivanje iznosa."
-#: gnucash/report/standard-reports/transaction.scm:979
+#: gnucash/report/standard-reports/transaction.scm:989
msgid "Enable links"
msgstr "UkljuÄi poveznice"
-#: gnucash/report/standard-reports/transaction.scm:980
+#: gnucash/report/standard-reports/transaction.scm:990
msgid "Enable hyperlinks in amounts."
msgstr "UkljuÄi hiperpoveznice za iznose."
-#: gnucash/report/standard-reports/transaction.scm:985
+#: gnucash/report/standard-reports/transaction.scm:995
msgid "Reverse amount display for certain account types."
msgstr "Obrni predznak prikazanih iznosa za određene vrste konta."
-#: gnucash/report/standard-reports/transaction.scm:1104
+#: gnucash/report/standard-reports/transaction.scm:1114
msgid "Num/T-Num"
msgstr "Broj/T-broj"
-#: gnucash/report/standard-reports/transaction.scm:1151
+#: gnucash/report/standard-reports/transaction.scm:1162
msgid "Transfer from/to"
msgstr "Prijenos iz/u"
-#: gnucash/report/standard-reports/transaction.scm:1448
+#: gnucash/report/standard-reports/transaction.scm:1462
msgid "Total For "
msgstr "Ukupno za "
-#: gnucash/report/standard-reports/transaction.scm:1460
+#: gnucash/report/standard-reports/transaction.scm:1474
msgid "Split Transaction"
msgstr "Višedjelna transakcija"
-#: gnucash/report/standard-reports/transaction.scm:2043
+#: gnucash/report/standard-reports/transaction.scm:2060
#, scheme-format
msgid "From ~a to ~a"
msgstr "Od ~a do ~a"
-#: gnucash/report/standard-reports/transaction.scm:2080
+#: gnucash/report/standard-reports/transaction.scm:2095
msgid "Reconciliation Report"
msgstr "Izvještaj o usklađenosti"
#: gnucash/report/standard-reports/trial-balance.scm:60
-#: gnucash/report/standard-reports/trial-balance.scm:655
+#: gnucash/report/standard-reports/trial-balance.scm:706
msgid "Trial Balance"
msgstr "Probna bilanca"
@@ -27015,7 +27308,8 @@ msgid ""
"Merchandising businesses will normally select their inventory accounts here."
msgstr ""
"Ne raÄunaj neto, već prikaži bruto podeÅ¡avanja za duguje/potražuje na ovim "
-"kontima. TrgovaÄka poduzeća će ovdje uobiÄajeno odabrati svoja konta inventara."
+"kontima. TrgovaÄka poduzeća će ovdje uobiÄajeno odabrati svoja konta "
+"inventara."
#: gnucash/report/standard-reports/trial-balance.scm:87
msgid "Income summary accounts"
@@ -27024,12 +27318,12 @@ msgstr "ZakljuÄni konti prihoda"
#: gnucash/report/standard-reports/trial-balance.scm:89
msgid ""
"Adjustments made to these accounts are gross adjusted (see above) in the "
-"Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly useful "
-"for merchandising businesses."
+"Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
+"useful for merchandising businesses."
msgstr ""
"Podešavanja na ovim kontima su bruto podešena (vidi gore) u stupcima: "
-"Podešavanja, Podešena probna bilanca i Stanje prihoda. Ovo je uglavnom korisno "
-"za trgovaÄka poduzeća."
+"Podešavanja, Podešena probna bilanca i Stanje prihoda. Ovo je uglavnom "
+"korisno za trgovaÄka poduzeća."
#: gnucash/report/standard-reports/trial-balance.scm:92
msgid "Adjusting Entries pattern"
@@ -27052,7 +27346,8 @@ msgid "Adjusting Entries Pattern is regular expression"
msgstr "Uzorak za podešavajuće unose je regularni izraz"
#: gnucash/report/standard-reports/trial-balance.scm:102
-msgid "Causes the Adjusting Entries Pattern to be treated as a regular expression."
+msgid ""
+"Causes the Adjusting Entries Pattern to be treated as a regular expression."
msgstr "Ovime će se uzorak za podešavajuće unose obraditi kao regularni izraz."
#: gnucash/report/standard-reports/trial-balance.scm:207
@@ -27079,19 +27374,19 @@ msgstr "Radni list"
msgid "Creates a complete end-of-period work sheet"
msgstr "Stvori potpuni radni list za kraj razdoblja"
-#: gnucash/report/standard-reports/trial-balance.scm:656
+#: gnucash/report/standard-reports/trial-balance.scm:707
msgid "Adjustments"
msgstr "Podešavanja"
-#: gnucash/report/standard-reports/trial-balance.scm:657
+#: gnucash/report/standard-reports/trial-balance.scm:708
msgid "Adjusted Trial Balance"
msgstr "Podešena probna bilanca"
-#: gnucash/report/standard-reports/trial-balance.scm:1111
+#: gnucash/report/standard-reports/trial-balance.scm:1162
msgid "Net Income"
msgstr "Neto prihod"
-#: gnucash/report/standard-reports/trial-balance.scm:1111
+#: gnucash/report/standard-reports/trial-balance.scm:1162
msgid "Net Loss"
msgstr "Neto gubitak"
@@ -27695,7 +27990,8 @@ msgid "Show time in addition to date"
msgstr "Uz datum, prikaži i vrijeme"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:85
-msgid "The creation time for this report can only be shown if the date is shown."
+msgid ""
+"The creation time for this report can only be shown if the date is shown."
msgstr ""
"Vrijeme stvaranje izvještaja se može prikazati samo, ako se prikazuje datum."
@@ -27724,7 +28020,8 @@ msgstr "Prikaži informacije o pripremaÄu u podnožju"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:110
msgid "Per default the preparer info will be shown before the report data."
-msgstr "Zadano je, da se podaci prireÄ‘ivaÄa prikazuju prije podataka izvjeÅ¡taja."
+msgstr ""
+"Zadano je, da se podaci prireÄ‘ivaÄa prikazuju prije podataka izvjeÅ¡taja."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:115
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:268
@@ -27733,7 +28030,8 @@ msgstr "Prikaži informacije o primatelju u podnožju"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:116
msgid "Per default the receiver info will be shown before the report data."
-msgstr "Zadano je, da se podaci primatelja prikazuju prije podataka izvještaja."
+msgstr ""
+"Zadano je, da se podaci primatelja prikazuju prije podataka izvještaja."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:121
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:269
@@ -27752,8 +28050,10 @@ msgstr "Prikaži komentare u podnožju"
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:128
msgid ""
-"Per default the additional comments text will be shown before the report data."
-msgstr "Zadano je, da se dodatni komentari prikazuju prije podataka izvještaja."
+"Per default the additional comments text will be shown before the report "
+"data."
+msgstr ""
+"Zadano je, da se dodatni komentari prikazuju prije podataka izvještaja."
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:133
#: gnucash/report/stylesheets/stylesheet-head-or-tail.scm:271
@@ -27978,20 +28278,21 @@ msgstr "Uruši izvještaj"
#: gnucash/report/utility-reports/hello-world.scm:219
msgid ""
-"This is for testing. Your reports probably shouldn't have an option like this."
+"This is for testing. Your reports probably shouldn't have an option like "
+"this."
msgstr ""
-"Ovo je za isprobavanje. Tvoji izvještaji vjerojatno ne bi trebali imati ovakvu "
-"opciju."
+"Ovo je za isprobavanje. Tvoji izvještaji vjerojatno ne bi trebali imati "
+"ovakvu opciju."
#: gnucash/report/utility-reports/hello-world.scm:342
msgid ""
-"This is a sample GnuCash report. See the guile (scheme) source code in the scm/"
-"report directory for details on writing your own reports, or extending existing "
-"reports."
+"This is a sample GnuCash report. See the guile (scheme) source code in the "
+"scm/report directory for details on writing your own reports, or extending "
+"existing reports."
msgstr ""
"Ovo je primjer za GnuCash izvještaj. Pogledaj izvorni guile kod (shemu) u "
-"direktoriju „scm/report“, o tome kako napisati tvoj vlastiti izvještaj ili kako "
-"proširiti postojeće izvještaje."
+"direktoriju „scm/report“, o tome kako napisati tvoj vlastiti izvještaj ili "
+"kako proširiti postojeće izvještaje."
#: gnucash/report/utility-reports/hello-world.scm:348
#, scheme-format
@@ -28011,8 +28312,10 @@ msgstr ""
#: gnucash/report/utility-reports/hello-world.scm:354
msgid ""
-"You can learn more about writing scheme at <http://www.scheme.com/tspl2d/>."
-msgstr "Više informacija o pisanju sheme nađi na „http://www.scheme.com/tspl2d/“."
+"You can learn more about writing scheme at <http://www.scheme.com/tspl2d/"
+">."
+msgstr ""
+"Više informacija o pisanju sheme nađi na „http://www.scheme.com/tspl2d/“."
#: gnucash/report/utility-reports/hello-world.scm:358
#, scheme-format
@@ -28148,39 +28451,39 @@ msgstr "Dobro došli u GnuCash ~a !"
msgid "GnuCash ~a has lots of nice features. Here are a few."
msgstr "GnuCash ~a ima puno dobrih funkcija. Evo nekih primjera."
-#: libgnucash/app-utils/app-utils.scm:307
+#: libgnucash/app-utils/app-utils.scm:294
msgid "Company Address"
msgstr "Adresa poduzeća"
-#: libgnucash/app-utils/app-utils.scm:308
+#: libgnucash/app-utils/app-utils.scm:295
msgid "Company ID"
msgstr "OIB poduzeća"
-#: libgnucash/app-utils/app-utils.scm:309
+#: libgnucash/app-utils/app-utils.scm:296
msgid "Company Phone Number"
msgstr "Telefon poduzeća"
-#: libgnucash/app-utils/app-utils.scm:310
+#: libgnucash/app-utils/app-utils.scm:297
msgid "Company Fax Number"
msgstr "Faks poduzeća"
-#: libgnucash/app-utils/app-utils.scm:311
+#: libgnucash/app-utils/app-utils.scm:298
msgid "Company Website URL"
msgstr "Web stranica poduzeća"
-#: libgnucash/app-utils/app-utils.scm:312
+#: libgnucash/app-utils/app-utils.scm:299
msgid "Company Email Address"
msgstr "E-pošta poduzeća"
-#: libgnucash/app-utils/app-utils.scm:313
+#: libgnucash/app-utils/app-utils.scm:300
msgid "Company Contact Person"
msgstr "Kontakt osoba poduzeća"
-#: libgnucash/app-utils/app-utils.scm:314
+#: libgnucash/app-utils/app-utils.scm:301
msgid "Fancy Date Format"
msgstr "Format složenog datuma"
-#: libgnucash/app-utils/app-utils.scm:315
+#: libgnucash/app-utils/app-utils.scm:302
msgid "custom"
msgstr "proizvoljno"
@@ -28198,8 +28501,8 @@ msgstr "Broj kupca"
#: libgnucash/app-utils/business-prefs.scm:33
msgid ""
-"The format string to use for generating customer numbers. This is a printf-style "
-"format string."
+"The format string to use for generating customer numbers. This is a printf-"
+"style format string."
msgstr ""
"Format znakovnog niza za stvaranje brojeva za kupce. Ovo je format znakovnog "
"niza u stilu printf."
@@ -28222,11 +28525,11 @@ msgstr "Broj radnika"
#: libgnucash/app-utils/business-prefs.scm:37
msgid ""
-"The format string to use for generating employee numbers. This is a printf-style "
-"format string."
+"The format string to use for generating employee numbers. This is a printf-"
+"style format string."
msgstr ""
-"Format znakovnog niza za stvaranje brojeva za radnika. Ovo je format znakovnog "
-"niza u stilu printf."
+"Format znakovnog niza za stvaranje brojeva za radnika. Ovo je format "
+"znakovnog niza u stilu printf."
#: libgnucash/app-utils/business-prefs.scm:38
msgid ""
@@ -28242,8 +28545,8 @@ msgstr "Format broja izlaznog raÄuna"
#: libgnucash/app-utils/business-prefs.scm:41
msgid ""
-"The format string to use for generating invoice numbers. This is a printf-style "
-"format string."
+"The format string to use for generating invoice numbers. This is a printf-"
+"style format string."
msgstr ""
"Format znakovnog niza za stvaranje brojeva za izlazne raÄune. Ovo je format "
"znakovnog niza u stilu printf."
@@ -28274,11 +28577,11 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:46
msgid ""
-"The previous bill number generated. This number will be incremented to generate "
-"the next bill number."
+"The previous bill number generated. This number will be incremented to "
+"generate the next bill number."
msgstr ""
-"Prethodno stvoreni broj za ulazne raÄune. Ovaj broj će biti uvećan, za stvaranje "
-"sljedećeg broja za ulazne raÄune."
+"Prethodno stvoreni broj za ulazne raÄune. Ovaj broj će biti uvećan, za "
+"stvaranje sljedećeg broja za ulazne raÄune."
#: libgnucash/app-utils/business-prefs.scm:47
msgid "Expense voucher number format"
@@ -28298,8 +28601,8 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:50
msgid ""
-"The previous expense voucher number generated. This number will be incremented "
-"to generate the next voucher number."
+"The previous expense voucher number generated. This number will be "
+"incremented to generate the next voucher number."
msgstr ""
"Prethodno stvoreni broj za vauÄere rashoda. Ovaj broj će biti uvećan, za "
"stvaranje sljedećeg broja za vauÄera."
@@ -28322,8 +28625,8 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:54
msgid ""
-"The previous job number generated. This number will be incremented to generate "
-"the next job number."
+"The previous job number generated. This number will be incremented to "
+"generate the next job number."
msgstr ""
"Prethodno stvoreni broj za naloge. Ovaj broj će biti uvećan, za stvaranje "
"sljedećeg broja za naloge."
@@ -28338,16 +28641,16 @@ msgstr "Broj narudžbe"
#: libgnucash/app-utils/business-prefs.scm:57
msgid ""
-"The format string to use for generating order numbers. This is a printf-style "
-"format string."
+"The format string to use for generating order numbers. This is a printf-"
+"style format string."
msgstr ""
-"Format znakovnog niza za stvaranje brojeva za narudžbe. Ovo je format znakovnog "
-"niza u stilu printf."
+"Format znakovnog niza za stvaranje brojeva za narudžbe. Ovo je format "
+"znakovnog niza u stilu printf."
#: libgnucash/app-utils/business-prefs.scm:58
msgid ""
-"The previous order number generated. This number will be incremented to generate "
-"the next order number."
+"The previous order number generated. This number will be incremented to "
+"generate the next order number."
msgstr ""
"Prethodno stvoreni broj za narudžbe. Ovaj broj će biti uvećan, za stvaranje "
"sljedećeg broja za narudžbe."
@@ -28362,8 +28665,8 @@ msgstr "Broj dobavljaÄa"
#: libgnucash/app-utils/business-prefs.scm:61
msgid ""
-"The format string to use for generating vendor numbers. This is a printf-style "
-"format string."
+"The format string to use for generating vendor numbers. This is a printf-"
+"style format string."
msgstr ""
"Format znakovnog niza za stvaranje brojeva za dobavljaÄa. Ovo je format "
"znakovnog niza u stilu printf."
@@ -28430,9 +28733,10 @@ msgstr "Standardni format datuma, koji se koristi za složene datume."
#: libgnucash/app-utils/business-prefs.scm:133
msgid ""
-"Choose the number of days after which transactions will be read-only and cannot "
-"be edited anymore. This threshold is marked by a red line in the account "
-"register windows. If zero, all transactions can be edited and none are read-only."
+"Choose the number of days after which transactions will be read-only and "
+"cannot be edited anymore. This threshold is marked by a red line in the "
+"account register windows. If zero, all transactions can be edited and none "
+"are read-only."
msgstr ""
"Odaberi broj dana, nakon kojeg će transakcije biti samo-za-Äitanje i njihovo "
"uređivanje više neće biti moguće. Ovaj prag je obillježen crvenim retkom u "
@@ -28441,229 +28745,242 @@ msgstr ""
#: libgnucash/app-utils/business-prefs.scm:144
msgid ""
-"Check to have split action field used in registers for 'Num' field in place of "
-"transaction number; transaction number shown as 'T-Num' on second line of "
-"register. Has corresponding effect on business features, reporting and imports/"
-"exports."
+"Check to have split action field used in registers for 'Num' field in place "
+"of transaction number; transaction number shown as 'T-Num' on second line of "
+"register. Has corresponding effect on business features, reporting and "
+"imports/exports."
msgstr ""
"OznaÄi, kako bi se za viÅ¡edjelnu transakciju, polje radnje koristilo za broj "
-"transakcije; broj transakcija se prikazuje kao „T-broj“ u drugom retku registra. "
-"Ima odgovarajući utjecaj na poslovne funkcije, izvještavanje i uvoze/izvoze."
+"transakcije; broj transakcija se prikazuje kao „T-broj“ u drugom retku "
+"registra. Ima odgovarajući utjecaj na poslovne funkcije, izvještavanje i "
+"uvoze/izvoze."
#: libgnucash/app-utils/business-prefs.scm:150
msgid ""
"Check to have trading accounts used for transactions involving more than one "
"currency or commodity."
msgstr ""
-"OznaÄi, kako bi se konti trgovanja koristili za transakcije, koje ukljuÄuju viÅ¡e "
-"od jedne valute ili robe."
+"OznaÄi, kako bi se konti trgovanja koristili za transakcije, koje ukljuÄuju "
+"više od jedne valute ili robe."
#: libgnucash/app-utils/business-prefs.scm:158
msgid "Budget to be used when none has been otherwise specified."
msgstr "KoriÅ¡teni proraÄun, kad niÅ¡ta drugo nije odreÄ‘eno."
-#: libgnucash/app-utils/date-utilities.scm:751
+#: libgnucash/app-utils/date-utilities.scm:446
+#, scheme-format
+msgid ""
+"Tried to look up an undefined date symbol '~a'. This report was probably "
+"saved by a later version of GnuCash. Defaulting to today."
+msgstr ""
+"Program je pokuÅ¡ao pronaći nedefiniran datumski simbol „~aâ€. Ovaj je "
+"izvještaj vjerojatno spremljen s novijom GnuCash verzijom. Postavlja se "
+"današnji datum."
+
+#: libgnucash/app-utils/date-utilities.scm:822
msgid "First day of the current calendar year."
msgstr "Prvi dan tekuće kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:758
+#: libgnucash/app-utils/date-utilities.scm:829
msgid "Last day of the current calendar year."
msgstr "Posljednji dan tekuće kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:765
+#: libgnucash/app-utils/date-utilities.scm:836
msgid "First day of the previous calendar year."
msgstr "Prvi dan prethodne kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:772
+#: libgnucash/app-utils/date-utilities.scm:843
msgid "Last day of the previous calendar year."
msgstr "Posljednji dan prethodne kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:776
+#: libgnucash/app-utils/date-utilities.scm:847
msgid "Start of next year"
msgstr "PoÄetak sljedeće godine"
-#: libgnucash/app-utils/date-utilities.scm:779
+#: libgnucash/app-utils/date-utilities.scm:850
msgid "First day of the next calendar year."
msgstr "Prvi dan sljedeće kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:783
+#: libgnucash/app-utils/date-utilities.scm:854
msgid "End of next year"
msgstr "Kraj sljedeće godine"
-#: libgnucash/app-utils/date-utilities.scm:786
+#: libgnucash/app-utils/date-utilities.scm:857
msgid "Last day of the next calendar year."
msgstr "Posljednji dan sljedeće kalendarske godine."
-#: libgnucash/app-utils/date-utilities.scm:790
+#: libgnucash/app-utils/date-utilities.scm:861
msgid "Start of accounting period"
msgstr "PoÄetak obraÄunskog razdoblja"
-#: libgnucash/app-utils/date-utilities.scm:793
+#: libgnucash/app-utils/date-utilities.scm:864
msgid "First day of the accounting period, as set in the global preferences."
-msgstr "Prvi dan obraÄunskog razdoblja, kao Å¡to je postavljeno u općim postavkama."
+msgstr ""
+"Prvi dan obraÄunskog razdoblja, kao Å¡to je postavljeno u općim postavkama."
-#: libgnucash/app-utils/date-utilities.scm:797
+#: libgnucash/app-utils/date-utilities.scm:868
msgid "End of accounting period"
msgstr "Kraj obraÄunskog razdoblja"
-#: libgnucash/app-utils/date-utilities.scm:800
+#: libgnucash/app-utils/date-utilities.scm:871
msgid "Last day of the accounting period, as set in the global preferences."
msgstr ""
-"Posljednji dan obraÄunskog razdoblja, kao Å¡to je postavljeno u općim postavkama."
+"Posljednji dan obraÄunskog razdoblja, kao Å¡to je postavljeno u općim "
+"postavkama."
-#: libgnucash/app-utils/date-utilities.scm:807
+#: libgnucash/app-utils/date-utilities.scm:878
msgid "First day of the current month."
msgstr "Prvi dan tekućeg mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:814
+#: libgnucash/app-utils/date-utilities.scm:885
msgid "Last day of the current month."
msgstr "Posljednji dan tekućeg mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:821
+#: libgnucash/app-utils/date-utilities.scm:892
msgid "First day of the previous month."
msgstr "Prvi dan prethodnog mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:828
+#: libgnucash/app-utils/date-utilities.scm:899
msgid "Last day of previous month."
msgstr "Posljednji dan prethodnog mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:832
+#: libgnucash/app-utils/date-utilities.scm:903
msgid "Start of next month"
msgstr "PoÄetak sljedećeg mjeseca"
-#: libgnucash/app-utils/date-utilities.scm:835
+#: libgnucash/app-utils/date-utilities.scm:906
msgid "First day of the next month."
msgstr "Prvi dan sljedećeg mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:839
+#: libgnucash/app-utils/date-utilities.scm:910
msgid "End of next month"
msgstr "Kraj sljedećeg mjeseca"
-#: libgnucash/app-utils/date-utilities.scm:842
+#: libgnucash/app-utils/date-utilities.scm:913
msgid "Last day of next month."
msgstr "Posljednji dan sljedećeg mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:846
+#: libgnucash/app-utils/date-utilities.scm:917
msgid "Start of current quarter"
msgstr "PoÄetak tekućeg kvartala"
-#: libgnucash/app-utils/date-utilities.scm:849
+#: libgnucash/app-utils/date-utilities.scm:920
msgid "First day of the current quarterly accounting period."
msgstr "Prvi dan tekućeg kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:853
+#: libgnucash/app-utils/date-utilities.scm:924
msgid "End of current quarter"
msgstr "Kraj tekućeg kvartala"
-#: libgnucash/app-utils/date-utilities.scm:856
+#: libgnucash/app-utils/date-utilities.scm:927
msgid "Last day of the current quarterly accounting period."
msgstr "Posljednji dan tekućeg kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:863
+#: libgnucash/app-utils/date-utilities.scm:934
msgid "First day of the previous quarterly accounting period."
msgstr "Prvi dan prethodnog kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:870
+#: libgnucash/app-utils/date-utilities.scm:941
msgid "Last day of previous quarterly accounting period."
msgstr "Posljednji dan prethodnog kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:874
+#: libgnucash/app-utils/date-utilities.scm:945
msgid "Start of next quarter"
msgstr "PoÄetak sljedećeg kvartala"
-#: libgnucash/app-utils/date-utilities.scm:877
+#: libgnucash/app-utils/date-utilities.scm:948
msgid "First day of the next quarterly accounting period."
msgstr "Prvi dan sljedećeg kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:881
+#: libgnucash/app-utils/date-utilities.scm:952
msgid "End of next quarter"
msgstr "Kraj sljedećeg kvartala"
-#: libgnucash/app-utils/date-utilities.scm:884
+#: libgnucash/app-utils/date-utilities.scm:955
msgid "Last day of next quarterly accounting period."
msgstr "Posljednji dan sljedećeg kvartalnog obraÄunskog razdoblja."
-#: libgnucash/app-utils/date-utilities.scm:890
+#: libgnucash/app-utils/date-utilities.scm:961
msgid "The current date."
msgstr "TrenutaÄni datum."
-#: libgnucash/app-utils/date-utilities.scm:894
+#: libgnucash/app-utils/date-utilities.scm:965
msgid "One Month Ago"
msgstr "Prije mjesec dana"
-#: libgnucash/app-utils/date-utilities.scm:896
+#: libgnucash/app-utils/date-utilities.scm:967
msgid "One Month Ago."
msgstr "Prije mjesec dana."
-#: libgnucash/app-utils/date-utilities.scm:900
+#: libgnucash/app-utils/date-utilities.scm:971
msgid "One Week Ago"
msgstr "Prije tjedan dana"
-#: libgnucash/app-utils/date-utilities.scm:902
+#: libgnucash/app-utils/date-utilities.scm:973
msgid "One Week Ago."
msgstr "Prije tjedan dana."
-#: libgnucash/app-utils/date-utilities.scm:906
+#: libgnucash/app-utils/date-utilities.scm:977
msgid "Three Months Ago"
msgstr "Prije tri mjeseca"
-#: libgnucash/app-utils/date-utilities.scm:908
+#: libgnucash/app-utils/date-utilities.scm:979
msgid "Three Months Ago."
msgstr "Prije tri mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:912
+#: libgnucash/app-utils/date-utilities.scm:983
msgid "Six Months Ago"
msgstr "Prije Å¡est mjeseci"
-#: libgnucash/app-utils/date-utilities.scm:914
+#: libgnucash/app-utils/date-utilities.scm:985
msgid "Six Months Ago."
msgstr "Prije Å¡est mjeseci."
-#: libgnucash/app-utils/date-utilities.scm:917
+#: libgnucash/app-utils/date-utilities.scm:988
msgid "One Year Ago"
msgstr "Prije godinu dana"
-#: libgnucash/app-utils/date-utilities.scm:919
+#: libgnucash/app-utils/date-utilities.scm:990
msgid "One Year Ago."
msgstr "Prije godinu dana."
-#: libgnucash/app-utils/date-utilities.scm:923
+#: libgnucash/app-utils/date-utilities.scm:994
msgid "One Month Ahead"
msgstr "Za mjesec dana"
-#: libgnucash/app-utils/date-utilities.scm:925
+#: libgnucash/app-utils/date-utilities.scm:996
msgid "One Month Ahead."
msgstr "Za mjesec dana."
-#: libgnucash/app-utils/date-utilities.scm:929
+#: libgnucash/app-utils/date-utilities.scm:1000
msgid "One Week Ahead"
msgstr "Za tjedan dana"
-#: libgnucash/app-utils/date-utilities.scm:931
+#: libgnucash/app-utils/date-utilities.scm:1002
msgid "One Week Ahead."
msgstr "Za tjedan dana."
-#: libgnucash/app-utils/date-utilities.scm:935
+#: libgnucash/app-utils/date-utilities.scm:1006
msgid "Three Months Ahead"
msgstr "Za tri mjeseca"
-#: libgnucash/app-utils/date-utilities.scm:937
+#: libgnucash/app-utils/date-utilities.scm:1008
msgid "Three Months Ahead."
msgstr "Za tri mjeseca."
-#: libgnucash/app-utils/date-utilities.scm:941
+#: libgnucash/app-utils/date-utilities.scm:1012
msgid "Six Months Ahead"
msgstr "Za Å¡est mjeseci"
-#: libgnucash/app-utils/date-utilities.scm:943
+#: libgnucash/app-utils/date-utilities.scm:1014
msgid "Six Months Ahead."
msgstr "Za Å¡est mjeseci."
-#: libgnucash/app-utils/date-utilities.scm:946
+#: libgnucash/app-utils/date-utilities.scm:1017
msgid "One Year Ahead"
msgstr "Za godinu dana"
-#: libgnucash/app-utils/date-utilities.scm:948
+#: libgnucash/app-utils/date-utilities.scm:1019
msgid "One Year Ahead."
msgstr "Za godinu dana."
@@ -28720,7 +29037,8 @@ msgstr "GreÅ¡ka u obradi SX [%s] kljuÄ [%s]=formula [%s] na [%s]: %s."
#, c-format
msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
msgstr ""
-"Greška %d u SX [%s] finalna gnc_numeric vrijednost, umjesto toga se koristi 0."
+"Greška %d u SX [%s] finalna gnc_numeric vrijednost, umjesto toga se koristi "
+"0."
#: libgnucash/app-utils/gnc-sx-instance-model.c:1766
#, c-format
@@ -28736,62 +29054,66 @@ msgstr "Nema dostupnog teÄaja u SX [%s] za %s → %s, vrijednost je nula."
#. * account generally corresponds to a specific line number
#. * on a paper form and each form has a unique
#. * identification (e.g., Form 1040, Schedule A).
-#: libgnucash/app-utils/gnc-ui-util.c:487
+#: libgnucash/app-utils/gnc-ui-util.c:647
msgid "Tax-related but has no tax code"
msgstr "Odnosi se na porez, ali nema Å¡ifru poreza"
-#: libgnucash/app-utils/gnc-ui-util.c:501
+#: libgnucash/app-utils/gnc-ui-util.c:661
msgid "Tax entity type not specified"
msgstr "Vrsta poreza nije određena"
-#: libgnucash/app-utils/gnc-ui-util.c:574
+#: libgnucash/app-utils/gnc-ui-util.c:734
#, c-format
msgid "Tax type %s: invalid code %s for account type"
msgstr "Vrsta poreza „%s“: neispravna šifra „%s†za vrstu konta"
-#: libgnucash/app-utils/gnc-ui-util.c:578
+#: libgnucash/app-utils/gnc-ui-util.c:738
#, c-format
msgid "Not tax-related; tax type %s: invalid code %s for account type"
msgstr ""
-"Ne odnosi se na porez; vrsta poreza „%s“: neispravna šifra „%s†za vrstu konta"
+"Ne odnosi se na porez; vrsta poreza „%s“: neispravna šifra „%s†za vrstu "
+"konta"
-#: libgnucash/app-utils/gnc-ui-util.c:591
+#: libgnucash/app-utils/gnc-ui-util.c:751
#, c-format
msgid "Invalid code %s for tax type %s"
msgstr "Nevaljana šifra „%s“ za vrstu poreza „%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:595
+#: libgnucash/app-utils/gnc-ui-util.c:755
#, c-format
msgid "Not tax-related; invalid code %s for tax type %s"
msgstr "Ne odnosi se na porez; neispravna šifra „%s“ za vrstu poreza „%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:613
+#: libgnucash/app-utils/gnc-ui-util.c:773
#, c-format
msgid "No form: code %s, tax type %s"
msgstr "Nema obrasca: Å¡ifra „%sâ€, vrsta poreza „%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:617
+#: libgnucash/app-utils/gnc-ui-util.c:777
#, c-format
msgid "Not tax-related; no form: code %s, tax type %s"
msgstr "Ne odnosi se na porez; nema obrasca: Å¡ifra „%sâ€, vrsta poreza „%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:634 libgnucash/app-utils/gnc-ui-util.c:649
+#: libgnucash/app-utils/gnc-ui-util.c:794
+#: libgnucash/app-utils/gnc-ui-util.c:809
#, c-format
msgid "No description: form %s, code %s, tax type %s"
msgstr "Nema opisa: obrazac „%s“, šifra %s, vrsta poreza „%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:638 libgnucash/app-utils/gnc-ui-util.c:653
+#: libgnucash/app-utils/gnc-ui-util.c:798
+#: libgnucash/app-utils/gnc-ui-util.c:813
#, c-format
msgid "Not tax-related; no description: form %s, code %s, tax type %s"
msgstr ""
-"Ne odnosi se na porez; nema opisa: obrazac „%s“, Å¡ifra „%sâ€, vrsta poreza „%s“"
+"Ne odnosi se na porez; nema opisa: obrazac „%s“, Å¡ifra „%sâ€, vrsta poreza "
+"„%s“"
-#: libgnucash/app-utils/gnc-ui-util.c:676
+#: libgnucash/app-utils/gnc-ui-util.c:836
#, c-format
msgid "Not tax-related; %s%s: %s (code %s, tax type %s)"
msgstr "Ne odnosi se na porez; %s%s: %s (Å¡ifra „%sâ€, vrsta poreza „%s“)"
-#: libgnucash/app-utils/gnc-ui-util.c:723
+#: libgnucash/app-utils/gnc-ui-util.c:883
#, c-format
msgid "(Tax-related subaccounts: %d)"
msgstr "(Porezni podkonti: %d)"
@@ -28800,38 +29122,50 @@ msgstr "(Porezni podkonti: %d)"
#. Translators: For the following strings, the single letters
#. after the colon are abbreviations of the word before the
#. colon. You should only translate the letter *after* the colon.
-#: libgnucash/app-utils/gnc-ui-util.c:760
+#: libgnucash/app-utils/gnc-ui-util.c:920
msgid "not cleared:n"
msgstr "not cleared:n"
# p = potvrđeno
#. Translators: Please only translate the letter *after* the colon.
-#: libgnucash/app-utils/gnc-ui-util.c:763
+#: libgnucash/app-utils/gnc-ui-util.c:923
msgid "cleared:c"
msgstr "cleared:p"
# d = da
#. Translators: Please only translate the letter *after* the colon.
-#: libgnucash/app-utils/gnc-ui-util.c:766
+#: libgnucash/app-utils/gnc-ui-util.c:926
msgid "reconciled:y"
msgstr "reconciled:d"
# z = zamrznuto
#. Translators: Please only translate the letter *after* the colon.
-#: libgnucash/app-utils/gnc-ui-util.c:769
+#: libgnucash/app-utils/gnc-ui-util.c:929
msgid "frozen:f"
msgstr "frozen:z"
# s = storno
#. Translators: Please only translate the letter *after* the colon.
-#: libgnucash/app-utils/gnc-ui-util.c:772
+#: libgnucash/app-utils/gnc-ui-util.c:932
msgid "void:v"
msgstr "void:s"
-#: libgnucash/app-utils/gnc-ui-util.c:813
+#: libgnucash/app-utils/gnc-ui-util.c:973
msgid "Opening Balances"
msgstr "PoÄetni saldo"
+#. Translators: the 3 ~a below refer to (1) option type (2) unknown
+#. new option name, (3) fallback option name. The order is
+#. important, and must not be changed.
+#: libgnucash/app-utils/options.scm:26
+#, scheme-format
+msgid ""
+"This report was saved using a later version of GnuCash. One of the newer ~a "
+"options '~a' is not available, fallback to the option '~a'."
+msgstr ""
+"Ovaj je izvještaj spremljen s novijom GnuCash verzijom. Jedna od novijih ~a "
+"vrsta opcija, „~aâ€, nije dostupna. Koristi rezervnu opciju „~aâ€."
+
#: libgnucash/app-utils/option-util.c:1697
#, c-format
msgid ""
@@ -28846,60 +29180,60 @@ msgid "Invalid option value"
msgstr "Nevaljana vrijednost opcije"
#. Translators: this string refers to a file name that gets renamed
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:646
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:645
msgid "Renamed to:"
msgstr "Preimenovano u:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:671
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:670
msgid "Notice"
msgstr "Napomena"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:676
-msgid "Your gnucash metadata has been migrated ."
-msgstr "Tvoji GnuCash metapodaci su migrirani."
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:675
+msgid "Your gnucash metadata has been migrated."
+msgstr "Tvoji su GnuCash metapodaci migrirani."
#. Translators: this refers to a directory name.
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:678
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:677
msgid "Old location:"
msgstr "Stari direktorij:"
#. Translators: this refers to a directory name.
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:680
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:679
msgid "New location:"
msgstr "Novi direktorij:"
#. Translators {1} will be replaced with the package name (typically Gnucash) at runtime
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:682
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:681
msgid ""
-"If you no longer intend to run {1} 2.6.x or older on this system you can safely "
-"remove the old directory."
+"If you no longer intend to run {1} 2.6.x or older on this system you can "
+"safely remove the old directory."
msgstr ""
-"Ukoliko na ovom sustavu ne namjeravaš nadalje pokretati {1} 2.6.x ili starije, "
-"možeš slobodno ukloniti stari direktorij."
+"Ukoliko na ovom sustavu ne namjeravaš nadalje pokretati {1} 2.6.x ili "
+"starije, možeš slobodno ukloniti stari direktorij."
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:689
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:688
msgid "In addition:"
msgstr "Dodatno:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:695
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:694
msgid "The following file has been copied to {1} instead:"
msgid_plural "The following files have been copied to {1} instead:"
msgstr[0] "Umjesto toga je sljedeća datoteka kopirana u {1}:"
msgstr[1] "Umjesto toga su sljedeće datoteke kopirane u {1}:"
msgstr[2] "Umjesto toga su sljedeće datoteke kopirane u {1}:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:699
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:698
msgid "The following file in {1} has been renamed:"
msgstr "Sljedeća datoteka u {1} je preimenovana:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:709
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:708
msgid "The following file has become obsolete and will be ignored:"
msgid_plural "The following files have become obsolete and will be ignored:"
msgstr[0] "Sljedeća datoteka je nepotrebna i bit će zanemarena:"
msgstr[1] "Sljedeće datoteke su nepotrebne i bit će zanemarene:"
msgstr[2] "Sljedeće datoteke su nepotrebne i bit će zanemarene:"
-#: libgnucash/core-utils/gnc-filepath-utils.cpp:719
+#: libgnucash/core-utils/gnc-filepath-utils.cpp:718
msgid "The following file could not be moved to {1}:"
msgid_plural "The following files could not be moved to {1}:"
msgstr[0] "Sljedeću datoteku nije bilo moguće premjestiti u {1}:"
@@ -28919,60 +29253,60 @@ msgid ""
msgstr ""
"Znak razdvajanja „%s“ je upotrijebljen u jednom ili više imena konta.\n"
"\n"
-"To će prouzroÄiti neoÄekivano ponaÅ¡anje. Ili promijeni imena konta ili odaberi "
-"drugi znak za razdvajanje.\n"
+"To će prouzroÄiti neoÄekivano ponaÅ¡anje. Ili promijeni imena konta ili "
+"odaberi drugi znak za razdvajanje.\n"
"\n"
"Ispod ćeš naći popis nevaljanih imena konta:\n"
"%s"
-#: libgnucash/engine/Account.cpp:4095
+#: libgnucash/engine/Account.cpp:4093
msgid "Asset"
msgstr "Imovina"
-#: libgnucash/engine/Account.cpp:4096
+#: libgnucash/engine/Account.cpp:4094
msgid "Credit Card"
msgstr "Kreditna kartica"
-#: libgnucash/engine/Account.cpp:4097
+#: libgnucash/engine/Account.cpp:4095
msgid "Liability"
msgstr "Obveze"
-#: libgnucash/engine/Account.cpp:4098
+#: libgnucash/engine/Account.cpp:4096
msgid "Stock"
msgstr "Dionica"
-#: libgnucash/engine/Account.cpp:4099
+#: libgnucash/engine/Account.cpp:4097
msgid "Mutual Fund"
msgstr "Investicijski fond"
-#: libgnucash/engine/Account.cpp:4104
+#: libgnucash/engine/Account.cpp:4102
msgid "A/Receivable"
msgstr "Potraživanja"
-#: libgnucash/engine/Account.cpp:4105
+#: libgnucash/engine/Account.cpp:4103
msgid "A/Payable"
msgstr "Dugovanja"
-#: libgnucash/engine/Account.cpp:4106
+#: libgnucash/engine/Account.cpp:4104
msgid "Root"
msgstr "Korijen"
-#: libgnucash/engine/Account.cpp:4537
+#: libgnucash/engine/Account.cpp:4535
msgid "Orphaned Gains"
msgstr "Nepovezani dobici"
-#: libgnucash/engine/Account.cpp:4551 libgnucash/engine/cap-gains.c:806
+#: libgnucash/engine/Account.cpp:4549 libgnucash/engine/cap-gains.c:806
#: libgnucash/engine/cap-gains.c:811 libgnucash/engine/cap-gains.c:812
msgid "Realized Gain/Loss"
msgstr "Ostvarena dobit/gubitak"
-#: libgnucash/engine/Account.cpp:4553
+#: libgnucash/engine/Account.cpp:4551
msgid ""
-"Realized Gains or Losses from Commodity or Trading Accounts that haven't been "
-"recorded elsewhere."
+"Realized Gains or Losses from Commodity or Trading Accounts that haven't "
+"been recorded elsewhere."
msgstr ""
-"Ostvarena dobit ili gubitak iz dionica ili burzovnih trgovaÄkih konta, koji nisu "
-"nigdje zabilježeni."
+"Ostvarena dobit ili gubitak iz dionica ili burzovnih trgovaÄkih konta, koji "
+"nisu nigdje zabilježeni."
#: libgnucash/engine/commodity-table.scm:36
msgid "ALL NON-CURRENCY"
@@ -28989,47 +29323,49 @@ msgstr "%#d. %B %Y."
msgid "%B %e, %Y"
msgstr "%e. %B %Y."
-#: libgnucash/engine/gnc-datetime.cpp:82
+#: libgnucash/engine/gnc-datetime.cpp:91
msgid "y-m-d"
msgstr "g-m-d"
-#: libgnucash/engine/gnc-datetime.cpp:94
+#: libgnucash/engine/gnc-datetime.cpp:103
msgid "d-m-y"
msgstr "d-m-g"
-#: libgnucash/engine/gnc-datetime.cpp:106
+#: libgnucash/engine/gnc-datetime.cpp:115
msgid "m-d-y"
msgstr "m-d-g"
-#: libgnucash/engine/gnc-datetime.cpp:120
+#: libgnucash/engine/gnc-datetime.cpp:129
msgid "d-m"
msgstr "d-m"
-#: libgnucash/engine/gnc-datetime.cpp:132
+#: libgnucash/engine/gnc-datetime.cpp:141
msgid "m-d"
msgstr "m-d"
-#: libgnucash/engine/gnc-datetime.cpp:458
+#: libgnucash/engine/gnc-datetime.cpp:554
msgid "Unknown date format specifier passed as argument."
msgstr "Nepoznati određenik za format datuma je prošao kao argument."
#. regex didn't find a match
-#: libgnucash/engine/gnc-datetime.cpp:463
+#: libgnucash/engine/gnc-datetime.cpp:559
msgid "Value can't be parsed into a date using the selected date format."
msgstr ""
"Vrijednost se ne može obraditi u datum, korištenjem odabranog formata datuma."
-#: libgnucash/engine/gnc-datetime.cpp:468
+#: libgnucash/engine/gnc-datetime.cpp:564
msgid "Value appears to contain a year while the selected format forbids this."
-msgstr "Čini se da vrijednost sardžava godinu, dok odabrani format to zabranjuje."
+msgstr ""
+"Čini se da vrijednost sardžava godinu, dok odabrani format to zabranjuje."
#: libgnucash/engine/gnc-features.c:116
msgid ""
"This Dataset contains features not supported by this version of GnuCash. You "
-"must use a newer version of GnuCash in order to support the following features:"
+"must use a newer version of GnuCash in order to support the following "
+"features:"
msgstr ""
-"Ovaj skup podataka sadrži funkcije koje nisu podržane u ovom GnuCash izdanju. "
-"Moraš koristiti novije izdanje, za podržavanje sljedećih funkcija:"
+"Ovaj skup podataka sadrži funkcije koje nisu podržane u ovom GnuCash "
+"izdanju. Moraš koristiti novije izdanje, za podržavanje sljedećih funkcija:"
#. Set memo.
#: libgnucash/engine/gncInvoice.c:1665
@@ -29103,7 +29439,8 @@ msgstr "Standardni konto dobiti ili gubitka"
#: libgnucash/engine/qofbookslots.h:71
msgid "Day Threshold for Read-Only Transactions (red line)"
msgstr ""
-"Prag za koliÄinu dana, nakon kojih se transakcije mogu samo Äitati (crveni redak)"
+"Prag za koliÄinu dana, nakon kojih se transakcije mogu samo Äitati (crveni "
+"redak)"
#: libgnucash/engine/qofbookslots.h:72
msgid "Use Split Action Field for Number"
@@ -29191,15 +29528,16 @@ msgstr "Traženje debalansa u kontu „%s“: %u od %u"
#. Translators: This string has a disambiguation prefix
#: libgnucash/engine/Split.c:1613
msgid ""
-"Displayed account code of the other account in a multi-split transaction|Split"
+"Displayed account code of the other account in a multi-split transaction|"
+"Split"
msgstr "Protustavka"
-#: libgnucash/engine/Transaction.c:2681
+#: libgnucash/engine/Transaction.c:2694
msgid "Voided transaction"
msgstr "Stornirana transakcija"
#. Dirtying taken care of by SetReadOnly
-#: libgnucash/engine/Transaction.c:2693
+#: libgnucash/engine/Transaction.c:2706
msgid "Transaction Voided"
msgstr "Transakcija je stornirana"
@@ -29261,6 +29599,129 @@ msgstr "Porezni broj"
msgid "The electronic tax number of your business"
msgstr "Elektronski porezni broj tvojeg poduzeća"
-#: libgnucash/tax/us/txf.scm:106
+#: libgnucash/tax/us/txf.scm:108
msgid "No help available."
msgstr "Pomoć nije dostupna."
+
+#~ msgid "Are you sure you want to delete the entries ?"
+#~ msgstr "Sigurno želiš izbrisati unose?"
+
+#~ msgid "Enter URL:"
+#~ msgstr "Unesi URL:"
+
+#~ msgid "QIF/OFX/HBCI Import, Transaction Matching"
+#~ msgstr "QIF/OFX/HBCI uvoz, uspoređivanje transakcija"
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" has not been found. \n"
+#~ "\n"
+#~ "The %s package should include the program \"qt3-wizard\". Please check "
+#~ "your installation to ensure this program is present. On some "
+#~ "distributions this may require installing additional packages."
+#~ msgstr ""
+#~ "Vanjski program „Čarobnjak za postavljanje AqBanking“ nije nađen. \n"
+#~ "\n"
+#~ "Program „qt3-wizard“ bi trebao biti ukljuÄen u „%s“. Provjeri prisutnost "
+#~ "ovog programa u tvojoj instalaciji. U nekim distribucijama ovo može "
+#~ "zahtijevati instalaciju dodatnih paketa."
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" failed to run "
+#~ "successfully because the additional software \"Qt\" was not found. Please "
+#~ "install the \"Qt/Windows Open Source Edition\" from Trolltech by "
+#~ "downloading it from www.trolltech.com\n"
+#~ "\n"
+#~ "If you have installed Qt already, you will have to adapt the PATH "
+#~ "variable of your system appropriately. Contact the GnuCash developers if "
+#~ "you need further assistance on how to install Qt correctly.\n"
+#~ "\n"
+#~ "Online Banking cannot be setup without Qt. Press \"Close\" now, then "
+#~ "\"Cancel\" to cancel the Online Banking setup."
+#~ msgstr ""
+#~ "Vanjski program „Čarobnjak za postavljanje AqBanking“ nije uspješno "
+#~ "pokrenut, jer dodatni softver „Qt“ nije nađen. Instaliraj „Qt/Windows "
+#~ "Open Source Edition“ od Trolltech, preuzimajući ga s „www.trolltech."
+#~ "com“.\n"
+#~ "\n"
+#~ "Ako je Qt već instaliran, morat ćeš prilagoditi varijablu „PATH“ na tvom "
+#~ "sustavu. Obrati se GnuCash programerima, ako ti je potrebna dodatna pomoć "
+#~ "o tome, kako ispravno instalirati Qt.\n"
+#~ "Internet bankarstvo se ne može podesiti bez Qt-a. Sad klikni „Zatvori“, "
+#~ "zatim „Odustani“, za odustajanje od podešavanja internet bankarstva."
+
+#~ msgid ""
+#~ "The external program \"AqBanking Setup Wizard\" failed to run "
+#~ "successfully. Online Banking can only be setup if this wizard has run "
+#~ "successfully. Please try running the \"AqBanking Setup Wizard\" again."
+#~ msgstr ""
+#~ "Vanjski program „Čarobnjak za postavljanje AqBanking“ nije uspješno "
+#~ "pokrenut. Internet bankarstvo može biti postavljeno samo, ako se ovaj "
+#~ "Äarobnjak uspjeÅ¡no pokrene. PokuÅ¡aj ponovo pokrenuti „Čarobnjak za "
+#~ "postavljanje AqBanking“."
+
+#~ msgid "Enter an Online Direct Debit Note"
+#~ msgstr "Unesi internetsko izravno terećenje"
+
+#~ msgid "Debited Account Number"
+#~ msgstr "Broj dužniÄkog konta"
+
+#~ msgid "Debited Account Bank Code"
+#~ msgstr "Å ifra banke dužniÄkog konta"
+
+#~ msgid "Credited Account Number"
+#~ msgstr "Broj vjerovniÄkog konta"
+
+#~ msgid "Credited Account Bank Code"
+#~ msgstr "Å ifra banke vjerovniÄkog konta"
+
+#~ msgid ""
+#~ "The internal check of the destination account number '%s' at the "
+#~ "specified bank with bank code '%s' failed. This means the account number "
+#~ "might contain an error."
+#~ msgstr ""
+#~ "Interna provjera broja konta odredišta „%s“ u navedenoj banci sa šifrom "
+#~ "banke „%s“ nije uspela. To znaÄi, da broj konta možda sadrži greÅ¡ku."
+
+#~ msgid ""
+#~ "The text you entered contained at least one character that is invalid for "
+#~ "a SEPA transaction. In SEPA, unfortunately only exactly the following "
+#~ "characters are allowed: a...z, A...Z, 0...9, and the following "
+#~ "punctuations: ' : ? , - ( + . ) / \n"
+#~ "\n"
+#~ "In particular, neither Umlauts nor an ampersand (&) is allowed, neither "
+#~ "in the recipient or sender name nor in any purpose line."
+#~ msgstr ""
+#~ "Unijeti tekst je sadržao barem jedan znak, koji nije valjan za SEPA "
+#~ "transakciju. U SEPA-i, su nažalost dozvoljeni samo sljedeći znakovi: a…z, "
+#~ "A…Z, 0…9, ' : ? , - ( + . ) / \n"
+#~ "\n"
+#~ "Nikako nisu dozvoljene niti glasovne oznake (ä, ö, ü, ß, Ä, ć, Ä‘, Å¡, ž), "
+#~ "niti ampersand (&), kako u imenu primatelja i pošiljaoca, tako niti u "
+#~ "bilo kojem retku svrhe."
+
+#~ msgid "_Issue Transaction..."
+#~ msgstr "_Izdaj transakciju …"
+
+#~ msgid "Issue a new transaction online through Online Banking"
+#~ msgstr "Izdaj novu transakciju, putem internet bankarstva"
+
+#~ msgid "_Direct Debit..."
+#~ msgstr "_Izravno terećenje …"
+
+#~ msgid "Issue a new direct debit note online through Online Banking"
+#~ msgstr "Izdaj novo izravno terećenje, putem internet bankarstva"
+
+#~ msgid "Import a MT940 file into GnuCash"
+#~ msgstr "Uvezi datoteku MT940 u GnuCash"
+
+#~ msgid "Import a MT942 file into GnuCash"
+#~ msgstr "Uvezi datoteku MT942 u GnuCash"
+
+#~ msgid "'Commodity from' can not be the same as 'Currency to'."
+#~ msgstr "„Roba iz†ne može biti ista, kao „Valuta uâ€."
+
+#~ msgid "Payment received, thank you."
+#~ msgstr "Zahvaljujemo Vam na plaćanju."
+
+#~ msgid "Client"
+#~ msgstr "Klijent"
commit 0c028669642ae4a5937bbb2f3c4344280eec283c
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 17:13:41 2019 +0200
PyDate_Check works for date and datetime
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index 1840b87c6..295a99a79 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -35,12 +35,12 @@
%typemap(in) time64 {
PyDateTime_IMPORT;
- if (!PyDate_Check($input) && !PyDateTime_Check($input) && !PyInt_Check($input)) {
+ if (!PyDate_Check($input) && !PyInt_Check($input)) {
PyErr_SetString(PyExc_ValueError,"date, datetime or integer expected");
return NULL;
}
- if (PyDateTime_Check($input)) {
+ if (PyDate_Check($input)) {
struct tm time = {PyDateTime_DATE_GET_SECOND($input),
PyDateTime_DATE_GET_MINUTE($input),
PyDateTime_DATE_GET_HOUR($input),
@@ -79,12 +79,12 @@
%typemap(in) time64 * (time64 secs) {
PyDateTime_IMPORT;
- if (!PyDate_Check($input) && !PyDateTime_Check($input) && !PyInt_Check($input)) {
+ if (!PyDate_Check($input) && !PyInt_Check($input)) {
PyErr_SetString(PyExc_ValueError,"date, datetime or integer expected");
return NULL;
}
- if (PyDateTime_Check($input)) {
+ if (PyDate_Check($input)) {
struct tm time = {PyDateTime_DATE_GET_SECOND($input),
PyDateTime_DATE_GET_MINUTE($input),
PyDateTime_DATE_GET_HOUR($input),
commit 18a26884197cc72551a58c77c88f7355bebe01eb
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 16:17:58 2019 +0200
typo
diff --git a/bindings/python/gnucash_business.py b/bindings/python/gnucash_business.py
index 53b8e1b34..b4583377d 100644
--- a/bindings/python/gnucash_business.py
+++ b/bindings/python/gnucash_business.py
@@ -143,7 +143,7 @@ class TaxTableEntry(GnuCashCoreClass):
class Invoice(GnuCashCoreClass):
def __init__(self, book=None, id=None, currency=None, owner=None,
date_opened=None, instance=None):
- """Invoice Contstructor
+ """Invoice Constructor
You must provide a book, id, currency and owner
(Customer, Job, Employee, Vendor) or an existing swig proxy object
commit db9e98a812daf6d293f29c6ed07a50dd28b8f70e
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 16:10:04 2019 +0200
also allow datetime.date
Initialisation of some business objects has been done with
datetime.date.today() and it is also mentioned as a possibility
in the source doc. So leave it possible.
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index dfedfa635..1840b87c6 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -35,8 +35,8 @@
%typemap(in) time64 {
PyDateTime_IMPORT;
- if (!PyDateTime_Check($input) && !PyInt_Check($input)) {
- PyErr_SetString(PyExc_ValueError,"datetime or integer expected");
+ if (!PyDate_Check($input) && !PyDateTime_Check($input) && !PyInt_Check($input)) {
+ PyErr_SetString(PyExc_ValueError,"date, datetime or integer expected");
return NULL;
}
@@ -79,8 +79,8 @@
%typemap(in) time64 * (time64 secs) {
PyDateTime_IMPORT;
- if (!PyDateTime_Check($input) && !PyInt_Check($input)) {
- PyErr_SetString(PyExc_ValueError,"datetime or integer expected");
+ if (!PyDate_Check($input) && !PyDateTime_Check($input) && !PyInt_Check($input)) {
+ PyErr_SetString(PyExc_ValueError,"date, datetime or integer expected");
return NULL;
}
commit 3884e6abf549ad5c6c8d09604a493d3f9ff88371
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 16:09:01 2019 +0200
unobfuscate get_date method name
diff --git a/bindings/python/gnucash_core.py b/bindings/python/gnucash_core.py
index b268503eb..38415abe8 100644
--- a/bindings/python/gnucash_core.py
+++ b/bindings/python/gnucash_core.py
@@ -812,7 +812,8 @@ class QueryDatePredicate(GnuCashCoreClass):
pass
QueryDatePredicate.add_constructor_and_methods_with_prefix(
- 'qof_query_', 'date_predicate')
+ 'qof_query_', 'date_predicate', exclude=["qof_query_date_predicate_get_date"])
+QueryDatePredicate.add_method('qof_query_date_predicate_get_date', 'get_date')
class QueryGuidPredicate(GnuCashCoreClass):
pass
commit 8ba5e552d92a9c745ba1295d76b3bcfd3408a485
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 14:50:29 2019 +0200
return None object if return value is FALSE
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index 88d345347..dfedfa635 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -136,12 +136,17 @@
PyDateTime_IMPORT;
PyObject *tp;
struct tm t;
- gnc_localtime_r($1, &t);
- tp = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1,
- t.tm_mday, t.tm_hour, t.tm_min,
- t.tm_sec, 0);
- $result = SWIG_Python_AppendOutput($result, tp);
+ // directly access return value (result) of function
+ // only return datetime if TRUE
+ if(result) {
+ gnc_localtime_r($1, &t);
+ tp = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1,
+ t.tm_mday, t.tm_hour, t.tm_min,
+ t.tm_sec, 0);
+
+ $result = SWIG_Python_AppendOutput($result, tp);
+ } else $result = SWIG_Python_AppendOutput($result, Py_None);
}
%apply time64 *date { time64 *last_date };
commit dafdd702e6bfffee5fe75f973f8a67320586c7ff
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 14:09:10 2019 +0200
additional author
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index 41e552cb4..88d345347 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -27,6 +27,7 @@
@brief SWIG interface file for type translation of time64 types
@author Mark Jenkins, ParIT Worker Co-operative <mark at parit.ca>
@author Jeff Green, ParIT Worker Co-operative <jeff at parit.ca>
+ @author Christoph Holtermann, mail at c-holtermann.net - modifications 2019-04
@ingroup python_bindings */
// A typemap for converting python dates to time64 in functions that
commit 79decfb754fb7ff7624357e98cbbe59a66e2ee7c
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 14:08:52 2019 +0200
deal with functions returning values through arguments
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index e7553b504..41e552cb4 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -69,6 +69,12 @@
// stack. (SWIG will name the variables ts1, ts2, ts3...)
//
// Mark Jenkins <mark at parit.ca>
+//
+// as far as I can see all occurences of pointers to time64 are now covered
+// by the named typemaps below (2019-04)
+//
+// Christoph Holtermann <mail at c-holtermann.net>
+
%typemap(in) time64 * (time64 secs) {
PyDateTime_IMPORT;
@@ -92,8 +98,9 @@
}
}
-// A typemap for converting time64 values returned from functions to
-// python dates. Note that we can't use Python DateTime's fromtimestamp function because it relies upon libc's localtime. Note also that while we create times with timegm we retrieve it with localtime
+/* A typemap for converting time64 values returned from functions to
+ python dates. Note that we can't use Python DateTime's fromtimestamp function because it relies upon libc's
+ localtime. Note also that while we create times with timegm we retrieve it with localtime */
%typemap(out) time64 {
if ($1 == INT64_MAX) {
$result = Py_None;
@@ -106,3 +113,35 @@
t.tm_sec, 0);
}
}
+
+// functions using a pointer to time64 to return data
+// these are named typemaps focussing for
+//
+// gboolean qof_query_date_predicate_get_date (const QofQueryPredData *pd, time64 *date)
+// gboolean xaccAccountGetReconcileLastDate (const Account *acc, time64 *last_date)
+// gboolean xaccAccountGetReconcilePostponeDate (const Account *acc, time64 *postpone_date)
+//
+// python functions return a list where the first item is the boolean return value and
+// the second item is a datetime object. This could be reduced to only returning a date or
+// null
+//
+// the modifiable argument is omitted in python function call
+
+%typemap(in, numinputs=0) time64 *date (time64 secs) {
+ $1 = &secs;
+}
+
+%typemap(argout) time64 *date (time64 secs) {
+ PyDateTime_IMPORT;
+ PyObject *tp;
+ struct tm t;
+ gnc_localtime_r($1, &t);
+ tp = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1,
+ t.tm_mday, t.tm_hour, t.tm_min,
+ t.tm_sec, 0);
+
+ $result = SWIG_Python_AppendOutput($result, tp);
+}
+
+%apply time64 *date { time64 *last_date };
+%apply time64 *date { time64 *postpone_date };
commit 445ff7e6c98b9203780b434fa2dbc4dda1340e3c
Author: c-holtermann <mail at c-holtermann.net>
Date: Sat Apr 6 07:51:15 2019 +0200
check for argument type. Also allow int.
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
index 82736186e..e7553b504 100644
--- a/bindings/python/time64.i
+++ b/bindings/python/time64.i
@@ -33,13 +33,23 @@
// require time64 as an argument
%typemap(in) time64 {
PyDateTime_IMPORT;
- struct tm time = {PyDateTime_DATE_GET_SECOND($input),
- PyDateTime_DATE_GET_MINUTE($input),
- PyDateTime_DATE_GET_HOUR($input),
- PyDateTime_GET_DAY($input),
- PyDateTime_GET_MONTH($input) - 1,
- PyDateTime_GET_YEAR($input) - 1900};
- $1 = gnc_mktime(&time);
+
+ if (!PyDateTime_Check($input) && !PyInt_Check($input)) {
+ PyErr_SetString(PyExc_ValueError,"datetime or integer expected");
+ return NULL;
+ }
+
+ if (PyDateTime_Check($input)) {
+ struct tm time = {PyDateTime_DATE_GET_SECOND($input),
+ PyDateTime_DATE_GET_MINUTE($input),
+ PyDateTime_DATE_GET_HOUR($input),
+ PyDateTime_GET_DAY($input),
+ PyDateTime_GET_MONTH($input) - 1,
+ PyDateTime_GET_YEAR($input) - 1900};
+ $1 = gnc_mktime(&time);
+ } else {
+ $1 = PyInt_AsLong($input);
+ }
}
// A typemap for converting python dates to time64 *, for functions that
@@ -61,14 +71,25 @@
// Mark Jenkins <mark at parit.ca>
%typemap(in) time64 * (time64 secs) {
PyDateTime_IMPORT;
- struct tm time = {PyDateTime_DATE_GET_SECOND($input),
- PyDateTime_DATE_GET_MINUTE($input),
- PyDateTime_DATE_GET_HOUR($input),
- PyDateTime_GET_DAY($input),
- PyDateTime_GET_MONTH($input) - 1,
- PyDateTime_GET_YEAR($input) - 1900};
- time64 secs = gnc_mktime(&time);
- $1 = &secs;
+
+ if (!PyDateTime_Check($input) && !PyInt_Check($input)) {
+ PyErr_SetString(PyExc_ValueError,"datetime or integer expected");
+ return NULL;
+ }
+
+ if (PyDateTime_Check($input)) {
+ struct tm time = {PyDateTime_DATE_GET_SECOND($input),
+ PyDateTime_DATE_GET_MINUTE($input),
+ PyDateTime_DATE_GET_HOUR($input),
+ PyDateTime_GET_DAY($input),
+ PyDateTime_GET_MONTH($input) - 1,
+ PyDateTime_GET_YEAR($input) - 1900};
+ time64 secs = gnc_mktime(&time);
+ $1 = &secs;
+ } else {
+ time64 secs = PyInt_AsLong($input);
+ $1 = &secs;
+ }
}
// A typemap for converting time64 values returned from functions to
commit c779bcb72fc6221d206d627dd05a9196db3aa444
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:43:19 2019 +0200
GetOwner may return project instead of owner
diff --git a/bindings/python/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
index ad132c871..1bc56de02 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_simple.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_simple.py
@@ -171,7 +171,10 @@ def invoiceToDict(invoice):
simple_invoice['notes'] = invoice.GetNotes()
simple_invoice['active'] = invoice.GetActive()
simple_invoice['currency'] = invoice.GetCurrency().get_mnemonic()
- simple_invoice['owner'] = vendorToDict(invoice.GetOwner())
+ owner = invoice.GetOwner()
+ if type(owner) == gnucash.gnucash_business.Job:
+ owner = owner.GetOwner()
+ simple_invoice['owner'] = vendorToDict(owner)
simple_invoice['owner_type'] = invoice.GetOwnerType()
simple_invoice['billing_id'] = invoice.GetBillingID()
simple_invoice['to_charge_amount'] = invoice.GetToChargeAmount().to_double()
commit 6925ee3115b329b1d93639c2275e89fbe788f26d
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:42:46 2019 +0200
be prepared for GetDateDue returning null
diff --git a/bindings/python/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
index 8f93a7af9..ad132c871 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_simple.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_simple.py
@@ -163,7 +163,7 @@ def invoiceToDict(invoice):
else:
simple_invoice['date_posted'] = invoice.GetDatePosted().strftime(
'%Y-%m-%d')
- if invoice.GetDateDue().strftime('%Y-%m-%d') == '1970-01-01':
+ if not invoice.GetDateDue() or invoice.GetDateDue().strftime('%Y-%m-%d') == '1970-01-01':
simple_invoice['date_due'] = None
else:
simple_invoice['date_due'] = invoice.GetDateDue().strftime(
commit 876079f8d2404b81c14314f524fe3e311337c91d
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:42:02 2019 +0200
remove TS suffix
diff --git a/bindings/python/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
index 259e244b9..8f93a7af9 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_simple.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_simple.py
@@ -111,12 +111,12 @@ def transactionToDict(transaction, entities):
simple_transaction['imbalance_value'] = transaction.GetImbalanceValue(
).to_double()
simple_transaction['is_balanced'] = transaction.IsBalanced()
- simple_transaction['date_posted'] = transaction.RetDatePostedTS(
simple_transaction['date'] = transaction.GetDate().strftime('%Y-%m-%d')
+ simple_transaction['date_posted'] = transaction.RetDatePosted(
).strftime('%Y-%m-%d')
- simple_transaction['date_entered'] = transaction.RetDateEnteredTS(
+ simple_transaction['date_entered'] = transaction.RetDateEntered(
).strftime('%Y-%m-%d')
- simple_transaction['date_due'] = transaction.RetDateDueTS().strftime(
+ simple_transaction['date_due'] = transaction.RetDateDue().strftime(
'%Y-%m-%d')
simple_transaction['void_status'] = transaction.GetVoidStatus()
simple_transaction['void_time'] = transaction.GetVoidTime().strftime(
commit 6eae440534f85064c7376fb32aa76b90e38f6d4d
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:41:28 2019 +0200
GetDate return unserializable datetime object
diff --git a/bindings/python/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
index 124c54aa7..259e244b9 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_simple.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_simple.py
@@ -111,8 +111,8 @@ def transactionToDict(transaction, entities):
simple_transaction['imbalance_value'] = transaction.GetImbalanceValue(
).to_double()
simple_transaction['is_balanced'] = transaction.IsBalanced()
- simple_transaction['date'] = transaction.GetDate()
simple_transaction['date_posted'] = transaction.RetDatePostedTS(
+ simple_transaction['date'] = transaction.GetDate().strftime('%Y-%m-%d')
).strftime('%Y-%m-%d')
simple_transaction['date_entered'] = transaction.RetDateEnteredTS(
).strftime('%Y-%m-%d')
commit b73be1b5239181071c0e161d80abe07f67044dc0
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:39:18 2019 +0200
GetInvTaxTable returns unserializable object
diff --git a/bindings/python/example_scripts/rest-api/gnucash_simple.py b/bindings/python/example_scripts/rest-api/gnucash_simple.py
index 509d7aca7..124c54aa7 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_simple.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_simple.py
@@ -57,7 +57,7 @@ def vendorToDict(vendor):
simple_vendor['notes'] = vendor.GetNotes()
simple_vendor['active'] = vendor.GetActive()
simple_vendor['currency'] = vendor.GetCurrency().get_mnemonic()
- simple_vendor['tax_table_override'] = vendor.GetTaxTableOverride()
+ #simple_vendor['tax_table_override'] = vendor.GetTaxTableOverride()
simple_vendor['address'] = addressToDict(vendor.GetAddr())
simple_vendor['tax_included'] = vendor.GetTaxIncluded()
@@ -77,7 +77,7 @@ def customerToDict(customer):
simple_customer['discount'] = customer.GetDiscount().to_double()
simple_customer['credit'] = customer.GetCredit().to_double()
simple_customer['currency'] = customer.GetCurrency().get_mnemonic()
- simple_customer['tax_table_override'] = customer.GetTaxTableOverride()
+ # simple_customer['tax_table_override'] = customer.GetTaxTableOverride()
simple_customer['address'] = addressToDict(customer.GetAddr())
simple_customer['shipping_address'] = addressToDict(
customer.GetShipAddr())
@@ -257,7 +257,7 @@ def entryToDict(entry):
simple_entry['discounted_how'] = entry.GetInvDiscountHow()
simple_entry['inv_taxable'] = entry.GetInvTaxable()
simple_entry['inv_tax_included'] = entry.GetInvTaxIncluded()
- simple_entry['inv_tax_table_override'] = entry.GetInvTaxTable()
+ # simple_entry['inv_tax_table_override'] = entry.GetInvTaxTable()
if entry.GetBillAccount() == None:
simple_entry['bill_account'] = {}
else:
commit b06801185c764bca61f05574496d93d95c08396c
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 14:50:05 2019 +0200
shebang should be specific to python version (PEP394)
preferred form is #!/usr/bin/env python3 as gnucash now only works with
python3
diff --git a/bindings/python/example_scripts/gnc_convenience.py b/bindings/python/example_scripts/gnc_convenience.py
index 808ab3886..2d222379a 100644
--- a/bindings/python/example_scripts/gnc_convenience.py
+++ b/bindings/python/example_scripts/gnc_convenience.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# -*- coding: UTF-8 -*-
##@file
diff --git a/bindings/python/example_scripts/latex_invoices.py b/bindings/python/example_scripts/latex_invoices.py
index f015261b0..f754bc1d2 100644
--- a/bindings/python/example_scripts/latex_invoices.py
+++ b/bindings/python/example_scripts/latex_invoices.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
##@file
diff --git a/bindings/python/example_scripts/new_book_with_opening_balances.py b/bindings/python/example_scripts/new_book_with_opening_balances.py
index b38960e4d..8e21440a0 100644
--- a/bindings/python/example_scripts/new_book_with_opening_balances.py
+++ b/bindings/python/example_scripts/new_book_with_opening_balances.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# new_book_with_opening_balances.py -- Replicate the account structure of a
# book and apply basis opening balances from the original
diff --git a/bindings/python/example_scripts/priceDB_test.py b/bindings/python/example_scripts/priceDB_test.py
index 7af031072..8ec671500 100644
--- a/bindings/python/example_scripts/priceDB_test.py
+++ b/bindings/python/example_scripts/priceDB_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Test file for price database stuff
# To update the price database call
# $PATH/gnucash --add-price-quotes $PATHTOFILE
diff --git a/bindings/python/example_scripts/price_database_example.py b/bindings/python/example_scripts/price_database_example.py
index 13b0d453a..49c5d28d9 100755
--- a/bindings/python/example_scripts/price_database_example.py
+++ b/bindings/python/example_scripts/price_database_example.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Another test file for price database stuff
# To update the price database call
# $PATH/gnucash --add-price-quotes $PATHTOFILE
diff --git a/bindings/python/example_scripts/quotes_historic.py b/bindings/python/example_scripts/quotes_historic.py
index c78995abc..16394b189 100644
--- a/bindings/python/example_scripts/quotes_historic.py
+++ b/bindings/python/example_scripts/quotes_historic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# quotes_historic.py -- Example Script to read historic quote data into gnucash
#
diff --git a/bindings/python/example_scripts/rest-api/gnucash_rest.py b/bindings/python/example_scripts/rest-api/gnucash_rest.py
index 307d3d831..d87a15679 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_rest.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_rest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
'''
diff --git a/bindings/python/example_scripts/simple_book.py b/bindings/python/example_scripts/simple_book.py
index 4bde60817..9a6040b92 100644
--- a/bindings/python/example_scripts/simple_book.py
+++ b/bindings/python/example_scripts/simple_book.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
## @file
# @brief Simple example for a book
diff --git a/bindings/python/example_scripts/simple_business_create.py b/bindings/python/example_scripts/simple_business_create.py
index 75a00228b..ade0887ad 100644
--- a/bindings/python/example_scripts/simple_business_create.py
+++ b/bindings/python/example_scripts/simple_business_create.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# simple_business_create.py -- Set up a set of books for business feature use
#
diff --git a/bindings/python/example_scripts/simple_invoice_insert.py b/bindings/python/example_scripts/simple_invoice_insert.py
index ad4d7fd0e..63633d72c 100644
--- a/bindings/python/example_scripts/simple_invoice_insert.py
+++ b/bindings/python/example_scripts/simple_invoice_insert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# simple_invoice_insert.py -- Add an invoice to a set of books
#
diff --git a/bindings/python/example_scripts/simple_session.py b/bindings/python/example_scripts/simple_session.py
index 1a2b424a8..3bd219c9c 100644
--- a/bindings/python/example_scripts/simple_session.py
+++ b/bindings/python/example_scripts/simple_session.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
## @file
# @brief Example Script simple session
# @ingroup python_bindings_examples
diff --git a/bindings/python/example_scripts/simple_sqlite_create.py b/bindings/python/example_scripts/simple_sqlite_create.py
index f3621ec38..7900c9534 100644
--- a/bindings/python/example_scripts/simple_sqlite_create.py
+++ b/bindings/python/example_scripts/simple_sqlite_create.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
## @file
# @brief Example Script simple sqlite create
# @ingroup python_bindings_examples
diff --git a/bindings/python/example_scripts/simple_test.py b/bindings/python/example_scripts/simple_test.py
index 274164168..9bc21789e 100644
--- a/bindings/python/example_scripts/simple_test.py
+++ b/bindings/python/example_scripts/simple_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
## @file
# @brief Creates a basic set of accounts and a couple of transactions
# @ingroup python_bindings_examples
commit e7d940ac3f0ec4de3c999e47aac7cc2c80717e3c
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:24:40 2019 +0200
iteritems removed in python3
diff --git a/bindings/python/example_scripts/new_book_with_opening_balances.py b/bindings/python/example_scripts/new_book_with_opening_balances.py
index 0ee02c403..b38960e4d 100644
--- a/bindings/python/example_scripts/new_book_with_opening_balances.py
+++ b/bindings/python/example_scripts/new_book_with_opening_balances.py
@@ -334,7 +334,7 @@ def main():
simple_opening_name_used = False
for (namespace, mnemonic), (opening_trans, opening_amount) in \
- opening_balance_per_currency.iteritems() :
+ opening_balance_per_currency.items() :
simple_opening_name_used = create_opening_balance_transaction(
commodtable, namespace, mnemonic,
new_book_root, new_book,
commit 77727ffc49aeaedb9368fe5161d6fab1a108ca0b
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:30:44 2019 +0200
python3 does not return list of keys
diff --git a/bindings/python/example_scripts/account_analysis.py b/bindings/python/example_scripts/account_analysis.py
index b7e59966a..bbe6532f7 100644
--- a/bindings/python/example_scripts/account_analysis.py
+++ b/bindings/python/example_scripts/account_analysis.py
@@ -117,7 +117,7 @@ def next_period_start(start_year, start_month, period_type):
def period_end(start_year, start_month, period_type):
if period_type not in PERIODS:
raise Exception("%s is not a valid period, should be %s" % (
- period_type, str(PERIODS.keys()) ) )
+ period_type, str(list(PERIODS.keys())) ) )
end_year, end_month = next_period_start(start_year, start_month,
period_type)
diff --git a/bindings/python/example_scripts/rest-api/gnucash_rest.py b/bindings/python/example_scripts/rest-api/gnucash_rest.py
index a7a54f2b5..307d3d831 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_rest.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_rest.py
@@ -843,7 +843,7 @@ def getSubAccounts(account):
flat_accounts = []
- if 'subaccounts' in account.keys():
+ if 'subaccounts' in list(account.keys()):
for n, subaccount in enumerate(account['subaccounts']):
flat_accounts.append(subaccount)
flat_accounts = flat_accounts + getSubAccounts(subaccount)
commit 64a01f302706007cfbe049a40fd6dae26001ee3e
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:32:14 2019 +0200
python3 - 'as' needed in exceptions instead of comma
diff --git a/bindings/python/example_scripts/simple_session.py b/bindings/python/example_scripts/simple_session.py
index ee053123c..1a2b424a8 100644
--- a/bindings/python/example_scripts/simple_session.py
+++ b/bindings/python/example_scripts/simple_session.py
@@ -14,7 +14,7 @@ FILE_2 = "/tmp/example_file.xac"
session = None
try:
session = Session(FILE_1)
-except GnuCashBackendException, backend_exception:
+except GnuCashBackendException as backend_exception:
assert( ERR_FILEIO_FILE_NOT_FOUND in backend_exception.errors)
@@ -28,7 +28,7 @@ session.destroy()
session = Session(FILE_2)
try:
session_2 = Session(FILE_2)
-except GnuCashBackendException, backend_exception:
+except GnuCashBackendException as backend_exception:
assert( ERR_BACKEND_LOCKED in backend_exception.errors )
session.end()
session.destroy()
commit 0068475bb1b1d4e3486b0e3897e7b9d66f75a070
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 17:35:34 2019 +0200
xrange has been dropped in python3
diff --git a/bindings/python/example_scripts/rest-api/gnucash_rest.py b/bindings/python/example_scripts/rest-api/gnucash_rest.py
index 3ee4ad83f..a7a54f2b5 100644
--- a/bindings/python/example_scripts/rest-api/gnucash_rest.py
+++ b/bindings/python/example_scripts/rest-api/gnucash_rest.py
@@ -1824,7 +1824,7 @@ def gnc_numeric_from_decimal(decimal_value):
numerator_place_value = 1
# add each digit to the final value multiplied by the place value
# from least significant to most sigificant
- for i in xrange(len(digits)-1,-1,-1):
+ for i in range(len(digits)-1,-1,-1):
numerator += digits[i] * numerator_place_value
numerator_place_value *= TEN
commit d64fb74b9ebfc981dbeb89e895325943abb2cfeb
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Mar 29 23:36:33 2019 +0800
[utilities] add supporting functions for guile-json use
converts nested-list to nested-vector, and vice-versa
diff --git a/libgnucash/scm/utilities.scm b/libgnucash/scm/utilities.scm
index 8035c8a47..93565600e 100644
--- a/libgnucash/scm/utilities.scm
+++ b/libgnucash/scm/utilities.scm
@@ -84,6 +84,19 @@
((addto! alist element)
(set! alist (cons element alist)))))
+;; pair of utility functions for use with guile-json which requires
+;; lists converted vectors to save as json arrays. traverse list
+;; converting into vectors, and vice versa.
+(define-public (traverse-list->vec lst)
+ (cond
+ ((list? lst) (list->vector (map traverse-list->vec lst)))
+ (else lst)))
+
+(define-public (traverse-vec->list vec)
+ (cond
+ ((vector? vec) (map traverse-vec->list (vector->list vec)))
+ (else vec)))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; gnc:substring-replace
;;
commit 66ae2abb8e69ff954e00aad743da4d16876c9d57
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat Jan 19 23:13:01 2019 +0800
[guile-json] remove dependency on srfi-43
this is a compatibility hack to remove dependency on srfi-43 which is
not present on ubuntu 14.04. create a simplified vector-for-each
suitable for this module.
diff --git a/borrowed/guile-json/json/builder.scm b/borrowed/guile-json/json/builder.scm
index 406f23bbb..4b5e43a25 100644
--- a/borrowed/guile-json/json/builder.scm
+++ b/borrowed/guile-json/json/builder.scm
@@ -27,11 +27,17 @@
(define-module (json builder)
#:use-module (ice-9 format)
#:use-module (srfi srfi-1)
- #:use-module (srfi srfi-43)
#:use-module (rnrs bytevectors)
#:export (scm->json
scm->json-string))
+;; simplified vector-for-each suitable for use in this module
+(define (vector-for-each fn v)
+ (for-each
+ (lambda (i)
+ (fn i (vector-ref v i)))
+ (iota (vector-length v))))
+
;;
;; String builder helpers
;;
commit 816dd3ea2a1bf7945d25f5c7a34525eb8c383fc0
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Mar 29 07:08:11 2019 +0800
[guile-json] show better error messages
diff --git a/borrowed/guile-json/json/builder.scm b/borrowed/guile-json/json/builder.scm
index 6060ac0ea..406f23bbb 100644
--- a/borrowed/guile-json/json/builder.scm
+++ b/borrowed/guile-json/json/builder.scm
@@ -182,7 +182,7 @@
((string? scm) (json-build-string scm port escape unicode))
((vector? scm) (json-build-array scm port escape unicode pretty level))
((pair? scm) (json-build-object scm port escape unicode pretty level))
- (else (throw 'json-invalid))))
+ (else (throw 'json-invalid scm))))
;;
;; Public procedures
commit d39f180c6084f391bcdf72ae9cb371950bacff76
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri Mar 29 00:02:44 2019 +0800
[guile-json] upgrade to latest version
diff --git a/borrowed/guile-json/AUTHORS b/borrowed/guile-json/AUTHORS
index 3343d4c78..2cfddfccc 100644
--- a/borrowed/guile-json/AUTHORS
+++ b/borrowed/guile-json/AUTHORS
@@ -1,8 +1,11 @@
Aleix Conchillo Flaque <aconchillo at gmail.com> is the author and current
-maintainer of guile-json. More details at <http://hacks-galore.org/aleix>.
+maintainer of guile-json.
List of contributors (in alphabetical order):
+Ludovic Courtès <ludo at gnu.org>
+Jason Douglas Earl <jearl at notengoamigos.org>
+Christopher Lam <christopher.lck at gmail.com>
Jan Nieuwenhuizen <janneke at gnu.org>
Ian Price <ianprice90 at googlemail.com>
David Thompson <dthompson2 at worcester.edu>
diff --git a/borrowed/guile-json/COPYING.LESSER b/borrowed/guile-json/COPYING.LESSER
deleted file mode 100644
index 65c5ca88a..000000000
--- a/borrowed/guile-json/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/borrowed/guile-json/Makefile.am b/borrowed/guile-json/Makefile.am
new file mode 100644
index 000000000..996f18b8e
--- /dev/null
+++ b/borrowed/guile-json/Makefile.am
@@ -0,0 +1,51 @@
+#
+# Makefile.am
+#
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+#
+# This file is part of guile-json.
+#
+# guile-json 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 3 of the License, or
+# (at your option) any later version.
+#
+# guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+#
+
+SUBDIRS = json tests
+
+ACLOCAL_AMFLAGS = -I build-aux
+
+PKG_LIST_VERSION=$(shell echo $(PACKAGE_VERSION) | sed "s/\./ /g")
+
+dist-hook:
+ $(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog
+ cp $(top_srcdir)/pkg-list.scm.in $(top_distdir)/pkg-list.scm
+ # '' is to make OS X happy
+ sed -i '' "s/%VERSION%/$(PKG_LIST_VERSION)/g" $(top_distdir)/pkg-list.scm
+
+GOBJECTS = $(SOURCES:%.scm=%.go)
+
+moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)
+objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
+
+nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_nodist_obj_DATA = $(GOBJECTS)
+
+GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+SUFFIXES = .scm .go
+.scm.go:
+ $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+
+SOURCES = json.scm
+
+CLEANFILES = $(GOBJECTS)
+
+EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
diff --git a/borrowed/guile-json/NEWS b/borrowed/guile-json/NEWS
index d4317c1a7..0d431a9b1 100644
--- a/borrowed/guile-json/NEWS
+++ b/borrowed/guile-json/NEWS
@@ -1,4 +1,96 @@
+
+* Version ?? (??)
+
+ - Complex numbers, inf and nan are not allowed anymore as valid numbers when
+ building JSON.
+ (Fixes #32)
+
+
+* Version 3.1.0 (Dec 31, 2018)
+
+ - scm->json and scm->json-string now support an additional key argument
+ #:unicode. If #:unicode is set to true unicode characters will be escaped
+ when needed, otherwise characters won't be escaped (which now becomes the
+ default).
+
+
+* Version 3.0.0 (Dec 29, 2018)
+
+ - This is another breaking change release.
+
+ - JSON objects are now defined as alists (instead of hash tables) and JSON
+ arrays are now defined as vectors (instead of lists). Both of these
+ changes are mainly to use types that have read syntax. This will simplify
+ things for the user when defining JSON objects which is probably the most
+ common case.
+
+ - Fixed and issue when parsing only JSON numbers.
+
+ - Added unit tests.
+
+
+* Version 2.0.0 (Dec 12, 2018)
+
+ - This is a breaking change release. It is not possible anymore to specify a
+ JSON object using alists. Instead alist->hash-table needs to be explicitly
+ used. This makes the bidirectional mapping between Guile hash-tables and
+ JSON objects consistent.
+
+
+* Version 1.3.2 (Dec 2, 2018)
+
+ - Don't use GUILE_SITE and GUILE_SITE_CCACHE, build them as before. Print a
+ helper message at the end of configure output to help users to install in
+ Guile system's directory.
+
+
+* Version 1.3.1 (Dec 1, 2018)
+
+ - Fix guile.m4 to allow multiple candidates for guild, guile-config and
+ guile-tools.
+
+ - Use GUILE_SITE as the variable instead of GUILE_SITE_DIR.
+ (Fixes #20)
+
+
+* Version 1.3.0 (Nov 28, 2018)
+
+ - Properly use guile.m4 macros to install to the right paths.
+ (thanks to Jason Douglas Earl)
+
+
+* Version 1.2.0 (Aug 22, 2018)
+
+ - Switch to GPLv3.
+
+
+* Version 1.1.1 (Aug 14, 2018)
+
+ - Don't output extra spaces except with pretty printing.
+
+
+* Version 1.1.0 (Jul 26, 2018)
+
+ - Install .go files to $(libdir)/guile.
+ (thanks to Ludovic Courtès)
+
+
+* Version 1.0.1 (May 24, 2018)
+
+ - Fixes an issue while handling alists with #nil at the beginning.
+
+
+* Version 1.0.0 (May 23, 2018)
+
+ - Support 4-byte unicode characters.
+ (thanks to Christopher Lam)
+
+ - Remove deprecated `json` macro.
+
+ - Dual GPLv3 and LGPLv3 license.
+
+
* Version 0.6.0 (Jan 16, 2017)
- Deprecate json macro in favor of scheme data types.
diff --git a/borrowed/guile-json/README b/borrowed/guile-json/README
deleted file mode 100644
index 920f85ce9..000000000
--- a/borrowed/guile-json/README
+++ /dev/null
@@ -1,158 +0,0 @@
-
-* guile-json
-
-guile-json is a JSON module for Guile. It supports parsing and
-building JSON documents according to the http://json.org
-specification. These are the main features:
-
-- Mostly complies with http://json.org specification (see UTF-8 below).
-
-- Build JSON documents programmatically using scheme data types.
-
-- Supports UTF-8 (doesn't fully support unicode hexadecimal digits).
-
-- Allows JSON pretty printing.
-
-
-* Installation
-
-guile-json is freely available for download under the terms of the GNU
-Lesser General Public License version 3 (LGPLv3+).
-
-Download the latest tarball and untar it:
-
-- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-0.6.0.tar.gz][guile-json-0.6.0.tar.gz]]
-
-Then, run the typical sequence:
-
- : $ ./configure --prefix=<guile-prefix>
- : $ make
- : $ sudo make install
-
-Where <guile-prefix> should preferably be the same as your system Guile
-installation directory (e.g. /usr).
-
-If everything installed successfully you should be up and running:
-
- : $ guile
- : scheme@(guile-user)> (use-modules (json))
- : scheme@(guile-user)> (scm->json '(1 2 3))
- : [1, 2, 3]
-
-It might be that you installed guile-json somewhere differently than
-your system's Guile. If so, you need to indicate Guile where to find
-guile-json, for example:
-
- : $ GUILE_LOAD_PATH=/usr/local/share/guile/site guile
-
-A pkg-list.scm file is also provided for users of the
-Guildhall/Dorodango packaging system.
-
-
-* Usage
-
-guile-json provides a few procedures to parse and build a JSON
-document. A JSON document is transformed into or from native Guile
-values according to the following table:
-
-| JSON | Guile |
-|--------+-------------|
-| string | string |
-| number | number |
-| object | hash-table* |
-| array | list |
-| true | #t |
-| false | #f |
-| null | #nil |
-
-*Note* (*): Association lists are also tranformed to JSON objects, in
-this case ordered will be preserved.
-
-To start using guile-json procedures and macros you first need to load
-the module:
-
- : scheme@(guile-user)> (use-modules (json))
-
-
-** Procedures
-
-- (*json->scm* #:optional port) : Reads a JSON document from the given
- port, or from the current input port if none is given.
-
- - /port/ : is optional, it defaults to the current input port.
-
-- (*json-string->scm* str) : Reads a JSON document from the given
- string.
-
-- (*scm->json* native #:optional port #:key escape pretty) : Creates a
- JSON document from the given native Guile value. The JSON document is
- written into the given port, or to the current output port if non is
- given.
-
- - /port/ : it defaults to the current output port.
- - /escape/ : if true, the slash (/ solidus) character will be escaped.
- - /pretty/ : if true, the JSON document will be pretty printed.
-
-- (*scm->json-string* native #:key escape pretty) : Creates a JSON
- document from the given native Guile value into a string.
-
- - /escape/ : if true, the slash (/ solidus) character will be escaped.
- - /pretty/ : if true, the JSON document will be pretty printed.
-
-
-** Exceptions
-
-A /json-invalid/ exception is thrown if an error is found during the
-JSON parsing. Since version 0.2.0, the /json-invalid/ exception has a
-single parser argument (see predicate and accessors below). The line or
-column where the error occured can be easily obtained from the parser
-port (calling /port-line/ or /port-column/ on the port).
-
-- (*json-parser?* parser) : Tells whether the given argument is a JSON
- parser record type.
-
-- (*json-parser-port* parser) : Get the port that the parser was reading
- from.
-
-
-** Examples
-
-- Build the string "hello world":
-
- : scheme@(guile-user)> (scm->json "hello world")
- : "hello world"
-
-- Build the [1, 2, 3] array:
-
- : scheme@(guile-user)> (scm->json '(1 2 3))
- : [1, 2, 3]
-
-- Build the [1, 2, 3, 4] array using unquote-splicing:
-
- : scheme@(guile-user)> (define values '(2 3))
- : scheme@(guile-user)> (scm->json `(1 , at values 4))
- : [1, 2, 3, 4]
-
-- Build the object { "project" : "foo", "author" : "bar" } using an
- association list (see how symbols can also be used):
-
- : scheme@(guile-user)> (scm->json '(("project" . "foo") (author . bar)))
- : {"project" : "foo","author" : "bar"}
-
-- Build again the same object { "project" : "foo", "author" : "bar" }
- using a hash table:
-
- : scheme@(guile-user)> (scm->json (alist->hash-table '((project . foo) (author . bar))))
- : {"project" : "foo","author" : "bar"}
-
-- Build the object { "values" : [ 234, 98.56 ] }:
-
- : scheme@(guile-user)> (scm->json '(("values" 234 98.56)))
- : {"values" : [234, 98.56]}
-
-- Build the object { "values" : [ 234, 98.56 ] } again, this time using
- a variable:
-
- : scheme@(guile-user)> (define values '(234 98.56))
- : scheme@(guile-user)> (scm->json `(("values" , at values)))
- : {"values" : [234, 98.56]}
diff --git a/borrowed/guile-json/README b/borrowed/guile-json/README
new file mode 120000
index 000000000..314e17d43
--- /dev/null
+++ b/borrowed/guile-json/README
@@ -0,0 +1 @@
+README.org
\ No newline at end of file
diff --git a/borrowed/guile-json/README b/borrowed/guile-json/README.org
similarity index 59%
copy from borrowed/guile-json/README
copy to borrowed/guile-json/README.org
index 920f85ce9..be669e3f3 100644
--- a/borrowed/guile-json/README
+++ b/borrowed/guile-json/README.org
@@ -3,25 +3,24 @@
guile-json is a JSON module for Guile. It supports parsing and
building JSON documents according to the http://json.org
-specification. These are the main features:
+specification.
-- Mostly complies with http://json.org specification (see UTF-8 below).
+- Complies with http://json.org specification.
-- Build JSON documents programmatically using scheme data types.
-
-- Supports UTF-8 (doesn't fully support unicode hexadecimal digits).
+- Builds JSON documents programmatically using scheme data types.
- Allows JSON pretty printing.
* Installation
-guile-json is freely available for download under the terms of the GNU
-Lesser General Public License version 3 (LGPLv3+).
-
Download the latest tarball and untar it:
-- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-0.6.0.tar.gz][guile-json-0.6.0.tar.gz]]
+- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-3.1.0.tar.gz][guile-json-3.1.0.tar.gz]]
+
+If you are cloning the repository make sure you run this first:
+
+ : $ autoreconf -vif
Then, run the typical sequence:
@@ -36,8 +35,8 @@ If everything installed successfully you should be up and running:
: $ guile
: scheme@(guile-user)> (use-modules (json))
- : scheme@(guile-user)> (scm->json '(1 2 3))
- : [1, 2, 3]
+ : scheme@(guile-user)> (scm->json #(1 2 3))
+ : [1,2,3]
It might be that you installed guile-json somewhere differently than
your system's Guile. If so, you need to indicate Guile where to find
@@ -55,18 +54,15 @@ guile-json provides a few procedures to parse and build a JSON
document. A JSON document is transformed into or from native Guile
values according to the following table:
-| JSON | Guile |
-|--------+-------------|
-| string | string |
-| number | number |
-| object | hash-table* |
-| array | list |
-| true | #t |
-| false | #f |
-| null | #nil |
-
-*Note* (*): Association lists are also tranformed to JSON objects, in
-this case ordered will be preserved.
+| JSON | Guile |
+|--------+--------|
+| string | string |
+| number | number |
+| object | alist |
+| array | vector |
+| true | #t |
+| false | #f |
+| null | #nil |
To start using guile-json procedures and macros you first need to load
the module:
@@ -84,21 +80,26 @@ the module:
- (*json-string->scm* str) : Reads a JSON document from the given
string.
-- (*scm->json* native #:optional port #:key escape pretty) : Creates a
+- (*scm->json* native #:optional port #:key escape unicode pretty) : Creates a
JSON document from the given native Guile value. The JSON document is
written into the given port, or to the current output port if non is
given.
- /port/ : it defaults to the current output port.
- /escape/ : if true, the slash (/ solidus) character will be escaped.
+ - /unicode/ : if true, unicode characters will be escaped when needed.
- /pretty/ : if true, the JSON document will be pretty printed.
-- (*scm->json-string* native #:key escape pretty) : Creates a JSON
+- (*scm->json-string* native #:key escape unicode pretty) : Creates a JSON
document from the given native Guile value into a string.
- /escape/ : if true, the slash (/ solidus) character will be escaped.
+ - /unicode/ : if true, unicode characters will be escaped when needed.
- /pretty/ : if true, the JSON document will be pretty printed.
+ Note that when using alists to build JSON objects, symbols or numbers might
+ be used as keys and they both will be converted to strings.
+
** Exceptions
@@ -119,40 +120,46 @@ port (calling /port-line/ or /port-column/ on the port).
- Build the string "hello world":
- : scheme@(guile-user)> (scm->json "hello world")
+ : > (scm->json "hello world ")
: "hello world"
- Build the [1, 2, 3] array:
- : scheme@(guile-user)> (scm->json '(1 2 3))
- : [1, 2, 3]
+ : > (scm->json #(1 2 3))
+ : [1,2,3]
+
+- Build the object { "project" : "foo", "author" : "bar" } using an alist. See
+ how symbols can also be used:
-- Build the [1, 2, 3, 4] array using unquote-splicing:
+ : > (scm->json '((project . foo) (author . bar)))
+ : {"project":"foo","author":"bar"}
- : scheme@(guile-user)> (define values '(2 3))
- : scheme@(guile-user)> (scm->json `(1 , at values 4))
- : [1, 2, 3, 4]
+- Build the object { "values" : [ 234, 98.56 ] }:
-- Build the object { "project" : "foo", "author" : "bar" } using an
- association list (see how symbols can also be used):
+ : > (scm->json '(("values" . #(234 98.56))))
+ : {"values":[234,98.56]}
- : scheme@(guile-user)> (scm->json '(("project" . "foo") (author . bar)))
- : {"project" : "foo","author" : "bar"}
+- Build the object { "values" : [ 234, 98.56 ] } again, this time using
+ a variable:
-- Build again the same object { "project" : "foo", "author" : "bar" }
- using a hash table:
+ : > (define values #(234 98.56))
+ : > (scm->json `(("values" . ,values)))
+ : {"values":[234,98.56]}
- : scheme@(guile-user)> (scm->json (alist->hash-table '((project . foo) (author . bar))))
- : {"project" : "foo","author" : "bar"}
-- Build the object { "values" : [ 234, 98.56 ] }:
+* License
- : scheme@(guile-user)> (scm->json '(("values" 234 98.56)))
- : {"values" : [234, 98.56]}
+Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
-- Build the object { "values" : [ 234, 98.56 ] } again, this time using
- a variable:
+guile-json 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 3 of the License, or (at your
+option) any later version.
+
+guile-json 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.
- : scheme@(guile-user)> (define values '(234 98.56))
- : scheme@(guile-user)> (scm->json `(("values" , at values)))
- : {"values" : [234, 98.56]}
+You should have received a copy of the GNU General Public License
+along with guile-json. If not, see https://www.gnu.org/licenses/.
diff --git a/borrowed/guile-json/configure.ac b/borrowed/guile-json/configure.ac
new file mode 100644
index 000000000..fbc1affab
--- /dev/null
+++ b/borrowed/guile-json/configure.ac
@@ -0,0 +1,67 @@
+#
+# configure.ac
+#
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+#
+# This file is part of guile-json.
+#
+# guile-json 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 3 of the License, or
+# (at your option) any later version.
+#
+# guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+#
+
+AC_INIT([guile-json], [3.1.0], [aconchillo at gmail.com])
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_SRCDIR(json.scm)
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability])
+AM_SILENT_RULES([yes])
+
+dnl We require pkg.m4 (from pkg-config) and guile.m4.
+dnl Make sure they are available.
+m4_pattern_forbid([PKG_CHECK_MODULES])
+m4_pattern_forbid([^GUILE_PKG])
+
+dnl Check for Guile 2.x.
+GUILE_PKG([3.0 2.2 2.0])
+GUILE_PROGS
+GUILE_SITE_DIR
+
+dnl Guile prefix and libdir.
+GUILE_PREFIX=`$PKG_CONFIG --print-errors --variable=prefix guile-$GUILE_EFFECTIVE_VERSION`
+GUILE_LIBDIR=`$PKG_CONFIG --print-errors --variable=libdir guile-$GUILE_EFFECTIVE_VERSION`
+AC_SUBST(GUILE_PREFIX)
+AC_SUBST(GUILE_LIBDIR)
+
+AC_CONFIG_FILES([Makefile json/Makefile tests/Makefile])
+AC_CONFIG_FILES([env], [chmod +x env])
+
+AC_OUTPUT
+
+dnl This is just for printing $libdir below.
+LIBDIR=`eval echo $libdir`
+LIBDIR=`eval echo $LIBDIR`
+AC_SUBST([LIBDIR])
+
+echo
+echo "*** $PACKAGE $VERSION has been successfully configured ***"
+echo
+echo "$PACKAGE is using:"
+echo
+echo " --prefix=$prefix --libdir=$LIBDIR"
+echo
+echo "If you want to install in Guile system's directory re-run with:"
+echo
+echo " --prefix=$GUILE_PREFIX --libdir=$GUILE_LIBDIR"
+echo
+
+# configure.ac ends here
diff --git a/borrowed/guile-json/env.in b/borrowed/guile-json/env.in
new file mode 100644
index 000000000..a7355a2ec
--- /dev/null
+++ b/borrowed/guile-json/env.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) 2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+#
+# This file is part of guile-json.
+#
+# guile-json 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 3 of the License, or
+# (at your option) any later version.
+#
+# guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+#
+
+if test -z "$GUILE_LOAD_PATH"; then
+ GUILE_LOAD_PATH="@abs_top_srcdir@"
+else
+ GUILE_LOAD_PATH="@abs_top_srcdir@":$GUILE_LOAD_PATH
+fi
+
+if test -z "$GUILE_LOAD_COMPILED_PATH"; then
+ GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@"
+else
+ GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@":$GUILE_LOAD_COMPILED_PATH
+fi
+
+export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH
+
+exec "$@"
diff --git a/borrowed/guile-json/json.scm b/borrowed/guile-json/json.scm
index 8e45f9340..3ca8dc026 100644
--- a/borrowed/guile-json/json.scm
+++ b/borrowed/guile-json/json.scm
@@ -1,23 +1,21 @@
;;; (json) --- Guile JSON implementation.
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json 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
-;; Lesser General Public License for more details.
+;; guile-json 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 Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
@@ -27,8 +25,7 @@
(define-module (json)
#:use-module (json builder)
- #:use-module (json parser)
- #:use-module (json syntax))
+ #:use-module (json parser))
(define-syntax re-export-modules
(syntax-rules ()
@@ -39,7 +36,6 @@
...))))
(re-export-modules (json builder)
- (json parser)
- (json syntax))
+ (json parser))
;;; (json) ends here
diff --git a/borrowed/guile-json/json/Makefile.am b/borrowed/guile-json/json/Makefile.am
new file mode 100644
index 000000000..adf597215
--- /dev/null
+++ b/borrowed/guile-json/json/Makefile.am
@@ -0,0 +1,39 @@
+#
+# Makefile.am
+#
+# Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+#
+# This file is part of guile-json.
+#
+# guile-json 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 3 of the License, or
+# (at your option) any later version.
+#
+# guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+#
+
+moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/json
+objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache/json
+
+SOURCES = builder.scm parser.scm
+
+GOBJECTS = $(SOURCES:%.scm=%.go)
+
+nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_nodist_obj_DATA = $(GOBJECTS)
+
+EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
+
+CLEANFILES = $(GOBJECTS)
+
+GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
+SUFFIXES = .scm .go
+.scm.go:
+ $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
diff --git a/borrowed/guile-json/json/builder.scm b/borrowed/guile-json/json/builder.scm
index d235d6517..6060ac0ea 100644
--- a/borrowed/guile-json/json/builder.scm
+++ b/borrowed/guile-json/json/builder.scm
@@ -1,24 +1,22 @@
;;; (json builder) --- Guile JSON implementation.
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;; Copyright (C) 2013-2019 Aleix Conchillo Flaque <aconchillo at gmail.com>
;; Copyright (C) 2015,2016 Jan Nieuwenhuizen <janneke at gnu.org>
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json 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
-;; Lesser General Public License for more details.
+;; guile-json 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 Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
@@ -29,6 +27,7 @@
(define-module (json builder)
#:use-module (ice-9 format)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-43)
#:use-module (rnrs bytevectors)
#:export (scm->json
scm->json-string))
@@ -87,17 +86,22 @@
;; Object builder functions
;;
-(define (build-object-pair p port escape pretty level)
+(define (build-object-pair p port escape unicode pretty level)
(display (indent-string pretty level) port)
- (json-build-string (car p) port escape)
- (display " : " port)
- (json-build (cdr p) port escape pretty level))
+ (json-build-string (car p) port escape unicode)
+ (build-space port pretty)
+ (display ":" port)
+ (build-space port pretty)
+ (json-build (cdr p) port escape unicode pretty level))
(define (build-newline port pretty)
(cond (pretty (newline port))))
+(define (build-space port pretty)
+ (cond (pretty (display " " port))))
+
(define (indent-string pretty level)
- (if pretty (format #f "~v_" (* 4 level)) ""))
+ (if pretty (format #f "~v_" (* 2 level)) ""))
;;
;; Main builder functions
@@ -120,18 +124,7 @@
((symbol? x) (symbol->string x))
(else x)))
-(define (atom? x)
- (or (char? x) (number? x) (string? x) (symbol? x)))
-
-(define (json-alist? x)
- (and (pair? x)
- (let loop ((x x))
- (or (null? x)
- (null? (car x))
- (and (pair? (car x)) (atom? (caar x))
- (loop (cdr x)))))))
-
-(define (json-build-string scm port escape)
+(define (json-build-string scm port escape unicode)
(display "\"" port)
(display
(list->string
@@ -146,47 +139,49 @@
((#\cr) '(#\\ #\r))
((#\ht) '(#\\ #\t))
((#\/) (if escape `(#\\ ,c) (list c)))
- (else (string->list (build-char-string c)))))
+ (else (if unicode (string->list (build-char-string c)) (list c)))))
(string->list (->string scm)))))
port)
(display "\"" port))
-(define (json-build-array scm port escape pretty level)
+(define (json-build-array scm port escape unicode pretty level)
(display "[" port)
(unless (null? scm)
- (json-build (car scm) port escape pretty (+ level 1))
- (for-each (lambda (v)
- (display ", " port)
- (json-build v port escape pretty (+ level 1)))
- (cdr scm)))
+ (vector-for-each (lambda (i v)
+ (if (> i 0) (display "," port))
+ (build-space port pretty)
+ (json-build v port escape unicode pretty (+ level 1)))
+ scm))
(display "]" port))
-(define (json-build-object scm port escape pretty level)
- (build-newline port pretty)
+(define (json-build-object scm port escape unicode pretty level)
+ (cond ((> level 0)
+ (build-newline port pretty)))
(simple-format port "~A{" (indent-string pretty level))
(build-newline port pretty)
(let ((pairs scm))
(unless (null? pairs)
- (build-object-pair (car pairs) port escape pretty (+ level 1))
+ (build-object-pair (car pairs) port escape unicode pretty (+ level 1))
(for-each (lambda (p)
(display "," port)
(build-newline port pretty)
- (build-object-pair p port escape pretty (+ level 1)))
+ (build-object-pair p port escape unicode pretty (+ level 1)))
(cdr pairs))))
(build-newline port pretty)
(simple-format port "~A}" (indent-string pretty level)))
-(define (json-build scm port escape pretty level)
+(define (json-number? number)
+ (and (number? number) (eqv? (imag-part number) 0) (finite? number)))
+
+(define (json-build scm port escape unicode pretty level)
(cond
((eq? scm #nil) (json-build-null port))
((boolean? scm) (json-build-boolean scm port))
- ((number? scm) (json-build-number scm port))
- ((symbol? scm) (json-build-string (symbol->string scm) port escape))
- ((string? scm) (json-build-string scm port escape))
- ((json-alist? scm) (json-build-object scm port escape pretty level))
- ((list? scm) (json-build-array scm port escape pretty level))
- ((hash-table? scm)
- (json-build-object (hash-map->list cons scm) port escape pretty level))
+ ((json-number? scm) (json-build-number scm port))
+ ((symbol? scm) (json-build-string (symbol->string scm) port escape unicode))
+ ((string? scm) (json-build-string scm port escape unicode))
+ ((vector? scm) (json-build-array scm port escape unicode pretty level))
+ ((pair? scm) (json-build-object scm port escape unicode pretty level))
(else (throw 'json-invalid))))
;;
@@ -195,18 +190,25 @@
(define* (scm->json scm
#:optional (port (current-output-port))
- #:key (escape #f) (pretty #f))
- "Creates a JSON document from native. The argument @var{scm} contains
-the native value of the JSON document. Takes one optional argument,
- at var{port}, which defaults to the current output port where the JSON
-document will be written."
- (json-build scm port escape pretty 0))
-
-(define* (scm->json-string scm #:key (escape #f) (pretty #f))
- "Creates a JSON document from native into a string. The argument
- at var{scm} contains the native value of the JSON document."
+ #:key (escape #f) (unicode #f) (pretty #f))
+ "Creates a JSON document from native. The argument @var{scm} contains the
+native value of the JSON document. Takes one optional argument, @var{port},
+which defaults to the current output port where the JSON document will be
+written. It also takes a few key arguments: @var{escape}: if true, the
+slash (/ solidus) character will be escaped, @{unicode} : if true, unicode
+characters will be escaped when needed and @{pretty}: if true, the JSON
+document will be pretty printed.
+
+Note that when using alists to build JSON objects, symbols or numbers might be
+used as keys and they both will be converted to strings.
+"
+ (json-build scm port escape unicode pretty 0))
+
+(define* (scm->json-string scm #:key (escape #f) (unicode #f) (pretty #f))
+ "Creates a JSON document from native into a string. The argument @var{scm}
+contains the native value of the JSON document."
(call-with-output-string
(lambda (p)
- (scm->json scm p #:escape escape #:pretty pretty))))
+ (scm->json scm p #:escape escape #:unicode unicode #:pretty pretty))))
;;; (json builder) ends here
diff --git a/borrowed/guile-json/json/parser.scm b/borrowed/guile-json/json/parser.scm
index e285803c9..eae6d482a 100644
--- a/borrowed/guile-json/json/parser.scm
+++ b/borrowed/guile-json/json/parser.scm
@@ -1,23 +1,21 @@
;;; (json parser) --- Guile JSON implementation.
-;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json 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
-;; Lesser General Public License for more details.
+;; guile-json 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 Lesser General Public
-;; License along with guile-json; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
@@ -79,76 +77,85 @@
(define (read-exp-part parser)
(let ((c (parser-peek-char parser)) (s ""))
- (case c
- ;; Stop parsing if whitespace found.
- ((#\ht #\vt #\lf #\cr #\sp) s)
- ;; We might be in an array or object, so stop here too.
- ((#\, #\] #\}) s)
- ;; We might have the exponential part
- ((#\e #\E)
- (let ((ch (parser-read-char parser)) ; current char
- (sign (read-sign parser))
- (digits (read-digits parser)))
- ;; If we don't have sign or digits, we have an invalid
- ;; number.
- (if (not (and (string-null? sign)
- (string-null? digits)))
- (string-append s (string ch) sign digits)
- #f)))
- ;; If we have a character different than e or E, we have an
- ;; invalid number.
- (else #f))))
+ (cond
+ ((eof-object? c) s)
+ (else
+ (case c
+ ;; Stop parsing if whitespace found.
+ ((#\ht #\vt #\lf #\cr #\sp) s)
+ ;; We might be in an array or object, so stop here too.
+ ((#\, #\] #\}) s)
+ ;; We might have the exponential part
+ ((#\e #\E)
+ (let ((ch (parser-read-char parser)) ; current char
+ (sign (read-sign parser))
+ (digits (read-digits parser)))
+ ;; If we don't have sign or digits, we have an invalid
+ ;; number.
+ (if (not (and (string-null? sign)
+ (string-null? digits)))
+ (string-append s (string ch) sign digits)
+ #f)))
+ ;; If we have a character different than e or E, we have an
+ ;; invalid number.
+ (else #f))))))
(define (read-real-part parser)
(let ((c (parser-peek-char parser)) (s ""))
- (case c
- ;; Stop parsing if whitespace found.
- ((#\ht #\vt #\lf #\cr #\sp) s)
- ;; We might be in an array or object, so stop here too.
- ((#\, #\] #\}) s)
- ;; If we read . we might have a real number
- ((#\.)
- (let ((ch (parser-read-char parser))
- (digits (read-digits parser)))
- ;; If we have digits, try to read the exponential part,
- ;; otherwise we have an invalid number.
- (cond
- ((not (string-null? digits))
- (let ((exp (read-exp-part parser)))
- (cond
- (exp (string-append s (string ch) digits exp))
- (else #f))))
- (else #f))))
- ;; If we have a character different than . we might continue
- ;; processing.
- (else #f))))
+ (cond
+ ((eof-object? c) s)
+ (else
+ (case c
+ ;; Stop parsing if whitespace found.
+ ((#\ht #\vt #\lf #\cr #\sp) s)
+ ;; We might be in an array or object, so stop here too.
+ ((#\, #\] #\}) s)
+ ;; If we read . we might have a real number
+ ((#\.)
+ (let ((ch (parser-read-char parser))
+ (digits (read-digits parser)))
+ ;; If we have digits, try to read the exponential part,
+ ;; otherwise we have an invalid number.
+ (cond
+ ((not (string-null? digits))
+ (let ((exp (read-exp-part parser)))
+ (cond
+ (exp (string-append s (string ch) digits exp))
+ (else #f))))
+ (else #f))))
+ ;; If we have a character different than . we might continue
+ ;; processing.
+ (else #f))))))
(define (read-number parser)
(let loop ((c (parser-peek-char parser)) (s ""))
- (case c
- ;; Stop parsing if whitespace found.
- ((#\ht #\vt #\lf #\cr #\sp) s)
- ;; We might be in an array or object, so stop here too.
- ((#\, #\] #\}) s)
- ((#\-)
- (let ((ch (parser-read-char parser)))
- (loop (parser-peek-char parser)
- (string-append s (string ch)))))
- ((#\0)
- (let ((ch (parser-read-char parser)))
- (string-append s
- (string ch)
- (or (read-real-part parser)
- (throw 'json-invalid parser)))))
- ((#\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)
- (let ((ch (parser-read-char parser)))
- (string-append s
- (string ch)
- (read-digits parser)
- (or (read-real-part parser)
- (read-exp-part parser)
- (throw 'json-invalid parser)))))
- (else (throw 'json-invalid parser)))))
+ (cond
+ ((eof-object? c) s)
+ (else
+ (case c
+ ;; Stop parsing if whitespace found.
+ ((#\ht #\vt #\lf #\cr #\sp) s)
+ ;; We might be in an array or object, so stop here too.
+ ((#\, #\] #\}) s)
+ ((#\-)
+ (let ((ch (parser-read-char parser)))
+ (loop (parser-peek-char parser)
+ (string-append s (string ch)))))
+ ((#\0)
+ (let ((ch (parser-read-char parser)))
+ (string-append s
+ (string ch)
+ (or (read-real-part parser)
+ (throw 'json-invalid parser)))))
+ ((#\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)
+ (let ((ch (parser-read-char parser)))
+ (string-append s
+ (string ch)
+ (read-digits parser)
+ (or (read-real-part parser)
+ (read-exp-part parser)
+ (throw 'json-invalid parser)))))
+ (else (throw 'json-invalid parser)))))))
;;
;; Object parsing helpers
@@ -171,8 +178,7 @@
(else (throw 'json-invalid parser))))))
(define (read-object parser)
- (let loop ((c (parser-peek-char parser))
- (pairs (make-hash-table)))
+ (let loop ((c (parser-peek-char parser)) (pairs '()))
(case c
;; Skip whitespaces
((#\ht #\vt #\lf #\cr #\sp)
@@ -185,8 +191,7 @@
;; Read one pair and continue
((#\")
(let ((pair (read-pair parser)))
- (hash-set! pairs (car pair) (cdr pair))
- (loop (parser-peek-char parser) pairs)))
+ (loop (parser-peek-char parser) (cons pair pairs))))
;; Skip comma and read more pairs
((#\,)
(parser-read-char parser)
@@ -208,7 +213,7 @@
;; end of array
((#\])
(parser-read-char parser)
- values)
+ (list->vector values))
;; this can be any json object
(else
(let ((value (json-read parser)))
diff --git a/borrowed/guile-json/m4/guile.m4 b/borrowed/guile-json/m4/guile.m4
new file mode 100644
index 000000000..f18dcd1d1
--- /dev/null
+++ b/borrowed/guile-json/m4/guile.m4
@@ -0,0 +1,394 @@
+## Autoconf macros for working with Guile.
+##
+## Copyright (C) 1998,2001, 2006, 2010, 2012, 2013, 2014 Free Software Foundation, Inc.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public License
+## as published by the Free Software Foundation; either version 3 of
+## the License, or (at your option) any later version.
+##
+## This library 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
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301 USA
+
+# serial 11
+
+## Index
+## -----
+##
+## GUILE_PKG -- find Guile development files
+## GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
+## GUILE_FLAGS -- set flags for compiling and linking with Guile
+## GUILE_SITE_DIR -- find path to Guile "site" directories
+## GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
+## GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
+## GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
+## GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable
+## GUILE_MODULE_EXPORTS -- check if a module exports a variable
+## GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable
+
+## Code
+## ----
+
+## NOTE: Comments preceding an AC_DEFUN (starting from "Usage:") are massaged
+## into doc/ref/autoconf-macros.texi (see Makefile.am in that directory).
+
+# GUILE_PKG -- find Guile development files
+#
+# Usage: GUILE_PKG([VERSIONS])
+#
+# This macro runs the @code{pkg-config} tool to find development files
+# for an available version of Guile.
+#
+# By default, this macro will search for the latest stable version of
+# Guile (e.g. 2.2), falling back to the previous stable version
+# (e.g. 2.0) if it is available. If no guile- at var{VERSION}.pc file is
+# found, an error is signalled. The found version is stored in
+# @var{GUILE_EFFECTIVE_VERSION}.
+#
+# If @code{GUILE_PROGS} was already invoked, this macro ensures that the
+# development files have the same effective version as the Guile
+# program.
+#
+# @var{GUILE_EFFECTIVE_VERSION} is marked for substitution, as by
+# @code{AC_SUBST}.
+#
+AC_DEFUN([GUILE_PKG],
+ [PKG_PROG_PKG_CONFIG
+ _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then
+ _guile_tmp=""
+ for v in $_guile_versions_to_search; do
+ if test "$v" = "$GUILE_EFFECTIVE_VERSION"; then
+ _guile_tmp=$v
+ fi
+ done
+ if test -z "$_guile_tmp"; then
+ AC_MSG_FAILURE([searching for guile development files for versions $_guile_versions_to_search, but previously found $GUILE version $GUILE_EFFECTIVE_VERSION])
+ fi
+ _guile_versions_to_search=$GUILE_EFFECTIVE_VERSION
+ fi
+ GUILE_EFFECTIVE_VERSION=""
+ _guile_errors=""
+ for v in $_guile_versions_to_search; do
+ if test -z "$GUILE_EFFECTIVE_VERSION"; then
+ AC_MSG_NOTICE([checking for guile $v])
+ PKG_CHECK_EXISTS([guile-$v], [GUILE_EFFECTIVE_VERSION=$v], [])
+ fi
+ done
+
+ if test -z "$GUILE_EFFECTIVE_VERSION"; then
+ AC_MSG_ERROR([
+No Guile development packages were found.
+
+Please verify that you have Guile installed. If you installed Guile
+from a binary distribution, please verify that you have also installed
+the development packages. If you installed it yourself, you might need
+to adjust your PKG_CONFIG_PATH; see the pkg-config man page for more.
+])
+ fi
+ AC_MSG_NOTICE([found guile $GUILE_EFFECTIVE_VERSION])
+ AC_SUBST([GUILE_EFFECTIVE_VERSION])
+ ])
+
+# GUILE_FLAGS -- set flags for compiling and linking with Guile
+#
+# Usage: GUILE_FLAGS
+#
+# This macro runs the @code{pkg-config} tool to find out how to compile
+# and link programs against Guile. It sets four variables:
+# @var{GUILE_CFLAGS}, @var{GUILE_LDFLAGS}, @var{GUILE_LIBS}, and
+# @var{GUILE_LTLIBS}.
+#
+# @var{GUILE_CFLAGS}: flags to pass to a C or C++ compiler to build code that
+# uses Guile header files. This is almost always just one or more @code{-I}
+# flags.
+#
+# @var{GUILE_LDFLAGS}: flags to pass to the compiler to link a program
+# against Guile. This includes @code{-lguile- at var{VERSION}} for the
+# Guile library itself, and may also include one or more @code{-L} flag
+# to tell the compiler where to find the libraries. But it does not
+# include flags that influence the program's runtime search path for
+# libraries, and will therefore lead to a program that fails to start,
+# unless all necessary libraries are installed in a standard location
+# such as @file{/usr/lib}.
+#
+# @var{GUILE_LIBS} and @var{GUILE_LTLIBS}: flags to pass to the compiler or to
+# libtool, respectively, to link a program against Guile. It includes flags
+# that augment the program's runtime search path for libraries, so that shared
+# libraries will be found at the location where they were during linking, even
+# in non-standard locations. @var{GUILE_LIBS} is to be used when linking the
+# program directly with the compiler, whereas @var{GUILE_LTLIBS} is to be used
+# when linking the program is done through libtool.
+#
+# The variables are marked for substitution, as by @code{AC_SUBST}.
+#
+AC_DEFUN([GUILE_FLAGS],
+ [AC_REQUIRE([GUILE_PKG])
+ PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION])
+
+ dnl GUILE_CFLAGS and GUILE_LIBS are already defined and AC_SUBST'd by
+ dnl PKG_CHECK_MODULES. But GUILE_LIBS to pkg-config is GUILE_LDFLAGS
+ dnl to us.
+
+ GUILE_LDFLAGS=$GUILE_LIBS
+
+ dnl Determine the platform dependent parameters needed to use rpath.
+ dnl AC_LIB_LINKFLAGS_FROM_LIBS is defined in gnulib/m4/lib-link.m4 and needs
+ dnl the file gnulib/build-aux/config.rpath.
+ AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LIBS], [$GUILE_LDFLAGS], [])
+ GUILE_LIBS="$GUILE_LDFLAGS $GUILE_LIBS"
+ AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LTLIBS], [$GUILE_LDFLAGS], [yes])
+ GUILE_LTLIBS="$GUILE_LDFLAGS $GUILE_LTLIBS"
+
+ AC_SUBST([GUILE_EFFECTIVE_VERSION])
+ AC_SUBST([GUILE_CFLAGS])
+ AC_SUBST([GUILE_LDFLAGS])
+ AC_SUBST([GUILE_LIBS])
+ AC_SUBST([GUILE_LTLIBS])
+ ])
+
+# GUILE_SITE_DIR -- find path to Guile site directories
+#
+# Usage: GUILE_SITE_DIR
+#
+# This looks for Guile's "site" directories. The variable @var{GUILE_SITE} will
+# be set to Guile's "site" directory for Scheme source files (usually something
+# like PREFIX/share/guile/site). @var{GUILE_SITE_CCACHE} will be set to the
+# directory for compiled Scheme files also known as @code{.go} files
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/site-ccache).
+# @var{GUILE_EXTENSION} will be set to the directory for compiled C extensions
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/extensions). The latter two
+# are set to blank if the particular version of Guile does not support
+# them. Note that this macro will run the macros @code{GUILE_PKG} and
+# @code{GUILE_PROGS} if they have not already been run.
+#
+# The variables are marked for substitution, as by @code{AC_SUBST}.
+#
+AC_DEFUN([GUILE_SITE_DIR],
+ [AC_REQUIRE([GUILE_PKG])
+ AC_REQUIRE([GUILE_PROGS])
+ AC_MSG_CHECKING(for Guile site directory)
+ GUILE_SITE=`$PKG_CONFIG --print-errors --variable=sitedir guile-$GUILE_EFFECTIVE_VERSION`
+ AC_MSG_RESULT($GUILE_SITE)
+ if test "$GUILE_SITE" = ""; then
+ AC_MSG_FAILURE(sitedir not found)
+ fi
+ AC_SUBST(GUILE_SITE)
+ AC_MSG_CHECKING([for Guile site-ccache directory using pkgconfig])
+ GUILE_SITE_CCACHE=`$PKG_CONFIG --variable=siteccachedir guile-$GUILE_EFFECTIVE_VERSION`
+ if test "$GUILE_SITE_CCACHE" = ""; then
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Guile site-ccache directory using interpreter])
+ GUILE_SITE_CCACHE=`$GUILE -c "(display (if (defined? '%site-ccache-dir) (%site-ccache-dir) \"\"))"`
+ if test $? != "0" -o "$GUILE_SITE_CCACHE" = ""; then
+ AC_MSG_RESULT(no)
+ GUILE_SITE_CCACHE=""
+ AC_MSG_WARN([siteccachedir not found])
+ fi
+ fi
+ AC_MSG_RESULT($GUILE_SITE_CCACHE)
+ AC_SUBST([GUILE_SITE_CCACHE])
+ AC_MSG_CHECKING(for Guile extensions directory)
+ GUILE_EXTENSION=`$PKG_CONFIG --print-errors --variable=extensiondir guile-$GUILE_EFFECTIVE_VERSION`
+ AC_MSG_RESULT($GUILE_EXTENSION)
+ if test "$GUILE_EXTENSION" = ""; then
+ GUILE_EXTENSION=""
+ AC_MSG_WARN(extensiondir not found)
+ fi
+ AC_SUBST(GUILE_EXTENSION)
+ ])
+
+# GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
+#
+# Usage: GUILE_PROGS([VERSION])
+#
+# This macro looks for programs @code{guile} and @code{guild}, setting
+# variables @var{GUILE} and @var{GUILD} to their paths, respectively.
+# The macro will attempt to find @code{guile} with the suffix of
+# @code{-X.Y}, followed by looking for it with the suffix @code{X.Y}, and
+# then fall back to looking for @code{guile} with no suffix. If
+# @code{guile} is still not found, signal an error. The suffix, if any,
+# that was required to find @code{guile} will be used for @code{guild}
+# as well.
+#
+# By default, this macro will search for the latest stable version of
+# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
+# version is found, the macro will signal an error.
+#
+# The effective version of the found @code{guile} is set to
+# @var{GUILE_EFFECTIVE_VERSION}. This macro ensures that the effective
+# version is compatible with the result of a previous invocation of
+# @code{GUILE_FLAGS}, if any.
+#
+# As a legacy interface, it also looks for @code{guile-config} and
+# @code{guile-tools}, setting @var{GUILE_CONFIG} and @var{GUILE_TOOLS}.
+#
+# The variables are marked for substitution, as by @code{AC_SUBST}.
+#
+AC_DEFUN([GUILE_PROGS],
+ [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
+ if test -z "$_guile_required_version"; then
+ _guile_required_version=2.2
+ fi
+
+ _guile_candidates=guile
+ _tmp=
+ for v in `echo "$_guile_required_version" | tr . ' '`; do
+ if test -n "$_tmp"; then _tmp=$_tmp.; fi
+ _tmp=$_tmp$v
+ _guile_candidates="guile-$_tmp guile$_tmp $_guile_candidates"
+ done
+
+ AC_PATH_PROGS(GUILE,[$_guile_candidates])
+ if test -z "$GUILE"; then
+ AC_MSG_ERROR([guile required but not found])
+ fi
+
+ _guile_suffix=`echo "$GUILE" | sed -e 's,^.*/guile\(.*\)$,\1,'`
+ _guile_effective_version=`$GUILE -c "(display (effective-version))"`
+ if test -z "$GUILE_EFFECTIVE_VERSION"; then
+ GUILE_EFFECTIVE_VERSION=$_guile_effective_version
+ elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
+ AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
+ fi
+
+ _guile_major_version=`$GUILE -c "(display (major-version))"`
+ _guile_minor_version=`$GUILE -c "(display (minor-version))"`
+ _guile_micro_version=`$GUILE -c "(display (micro-version))"`
+ _guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version"
+
+ AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
+ _major_version=`echo $_guile_required_version | cut -d . -f 1`
+ _minor_version=`echo $_guile_required_version | cut -d . -f 2`
+ _micro_version=`echo $_guile_required_version | cut -d . -f 3`
+ if test "$_guile_major_version" -gt "$_major_version"; then
+ true
+ elif test "$_guile_major_version" -eq "$_major_version"; then
+ if test "$_guile_minor_version" -gt "$_minor_version"; then
+ true
+ elif test "$_guile_minor_version" -eq "$_minor_version"; then
+ if test -n "$_micro_version"; then
+ if test "$_guile_micro_version" -lt "$_micro_version"; then
+ AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
+ fi
+ fi
+ elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then
+ # Allow prereleases that have the right effective version.
+ true
+ else
+ as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5
+ fi
+ elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then
+ # Allow prereleases that have the right effective version.
+ true
+ else
+ AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
+ fi
+ AC_MSG_RESULT([$_guile_prog_version])
+
+ AC_PATH_PROGS(GUILD,[guild$_guile_suffix guild])
+ AC_SUBST(GUILD)
+
+ AC_PATH_PROGS(GUILE_CONFIG,[guile-config$_guile_suffix guile-config])
+ AC_SUBST(GUILE_CONFIG)
+ if test -n "$GUILD"; then
+ GUILE_TOOLS=$GUILD
+ else
+ AC_PATH_PROGS(GUILE_TOOLS,[guile-tools$_guile_suffix guile-tools])
+ fi
+ AC_SUBST(GUILE_TOOLS)
+ ])
+
+# GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
+#
+# Usage: GUILE_CHECK_RETVAL(var,check)
+#
+# @var{var} is a shell variable name to be set to the return value.
+# @var{check} is a Guile Scheme expression, evaluated with "$GUILE -c", and
+# returning either 0 or non-#f to indicate the check passed.
+# Non-0 number or #f indicates failure.
+# Avoid using the character "#" since that confuses autoconf.
+#
+AC_DEFUN([GUILE_CHECK],
+ [AC_REQUIRE([GUILE_PROGS])
+ $GUILE -c "$2" > /dev/null 2>&1
+ $1=$?
+ ])
+
+# GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
+#
+# Usage: GUILE_MODULE_CHECK(var,module,featuretest,description)
+#
+# @var{var} is a shell variable name to be set to "yes" or "no".
+# @var{module} is a list of symbols, like: (ice-9 common-list).
+# @var{featuretest} is an expression acceptable to GUILE_CHECK, q.v.
+# @var{description} is a present-tense verb phrase (passed to AC_MSG_CHECKING).
+#
+AC_DEFUN([GUILE_MODULE_CHECK],
+ [AC_MSG_CHECKING([if $2 $4])
+ GUILE_CHECK($1,(use-modules $2) (exit ((lambda () $3))))
+ if test "$$1" = "0" ; then $1=yes ; else $1=no ; fi
+ AC_MSG_RESULT($$1)
+ ])
+
+# GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
+#
+# Usage: GUILE_MODULE_AVAILABLE(var,module)
+#
+# @var{var} is a shell variable name to be set to "yes" or "no".
+# @var{module} is a list of symbols, like: (ice-9 common-list).
+#
+AC_DEFUN([GUILE_MODULE_AVAILABLE],
+ [GUILE_MODULE_CHECK($1,$2,0,is available)
+ ])
+
+# GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable
+#
+# Usage: GUILE_MODULE_REQUIRED(symlist)
+#
+# @var{symlist} is a list of symbols, WITHOUT surrounding parens,
+# like: ice-9 common-list.
+#
+AC_DEFUN([GUILE_MODULE_REQUIRED],
+ [GUILE_MODULE_AVAILABLE(ac_guile_module_required, ($1))
+ if test "$ac_guile_module_required" = "no" ; then
+ AC_MSG_ERROR([required guile module not found: ($1)])
+ fi
+ ])
+
+# GUILE_MODULE_EXPORTS -- check if a module exports a variable
+#
+# Usage: GUILE_MODULE_EXPORTS(var,module,modvar)
+#
+# @var{var} is a shell variable to be set to "yes" or "no".
+# @var{module} is a list of symbols, like: (ice-9 common-list).
+# @var{modvar} is the Guile Scheme variable to check.
+#
+AC_DEFUN([GUILE_MODULE_EXPORTS],
+ [GUILE_MODULE_CHECK($1,$2,$3,exports `$3')
+ ])
+
+# GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable
+#
+# Usage: GUILE_MODULE_REQUIRED_EXPORT(module,modvar)
+#
+# @var{module} is a list of symbols, like: (ice-9 common-list).
+# @var{modvar} is the Guile Scheme variable to check.
+#
+AC_DEFUN([GUILE_MODULE_REQUIRED_EXPORT],
+ [GUILE_MODULE_EXPORTS(guile_module_required_export,$1,$2)
+ if test "$guile_module_required_export" = "no" ; then
+ AC_MSG_ERROR([module $1 does not export $2; required])
+ fi
+ ])
+
+## guile.m4 ends here
diff --git a/borrowed/guile-json/pkg-list.scm.in b/borrowed/guile-json/pkg-list.scm.in
new file mode 100644
index 000000000..4b90963d0
--- /dev/null
+++ b/borrowed/guile-json/pkg-list.scm.in
@@ -0,0 +1,29 @@
+;;
+;; Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+;;
+
+(package (json (%VERSION%))
+ (depends (srfi-1))
+ (synopsis "JSON parser/writer for Guile")
+ (description
+ "guile-json supports the parsing and writing of JSON from Guile."
+ "It aims to be fully compliant with the json.org specification, and"
+ "is released under the GPLv3.")
+ (homepage "https://github.com/aconchillo/guile-json")
+ (libraries "json.scm" "json")
+ (documentation "README" "COPYING"))
diff --git a/borrowed/guile-json/tests/Makefile.am b/borrowed/guile-json/tests/Makefile.am
new file mode 100644
index 000000000..bd3a80157
--- /dev/null
+++ b/borrowed/guile-json/tests/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Makefile.am
+#
+# Copyright (C) 2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+#
+# This file is part of guile-json.
+#
+# guile-json 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 3 of the License, or
+# (at your option) any later version.
+#
+# guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+#
+
+TESTS = test-builder.scm test-parser.scm
+
+TEST_EXTENSIONS = .scm
+
+SCM_LOG_COMPILER = $(GUILE)
+AM_SCM_LOG_FLAGS = --no-auto-compile -L $(top_srcdir)
+
+CLEANFILES = $(TESTS:%.scm=%.log)
+
+EXTRA_DIST = $(TESTS) runner.scm
diff --git a/borrowed/guile-json/tests/runner.scm b/borrowed/guile-json/tests/runner.scm
new file mode 100644
index 000000000..b934c4f69
--- /dev/null
+++ b/borrowed/guile-json/tests/runner.scm
@@ -0,0 +1,57 @@
+;;; (tests runner) --- Guile JSON implementation.
+
+;; Copyright (C) 2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; Test runner. This has been copied from GNU Cash.
+
+;;; Code:
+
+(define-module (tests runner)
+ #:use-module (srfi srfi-64)
+ #:export (json:test-runner))
+
+(define (json:test-runner)
+ (let ((runner (test-runner-null))
+ (num-passed 0)
+ (num-failed 0))
+ (test-runner-on-test-end! runner
+ (lambda (runner)
+ (format #t "[~a] line:~a, test: ~a\n"
+ (test-result-ref runner 'result-kind)
+ (test-result-ref runner 'source-line)
+ (test-runner-test-name runner))
+ (case (test-result-kind runner)
+ ((pass xpass) (set! num-passed (1+ num-passed)))
+ ((fail xfail)
+ (if (test-result-ref runner 'expected-value)
+ (format #t "~a\n -> expected: ~s\n -> obtained: ~s\n"
+ (string-join (test-runner-group-path runner) "/")
+ (test-result-ref runner 'expected-value)
+ (test-result-ref runner 'actual-value)))
+ (set! num-failed (1+ num-failed)))
+ (else #t))))
+ (test-runner-on-final! runner
+ (lambda (runner)
+ (format #t "Source:~a\npass = ~a, fail = ~a\n"
+ (test-result-ref runner 'source-file) num-passed num-failed)
+ (zero? num-failed)))
+ runner))
+
+;;; (tests runner) ends here
diff --git a/borrowed/guile-json/tests/test-builder.scm b/borrowed/guile-json/tests/test-builder.scm
new file mode 100644
index 000000000..673d94b06
--- /dev/null
+++ b/borrowed/guile-json/tests/test-builder.scm
@@ -0,0 +1,82 @@
+;;; (tests test-builder) --- Guile JSON implementation.
+
+;; Copyright (C) 2018, 2019 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; Unit tests the JSON builder
+
+;;; Code:
+
+(define-module (tests test-builder)
+ #:use-module (srfi srfi-64)
+ #:use-module (json)
+ #:use-module (tests runner))
+
+(test-runner-factory json:test-runner)
+
+(test-begin "test-builder")
+
+;; Numbers
+(test-equal "1234" (scm->json-string 1234))
+(test-equal "-1234" (scm->json-string -1234))
+(test-equal "-54.897" (scm->json-string -54.897))
+(test-equal "1000.0" (scm->json-string 1e3))
+(test-equal "0.001" (scm->json-string 1e-3))
+(test-equal "0.5" (scm->json-string 1/2))
+(test-equal "0.75" (scm->json-string 3/4))
+(test-error #t (scm->json-string 1+2i))
+(test-error #t (scm->json-string +inf.0))
+(test-error #t (scm->json-string -inf.0))
+(test-error #t (scm->json-string +nan.0))
+
+
+;; Strings
+(test-equal "\"hello guile!\"" (scm->json-string "hello guile!"))
+(test-equal "\"ä½ å¥½ guile!\"" (scm->json-string "ä½ å¥½ guile!"))
+(test-equal "\"\\u4f60\\u597d guile!\"" (scm->json-string "ä½ å¥½ guile!" #:unicode #t))
+(test-equal "\"</script>\"" (scm->json-string "</script>"))
+(test-equal "\"<\\/script>\"" (scm->json-string "</script>" #:escape #t))
+
+;; Boolean
+(test-equal "true" (scm->json-string #t))
+(test-equal "false" (scm->json-string #f))
+
+;; Null
+(test-equal "null" (scm->json-string #nil))
+
+;; Arrays
+(test-equal "[]" (scm->json-string #()))
+(test-equal "[1,2,3,4]" (scm->json-string #(1 2 3 4)))
+(test-equal "[1,2,[3,4],[5,6,[7,8]]]" (scm->json-string #(1 2 #(3 4) #(5 6 #(7 8)))))
+(test-equal "[1,\"two\",3,\"four\"]" (scm->json-string #(1 "two" 3 "four")))
+
+;; Objects
+(test-equal "{\"foo\":\"bar\"}" (scm->json-string '((foo . bar))))
+(test-equal "{\"foo\":\"bar\"}" (scm->json-string '(("foo" . "bar"))))
+(test-equal "{\"foo\":[1,2,3]}" (scm->json-string '((foo . #(1 2 3)))))
+(test-equal "{\"foo\":{\"bar\":[1,2,3]}}" (scm->json-string '((foo . ((bar . #(1 2 3)))))))
+(test-equal "{\"foo\":[1,{\"two\":\"three\"}]}" (scm->json-string '((foo . #(1 (("two" . "three")))))))
+(test-equal "{\"title\":\"A book\",\"author\":\"An author\",\"price\":29.99}"
+ (scm->json-string '((title . "A book")
+ (author . "An author")
+ (price . 29.99))))
+
+(exit (if (test-end "test-builder") 0 1))
+
+;;; (tests test-builder) ends here
diff --git a/borrowed/guile-json/tests/test-parser.scm b/borrowed/guile-json/tests/test-parser.scm
new file mode 100644
index 000000000..e3acb80d2
--- /dev/null
+++ b/borrowed/guile-json/tests/test-parser.scm
@@ -0,0 +1,76 @@
+;;; (tests test-parser) --- Guile JSON implementation.
+
+;; Copyright (C) 2018 Aleix Conchillo Flaque <aconchillo at gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json 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 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json 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 guile-json. If not, see https://www.gnu.org/licenses/.
+
+;;; Commentary:
+
+;; Unit tests the JSON parser
+
+;;; Code:
+
+(define-module (tests test-parser)
+ #:use-module (srfi srfi-64)
+ #:use-module (json)
+ #:use-module (tests runner))
+
+(test-runner-factory json:test-runner)
+
+(test-begin "test-parser")
+
+;; Numbers
+(test-equal 1234 (json-string->scm "1234"))
+(test-equal -1234 (json-string->scm "-1234"))
+(test-equal -54.897 (json-string->scm "-54.897"))
+(test-equal 1000.0 (json-string->scm "1e3"))
+(test-equal 0.001 (json-string->scm "1E-3"))
+
+;; Strings
+(test-equal "hello guile!" (json-string->scm "\"hello guile!\""))
+(test-equal "ä½ å¥½ guile!" (json-string->scm "\"ä½ å¥½ guile!\""))
+(test-equal "ä½ å¥½ guile!" (json-string->scm "\"\\u4f60\\u597d guile!\""))
+
+;; Boolean
+(test-equal #t (json-string->scm "true"))
+(test-equal #f (json-string->scm "false"))
+
+;; Null
+(test-equal #nil (json-string->scm "null"))
+
+;; Arrays
+(test-equal #() (json-string->scm "[]"))
+(test-equal #(1 2 3 4) (json-string->scm "[1,2,3,4]"))
+(test-equal #(1 2 #(3 4) #(5 6 #(7 8))) (json-string->scm "[1,2,[3,4],[5,6,[7,8]]]" ))
+(test-equal #(1 "two" 3 "four") (json-string->scm "[1,\"two\",3,\"four\"]"))
+
+;; Objects
+(test-equal '(("foo" . "bar")) (json-string->scm "{\"foo\":\"bar\"}"))
+(test-equal '(("foo" . "bar")) (json-string->scm "{\"foo\":\"bar\"}"))
+(test-equal '(("foo" . #(1 2 3))) (json-string->scm "{\"foo\":[1,2,3]}"))
+(test-equal '(("foo" . (("bar" . #(1 2 3))))) (json-string->scm "{\"foo\":{\"bar\":[1,2,3]}}"))
+(test-equal '(("foo" . #(1 (("two" . "three"))))) (json-string->scm "{\"foo\":[1,{\"two\":\"three\"}]}"))
+
+;; Since the following JSON object contains more than one key-value pair, we
+;; can't use "test-equal" directly since the output could be unordered.
+(define book (json-string->scm "{\"title\":\"A book\",\"author\":\"An author\",\"price\":29.99}"))
+(test-equal "A book" (assoc-ref book "title"))
+(test-equal "An author" (assoc-ref book "author"))
+(test-equal 29.99 (assoc-ref book "price"))
+
+(exit (if (test-end "test-parser") 0 1))
+
+;;; (tests test-parser) ends here
commit 492539e1db55a53565fe41c4639acb4176f25441
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Apr 4 08:26:08 2019 +0800
[html-style-info] compact functions
diff --git a/gnucash/report/report-system/html-style-info.scm b/gnucash/report/report-system/html-style-info.scm
index 35eca29ec..50b0a7b76 100644
--- a/gnucash/report/report-system/html-style-info.scm
+++ b/gnucash/report/report-system/html-style-info.scm
@@ -110,10 +110,8 @@
(record-modifier <html-markup-style-info> 'font-face))
(define (gnc:html-markup-style-info-set-font-face! record value)
- (begin
- (gnc:html-markup-style-info-set-closing-font-tag!
- record (not (eq? value #f)))
- (gnc:html-markup-style-info-set-font-face-internal! record value)))
+ (gnc:html-markup-style-info-set-closing-font-tag! record value)
+ (gnc:html-markup-style-info-set-font-face-internal! record value))
(define gnc:html-markup-style-info-font-size
(record-accessor <html-markup-style-info> 'font-size))
@@ -122,10 +120,8 @@
(record-modifier <html-markup-style-info> 'font-size))
(define (gnc:html-markup-style-info-set-font-size! record value)
- (begin
- (gnc:html-markup-style-info-set-closing-font-tag!
- record (not (eq? value #f)))
- (gnc:html-markup-style-info-set-font-size-internal! record value)))
+ (gnc:html-markup-style-info-set-closing-font-tag! record value)
+ (gnc:html-markup-style-info-set-font-size-internal! record value))
(define gnc:html-markup-style-info-font-color
(record-accessor <html-markup-style-info> 'font-color))
@@ -154,53 +150,52 @@
(hash-set! (gnc:html-markup-style-info-attributes info) attr val))
(define (gnc:html-markup-style-info-merge s1 s2)
- (if (not (gnc:html-markup-style-info? s1))
- s2
- (if (not (gnc:html-markup-style-info? s2))
- s1
- (let* ((tag-1 (gnc:html-markup-style-info-tag s1))
- (face-1 (gnc:html-markup-style-info-font-face s1))
- (size-1 (gnc:html-markup-style-info-font-size s1))
- (color-1 (gnc:html-markup-style-info-font-color s1))
- (closing-font-tag-1
- (gnc:html-markup-style-info-closing-font-tag s1)))
- (gnc:make-html-markup-style-info-internal
- ;; tag
- (if tag-1 tag-1 (gnc:html-markup-style-info-tag s2))
- ;; attributes: if the child is overriding the
- ;; parent tag, don't initialize the attribute table
- ;; to the parent's attributes. Otherwise, load
- ;; parent attrs then load child attrs over them.
- (let ((ht (make-hash-table)))
- (if (not tag-1)
- (hash-fold
- (lambda (k v p) (hash-set! ht k v) #f) #f
- (gnc:html-markup-style-info-attributes s2)))
- (hash-fold
- (lambda (k v p) (hash-set! ht k v) #f) #f
- (gnc:html-markup-style-info-attributes s1))
- ht)
- ;; font face
- (if face-1 face-1 (gnc:html-markup-style-info-font-face s2))
- ;; font size
- (if size-1 size-1 (gnc:html-markup-style-info-font-size s2))
- ;; color
- (if color-1 color-1
- (gnc:html-markup-style-info-font-color s2))
- ;; closing font tag
- (or closing-font-tag-1
- (gnc:html-markup-style-info-closing-font-tag s2))
- ;; inheritable (get this always from child)
- (gnc:html-markup-style-info-inheritable? s1))))))
+ (cond
+ ((not (gnc:html-markup-style-info? s1)) s2)
+ ((not (gnc:html-markup-style-info? s2)) s1)
+ (else
+ (gnc:make-html-markup-style-info-internal
+ ;; tag
+ (or (gnc:html-markup-style-info-tag s1)
+ (gnc:html-markup-style-info-tag s2))
+ ;; attributes: if the child is overriding the
+ ;; parent tag, don't initialize the attribute table
+ ;; to the parent's attributes. Otherwise, load
+ ;; parent attrs then load child attrs over them.
+ (let ((ht (make-hash-table)))
+ (unless (gnc:html-markup-style-info-tag s1)
+ (hash-for-each
+ (lambda (k v)
+ (hash-set! ht k v))
+ (gnc:html-markup-style-info-attributes s2)))
+ (hash-for-each
+ (lambda (k v) (hash-set! ht k v))
+ (gnc:html-markup-style-info-attributes s1))
+ ht)
+ ;; font face
+ (or (gnc:html-markup-style-info-font-face s1)
+ (gnc:html-markup-style-info-font-face s2))
+ ;; font size
+ (or (gnc:html-markup-style-info-font-size s1)
+ (gnc:html-markup-style-info-font-size s2))
+ ;; color
+ (or (gnc:html-markup-style-info-font-color s1)
+ (gnc:html-markup-style-info-font-color s2))
+ ;; closing font tag
+ (or (gnc:html-markup-style-info-closing-font-tag s1)
+ (gnc:html-markup-style-info-closing-font-tag s2))
+ ;; inheritable (get this always from child)
+ (gnc:html-markup-style-info-inheritable? s1)))))
(define (gnc:html-style-info-merge s1 s2)
- (if (or (gnc:html-markup-style-info? s1)
- (gnc:html-markup-style-info? s2))
- (gnc:html-markup-style-info-merge s1 s2)
- (if (or (gnc:html-data-style-info? s1)
- (gnc:html-data-style-info? s2))
- (gnc:html-data-style-info-merge s1 s2)
- #f)))
+ (cond
+ ((or (gnc:html-markup-style-info? s1) (gnc:html-markup-style-info? s2))
+ (gnc:html-markup-style-info-merge s1 s2))
+
+ ((or (gnc:html-data-style-info? s1) (gnc:html-data-style-info? s2))
+ (gnc:html-data-style-info-merge s1 s2))
+
+ (else #f)))
(define (gnc:html-data-style-info-merge s1 s2)
(if (gnc:html-data-style-info? s1) s1 s2))
@@ -311,8 +306,7 @@
(record-modifier <html-style-table> 'inheritable))
(define (gnc:html-style-table-compiled? table)
- (if (gnc:html-style-table-compiled table)
- #t #f))
+ (gnc:html-style-table-compiled table))
(define (gnc:html-style-table-compile table antecedents)
;; merge a key-value pair from an antecedent into the
@@ -387,9 +381,7 @@
(if (and table (gnc:html-style-table-compiled? table))
(hash-ref (gnc:html-style-table-compiled table) markup)
(fetch-worker
- (if table
- (hash-ref (gnc:html-style-table-primary table) markup)
- #f)
+ (and table (hash-ref (gnc:html-style-table-primary table) markup))
antecedents)))
(define (gnc:html-style-table-set! table markup style-info)
commit 3923dfa19a29c58138263703ff5e111eff4e881f
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Thu Apr 4 06:39:09 2019 +0800
[business-prefs] tidy counter definitions
(for-each) is more appropriate here because the (map) output is
unused...
diff --git a/libgnucash/app-utils/business-prefs.scm b/libgnucash/app-utils/business-prefs.scm
index de7362ecb..60f7bf623 100644
--- a/libgnucash/app-utils/business-prefs.scm
+++ b/libgnucash/app-utils/business-prefs.scm
@@ -158,35 +158,27 @@
"a" (N_ "Budget to be used when none has been otherwise specified.")))
;; Counters Tab
- (map (lambda (vals)
- (let* (
- ; Unpack the list of strings for this counter type
- (key (car vals))
- (sort-string key)
- (format-label (cadr vals))
- (number-label (caddr vals))
- (format-description (cadddr vals))
- (number-description (cadddr (cdr vals)))
- )
- (begin
- ; For each counter-type we create an option for
- ; the last used number and the format string to
- ; use.
- (reg-option
- (gnc:make-counter-option
- gnc:*option-section-counters* number-label key
- (string-append sort-string "a") number-description 0))
- (reg-option
- (gnc:make-counter-format-option
- gnc:*option-section-counters* format-label key
- (string-append sort-string "b") format-description ""))
- )
- )
- )
- ;; Make counter and format option for each defined counter
- counter-types
- )
-)
+ (for-each
+ (lambda (vals)
+ ;; Unpack the list of strings for this counter type
+ (let* ((key (car vals))
+ (format-label (cadr vals))
+ (number-label (caddr vals))
+ (format-description (cadddr vals))
+ (number-description (cadddr (cdr vals))))
+ ;; For each counter-type we create an option for the last used
+ ;; number and the format string to use.
+ (reg-option
+ (gnc:make-counter-option
+ gnc:*option-section-counters* number-label key
+ (string-append key "a") number-description 0))
+
+ (reg-option
+ (gnc:make-counter-format-option
+ gnc:*option-section-counters* format-label key
+ (string-append key "b") format-description ""))))
+ ;; Make counter and format option for each defined counter
+ counter-types))
(gnc-register-kvp-option-generator QOF-ID-BOOK-SCM book-options-generator)
commit 298797a9bebb1140a61dee87b89d2ff962b78f58
Author: c-holtermann <mail at c-holtermann.net>
Date: Thu Apr 4 11:03:52 2019 +0200
fix due to different invoice date handling
diff --git a/bindings/python/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
index bcfd3441e..f44f308ab 100755
--- a/bindings/python/example_scripts/gncinvoice_jinja.py
+++ b/bindings/python/example_scripts/gncinvoice_jinja.py
@@ -196,7 +196,7 @@ def main(argv=None):
output = template.render(invoice=invoice, locale=locale) #, company=company)
if filename_from_invoice:
- filename_date = str(invoice.GetDatePosted()) # something like 2014-11-01
+ filename_date = invoice.GetDatePosted().strftime("%Y-%m-%d") # something like 2014-11-01
filename_owner_name = str(invoice.GetOwner().GetName())
filename_invoice_id = str(invoice.GetID())
filename_output = filename_date + "_" + filename_owner_name + "_" + filename_invoice_id + ".tex"
commit 206ed63233ede3a7bd7e00961d85f78bd7aa4b5d
Author: Christoph Holtermann <c.holtermann at gmx.de>
Date: Fri Sep 21 08:53:16 2018 +0200
typo
diff --git a/bindings/python/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
index e199eb262..bcfd3441e 100755
--- a/bindings/python/example_scripts/gncinvoice_jinja.py
+++ b/bindings/python/example_scripts/gncinvoice_jinja.py
@@ -9,8 +9,8 @@
#
# @details
# Input is a template file that will be filled with information from
-# gnucash Invoices. Jinja2 templating engine ist used. Templates can
-# be Latex, Html or anything.
+# gnucash Invoices. Jinja2 templating engine is being used for this.
+# Templates can be Latex, Html or anything.
#
# Example templates for german invoices:
# - Invoice.tex.tmpl
commit 247d04a5441d8a102555c8bd69c154f9060dd06e
Author: Christoph Holtermann <c.holtermann at gmx.de>
Date: Fri Sep 21 08:49:48 2018 +0200
make executable, remove double -o
diff --git a/bindings/python/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
old mode 100644
new mode 100755
index 6066d5812..e199eb262
--- a/bindings/python/example_scripts/gncinvoice_jinja.py
+++ b/bindings/python/example_scripts/gncinvoice_jinja.py
@@ -5,7 +5,7 @@
# @brief exports an invoice from gnucash using a template file, see \ref py_invoice_export
# @ingroup python_bindings_examples
# @author Christoph Holtermann (c.holtermann (at) gmx.de)
-# @date 2014-11
+# @date 2014-2018
#
# @details
# Input is a template file that will be filled with information from
@@ -143,9 +143,8 @@ def main(argv=None):
print("-I ID use invoice ID")
print("-t filename use filename as template file")
print("-o filename use filename as output file")
- print( "-o filename use filename as output file" )
- print( "-O create output filename by date, owner and invoice number" )
- print( "-P path path for output file. Overwrites path in -o option" )
+ print("-O create output filename by date, owner and invoice number")
+ print("-P path path for output file. Overwrites path in -o option")
return retcode
commit 1184e92687e704d67373e4ce6c55165577faa132
Author: Christoph Holtermann <c.holtermann at gmx.de>
Date: Thu Sep 6 13:17:31 2018 +0200
2to3
diff --git a/bindings/python/example_scripts/str_methods.py b/bindings/python/example_scripts/str_methods.py
index 64c81445c..dfbec36c6 100644
--- a/bindings/python/example_scripts/str_methods.py
+++ b/bindings/python/example_scripts/str_methods.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python3
## @file
-# @brief Add __str__ and __unicode__ methods to financial objects so that @code print object @endcode leads to human readable results
-""" @package str_methods.py -- Add __str__ and __unicode__ methods to financial objects
+# @brief Add __str__ methods to financial objects so that @code print object @endcode leads to human readable results
+""" @package str_methods.py -- Add __str__ methods to financial objects
- Import this module and str(Object) and unicode(Object) where Object is Transaction, Split,Invoice
- or Entry leads to human readable results. That is handy when using @code print object @endcode
+ Import this module and str(Object) where Object is Transaction, Split, Invoice or Entry leads to
+ human readable results. That is handy when using @code print object @endcode
I chose to put these functions/methods in a separate file to develop them like this and maybe if
they prove to be useful they can be put in gnucash_core.py.
@@ -150,29 +150,29 @@ class ClassWithCutting__format__():
value=self.value
# Replace Tabs and linebreaks
- import types
- if type(value) in [types.StringType, types.UnicodeType]:
- value=value.replace("\t","|")
- value=value.replace("\n","|")
+ #import types
+ if isinstance(value, str):
+ value = value.replace("\t","|")
+ value = value.replace("\n","|")
# Do regular formatting of object
- value=value.__format__(fmt)
+ value = value.__format__(fmt)
# Cut resulting value if longer than specified by width
- width=get_width(fmt)
+ width = get_width(fmt)
if width:
- value=cut(value, width, "...")
+ value = cut(value, width, "...")
return value
def all_as_classwithcutting__format__(*args):
"""Converts every argument to instance of ClassWithCutting__format__"""
- import types
+ #import types
l=[]
for a in args:
- if type(a) in [types.StringType, types.UnicodeType]:
- a=a.decode("UTF-8")
+ #if type(a) in [types.StringType, types.UnicodeType]:
+ # a=a.decode("UTF-8")
l.append(ClassWithCutting__format__(a))
return l
@@ -180,15 +180,15 @@ def all_as_classwithcutting__format__(*args):
def all_as_classwithcutting__format__keys(encoding=None, error=None, **keys):
"""Converts every argument to instance of ClassWithCutting__format__"""
- import types
+ #import types
d={}
if encoding==None:
encoding=DEFAULT_ENCODING
if error==None:
error=DEFAULT_ERROR
for a in keys:
- if type(keys[a]) in [types.StringType, types.UnicodeType]:
- keys[a]=keys[a].decode(encoding,error)
+ #if isinstance(keys[a], str):
+ # keys[a]=keys[a].decode(encoding,error)
d[a]=ClassWithCutting__format__(keys[a])
return d
@@ -196,8 +196,8 @@ def all_as_classwithcutting__format__keys(encoding=None, error=None, **keys):
# Split
-def __split__unicode__(self, encoding=None, error=None):
- """__unicode__(self, encoding=None, error=None) -> object
+def __split__str__(self, encoding=None, error=None):
+ """__str__(self, encoding=None, error=None) -> object
Serialize the Split object and return as a new Unicode object.
@@ -229,40 +229,31 @@ def __split__unicode__(self, encoding=None, error=None):
"memo":self.GetMemo(),
"lot":lot_str}
- fmt_str= (u"Account: {account:20} "+
- u"Value: {value:>10} "+
- u"Memo: {memo:30} ")
+ fmt_str= ("Account: {account:20} "+
+ "Value: {value:>10} "+
+ "Memo: {memo:30} ")
if self.optionflags & self.OPTIONFLAGS_BY_NAME["PRINT_TRANSACTION"]:
fmt_t_dict={
"transaction_time":time.ctime(transaction.GetDate()),
"transaction2":transaction.GetDescription()}
fmt_t_str=(
- u"Transaction: {transaction_time:30} "+
- u"- {transaction2:30} "+
- u"Lot: {lot:10}")
+ "Transaction: {transaction_time:30} "+
+ "- {transaction2:30} "+
+ "Lot: {lot:10}")
fmt_dict.update(fmt_t_dict)
fmt_str += fmt_t_str
return fmt_str.format(**all_as_classwithcutting__format__keys(encoding,error,**fmt_dict))
-def __split__str__(self):
- """Returns a bytestring representation of self.__unicode__"""
-
- from gnucash import Split
- #self=Split(instance=self)
-
- return unicode(self).encode('utf-8')
-
# This could be something like an __init__. Maybe we could call it virus because it infects the Split object which
# thereafter mutates to have better capabilities.
infect(gnucash.Split,__split__str__,"__str__")
-infect(gnucash.Split,__split__unicode__,"__unicode__")
gnucash.Split.register_optionflag("PRINT_TRANSACTION")
gnucash.Split.setflag("PRINT_TRANSACTION",True)
-def __transaction__unicode__(self):
- """__unicode__ method for Transaction class"""
+def __transaction__str__(self):
+ """__str__ method for Transaction class"""
from gnucash import Transaction
import time
self=Transaction(instance=self)
@@ -271,7 +262,7 @@ def __transaction__unicode__(self):
'Description:',self.GetDescription(),
'Notes:',self.GetNotes())
- transaction_str = u"{0:6}{1:25} {2:14}{3:40} {4:7}{5:40}".format(
+ transaction_str = "{0:6}{1:25} {2:14}{3:40} {4:7}{5:40}".format(
*all_as_classwithcutting__format__(*fmt_tuple))
transaction_str += "\n"
@@ -282,29 +273,18 @@ def __transaction__unicode__(self):
transaction_flag = split.getflag("PRINT_TRANSACTION")
split.setflag("PRINT_TRANSACTION",False)
- splits_str += u"[{0:>2}] ".format(unicode(n))
- splits_str += unicode(split)
+ splits_str += "[{0:>2}] ".format(str(n))
+ splits_str += str(split)
splits_str += "\n"
split.setflag("PRINT_TRANSACTION",transaction_flag)
return transaction_str + splits_str
-def __transaction__str__(self):
- """__str__ method for Transaction class"""
- from gnucash import Transaction
-
- self=Transaction(instance=self)
- return unicode(self).encode('utf-8')
-
-# These lines add transaction_str as method __str__ to Transaction object
gnucash.gnucash_core_c.__transaction__str__=__transaction__str__
gnucash.Transaction.add_method("__transaction__str__","__str__")
-gnucash.gnucash_core_c.__transaction__unicode__=__transaction__unicode__
-gnucash.Transaction.add_method("__transaction__unicode__","__unicode__")
-
-def __invoice__unicode__(self):
- """__unicode__ method for Invoice"""
+def __invoice__str__(self):
+ """__str__ method for Invoice"""
from gnucash.gnucash_business import Invoice
self=Invoice(instance=self)
@@ -324,37 +304,27 @@ def __invoice__unicode__(self):
"total_value":str(self.GetTotal()),
"currency_mnemonic":self.GetCurrency().get_mnemonic()}
- ret_invoice= (u"{id_name:4}{id_value:10} {notes_name:7}{notes_value:20} {active_name:8}{active_value:7} {owner_name:12}{owner_value:20}"+
- u"{total_name:8}{total_value:10}{currency_mnemonic:3}").\
+ ret_invoice= ("{id_name:4}{id_value:10} {notes_name:7}{notes_value:20} {active_name:8}{active_value:7} {owner_name:12}{owner_value:20}"+
+ "{total_name:8}{total_value:10}{currency_mnemonic:3}").\
format(**all_as_classwithcutting__format__keys(**fmt_dict))
- ret_entries=u""
+ ret_entries=""
entry_list = self.GetEntries()
for entry in entry_list: # Type of entry has to be checked
if not(type(entry)==Entry):
entry=Entry(instance=entry)
- ret_entries += " "+unicode(entry)+"\n"
+ ret_entries += " "+str(entry)+"\n"
return ret_invoice+"\n"+ret_entries
-def __invoice__str__(self):
- """__str__ method for invoice class"""
-
- from gnucash.gnucash_business import Invoice
- self=Invoice(instance=self)
-
- return unicode(self).encode('utf-8')
from gnucash.gnucash_business import Invoice
gnucash.gnucash_core_c.__invoice__str__=__invoice__str__
gnucash.gnucash_business.Invoice.add_method("__invoice__str__","__str__")
-gnucash.gnucash_core_c.__invoice__unicode__=__invoice__unicode__
-gnucash.gnucash_business.Invoice.add_method("__invoice__unicode__","__unicode__")
-
-def __entry__unicode__(self):
- """__unicode__ method for Entry"""
+def __entry__str__(self):
+ """__str__ method for Entry"""
from gnucash.gnucash_business import Entry
self=Entry(instance=self)
@@ -362,34 +332,21 @@ def __entry__unicode__(self):
# This dict and the return statement can be changed according to individual needs
fmt_dict={
"date_name":"Date:",
- "date_value":unicode(self.GetDate()),
+ "date_value":str(self.GetDate()),
"description_name":"Description:",
"description_value":self.GetDescription(),
"notes_name":"Notes:",
"notes_value":self.GetNotes(),
"quant_name":"Quantity:",
- "quant_value":unicode(self.GetQuantity()),
+ "quant_value":str(self.GetQuantity()),
"invprice_name":"InvPrice:",
- "invprice_value":unicode(self.GetInvPrice())}
+ "invprice_value":str(self.GetInvPrice())}
- return (u"{date_name:6}{date_value:15} {description_name:13}{description_value:20} {notes_name:7}{notes_value:20}"+
- u"{quant_name:12}{quant_value:7} {invprice_name:10}{invprice_value:7}").\
+ return ("{date_name:6}{date_value:15} {description_name:13}{description_value:20} {notes_name:7}{notes_value:20}"+
+ "{quant_name:12}{quant_value:7} {invprice_name:10}{invprice_value:7}").\
format(**all_as_classwithcutting__format__keys(**fmt_dict))
-def __entry__str__(self):
- """__str__ method for Entry class"""
-
- from gnucash.gnucash_business import Entry
- self=Entry(instance=self)
-
- return unicode(self).encode('utf-8')
-
from gnucash.gnucash_business import Entry
gnucash.gnucash_core_c.__entry__str__=__entry__str__
gnucash.gnucash_business.Entry.add_method("__entry__str__","__str__")
-
-gnucash.gnucash_core_c.__entry__unicode__=__entry__unicode__
-gnucash.gnucash_business.Entry.add_method("__entry__unicode__","__unicode__")
-
-
commit 002595f4ccf6912235f5d41117b4796dae7f223a
Author: Christoph Holtermann <c.holtermann at gmx.de>
Date: Thu Sep 6 13:15:20 2018 +0200
add options iOP
diff --git a/bindings/python/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
index c6d59c4df..6066d5812 100644
--- a/bindings/python/example_scripts/gncinvoice_jinja.py
+++ b/bindings/python/example_scripts/gncinvoice_jinja.py
@@ -32,6 +32,7 @@
try:
import locale
+ import os
import sys
import getopt
import gnucash
@@ -60,9 +61,12 @@ def main(argv=None):
list_invoices = False
invoice_number = None
invoice_id = None
+ filename_from_invoice = False
+ output_path = None
+ with_ipshell = False
try:
- opts, args = getopt.getopt(argv[1:], "fhlI:t:o:", ["help"])
+ opts, args = getopt.getopt(argv[1:], "fhliI:t:o:OP:", ["help"])
except getopt.error as msg:
raise Usage(msg)
@@ -74,16 +78,27 @@ def main(argv=None):
raise Usage("Help:")
if opt[0] in ["-I"]:
invoice_id = opt[1]
- print("using invoice ID '" + str(invoice_id) + "'.")
+ print ("using invoice ID '" + str(invoice_id) + "'.")
+ if opt[0] in ["-i"]:
+ print ("Using ipshell")
+ with_ipshell = True
if opt[0] in ["-o"]:
filename_output = opt[1]
print("using output file", filename_output)
+ if opt[0] in ["-O"]:
+ if filename_output:
+ print ("given output filename will be overwritten,")
+ print ("creating output filename from Invoice data.")
+ filename_from_invoice = True
if opt[0] in ["-t"]:
filename_template = opt[1]
print("using template file", filename_template)
if opt[0] in ["-l"]:
list_invoices = True
print("listing invoices")
+ if opt[0] in ["-P"]:
+ output_path = opt[1]
+ print ("output path is", output_path + ".")
# Check for correct input
if len(args)>1:
@@ -100,7 +115,7 @@ def main(argv=None):
raise Usage("No template given !")
# Check for output file
- if not filename_output:
+ if not (filename_output or filename_from_invoice):
if filename_template:
filename_output = filename_template + ".out"
print("no output filename given, will be:", filename_output)
@@ -128,6 +143,9 @@ def main(argv=None):
print("-I ID use invoice ID")
print("-t filename use filename as template file")
print("-o filename use filename as output file")
+ print( "-o filename use filename as output file" )
+ print( "-O create output filename by date, owner and invoice number" )
+ print( "-P path path for output file. Overwrites path in -o option" )
return retcode
@@ -166,17 +184,35 @@ def main(argv=None):
print("Using the following invoice:")
print(invoice)
- loader = jinja2.FileSystemLoader('.')
+
+ path_template = os.path.dirname(filename_template)
+ filename_template_basename = os.path.basename(filename_template)
+
+ loader = jinja2.FileSystemLoader(path_template)
env = jinja2.Environment(loader=loader)
- template = env.get_template(filename_template)
+ template = env.get_template(filename_template_basename)
+
+ #company = gnucash_business.Company(book.instance)
+
+ output = template.render(invoice=invoice, locale=locale) #, company=company)
- #import IPython
- #IPython.embed()
- output = template.render(invoice=invoice, locale=locale)
+ if filename_from_invoice:
+ filename_date = str(invoice.GetDatePosted()) # something like 2014-11-01
+ filename_owner_name = str(invoice.GetOwner().GetName())
+ filename_invoice_id = str(invoice.GetID())
+ filename_output = filename_date + "_" + filename_owner_name + "_" + filename_invoice_id + ".tex"
- print("Writing output", filename_output, ".")
+ if output_path:
+ filename_output = os.path.join(output_path, os.path.basename(filename_output))
+
+ print ("Writing output", filename_output, ".")
with open(filename_output, 'w') as f:
- f.write(output.encode('utf-8'))
+ f.write(output)
+
+ if with_ipshell:
+ import IPython
+ IPython.embed()
+
if __name__ == "__main__":
sys.exit(main())
commit 61f7613b8d7a88b31b37ad1c82063a5a5a46a29e
Author: Christoph Holtermann <c.holtermann at gmx.de>
Date: Sun Sep 2 16:25:04 2018 +0200
fix for python3
diff --git a/bindings/python/example_scripts/gncinvoice_jinja.py b/bindings/python/example_scripts/gncinvoice_jinja.py
index 73aa805b8..c6d59c4df 100644
--- a/bindings/python/example_scripts/gncinvoice_jinja.py
+++ b/bindings/python/example_scripts/gncinvoice_jinja.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
##@file
@@ -63,7 +63,7 @@ def main(argv=None):
try:
opts, args = getopt.getopt(argv[1:], "fhlI:t:o:", ["help"])
- except getopt.error, msg:
+ except getopt.error as msg:
raise Usage(msg)
for opt in opts:
@@ -105,12 +105,12 @@ def main(argv=None):
filename_output = filename_template + ".out"
print("no output filename given, will be:", filename_output)
- except Usage, err:
+ except Usage as err:
if err.msg == "Help:":
retcode=0
else:
- print(>>sys.stderr, "Error:",err.msg)
- print(>>sys.stderr, "for help use --help")
+ print("Error:", err.msg, file=sys.stderr)
+ print("for help use --help", file=sys.stderr)
retcode=2
print()
diff --git a/bindings/python/example_scripts/str_methods.py b/bindings/python/example_scripts/str_methods.py
index d1f2f52b8..64c81445c 100644
--- a/bindings/python/example_scripts/str_methods.py
+++ b/bindings/python/example_scripts/str_methods.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
## @file
# @brief Add __str__ and __unicode__ methods to financial objects so that @code print object @endcode leads to human readable results
""" @package str_methods.py -- Add __str__ and __unicode__ methods to financial objects
@@ -30,7 +30,8 @@
# * It seems useful to have an object for each modification. That is because there is some Initialisation to be done.
#
-import gnucash, function_class
+import gnucash
+from gnucash import function_class
# Default values for encoding of strings in GnuCashs Database
DEFAULT_ENCODING = "UTF-8"
commit 505514e1d7aeacba4bde9e30266d88574172eb3c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Apr 3 21:46:21 2019 +0800
[html-style-sheet] modernize hash functions
use hash-map->list
diff --git a/gnucash/report/report-system/html-style-sheet.scm b/gnucash/report/report-system/html-style-sheet.scm
index fd7c3cc15..7852cb285 100644
--- a/gnucash/report/report-system/html-style-sheet.scm
+++ b/gnucash/report/report-system/html-style-sheet.scm
@@ -154,15 +154,12 @@
(close port)))))
(define (gnc:html-style-sheet-set-style! sheet tag . rest)
- (let ((newstyle #f))
- (if (and (= (length rest) 2)
- (procedure? (car rest)))
- (set! newstyle
- (apply gnc:make-html-data-style-info rest))
- (set! newstyle
- (apply gnc:make-html-markup-style-info rest)))
- (gnc:html-style-table-set!
- (gnc:html-style-sheet-style sheet) tag newstyle)))
+ (gnc:html-style-table-set!
+ (gnc:html-style-sheet-style sheet) tag
+ (if (and (= (length rest) 2)
+ (procedure? (car rest)))
+ (apply gnc:make-html-data-style-info rest)
+ (apply gnc:make-html-markup-style-info rest))))
(define (gnc:make-html-style-sheet template-name style-sheet-name)
(let* ((template (gnc:html-style-sheet-template-find template-name)))
@@ -234,7 +231,7 @@
(let ((newdoc ((gnc:html-style-sheet-renderer sheet)
(gnc:html-style-sheet-options sheet)
doc))
- (headers? (if (null? rest) #f (if (car rest) #t #f))))
+ (headers? (and (pair? rest) (car rest))))
;; Copy values over to stylesheet-produced document. note that this is a
;; bug that should probably better be fixed by having the stylesheets
@@ -266,27 +263,20 @@
(gnc:html-document-render newdoc headers?)))
(define (gnc:get-html-style-sheets)
- (let* ((ss '()))
- (hash-for-each (lambda (k v) (set! ss (cons v ss)))
- *gnc:_style-sheets_*)
- (sort ss
- (lambda (a b)
- (string<? (gnc:html-style-sheet-name a)
- (gnc:html-style-sheet-name b))))))
+ (sort (map cdr (hash-map->list cons *gnc:_style-sheets_*))
+ (lambda (a b)
+ (string<? (gnc:html-style-sheet-name a)
+ (gnc:html-style-sheet-name b)))))
(define (gnc:get-html-templates)
- (let* ((ss '()))
- (hash-for-each (lambda (k v)
- (set! ss (cons v ss)))
- *gnc:_style-sheet-templates_*)
- (sort ss
- (lambda (a b)
- (string<? (gnc:html-style-sheet-template-name a)
- (gnc:html-style-sheet-template-name b))))))
+ (sort (map cdr (hash-map->list cons *gnc:_style-sheet-templates_*))
+ (lambda (a b)
+ (string<? (gnc:html-style-sheet-template-name a)
+ (gnc:html-style-sheet-template-name b)))))
(define (gnc:html-style-sheet-find tname)
(hash-ref *gnc:_style-sheets_* tname))
(define (gnc:html-style-sheet-remove sheet)
- (if (not (string=? (gnc:html-style-sheet-name sheet) (N_ "Default")))
- (hash-remove! *gnc:_style-sheets_* (gnc:html-style-sheet-name sheet))))
+ (unless (string=? (gnc:html-style-sheet-name sheet) (N_ "Default"))
+ (hash-remove! *gnc:_style-sheets_* (gnc:html-style-sheet-name sheet))))
commit f4220c325d15714522f59cdb919b5e06cce0b21d
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Apr 3 21:24:00 2019 +0800
[html-document] compact functions
diff --git a/gnucash/report/report-system/html-document.scm b/gnucash/report/report-system/html-document.scm
index e678a073e..f7124f6bd 100644
--- a/gnucash/report/report-system/html-document.scm
+++ b/gnucash/report/report-system/html-document.scm
@@ -98,14 +98,12 @@
(record-predicate <html-document>))
(define (gnc:html-document-set-style! doc tag . rest)
- (let ((newstyle #f))
- (if (and (= (length rest) 2)
- (procedure? (car rest)))
- (set! newstyle
- (apply gnc:make-html-data-style-info rest))
- (set! newstyle
- (apply gnc:make-html-markup-style-info rest)))
- (gnc:html-style-table-set! (gnc:html-document-style doc) tag newstyle)))
+ (gnc:html-style-table-set!
+ (gnc:html-document-style doc) tag
+ (if (and (= (length rest) 2)
+ (procedure? (car rest)))
+ (apply gnc:make-html-data-style-info rest)
+ (apply gnc:make-html-markup-style-info rest))))
(define (gnc:html-document-tree-collapse tree)
(let ((retval '()))
@@ -126,10 +124,10 @@
;; returns the html document as a string, I think.
(define (gnc:html-document-render doc . rest)
(let ((stylesheet (gnc:html-document-style-sheet doc))
- (headers? (if (null? rest) #t (if (car rest) #t #f)))
- (style-text (gnc:html-document-style-text doc))
- )
- (if stylesheet
+ (headers? (or (null? rest) (car rest)))
+ (style-text (gnc:html-document-style-text doc)))
+
+ (if stylesheet
;; if there's a style sheet, let it do the rendering
(gnc:html-style-sheet-render stylesheet doc headers?)
@@ -205,33 +203,20 @@
(append (gnc:html-document-objects doc) objects)))
(define (gnc:html-document-fetch-markup-style doc markup)
- (let ((style-info #f)
- (style-stack (gnc:html-document-style-stack doc)))
- (if (not (null? style-stack))
- (set! style-info
- (gnc:html-style-table-fetch
- (car style-stack)
- (cdr style-stack)
- markup)))
- (if (not style-info)
- (gnc:make-html-markup-style-info)
- style-info)))
+ (let ((style-stack (gnc:html-document-style-stack doc)))
+ (or (and (pair? style-stack)
+ (gnc:html-style-table-fetch
+ (car style-stack) (cdr style-stack) markup))
+ (gnc:make-html-markup-style-info))))
(define (gnc:html-document-fetch-data-style doc markup)
- (let ((style-info #f)
- (style-stack (gnc:html-document-style-stack doc)))
- (if (not (null? (gnc:html-document-style-stack doc)))
- (set! style-info
- (gnc:html-style-table-fetch
- (car style-stack)
- (cdr style-stack)
- markup)))
- (if (not style-info)
- (gnc:make-html-data-style-info
- (lambda (datum parms)
- (format #f "~a ~a" markup datum))
- #f)
- style-info)))
+ (let ((style-stack (gnc:html-document-style-stack doc)))
+ (or (and (pair? style-stack)
+ (gnc:html-style-table-fetch
+ (car style-stack) (cdr style-stack) markup))
+ (gnc:make-html-data-style-info
+ (lambda (datum parms) (format #f "~a ~a" markup datum))
+ #f))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; markup-rendering functions : markup-start and markup-end return
commit df80796afe60d628741d03daad2b1b6f529328a3
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 2 17:27:41 2019 -0700
Bug 797170 - gnucash-3.5 fails to compile with GTK+3-3.20.x
Because of mismatched Gtk version macros in gcrp_grab_on_window.
diff --git a/gnucash/gnome-utils/gnc-cell-renderer-popup.c b/gnucash/gnome-utils/gnc-cell-renderer-popup.c
index 04bcf060b..7ba11429c 100644
--- a/gnucash/gnome-utils/gnc-cell-renderer-popup.c
+++ b/gnucash/gnome-utils/gnc-cell-renderer-popup.c
@@ -223,7 +223,7 @@ gcrp_grab_on_window (GdkWindow *window,
GdkDevice *device;
#endif
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
GdkEvent *event = gtk_get_current_event ();
#endif
@@ -234,7 +234,7 @@ gcrp_grab_on_window (GdkWindow *window,
device = gdk_device_manager_get_client_pointer (device_manager);
#endif
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
if ((gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_POINTER, TRUE, NULL,
event, NULL, NULL) == GDK_GRAB_SUCCESS )) {
if (gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_KEYBOARD, TRUE, NULL,
@@ -251,7 +251,7 @@ gcrp_grab_on_window (GdkWindow *window,
#endif
return TRUE;
else {
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
gdk_seat_ungrab (seat);
#else
gdk_device_ungrab (device, activate_time);
commit b14cb64d1da7e6c6a5af7219511fba4963714ab8
Author: Juraj Svec <ageorgo at gmail.com>
Date: Tue Apr 2 16:40:16 2019 -0700
Bug 797169 - GnuCash hangs loading XML file
Copy-paste error.
diff --git a/gnucash/gnome-utils/assistant-xml-encoding.c b/gnucash/gnome-utils/assistant-xml-encoding.c
index 11cebadbf..4f5aa69cb 100644
--- a/gnucash/gnome-utils/assistant-xml-encoding.c
+++ b/gnucash/gnome-utils/assistant-xml-encoding.c
@@ -533,7 +533,7 @@ gxi_ambiguous_info_destroy (GncXmlImportData *data)
if (data->ambiguous_ht)
{
g_hash_table_destroy (data->ambiguous_ht);
- data->unique = NULL;
+ data->ambiguous_ht = NULL;
}
if (data->ambiguous_list)
{
Summary of changes:
.gitignore | 44 -
CMakeLists.txt | 4 +-
.../python/example_scripts/account_analysis.py | 2 +-
bindings/python/example_scripts/gnc_convenience.py | 2 +-
.../python/example_scripts/gncinvoice_jinja.py | 71 +-
bindings/python/example_scripts/latex_invoices.py | 2 +-
.../new_book_with_opening_balances.py | 4 +-
bindings/python/example_scripts/priceDB_test.py | 2 +-
.../example_scripts/price_database_example.py | 2 +-
bindings/python/example_scripts/quotes_historic.py | 2 +-
.../example_scripts/rest-api/gnucash_rest.py | 6 +-
.../example_scripts/rest-api/gnucash_simple.py | 21 +-
bindings/python/example_scripts/simple_book.py | 2 +-
.../example_scripts/simple_business_create.py | 2 +-
.../example_scripts/simple_invoice_insert.py | 2 +-
bindings/python/example_scripts/simple_session.py | 6 +-
.../python/example_scripts/simple_sqlite_create.py | 2 +-
bindings/python/example_scripts/simple_test.py | 2 +-
bindings/python/example_scripts/str_methods.py | 134 +-
bindings/python/gnucash_business.py | 2 +-
bindings/python/gnucash_core.py | 3 +-
bindings/python/time64.i | 100 +-
borrowed/guile-json/AUTHORS | 5 +-
borrowed/guile-json/CMakeLists.txt | 4 +-
borrowed/guile-json/COPYING | 674 ++
borrowed/guile-json/COPYING.LESSER | 165 -
borrowed/guile-json/INSTALL | 368 +
borrowed/guile-json/Makefile.am | 51 +
borrowed/guile-json/NEWS | 92 +
borrowed/guile-json/README | 159 +-
borrowed/guile-json/{README => README.org} | 103 +-
borrowed/guile-json/configure.ac | 67 +
borrowed/guile-json/env.in | 35 +
borrowed/guile-json/json.scm | 30 +-
borrowed/guile-json/json/Makefile.am | 39 +
borrowed/guile-json/json/builder.scm | 130 +-
borrowed/guile-json/json/parser.scm | 169 +-
borrowed/guile-json/m4/guile.m4 | 394 +
borrowed/guile-json/pkg-list.scm.in | 29 +
borrowed/guile-json/tests/Makefile.am | 31 +
.../guile-json/tests/runner.scm | 46 +-
borrowed/guile-json/tests/test-builder.scm | 82 +
borrowed/guile-json/tests/test-parser.scm | 76 +
common/cmake_modules/GncAddSchemeTargets.cmake | 50 +-
gnucash/gnome-utils/assistant-xml-encoding.c | 2 +-
gnucash/gnome-utils/dialog-options.c | 14 +-
gnucash/gnome-utils/gnc-cell-renderer-popup.c | 6 +-
gnucash/gnome-utils/gnc-gnome-utils.c | 32 +-
gnucash/gnome-utils/gnc-gnome-utils.h | 4 +-
gnucash/gnome-utils/gnc-main-window.c | 2 +-
gnucash/gnome-utils/gnc-plugin-menu-additions.c | 1 +
gnucash/gnome-utils/gnc-tree-model-price.c | 27 +-
gnucash/gnome-utils/gnc-tree-view-commodity.c | 48 +
gnucash/gnome-utils/gnc-tree-view-commodity.h | 10 +
gnucash/gnome-utils/gnc-tree-view-price.c | 10 +
gnucash/gnome/business-options-gnome.c | 1 +
gnucash/gnome/dialog-commodities.c | 135 +-
gnucash/gnome/dialog-price-edit-db.c | 77 +-
gnucash/gnome/dialog-price-editor.c | 115 +-
gnucash/gnome/dialog-trans-assoc.c | 19 +-
gnucash/gnome/gnc-plugin-page-register.c | 2 +-
gnucash/gnome/gnc-plugin-page-register2.c | 2 +-
gnucash/gnome/gnc-split-reg.c | 10 +-
gnucash/gnucash-bin.c | 1 +
.../gschemas/org.gnucash.warnings.gschema.xml.in | 10 +
gnucash/gtkbuilder/assistant-csv-export.glade | 36 +-
gnucash/gtkbuilder/assistant-hierarchy.glade | 229 +-
gnucash/gtkbuilder/dialog-commodities.glade | 198 +-
gnucash/gtkbuilder/dialog-import.glade | 29 +-
gnucash/gtkbuilder/dialog-price.glade | 259 +-
.../import-export/csv-exp/assistant-csv-export.c | 80 +-
.../import-export/csv-exp/assistant-csv-export.h | 2 +
gnucash/import-export/import-main-matcher.c | 270 +-
.../import-export/qif-imp/assistant-qif-import.c | 3 +-
gnucash/python/init.py | 18 +-
gnucash/python/pycons/console.py | 4 +-
gnucash/python/pycons/ishell.py | 2 +-
gnucash/python/pycons/shell.py | 14 +-
.../register/ledger-core/split-register-model.c | 6 +
gnucash/report/business-reports/invoice.scm | 20 +-
.../report/report-gnome/gnc-plugin-page-report.c | 1 +
.../report/report-system/commodity-utilities.scm | 2 +-
gnucash/report/report-system/html-document.scm | 59 +-
gnucash/report/report-system/html-style-info.scm | 108 +-
gnucash/report/report-system/html-style-sheet.scm | 44 +-
gnucash/report/report-system/report.scm | 49 +-
.../report-system/test/test-commodity-utils.scm | 112 +-
.../report-system/test/test-report-system.scm | 13 +
.../standard-reports/income-gst-statement.scm | 12 +-
libgnucash/app-utils/business-options.c | 1 +
libgnucash/app-utils/business-prefs.scm | 50 +-
libgnucash/app-utils/fin.scm | 177 +-
libgnucash/app-utils/gnc-helpers.c | 2 +-
libgnucash/app-utils/option-util.c | 2 +-
libgnucash/core-utils/gnc-filepath-utils.cpp | 17 +-
libgnucash/doc/python-bindings-doxygen.py | 13 +-
libgnucash/engine/glib-helpers.c | 2 +-
libgnucash/engine/gnc-hooks.c | 2 +-
libgnucash/engine/gnc-pricedb-p.h | 1 +
libgnucash/engine/gnc-pricedb.c | 32 +-
libgnucash/engine/gnc-pricedb.h | 2 +
libgnucash/engine/gnc-uri-utils.c | 23 +-
libgnucash/engine/kvp-scm.cpp | 5 +-
libgnucash/engine/qoflog.cpp | 25 +-
libgnucash/scm/CMakeLists.txt | 4 +-
libgnucash/scm/price-quotes.scm | 25 +-
libgnucash/scm/test/CMakeLists.txt | 26 +
.../scm/test/test-libgnucash-scm-utilities.scm | 63 +
libgnucash/scm/utilities.scm | 123 +-
po/CMakeLists.txt | 6 +-
po/ChangeLog | 10 -
po/de.po | 2893 ++++---
po/hr.po | 8681 +++++++++++---------
113 files changed, 10153 insertions(+), 7346 deletions(-)
mode change 100644 => 100755 bindings/python/example_scripts/gncinvoice_jinja.py
create mode 100644 borrowed/guile-json/COPYING
delete mode 100644 borrowed/guile-json/COPYING.LESSER
create mode 100644 borrowed/guile-json/INSTALL
create mode 100644 borrowed/guile-json/Makefile.am
mode change 100644 => 120000 borrowed/guile-json/README
copy borrowed/guile-json/{README => README.org} (59%)
create mode 100644 borrowed/guile-json/configure.ac
create mode 100644 borrowed/guile-json/env.in
create mode 100644 borrowed/guile-json/json/Makefile.am
create mode 100644 borrowed/guile-json/m4/guile.m4
create mode 100644 borrowed/guile-json/pkg-list.scm.in
create mode 100644 borrowed/guile-json/tests/Makefile.am
copy libgnucash/engine/test/srfi64-extras.scm => borrowed/guile-json/tests/runner.scm (54%)
create mode 100644 borrowed/guile-json/tests/test-builder.scm
create mode 100644 borrowed/guile-json/tests/test-parser.scm
mode change 100644 => 100755 libgnucash/engine/gnc-uri-utils.c
create mode 100644 libgnucash/scm/test/CMakeLists.txt
create mode 100644 libgnucash/scm/test/test-libgnucash-scm-utilities.scm
delete mode 100644 po/ChangeLog
More information about the gnucash-changes
mailing list